Update generated files to fix Dart 2 issues. (#36)

Regenerated using updated generator, and existing discovery documents.
diff --git a/generated/googleapis/CHANGELOG.md b/generated/googleapis/CHANGELOG.md
index d48d405..1402482 100644
--- a/generated/googleapis/CHANGELOG.md
+++ b/generated/googleapis/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.50.1
+
+* Re-generated with updated code generator to support Dart 2.
+
 ## 0.50.0
 
 * [api-new] serviceusage:v1
diff --git a/generated/googleapis/lib/abusiveexperiencereport/v1.dart b/generated/googleapis/lib/abusiveexperiencereport/v1.dart
index 7bf4fa2..d149067 100644
--- a/generated/googleapis/lib/abusiveexperiencereport/v1.dart
+++ b/generated/googleapis/lib/abusiveexperiencereport/v1.dart
@@ -64,7 +64,7 @@
   async.Future<SiteSummaryResponse> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -110,7 +110,7 @@
   /// this method will complete with the same error.
   async.Future<ViolatingSitesResponse> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -229,7 +229,8 @@
   ViolatingSitesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("violatingSites")) {
       violatingSites = _json["violatingSites"]
-          .map((value) => new SiteSummaryResponse.fromJson(value))
+          .map<SiteSummaryResponse>(
+              (value) => new SiteSummaryResponse.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/acceleratedmobilepageurl/v1.dart b/generated/googleapis/lib/acceleratedmobilepageurl/v1.dart
index a139f23..861eab5 100644
--- a/generated/googleapis/lib/acceleratedmobilepageurl/v1.dart
+++ b/generated/googleapis/lib/acceleratedmobilepageurl/v1.dart
@@ -53,7 +53,7 @@
   async.Future<BatchGetAmpUrlsResponse> batchGet(BatchGetAmpUrlsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -241,12 +241,13 @@
 
   BatchGetAmpUrlsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("ampUrls")) {
-      ampUrls =
-          _json["ampUrls"].map((value) => new AmpUrl.fromJson(value)).toList();
+      ampUrls = _json["ampUrls"]
+          .map<AmpUrl>((value) => new AmpUrl.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("urlErrors")) {
       urlErrors = _json["urlErrors"]
-          .map((value) => new AmpUrlError.fromJson(value))
+          .map<AmpUrlError>((value) => new AmpUrlError.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/adexchangebuyer/v1_3.dart b/generated/googleapis/lib/adexchangebuyer/v1_3.dart
index 0520ab7..ef8e982 100644
--- a/generated/googleapis/lib/adexchangebuyer/v1_3.dart
+++ b/generated/googleapis/lib/adexchangebuyer/v1_3.dart
@@ -65,7 +65,7 @@
   /// this method will complete with the same error.
   async.Future<Account> get(core.int id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -105,7 +105,7 @@
   /// this method will complete with the same error.
   async.Future<AccountsList> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -147,7 +147,7 @@
   async.Future<Account> patch(Account request, core.int id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -195,7 +195,7 @@
   async.Future<Account> update(Account request, core.int id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -246,7 +246,7 @@
   /// this method will complete with the same error.
   async.Future<BillingInfo> get(core.int accountId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -287,7 +287,7 @@
   /// this method will complete with the same error.
   async.Future<BillingInfoList> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -336,7 +336,7 @@
   async.Future<Budget> get(core.String accountId, core.String billingId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -392,7 +392,7 @@
       Budget request, core.String accountId, core.String billingId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -450,7 +450,7 @@
       Budget request, core.String accountId, core.String billingId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -511,7 +511,7 @@
   async.Future<Creative> get(core.int accountId, core.String buyerCreativeId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -559,7 +559,7 @@
   /// this method will complete with the same error.
   async.Future<Creative> insert(Creative request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -627,7 +627,7 @@
       core.String statusFilter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -687,7 +687,7 @@
   /// this method will complete with the same error.
   async.Future<DirectDeal> get(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -727,7 +727,7 @@
   /// this method will complete with the same error.
   async.Future<DirectDealsList> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -789,7 +789,7 @@
       core.String accountId, core.String endDateTime, core.String startDateTime,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -854,7 +854,7 @@
   async.Future delete(core.String accountId, core.String configId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -908,7 +908,7 @@
       core.String accountId, core.String configId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -960,7 +960,7 @@
       PretargetingConfig request, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1006,7 +1006,7 @@
   async.Future<PretargetingConfigList> list(core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1055,7 +1055,7 @@
       PretargetingConfig request, core.String accountId, core.String configId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1112,7 +1112,7 @@
       PretargetingConfig request, core.String accountId, core.String configId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1228,7 +1228,8 @@
   Account.fromJson(core.Map _json) {
     if (_json.containsKey("bidderLocation")) {
       bidderLocation = _json["bidderLocation"]
-          .map((value) => new AccountBidderLocation.fromJson(value))
+          .map<AccountBidderLocation>(
+              (value) => new AccountBidderLocation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("cookieMatchingNid")) {
@@ -1299,8 +1300,9 @@
 
   AccountsList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Account.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Account>((value) => new Account.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1386,7 +1388,7 @@
   BillingInfoList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new BillingInfo.fromJson(value))
+          .map<BillingInfo>((value) => new BillingInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1590,7 +1592,8 @@
     }
     if (_json.containsKey("reasons")) {
       reasons = _json["reasons"]
-          .map((value) => new CreativeFilteringReasonsReasons.fromJson(value))
+          .map<CreativeFilteringReasonsReasons>(
+              (value) => new CreativeFilteringReasonsReasons.fromJson(value))
           .toList();
     }
   }
@@ -1958,12 +1961,14 @@
     }
     if (_json.containsKey("corrections")) {
       corrections = _json["corrections"]
-          .map((value) => new CreativeCorrections.fromJson(value))
+          .map<CreativeCorrections>(
+              (value) => new CreativeCorrections.fromJson(value))
           .toList();
     }
     if (_json.containsKey("disapprovalReasons")) {
       disapprovalReasons = _json["disapprovalReasons"]
-          .map((value) => new CreativeDisapprovalReasons.fromJson(value))
+          .map<CreativeDisapprovalReasons>(
+              (value) => new CreativeDisapprovalReasons.fromJson(value))
           .toList();
     }
     if (_json.containsKey("filteringReasons")) {
@@ -2107,8 +2112,9 @@
 
   CreativesList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Creative.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Creative>((value) => new Creative.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2309,7 +2315,7 @@
   DirectDealsList.fromJson(core.Map _json) {
     if (_json.containsKey("directDeals")) {
       directDeals = _json["directDeals"]
-          .map((value) => new DirectDeal.fromJson(value))
+          .map<DirectDeal>((value) => new DirectDeal.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -2579,7 +2585,8 @@
     }
     if (_json.containsKey("performanceReport")) {
       performanceReport = _json["performanceReport"]
-          .map((value) => new PerformanceReport.fromJson(value))
+          .map<PerformanceReport>(
+              (value) => new PerformanceReport.fromJson(value))
           .toList();
     }
   }
@@ -2797,7 +2804,8 @@
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new PretargetingConfigDimensions.fromJson(value))
+          .map<PretargetingConfigDimensions>(
+              (value) => new PretargetingConfigDimensions.fromJson(value))
           .toList();
     }
     if (_json.containsKey("excludedContentLabels")) {
@@ -2808,7 +2816,7 @@
     }
     if (_json.containsKey("excludedPlacements")) {
       excludedPlacements = _json["excludedPlacements"]
-          .map((value) =>
+          .map<PretargetingConfigExcludedPlacements>((value) =>
               new PretargetingConfigExcludedPlacements.fromJson(value))
           .toList();
     }
@@ -2841,7 +2849,8 @@
     }
     if (_json.containsKey("placements")) {
       placements = _json["placements"]
-          .map((value) => new PretargetingConfigPlacements.fromJson(value))
+          .map<PretargetingConfigPlacements>(
+              (value) => new PretargetingConfigPlacements.fromJson(value))
           .toList();
     }
     if (_json.containsKey("platforms")) {
@@ -2952,7 +2961,8 @@
   PretargetingConfigList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new PretargetingConfig.fromJson(value))
+          .map<PretargetingConfig>(
+              (value) => new PretargetingConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
diff --git a/generated/googleapis/lib/adexchangebuyer/v1_4.dart b/generated/googleapis/lib/adexchangebuyer/v1_4.dart
index d69eb60..250a94d 100644
--- a/generated/googleapis/lib/adexchangebuyer/v1_4.dart
+++ b/generated/googleapis/lib/adexchangebuyer/v1_4.dart
@@ -73,7 +73,7 @@
   /// this method will complete with the same error.
   async.Future<Account> get(core.int id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -113,7 +113,7 @@
   /// this method will complete with the same error.
   async.Future<AccountsList> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -158,7 +158,7 @@
   async.Future<Account> patch(Account request, core.int id,
       {core.bool confirmUnsafeAccountChange, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -214,7 +214,7 @@
   async.Future<Account> update(Account request, core.int id,
       {core.bool confirmUnsafeAccountChange, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -270,7 +270,7 @@
   /// this method will complete with the same error.
   async.Future<BillingInfo> get(core.int accountId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -311,7 +311,7 @@
   /// this method will complete with the same error.
   async.Future<BillingInfoList> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -360,7 +360,7 @@
   async.Future<Budget> get(core.String accountId, core.String billingId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -416,7 +416,7 @@
       Budget request, core.String accountId, core.String billingId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -474,7 +474,7 @@
       Budget request, core.String accountId, core.String billingId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -535,7 +535,7 @@
       core.int accountId, core.String buyerCreativeId, core.String dealId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -594,7 +594,7 @@
   async.Future<Creative> get(core.int accountId, core.String buyerCreativeId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -642,7 +642,7 @@
   /// this method will complete with the same error.
   async.Future<Creative> insert(Creative request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -725,7 +725,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -786,7 +786,7 @@
       core.int accountId, core.String buyerCreativeId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -839,7 +839,7 @@
       core.int accountId, core.String buyerCreativeId, core.String dealId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -905,7 +905,7 @@
       DeleteOrderDealsRequest request, core.String proposalId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -957,7 +957,7 @@
       AddOrderDealsRequest request, core.String proposalId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1008,7 +1008,7 @@
   async.Future<GetOrderDealsResponse> list(core.String proposalId,
       {core.String pqlQuery, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1058,7 +1058,7 @@
       EditAllOrderDealsRequest request, core.String proposalId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1117,7 +1117,7 @@
       AddOrderNotesRequest request, core.String proposalId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1170,7 +1170,7 @@
   async.Future<GetOrderNotesResponse> list(core.String proposalId,
       {core.String pqlQuery, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1225,7 +1225,7 @@
       UpdatePrivateAuctionProposalRequest request, core.String privateAuctionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1297,7 +1297,7 @@
       core.String accountId, core.String endDateTime, core.String startDateTime,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1362,7 +1362,7 @@
   async.Future delete(core.String accountId, core.String configId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1416,7 +1416,7 @@
       core.String accountId, core.String configId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1468,7 +1468,7 @@
       PretargetingConfig request, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1514,7 +1514,7 @@
   async.Future<PretargetingConfigList> list(core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1563,7 +1563,7 @@
       PretargetingConfig request, core.String accountId, core.String configId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1620,7 +1620,7 @@
       PretargetingConfig request, core.String accountId, core.String configId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1677,7 +1677,7 @@
   /// this method will complete with the same error.
   async.Future<Product> get(core.String productId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1720,7 +1720,7 @@
   async.Future<GetOffersResponse> search(
       {core.String pqlQuery, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1768,7 +1768,7 @@
   /// this method will complete with the same error.
   async.Future<Proposal> get(core.String proposalId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1811,7 +1811,7 @@
   async.Future<CreateOrdersResponse> insert(CreateOrdersRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1872,7 +1872,7 @@
       core.String revisionNumber, core.String updateAction,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1929,7 +1929,7 @@
   async.Future<GetOrdersResponse> search(
       {core.String pqlQuery, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1969,7 +1969,7 @@
   /// this method will complete with the same error.
   async.Future setupcomplete(core.String proposalId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2034,7 +2034,7 @@
       core.String revisionNumber, core.String updateAction,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2097,7 +2097,7 @@
   async.Future<GetPublisherProfilesByAccountIdResponse> list(core.int accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2226,7 +2226,8 @@
   Account.fromJson(core.Map _json) {
     if (_json.containsKey("bidderLocation")) {
       bidderLocation = _json["bidderLocation"]
-          .map((value) => new AccountBidderLocation.fromJson(value))
+          .map<AccountBidderLocation>(
+              (value) => new AccountBidderLocation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("cookieMatchingNid")) {
@@ -2297,8 +2298,9 @@
 
   AccountsList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Account.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Account>((value) => new Account.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2333,7 +2335,7 @@
   AddOrderDealsRequest.fromJson(core.Map _json) {
     if (_json.containsKey("deals")) {
       deals = _json["deals"]
-          .map((value) => new MarketplaceDeal.fromJson(value))
+          .map<MarketplaceDeal>((value) => new MarketplaceDeal.fromJson(value))
           .toList();
     }
     if (_json.containsKey("proposalRevisionNumber")) {
@@ -2372,7 +2374,7 @@
   AddOrderDealsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deals")) {
       deals = _json["deals"]
-          .map((value) => new MarketplaceDeal.fromJson(value))
+          .map<MarketplaceDeal>((value) => new MarketplaceDeal.fromJson(value))
           .toList();
     }
     if (_json.containsKey("proposalRevisionNumber")) {
@@ -2402,7 +2404,7 @@
   AddOrderNotesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("notes")) {
       notes = _json["notes"]
-          .map((value) => new MarketplaceNote.fromJson(value))
+          .map<MarketplaceNote>((value) => new MarketplaceNote.fromJson(value))
           .toList();
     }
   }
@@ -2425,7 +2427,7 @@
   AddOrderNotesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("notes")) {
       notes = _json["notes"]
-          .map((value) => new MarketplaceNote.fromJson(value))
+          .map<MarketplaceNote>((value) => new MarketplaceNote.fromJson(value))
           .toList();
     }
   }
@@ -2506,7 +2508,7 @@
   BillingInfoList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new BillingInfo.fromJson(value))
+          .map<BillingInfo>((value) => new BillingInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -2662,7 +2664,7 @@
   CreateOrdersRequest.fromJson(core.Map _json) {
     if (_json.containsKey("proposals")) {
       proposals = _json["proposals"]
-          .map((value) => new Proposal.fromJson(value))
+          .map<Proposal>((value) => new Proposal.fromJson(value))
           .toList();
     }
     if (_json.containsKey("webPropertyCode")) {
@@ -2692,7 +2694,7 @@
   CreateOrdersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("proposals")) {
       proposals = _json["proposals"]
-          .map((value) => new Proposal.fromJson(value))
+          .map<Proposal>((value) => new Proposal.fromJson(value))
           .toList();
     }
   }
@@ -2774,7 +2776,8 @@
   CreativeCorrections.fromJson(core.Map _json) {
     if (_json.containsKey("contexts")) {
       contexts = _json["contexts"]
-          .map((value) => new CreativeCorrectionsContexts.fromJson(value))
+          .map<CreativeCorrectionsContexts>(
+              (value) => new CreativeCorrectionsContexts.fromJson(value))
           .toList();
     }
     if (_json.containsKey("details")) {
@@ -2851,7 +2854,8 @@
     }
     if (_json.containsKey("reasons")) {
       reasons = _json["reasons"]
-          .map((value) => new CreativeFilteringReasonsReasons.fromJson(value))
+          .map<CreativeFilteringReasonsReasons>(
+              (value) => new CreativeFilteringReasonsReasons.fromJson(value))
           .toList();
     }
   }
@@ -3223,13 +3227,13 @@
   CreativeServingRestrictions.fromJson(core.Map _json) {
     if (_json.containsKey("contexts")) {
       contexts = _json["contexts"]
-          .map((value) =>
+          .map<CreativeServingRestrictionsContexts>((value) =>
               new CreativeServingRestrictionsContexts.fromJson(value))
           .toList();
     }
     if (_json.containsKey("disapprovalReasons")) {
       disapprovalReasons = _json["disapprovalReasons"]
-          .map((value) =>
+          .map<CreativeServingRestrictionsDisapprovalReasons>((value) =>
               new CreativeServingRestrictionsDisapprovalReasons.fromJson(value))
           .toList();
     }
@@ -3411,7 +3415,8 @@
     }
     if (_json.containsKey("corrections")) {
       corrections = _json["corrections"]
-          .map((value) => new CreativeCorrections.fromJson(value))
+          .map<CreativeCorrections>(
+              (value) => new CreativeCorrections.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dealsStatus")) {
@@ -3453,7 +3458,8 @@
     }
     if (_json.containsKey("servingRestrictions")) {
       servingRestrictions = _json["servingRestrictions"]
-          .map((value) => new CreativeServingRestrictions.fromJson(value))
+          .map<CreativeServingRestrictions>(
+              (value) => new CreativeServingRestrictions.fromJson(value))
           .toList();
     }
     if (_json.containsKey("vendorType")) {
@@ -3616,7 +3622,8 @@
   CreativeDealIds.fromJson(core.Map _json) {
     if (_json.containsKey("dealStatuses")) {
       dealStatuses = _json["dealStatuses"]
-          .map((value) => new CreativeDealIdsDealStatuses.fromJson(value))
+          .map<CreativeDealIdsDealStatuses>(
+              (value) => new CreativeDealIdsDealStatuses.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3656,8 +3663,9 @@
 
   CreativesList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Creative.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Creative>((value) => new Creative.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3918,7 +3926,7 @@
     }
     if (_json.containsKey("fixedPrices")) {
       fixedPrices = _json["fixedPrices"]
-          .map((value) => new PricePerBuyer.fromJson(value))
+          .map<PricePerBuyer>((value) => new PricePerBuyer.fromJson(value))
           .toList();
     }
     if (_json.containsKey("guaranteedImpressions")) {
@@ -4028,7 +4036,7 @@
     }
     if (_json.containsKey("reservePricePerBuyers")) {
       reservePricePerBuyers = _json["reservePricePerBuyers"]
-          .map((value) => new PricePerBuyer.fromJson(value))
+          .map<PricePerBuyer>((value) => new PricePerBuyer.fromJson(value))
           .toList();
     }
   }
@@ -4056,7 +4064,7 @@
   DealTermsNonGuaranteedFixedPriceTerms.fromJson(core.Map _json) {
     if (_json.containsKey("fixedPrices")) {
       fixedPrices = _json["fixedPrices"]
-          .map((value) => new PricePerBuyer.fromJson(value))
+          .map<PricePerBuyer>((value) => new PricePerBuyer.fromJson(value))
           .toList();
     }
   }
@@ -4155,7 +4163,7 @@
   DeleteOrderDealsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deals")) {
       deals = _json["deals"]
-          .map((value) => new MarketplaceDeal.fromJson(value))
+          .map<MarketplaceDeal>((value) => new MarketplaceDeal.fromJson(value))
           .toList();
     }
     if (_json.containsKey("proposalRevisionNumber")) {
@@ -4192,7 +4200,8 @@
     }
     if (_json.containsKey("frequencyCaps")) {
       frequencyCaps = _json["frequencyCaps"]
-          .map((value) => new DeliveryControlFrequencyCap.fromJson(value))
+          .map<DeliveryControlFrequencyCap>(
+              (value) => new DeliveryControlFrequencyCap.fromJson(value))
           .toList();
     }
   }
@@ -4264,7 +4273,8 @@
     }
     if (_json.containsKey("dimensionValues")) {
       dimensionValues = _json["dimensionValues"]
-          .map((value) => new DimensionDimensionValue.fromJson(value))
+          .map<DimensionDimensionValue>(
+              (value) => new DimensionDimensionValue.fromJson(value))
           .toList();
     }
   }
@@ -4357,7 +4367,7 @@
   EditAllOrderDealsRequest.fromJson(core.Map _json) {
     if (_json.containsKey("deals")) {
       deals = _json["deals"]
-          .map((value) => new MarketplaceDeal.fromJson(value))
+          .map<MarketplaceDeal>((value) => new MarketplaceDeal.fromJson(value))
           .toList();
     }
     if (_json.containsKey("proposal")) {
@@ -4402,7 +4412,7 @@
   EditAllOrderDealsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deals")) {
       deals = _json["deals"]
-          .map((value) => new MarketplaceDeal.fromJson(value))
+          .map<MarketplaceDeal>((value) => new MarketplaceDeal.fromJson(value))
           .toList();
     }
     if (_json.containsKey("orderRevisionNumber")) {
@@ -4432,7 +4442,7 @@
   GetOffersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("products")) {
       products = _json["products"]
-          .map((value) => new Product.fromJson(value))
+          .map<Product>((value) => new Product.fromJson(value))
           .toList();
     }
   }
@@ -4456,7 +4466,7 @@
   GetOrderDealsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deals")) {
       deals = _json["deals"]
-          .map((value) => new MarketplaceDeal.fromJson(value))
+          .map<MarketplaceDeal>((value) => new MarketplaceDeal.fromJson(value))
           .toList();
     }
   }
@@ -4483,7 +4493,7 @@
   GetOrderNotesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("notes")) {
       notes = _json["notes"]
-          .map((value) => new MarketplaceNote.fromJson(value))
+          .map<MarketplaceNote>((value) => new MarketplaceNote.fromJson(value))
           .toList();
     }
   }
@@ -4507,7 +4517,7 @@
   GetOrdersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("proposals")) {
       proposals = _json["proposals"]
-          .map((value) => new Proposal.fromJson(value))
+          .map<Proposal>((value) => new Proposal.fromJson(value))
           .toList();
     }
   }
@@ -4531,7 +4541,8 @@
   GetPublisherProfilesByAccountIdResponse.fromJson(core.Map _json) {
     if (_json.containsKey("profiles")) {
       profiles = _json["profiles"]
-          .map((value) => new PublisherProfileApiProto.fromJson(value))
+          .map<PublisherProfileApiProto>(
+              (value) => new PublisherProfileApiProto.fromJson(value))
           .toList();
     }
   }
@@ -4702,12 +4713,13 @@
     }
     if (_json.containsKey("sellerContacts")) {
       sellerContacts = _json["sellerContacts"]
-          .map((value) => new ContactInformation.fromJson(value))
+          .map<ContactInformation>(
+              (value) => new ContactInformation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("sharedTargetings")) {
       sharedTargetings = _json["sharedTargetings"]
-          .map((value) => new SharedTargeting.fromJson(value))
+          .map<SharedTargeting>((value) => new SharedTargeting.fromJson(value))
           .toList();
     }
     if (_json.containsKey("syndicationProduct")) {
@@ -5227,7 +5239,8 @@
     }
     if (_json.containsKey("performanceReport")) {
       performanceReport = _json["performanceReport"]
-          .map((value) => new PerformanceReport.fromJson(value))
+          .map<PerformanceReport>(
+              (value) => new PerformanceReport.fromJson(value))
           .toList();
     }
   }
@@ -5503,7 +5516,8 @@
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new PretargetingConfigDimensions.fromJson(value))
+          .map<PretargetingConfigDimensions>(
+              (value) => new PretargetingConfigDimensions.fromJson(value))
           .toList();
     }
     if (_json.containsKey("excludedContentLabels")) {
@@ -5514,7 +5528,7 @@
     }
     if (_json.containsKey("excludedPlacements")) {
       excludedPlacements = _json["excludedPlacements"]
-          .map((value) =>
+          .map<PretargetingConfigExcludedPlacements>((value) =>
               new PretargetingConfigExcludedPlacements.fromJson(value))
           .toList();
     }
@@ -5550,7 +5564,8 @@
     }
     if (_json.containsKey("placements")) {
       placements = _json["placements"]
-          .map((value) => new PretargetingConfigPlacements.fromJson(value))
+          .map<PretargetingConfigPlacements>(
+              (value) => new PretargetingConfigPlacements.fromJson(value))
           .toList();
     }
     if (_json.containsKey("platforms")) {
@@ -5573,7 +5588,7 @@
     }
     if (_json.containsKey("videoPlayerSizes")) {
       videoPlayerSizes = _json["videoPlayerSizes"]
-          .map(
+          .map<PretargetingConfigVideoPlayerSizes>(
               (value) => new PretargetingConfigVideoPlayerSizes.fromJson(value))
           .toList();
     }
@@ -5680,7 +5695,8 @@
   PretargetingConfigList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new PretargetingConfig.fromJson(value))
+          .map<PretargetingConfig>(
+              (value) => new PretargetingConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -5969,7 +5985,8 @@
     }
     if (_json.containsKey("creatorContacts")) {
       creatorContacts = _json["creatorContacts"]
-          .map((value) => new ContactInformation.fromJson(value))
+          .map<ContactInformation>(
+              (value) => new ContactInformation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creatorRole")) {
@@ -5995,7 +6012,8 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new MarketplaceLabel.fromJson(value))
+          .map<MarketplaceLabel>(
+              (value) => new MarketplaceLabel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("lastUpdateTimeMs")) {
@@ -6031,7 +6049,7 @@
     }
     if (_json.containsKey("sharedTargetings")) {
       sharedTargetings = _json["sharedTargetings"]
-          .map((value) => new SharedTargeting.fromJson(value))
+          .map<SharedTargeting>((value) => new SharedTargeting.fromJson(value))
           .toList();
     }
     if (_json.containsKey("state")) {
@@ -6236,7 +6254,8 @@
     }
     if (_json.containsKey("buyerContacts")) {
       buyerContacts = _json["buyerContacts"]
-          .map((value) => new ContactInformation.fromJson(value))
+          .map<ContactInformation>(
+              (value) => new ContactInformation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("buyerPrivateData")) {
@@ -6265,7 +6284,8 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new MarketplaceLabel.fromJson(value))
+          .map<MarketplaceLabel>(
+              (value) => new MarketplaceLabel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("lastUpdaterOrCommentorRole")) {
@@ -6300,7 +6320,8 @@
     }
     if (_json.containsKey("sellerContacts")) {
       sellerContacts = _json["sellerContacts"]
-          .map((value) => new ContactInformation.fromJson(value))
+          .map<ContactInformation>(
+              (value) => new ContactInformation.fromJson(value))
           .toList();
     }
   }
@@ -6622,7 +6643,7 @@
   PublisherProvidedForecast.fromJson(core.Map _json) {
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("weeklyImpressions")) {
@@ -6699,12 +6720,12 @@
   SharedTargeting.fromJson(core.Map _json) {
     if (_json.containsKey("exclusions")) {
       exclusions = _json["exclusions"]
-          .map((value) => new TargetingValue.fromJson(value))
+          .map<TargetingValue>((value) => new TargetingValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("inclusions")) {
       inclusions = _json["inclusions"]
-          .map((value) => new TargetingValue.fromJson(value))
+          .map<TargetingValue>((value) => new TargetingValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("key")) {
@@ -6804,7 +6825,8 @@
   TargetingValueCreativeSize.fromJson(core.Map _json) {
     if (_json.containsKey("companionSizes")) {
       companionSizes = _json["companionSizes"]
-          .map((value) => new TargetingValueSize.fromJson(value))
+          .map<TargetingValueSize>(
+              (value) => new TargetingValueSize.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeSizeType")) {
@@ -6853,7 +6875,7 @@
   TargetingValueDayPartTargeting.fromJson(core.Map _json) {
     if (_json.containsKey("dayParts")) {
       dayParts = _json["dayParts"]
-          .map((value) =>
+          .map<TargetingValueDayPartTargetingDayPart>((value) =>
               new TargetingValueDayPartTargetingDayPart.fromJson(value))
           .toList();
     }
diff --git a/generated/googleapis/lib/adexchangeseller/v1_1.dart b/generated/googleapis/lib/adexchangeseller/v1_1.dart
index 787fc61..5fdf1eb 100644
--- a/generated/googleapis/lib/adexchangeseller/v1_1.dart
+++ b/generated/googleapis/lib/adexchangeseller/v1_1.dart
@@ -77,7 +77,7 @@
   /// this method will complete with the same error.
   async.Future<Account> get(core.String accountId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -132,7 +132,7 @@
   async.Future<AdClients> list(
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -189,7 +189,7 @@
   async.Future<AdUnit> get(core.String adClientId, core.String adUnitId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -251,7 +251,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -323,7 +323,7 @@
       core.String adClientId, core.String adUnitId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -386,7 +386,7 @@
   /// this method will complete with the same error.
   async.Future<Alerts> list({core.String locale, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -441,7 +441,7 @@
       core.String adClientId, core.String customChannelId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -499,7 +499,7 @@
   async.Future<CustomChannels> list(core.String adClientId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -573,7 +573,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -647,7 +647,7 @@
   /// this method will complete with the same error.
   async.Future<Metadata> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -690,7 +690,7 @@
   /// this method will complete with the same error.
   async.Future<Metadata> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -735,7 +735,7 @@
   /// this method will complete with the same error.
   async.Future<PreferredDeal> get(core.String dealId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -775,7 +775,7 @@
   /// this method will complete with the same error.
   async.Future<PreferredDeals> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -874,7 +874,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -970,7 +970,7 @@
       core.int startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1028,7 +1028,7 @@
   async.Future<SavedReports> list(
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1089,7 +1089,7 @@
   async.Future<UrlChannels> list(core.String adClientId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1242,8 +1242,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new AdClient.fromJson(value)).toList();
+      items = _json["items"]
+          .map<AdClient>((value) => new AdClient.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1360,8 +1361,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new AdUnit.fromJson(value)).toList();
+      items = _json["items"]
+          .map<AdUnit>((value) => new AdUnit.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1462,7 +1464,9 @@
 
   Alerts.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Alert.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Alert>((value) => new Alert.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1619,7 +1623,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new CustomChannel.fromJson(value))
+          .map<CustomChannel>((value) => new CustomChannel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1660,7 +1664,8 @@
   Metadata.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ReportingMetadataEntry.fromJson(value))
+          .map<ReportingMetadataEntry>(
+              (value) => new ReportingMetadataEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1785,7 +1790,7 @@
   PreferredDeals.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new PreferredDeal.fromJson(value))
+          .map<PreferredDeal>((value) => new PreferredDeal.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1886,7 +1891,7 @@
     }
     if (_json.containsKey("headers")) {
       headers = _json["headers"]
-          .map((value) => new ReportHeaders.fromJson(value))
+          .map<ReportHeaders>((value) => new ReportHeaders.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -2084,7 +2089,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new SavedReport.fromJson(value))
+          .map<SavedReport>((value) => new SavedReport.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -2178,7 +2183,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new UrlChannel.fromJson(value))
+          .map<UrlChannel>((value) => new UrlChannel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
diff --git a/generated/googleapis/lib/adexchangeseller/v2_0.dart b/generated/googleapis/lib/adexchangeseller/v2_0.dart
index 33b0d31..b0915eb 100644
--- a/generated/googleapis/lib/adexchangeseller/v2_0.dart
+++ b/generated/googleapis/lib/adexchangeseller/v2_0.dart
@@ -81,7 +81,7 @@
   /// this method will complete with the same error.
   async.Future<Account> get(core.String accountId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -130,7 +130,7 @@
   async.Future<Accounts> list(
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -191,7 +191,7 @@
   async.Future<AdClients> list(core.String accountId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -252,7 +252,7 @@
   async.Future<Alerts> list(core.String accountId,
       {core.String locale, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -311,7 +311,7 @@
       core.String customChannelId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -377,7 +377,7 @@
       core.String accountId, core.String adClientId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -451,7 +451,7 @@
   /// this method will complete with the same error.
   async.Future<Metadata> list(core.String accountId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -502,7 +502,7 @@
   /// this method will complete with the same error.
   async.Future<Metadata> list(core.String accountId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -556,7 +556,7 @@
   async.Future<PreferredDeal> get(core.String accountId, core.String dealId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -605,7 +605,7 @@
   async.Future<PreferredDeals> list(core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -713,7 +713,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -817,7 +817,7 @@
       core.int startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -883,7 +883,7 @@
   async.Future<SavedReports> list(core.String accountId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -952,7 +952,7 @@
   async.Future<UrlChannels> list(core.String accountId, core.String adClientId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1051,8 +1051,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Account.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Account>((value) => new Account.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1161,8 +1162,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new AdClient.fromJson(value)).toList();
+      items = _json["items"]
+          .map<AdClient>((value) => new AdClient.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1263,7 +1265,9 @@
 
   Alerts.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Alert.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Alert>((value) => new Alert.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1420,7 +1424,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new CustomChannel.fromJson(value))
+          .map<CustomChannel>((value) => new CustomChannel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1461,7 +1465,8 @@
   Metadata.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ReportingMetadataEntry.fromJson(value))
+          .map<ReportingMetadataEntry>(
+              (value) => new ReportingMetadataEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1586,7 +1591,7 @@
   PreferredDeals.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new PreferredDeal.fromJson(value))
+          .map<PreferredDeal>((value) => new PreferredDeal.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1687,7 +1692,7 @@
     }
     if (_json.containsKey("headers")) {
       headers = _json["headers"]
-          .map((value) => new ReportHeaders.fromJson(value))
+          .map<ReportHeaders>((value) => new ReportHeaders.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1885,7 +1890,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new SavedReport.fromJson(value))
+          .map<SavedReport>((value) => new SavedReport.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1979,7 +1984,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new UrlChannel.fromJson(value))
+          .map<UrlChannel>((value) => new UrlChannel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
diff --git a/generated/googleapis/lib/adexperiencereport/v1.dart b/generated/googleapis/lib/adexperiencereport/v1.dart
index 04b7251..8a09f61 100644
--- a/generated/googleapis/lib/adexperiencereport/v1.dart
+++ b/generated/googleapis/lib/adexperiencereport/v1.dart
@@ -64,7 +64,7 @@
   async.Future<SiteSummaryResponse> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -110,7 +110,7 @@
   /// this method will complete with the same error.
   async.Future<ViolatingSitesResponse> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -271,7 +271,8 @@
   ViolatingSitesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("violatingSites")) {
       violatingSites = _json["violatingSites"]
-          .map((value) => new SiteSummaryResponse.fromJson(value))
+          .map<SiteSummaryResponse>(
+              (value) => new SiteSummaryResponse.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/admin/datatransfer_v1.dart b/generated/googleapis/lib/admin/datatransfer_v1.dart
index 129a4aa..85475a2 100644
--- a/generated/googleapis/lib/admin/datatransfer_v1.dart
+++ b/generated/googleapis/lib/admin/datatransfer_v1.dart
@@ -61,7 +61,7 @@
   async.Future<Application> get(core.String applicationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -112,7 +112,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -169,7 +169,7 @@
   async.Future<DataTransfer> get(core.String dataTransferId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -212,7 +212,7 @@
   async.Future<DataTransfer> insert(DataTransfer request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -273,7 +273,7 @@
       core.String status,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -350,7 +350,8 @@
     }
     if (_json.containsKey("transferParams")) {
       transferParams = _json["transferParams"]
-          .map((value) => new ApplicationTransferParam.fromJson(value))
+          .map<ApplicationTransferParam>(
+              (value) => new ApplicationTransferParam.fromJson(value))
           .toList();
     }
   }
@@ -398,7 +399,8 @@
     }
     if (_json.containsKey("applicationTransferParams")) {
       applicationTransferParams = _json["applicationTransferParams"]
-          .map((value) => new ApplicationTransferParam.fromJson(value))
+          .map<ApplicationTransferParam>(
+              (value) => new ApplicationTransferParam.fromJson(value))
           .toList();
     }
     if (_json.containsKey("applicationTransferStatus")) {
@@ -476,7 +478,7 @@
   ApplicationsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("applications")) {
       applications = _json["applications"]
-          .map((value) => new Application.fromJson(value))
+          .map<Application>((value) => new Application.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -544,7 +546,8 @@
   DataTransfer.fromJson(core.Map _json) {
     if (_json.containsKey("applicationDataTransfers")) {
       applicationDataTransfers = _json["applicationDataTransfers"]
-          .map((value) => new ApplicationDataTransfer.fromJson(value))
+          .map<ApplicationDataTransfer>(
+              (value) => new ApplicationDataTransfer.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -621,7 +624,7 @@
   DataTransfersListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("dataTransfers")) {
       dataTransfers = _json["dataTransfers"]
-          .map((value) => new DataTransfer.fromJson(value))
+          .map<DataTransfer>((value) => new DataTransfer.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
diff --git a/generated/googleapis/lib/admin/directory_v1.dart b/generated/googleapis/lib/admin/directory_v1.dart
index 5065aed..4b936aa 100644
--- a/generated/googleapis/lib/admin/directory_v1.dart
+++ b/generated/googleapis/lib/admin/directory_v1.dart
@@ -189,7 +189,7 @@
   async.Future delete(core.String userKey, core.int codeId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -243,7 +243,7 @@
   async.Future<Asp> get(core.String userKey, core.int codeId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -292,7 +292,7 @@
   /// this method will complete with the same error.
   async.Future<Asps> list(core.String userKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -338,7 +338,7 @@
   /// this method will complete with the same error.
   async.Future stop(Channel request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -392,7 +392,7 @@
       core.String resourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -455,7 +455,7 @@
   async.Future<ChromeOsDevice> get(core.String customerId, core.String deviceId,
       {core.String projection, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -546,7 +546,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -615,7 +615,7 @@
       core.String customerId, core.String orgUnitPath,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -680,7 +680,7 @@
       ChromeOsDevice request, core.String customerId, core.String deviceId,
       {core.String projection, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -746,7 +746,7 @@
       ChromeOsDevice request, core.String customerId, core.String deviceId,
       {core.String projection, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -806,7 +806,7 @@
   /// this method will complete with the same error.
   async.Future<Customer> get(core.String customerKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -851,7 +851,7 @@
   async.Future<Customer> patch(Customer request, core.String customerKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -899,7 +899,7 @@
   async.Future<Customer> update(Customer request, core.String customerKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -951,7 +951,7 @@
   async.Future delete(core.String customer, core.String domainAliasName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1005,7 +1005,7 @@
       core.String customer, core.String domainAliasName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1056,7 +1056,7 @@
   async.Future<DomainAlias> insert(DomainAlias request, core.String customer,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1107,7 +1107,7 @@
   async.Future<DomainAliases> list(core.String customer,
       {core.String parentDomainName, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1161,7 +1161,7 @@
   async.Future delete(core.String customer, core.String domainName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1214,7 +1214,7 @@
   async.Future<Domains> get(core.String customer, core.String domainName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1265,7 +1265,7 @@
   async.Future<Domains> insert(Domains request, core.String customer,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1311,7 +1311,7 @@
   /// this method will complete with the same error.
   async.Future<Domains2> list(core.String customer, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1361,7 +1361,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String groupKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1405,7 +1405,7 @@
   /// this method will complete with the same error.
   async.Future<Group> get(core.String groupKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1447,7 +1447,7 @@
   /// this method will complete with the same error.
   async.Future<Group> insert(Group request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1508,7 +1508,7 @@
       core.String userKey,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1566,7 +1566,7 @@
   async.Future<Group> patch(Group request, core.String groupKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1615,7 +1615,7 @@
   async.Future<Group> update(Group request, core.String groupKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1667,7 +1667,7 @@
   async.Future delete(core.String groupKey, core.String alias,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1720,7 +1720,7 @@
   async.Future<Alias> insert(Alias request, core.String groupKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1765,7 +1765,7 @@
   /// this method will complete with the same error.
   async.Future<Aliases> list(core.String groupKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1814,7 +1814,7 @@
   async.Future delete(core.String groupKey, core.String memberKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1867,7 +1867,7 @@
   async.Future<Member> get(core.String groupKey, core.String memberKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1919,7 +1919,7 @@
       core.String groupKey, core.String memberKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1970,7 +1970,7 @@
   async.Future<Member> insert(Member request, core.String groupKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2025,7 +2025,7 @@
       core.String roles,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2085,7 +2085,7 @@
       Member request, core.String groupKey, core.String memberKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2144,7 +2144,7 @@
       Member request, core.String groupKey, core.String memberKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2205,7 +2205,7 @@
       core.String resourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2260,7 +2260,7 @@
   async.Future delete(core.String customerId, core.String resourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2319,7 +2319,7 @@
   async.Future<MobileDevice> get(core.String customerId, core.String resourceId,
       {core.String projection, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2407,7 +2407,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2477,7 +2477,7 @@
   async.Future delete(core.String customer, core.String notificationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2532,7 +2532,7 @@
       core.String customer, core.String notificationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2592,7 +2592,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2651,7 +2651,7 @@
       Notification request, core.String customer, core.String notificationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2708,7 +2708,7 @@
       Notification request, core.String customer, core.String notificationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2767,7 +2767,7 @@
       core.String customerId, core.List<core.String> orgUnitPath,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2824,7 +2824,7 @@
       core.String customerId, core.List<core.String> orgUnitPath,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2878,7 +2878,7 @@
   async.Future<OrgUnit> insert(OrgUnit request, core.String customerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2934,7 +2934,7 @@
   async.Future<OrgUnits> list(core.String customerId,
       {core.String orgUnitPath, core.String type, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2990,7 +2990,7 @@
       core.List<core.String> orgUnitPath,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3050,7 +3050,7 @@
       core.List<core.String> orgUnitPath,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3110,7 +3110,7 @@
   /// this method will complete with the same error.
   async.Future<Privileges> list(core.String customer, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3159,7 +3159,7 @@
   /// this method will complete with the same error.
   async.Future<AppAccessCollections> GetSettings({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3196,7 +3196,7 @@
   /// this method will complete with the same error.
   async.Future<TrustedApps> ListTrustedApps({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3258,7 +3258,7 @@
   async.Future delete(core.String customer, core.String buildingId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3313,7 +3313,7 @@
   async.Future<Building> get(core.String customer, core.String buildingId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3366,7 +3366,7 @@
   async.Future<Building> insert(Building request, core.String customer,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3415,7 +3415,7 @@
   /// this method will complete with the same error.
   async.Future<Buildings> list(core.String customer, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3467,7 +3467,7 @@
       Building request, core.String customer, core.String buildingId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3526,7 +3526,7 @@
       Building request, core.String customer, core.String buildingId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3587,7 +3587,7 @@
   async.Future delete(core.String customer, core.String calendarResourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3643,7 +3643,7 @@
       core.String customer, core.String calendarResourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3697,7 +3697,7 @@
       CalendarResource request, core.String customer,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3770,7 +3770,7 @@
       core.String query,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3838,7 +3838,7 @@
       core.String customer, core.String calendarResourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3901,7 +3901,7 @@
       core.String customer, core.String calendarResourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3962,7 +3962,7 @@
   async.Future delete(core.String customer, core.String featureKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4017,7 +4017,7 @@
   async.Future<Feature> get(core.String customer, core.String featureKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4070,7 +4070,7 @@
   async.Future<Feature> insert(Feature request, core.String customer,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4122,7 +4122,7 @@
   async.Future<Features> list(core.String customer,
       {core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4177,7 +4177,7 @@
       Feature request, core.String customer, core.String featureKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4234,7 +4234,7 @@
       FeatureRename request, core.String customer, core.String oldName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4296,7 +4296,7 @@
       Feature request, core.String customer, core.String featureKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4354,7 +4354,7 @@
   async.Future delete(core.String customer, core.String roleAssignmentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4408,7 +4408,7 @@
       core.String customer, core.String roleAssignmentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4460,7 +4460,7 @@
       RoleAssignment request, core.String customer,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4524,7 +4524,7 @@
       core.String userKey,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4587,7 +4587,7 @@
   async.Future delete(core.String customer, core.String roleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4640,7 +4640,7 @@
   async.Future<Role> get(core.String customer, core.String roleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4691,7 +4691,7 @@
   async.Future<Role> insert(Role request, core.String customer,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4742,7 +4742,7 @@
   async.Future<Roles> list(core.String customer,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4796,7 +4796,7 @@
       Role request, core.String customer, core.String roleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4853,7 +4853,7 @@
       Role request, core.String customer, core.String roleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4911,7 +4911,7 @@
   async.Future delete(core.String customerId, core.String schemaKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4964,7 +4964,7 @@
   async.Future<Schema> get(core.String customerId, core.String schemaKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5015,7 +5015,7 @@
   async.Future<Schema> insert(Schema request, core.String customerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5061,7 +5061,7 @@
   /// this method will complete with the same error.
   async.Future<Schemas> list(core.String customerId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5110,7 +5110,7 @@
       Schema request, core.String customerId, core.String schemaKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5167,7 +5167,7 @@
       Schema request, core.String customerId, core.String schemaKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5226,7 +5226,7 @@
   async.Future delete(core.String userKey, core.String clientId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5280,7 +5280,7 @@
   async.Future<Token> get(core.String userKey, core.String clientId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5330,7 +5330,7 @@
   /// this method will complete with the same error.
   async.Future<Tokens> list(core.String userKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5380,7 +5380,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String userKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5444,7 +5444,7 @@
       core.String viewType,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5495,7 +5495,7 @@
   /// this method will complete with the same error.
   async.Future<User> insert(User request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5602,7 +5602,7 @@
       core.String viewType,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5678,7 +5678,7 @@
   async.Future makeAdmin(UserMakeAdmin request, core.String userKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5729,7 +5729,7 @@
   async.Future<User> patch(User request, core.String userKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5775,7 +5775,7 @@
   async.Future undelete(UserUndelete request, core.String userKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5826,7 +5826,7 @@
   async.Future<User> update(User request, core.String userKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5938,7 +5938,7 @@
       core.String viewType,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6023,7 +6023,7 @@
   async.Future delete(core.String userKey, core.String alias,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6076,7 +6076,7 @@
   async.Future<Alias> insert(Alias request, core.String userKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6127,7 +6127,7 @@
   async.Future<Aliases> list(core.String userKey,
       {core.String event, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6180,7 +6180,7 @@
   async.Future<Channel> watch(Channel request, core.String userKey,
       {core.String event, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6233,7 +6233,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String userKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6279,7 +6279,7 @@
   /// this method will complete with the same error.
   async.Future<UserPhoto> get(core.String userKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6326,7 +6326,7 @@
   async.Future<UserPhoto> patch(UserPhoto request, core.String userKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6376,7 +6376,7 @@
   async.Future<UserPhoto> update(UserPhoto request, core.String userKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6428,7 +6428,7 @@
   /// this method will complete with the same error.
   async.Future generate(core.String userKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6472,7 +6472,7 @@
   /// this method will complete with the same error.
   async.Future invalidate(core.String userKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6521,7 +6521,7 @@
   async.Future<VerificationCodes> list(core.String userKey,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6836,7 +6836,8 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Asp.fromJson(value)).toList();
+      items =
+          _json["items"].map<Asp>((value) => new Asp.fromJson(value)).toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -6993,7 +6994,7 @@
   Buildings.fromJson(core.Map _json) {
     if (_json.containsKey("buildings")) {
       buildings = _json["buildings"]
-          .map((value) => new Building.fromJson(value))
+          .map<Building>((value) => new Building.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -7207,7 +7208,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new CalendarResource.fromJson(value))
+          .map<CalendarResource>(
+              (value) => new CalendarResource.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -7602,7 +7604,8 @@
   ChromeOsDevice.fromJson(core.Map _json) {
     if (_json.containsKey("activeTimeRanges")) {
       activeTimeRanges = _json["activeTimeRanges"]
-          .map((value) => new ChromeOsDeviceActiveTimeRanges.fromJson(value))
+          .map<ChromeOsDeviceActiveTimeRanges>(
+              (value) => new ChromeOsDeviceActiveTimeRanges.fromJson(value))
           .toList();
     }
     if (_json.containsKey("annotatedAssetId")) {
@@ -7619,7 +7622,8 @@
     }
     if (_json.containsKey("deviceFiles")) {
       deviceFiles = _json["deviceFiles"]
-          .map((value) => new ChromeOsDeviceDeviceFiles.fromJson(value))
+          .map<ChromeOsDeviceDeviceFiles>(
+              (value) => new ChromeOsDeviceDeviceFiles.fromJson(value))
           .toList();
     }
     if (_json.containsKey("deviceId")) {
@@ -7669,7 +7673,8 @@
     }
     if (_json.containsKey("recentUsers")) {
       recentUsers = _json["recentUsers"]
-          .map((value) => new ChromeOsDeviceRecentUsers.fromJson(value))
+          .map<ChromeOsDeviceRecentUsers>(
+              (value) => new ChromeOsDeviceRecentUsers.fromJson(value))
           .toList();
     }
     if (_json.containsKey("serialNumber")) {
@@ -7832,7 +7837,7 @@
   ChromeOsDevices.fromJson(core.Map _json) {
     if (_json.containsKey("chromeosdevices")) {
       chromeosdevices = _json["chromeosdevices"]
-          .map((value) => new ChromeOsDevice.fromJson(value))
+          .map<ChromeOsDevice>((value) => new ChromeOsDevice.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -8174,7 +8179,7 @@
   DomainAliases.fromJson(core.Map _json) {
     if (_json.containsKey("domainAliases")) {
       domainAliases = _json["domainAliases"]
-          .map((value) => new DomainAlias.fromJson(value))
+          .map<DomainAlias>((value) => new DomainAlias.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -8233,7 +8238,7 @@
     }
     if (_json.containsKey("domainAliases")) {
       domainAliases = _json["domainAliases"]
-          .map((value) => new DomainAlias.fromJson(value))
+          .map<DomainAlias>((value) => new DomainAlias.fromJson(value))
           .toList();
     }
     if (_json.containsKey("domainName")) {
@@ -8297,8 +8302,9 @@
 
   Domains2.fromJson(core.Map _json) {
     if (_json.containsKey("domains")) {
-      domains =
-          _json["domains"].map((value) => new Domains.fromJson(value)).toList();
+      domains = _json["domains"]
+          .map<Domains>((value) => new Domains.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("etag")) {
       etag = _json["etag"];
@@ -8433,7 +8439,7 @@
     }
     if (_json.containsKey("features")) {
       features = _json["features"]
-          .map((value) => new Feature.fromJson(value))
+          .map<Feature>((value) => new Feature.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -8588,8 +8594,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("groups")) {
-      groups =
-          _json["groups"].map((value) => new Group.fromJson(value)).toList();
+      groups = _json["groups"]
+          .map<Group>((value) => new Group.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -8720,8 +8727,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("members")) {
-      members =
-          _json["members"].map((value) => new Member.fromJson(value)).toList();
+      members = _json["members"]
+          .map<Member>((value) => new Member.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -8961,7 +8969,8 @@
     }
     if (_json.containsKey("applications")) {
       applications = _json["applications"]
-          .map((value) => new MobileDeviceApplications.fromJson(value))
+          .map<MobileDeviceApplications>(
+              (value) => new MobileDeviceApplications.fromJson(value))
           .toList();
     }
     if (_json.containsKey("basebandVersion")) {
@@ -9257,7 +9266,7 @@
     }
     if (_json.containsKey("mobiledevices")) {
       mobiledevices = _json["mobiledevices"]
-          .map((value) => new MobileDevice.fromJson(value))
+          .map<MobileDevice>((value) => new MobileDevice.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -9394,7 +9403,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Notification.fromJson(value))
+          .map<Notification>((value) => new Notification.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -9548,7 +9557,7 @@
     }
     if (_json.containsKey("organizationUnits")) {
       organizationUnits = _json["organizationUnits"]
-          .map((value) => new OrgUnit.fromJson(value))
+          .map<OrgUnit>((value) => new OrgUnit.fromJson(value))
           .toList();
     }
   }
@@ -9600,7 +9609,7 @@
   Privilege.fromJson(core.Map _json) {
     if (_json.containsKey("childPrivileges")) {
       childPrivileges = _json["childPrivileges"]
-          .map((value) => new Privilege.fromJson(value))
+          .map<Privilege>((value) => new Privilege.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -9670,8 +9679,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Privilege.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Privilege>((value) => new Privilege.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -9777,7 +9787,8 @@
     }
     if (_json.containsKey("rolePrivileges")) {
       rolePrivileges = _json["rolePrivileges"]
-          .map((value) => new RoleRolePrivileges.fromJson(value))
+          .map<RoleRolePrivileges>(
+              (value) => new RoleRolePrivileges.fromJson(value))
           .toList();
     }
   }
@@ -9916,7 +9927,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new RoleAssignment.fromJson(value))
+          .map<RoleAssignment>((value) => new RoleAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -9965,7 +9976,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Role.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Role>((value) => new Role.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -10019,7 +10032,7 @@
     }
     if (_json.containsKey("fields")) {
       fields = _json["fields"]
-          .map((value) => new SchemaFieldSpec.fromJson(value))
+          .map<SchemaFieldSpec>((value) => new SchemaFieldSpec.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -10213,8 +10226,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("schemas")) {
-      schemas =
-          _json["schemas"].map((value) => new Schema.fromJson(value)).toList();
+      schemas = _json["schemas"]
+          .map<Schema>((value) => new Schema.fromJson(value))
+          .toList();
     }
   }
 
@@ -10340,7 +10354,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Token.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Token>((value) => new Token.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -10446,7 +10462,7 @@
     }
     if (_json.containsKey("trustedApps")) {
       trustedApps = _json["trustedApps"]
-          .map((value) => new TrustedAppId.fromJson(value))
+          .map<TrustedAppId>((value) => new TrustedAppId.fromJson(value))
           .toList();
     }
   }
@@ -12132,7 +12148,9 @@
       triggerEvent = _json["trigger_event"];
     }
     if (_json.containsKey("users")) {
-      users = _json["users"].map((value) => new User.fromJson(value)).toList();
+      users = _json["users"]
+          .map<User>((value) => new User.fromJson(value))
+          .toList();
     }
   }
 
@@ -12230,7 +12248,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new VerificationCode.fromJson(value))
+          .map<VerificationCode>(
+              (value) => new VerificationCode.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
diff --git a/generated/googleapis/lib/admin/reports_v1.dart b/generated/googleapis/lib/admin/reports_v1.dart
index f3b1866..f4dea2a 100644
--- a/generated/googleapis/lib/admin/reports_v1.dart
+++ b/generated/googleapis/lib/admin/reports_v1.dart
@@ -111,7 +111,7 @@
       core.String startTime,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -230,7 +230,7 @@
       core.String startTime,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -310,7 +310,7 @@
   /// this method will complete with the same error.
   async.Future stop(Channel request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -379,7 +379,7 @@
       core.String parameters,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -471,7 +471,7 @@
       core.String parameters,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -576,7 +576,7 @@
       core.String parameters,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -643,8 +643,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Activity.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Activity>((value) => new Activity.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -808,7 +809,8 @@
     }
     if (_json.containsKey("parameters")) {
       parameters = _json["parameters"]
-          .map((value) => new ActivityEventsParameters.fromJson(value))
+          .map<ActivityEventsParameters>(
+              (value) => new ActivityEventsParameters.fromJson(value))
           .toList();
     }
     if (_json.containsKey("type")) {
@@ -917,7 +919,7 @@
     }
     if (_json.containsKey("events")) {
       events = _json["events"]
-          .map((value) => new ActivityEvents.fromJson(value))
+          .map<ActivityEvents>((value) => new ActivityEvents.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -1234,7 +1236,8 @@
     }
     if (_json.containsKey("parameters")) {
       parameters = _json["parameters"]
-          .map((value) => new UsageReportParameters.fromJson(value))
+          .map<UsageReportParameters>(
+              (value) => new UsageReportParameters.fromJson(value))
           .toList();
     }
   }
@@ -1313,7 +1316,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new UsageReportsWarningsData.fromJson(value))
+          .map<UsageReportsWarningsData>(
+              (value) => new UsageReportsWarningsData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -1368,12 +1372,13 @@
     }
     if (_json.containsKey("usageReports")) {
       usageReports = _json["usageReports"]
-          .map((value) => new UsageReport.fromJson(value))
+          .map<UsageReport>((value) => new UsageReport.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warnings")) {
       warnings = _json["warnings"]
-          .map((value) => new UsageReportsWarnings.fromJson(value))
+          .map<UsageReportsWarnings>(
+              (value) => new UsageReportsWarnings.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/adsense/v1_4.dart b/generated/googleapis/lib/adsense/v1_4.dart
index 508eeb3..b159367 100644
--- a/generated/googleapis/lib/adsense/v1_4.dart
+++ b/generated/googleapis/lib/adsense/v1_4.dart
@@ -96,7 +96,7 @@
   async.Future<Account> get(core.String accountId,
       {core.bool tree, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -148,7 +148,7 @@
   async.Future<Accounts> list(
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -209,7 +209,7 @@
   async.Future<AdClients> list(core.String accountId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -275,7 +275,7 @@
       core.String accountId, core.String adClientId, core.String adUnitId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -334,7 +334,7 @@
       core.String accountId, core.String adClientId, core.String adUnitId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -404,7 +404,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -483,7 +483,7 @@
       core.String accountId, core.String adClientId, core.String adUnitId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -551,7 +551,7 @@
   async.Future delete(core.String accountId, core.String alertId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -606,7 +606,7 @@
   async.Future<Alerts> list(core.String accountId,
       {core.String locale, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -669,7 +669,7 @@
       core.String customChannelId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -735,7 +735,7 @@
       core.String accountId, core.String adClientId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -816,7 +816,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -886,7 +886,7 @@
   /// this method will complete with the same error.
   async.Future<Payments> list(core.String accountId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1004,7 +1004,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1115,7 +1115,7 @@
       core.int startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1182,7 +1182,7 @@
   async.Future<SavedReports> list(core.String accountId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1243,7 +1243,7 @@
       core.String accountId, core.String savedAdStyleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1300,7 +1300,7 @@
   async.Future<SavedAdStyles> list(core.String accountId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1369,7 +1369,7 @@
   async.Future<UrlChannels> list(core.String accountId, core.String adClientId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1437,7 +1437,7 @@
   async.Future<AdClients> list(
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1494,7 +1494,7 @@
   async.Future<AdUnit> get(core.String adClientId, core.String adUnitId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1545,7 +1545,7 @@
   async.Future<AdCode> getAdCode(core.String adClientId, core.String adUnitId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1608,7 +1608,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1680,7 +1680,7 @@
       core.String adClientId, core.String adUnitId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1739,7 +1739,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String alertId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1785,7 +1785,7 @@
   /// this method will complete with the same error.
   async.Future<Alerts> list({core.String locale, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1840,7 +1840,7 @@
       core.String adClientId, core.String customChannelId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1898,7 +1898,7 @@
   async.Future<CustomChannels> list(core.String adClientId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1972,7 +1972,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2046,7 +2046,7 @@
   /// this method will complete with the same error.
   async.Future<Metadata> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2089,7 +2089,7 @@
   /// this method will complete with the same error.
   async.Future<Metadata> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2132,7 +2132,7 @@
   /// this method will complete with the same error.
   async.Future<Payments> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2245,7 +2245,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2352,7 +2352,7 @@
       core.int startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2411,7 +2411,7 @@
   async.Future<SavedReports> list(
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2463,7 +2463,7 @@
   async.Future<SavedAdStyle> get(core.String savedAdStyleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2512,7 +2512,7 @@
   async.Future<SavedAdStyles> list(
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2572,7 +2572,7 @@
   async.Future<UrlChannels> list(core.String adClientId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2646,7 +2646,7 @@
     }
     if (_json.containsKey("subAccounts")) {
       subAccounts = _json["subAccounts"]
-          .map((value) => new Account.fromJson(value))
+          .map<Account>((value) => new Account.fromJson(value))
           .toList();
     }
     if (_json.containsKey("timezone")) {
@@ -2704,8 +2704,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Account.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Account>((value) => new Account.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2814,8 +2815,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new AdClient.fromJson(value)).toList();
+      items = _json["items"]
+          .map<AdClient>((value) => new AdClient.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3341,8 +3343,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new AdUnit.fromJson(value)).toList();
+      items = _json["items"]
+          .map<AdUnit>((value) => new AdUnit.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3460,7 +3463,7 @@
     }
     if (_json.containsKey("headers")) {
       headers = _json["headers"]
-          .map((value) =>
+          .map<AdsenseReportsGenerateResponseHeaders>((value) =>
               new AdsenseReportsGenerateResponseHeaders.fromJson(value))
           .toList();
     }
@@ -3599,7 +3602,9 @@
 
   Alerts.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Alert.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Alert>((value) => new Alert.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3757,7 +3762,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new CustomChannel.fromJson(value))
+          .map<CustomChannel>((value) => new CustomChannel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3798,7 +3803,8 @@
   Metadata.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ReportingMetadataEntry.fromJson(value))
+          .map<ReportingMetadataEntry>(
+              (value) => new ReportingMetadataEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3890,8 +3896,9 @@
 
   Payments.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Payment.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Payment>((value) => new Payment.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -4071,7 +4078,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new SavedAdStyle.fromJson(value))
+          .map<SavedAdStyle>((value) => new SavedAdStyle.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4163,7 +4170,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new SavedReport.fromJson(value))
+          .map<SavedReport>((value) => new SavedReport.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4257,7 +4264,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new UrlChannel.fromJson(value))
+          .map<UrlChannel>((value) => new UrlChannel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
diff --git a/generated/googleapis/lib/adsensehost/v4_1.dart b/generated/googleapis/lib/adsensehost/v4_1.dart
index 0af00c0..e5e1918 100644
--- a/generated/googleapis/lib/adsensehost/v4_1.dart
+++ b/generated/googleapis/lib/adsensehost/v4_1.dart
@@ -69,7 +69,7 @@
   /// this method will complete with the same error.
   async.Future<Account> get(core.String accountId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -112,7 +112,7 @@
   async.Future<Accounts> list(core.List<core.String> filterAdClientId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -166,7 +166,7 @@
   async.Future<AdClient> get(core.String accountId, core.String adClientId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -223,7 +223,7 @@
   async.Future<AdClients> list(core.String accountId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -285,7 +285,7 @@
       core.String accountId, core.String adClientId, core.String adUnitId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -344,7 +344,7 @@
       core.String accountId, core.String adClientId, core.String adUnitId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -406,7 +406,7 @@
       core.String accountId, core.String adClientId, core.String adUnitId,
       {core.List<core.String> hostCustomChannelId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -469,7 +469,7 @@
       AdUnit request, core.String accountId, core.String adClientId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -537,7 +537,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -604,7 +604,7 @@
       core.String adClientId, core.String adUnitId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -666,7 +666,7 @@
       AdUnit request, core.String accountId, core.String adClientId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -769,7 +769,7 @@
       core.int startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -847,7 +847,7 @@
   /// this method will complete with the same error.
   async.Future<AdClient> get(core.String adClientId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -896,7 +896,7 @@
   async.Future<AdClients> list(
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -959,7 +959,7 @@
       core.String websiteLocale,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1014,7 +1014,7 @@
   async.Future<AssociationSession> verify(core.String token,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1067,7 +1067,7 @@
       core.String adClientId, core.String customChannelId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1119,7 +1119,7 @@
       core.String adClientId, core.String customChannelId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1171,7 +1171,7 @@
       CustomChannel request, core.String adClientId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1227,7 +1227,7 @@
   async.Future<CustomChannels> list(core.String adClientId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1284,7 +1284,7 @@
       core.String adClientId, core.String customChannelId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1339,7 +1339,7 @@
       CustomChannel request, core.String adClientId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1434,7 +1434,7 @@
       core.int startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1512,7 +1512,7 @@
       core.String adClientId, core.String urlChannelId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1563,7 +1563,7 @@
   async.Future<UrlChannel> insert(UrlChannel request, core.String adClientId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1619,7 +1619,7 @@
   async.Future<UrlChannels> list(core.String adClientId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1718,8 +1718,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Account.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Account>((value) => new Account.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1822,8 +1823,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new AdClient.fromJson(value)).toList();
+      items = _json["items"]
+          .map<AdClient>((value) => new AdClient.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2282,8 +2284,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new AdUnit.fromJson(value)).toList();
+      items = _json["items"]
+          .map<AdUnit>((value) => new AdUnit.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2484,7 +2487,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new CustomChannel.fromJson(value))
+          .map<CustomChannel>((value) => new CustomChannel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -2594,7 +2597,7 @@
     }
     if (_json.containsKey("headers")) {
       headers = _json["headers"]
-          .map((value) => new ReportHeaders.fromJson(value))
+          .map<ReportHeaders>((value) => new ReportHeaders.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -2706,7 +2709,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new UrlChannel.fromJson(value))
+          .map<UrlChannel>((value) => new UrlChannel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
diff --git a/generated/googleapis/lib/analytics/v3.dart b/generated/googleapis/lib/analytics/v3.dart
index ff9b0ad..ed18aa7 100644
--- a/generated/googleapis/lib/analytics/v3.dart
+++ b/generated/googleapis/lib/analytics/v3.dart
@@ -162,7 +162,7 @@
       core.int start_index,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -302,7 +302,7 @@
       core.int start_index,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -406,7 +406,7 @@
       core.String sort,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -523,7 +523,7 @@
   async.Future<AccountSummaries> list(
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -576,7 +576,7 @@
   async.Future delete(core.String accountId, core.String linkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -630,7 +630,7 @@
       EntityUserLink request, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -685,7 +685,7 @@
   async.Future<EntityUserLinks> list(core.String accountId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -741,7 +741,7 @@
       EntityUserLink request, core.String accountId, core.String linkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -804,7 +804,7 @@
   async.Future<Accounts> list(
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -869,7 +869,7 @@
       core.String accountId, core.String webPropertyId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -937,7 +937,7 @@
       core.String webPropertyId, core.String customDimensionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -996,7 +996,7 @@
       CustomDimension request, core.String accountId, core.String webPropertyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1058,7 +1058,7 @@
       core.String accountId, core.String webPropertyId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1131,7 +1131,7 @@
       {core.bool ignoreCustomDataSourceLinks,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1209,7 +1209,7 @@
       {core.bool ignoreCustomDataSourceLinks,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1283,7 +1283,7 @@
       core.String webPropertyId, core.String customMetricId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1342,7 +1342,7 @@
       CustomMetric request, core.String accountId, core.String webPropertyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1404,7 +1404,7 @@
       core.String accountId, core.String webPropertyId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1471,7 +1471,7 @@
       core.String webPropertyId, core.String customMetricId,
       {core.bool ignoreCustomDataSourceLinks, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1544,7 +1544,7 @@
       core.String webPropertyId, core.String customMetricId,
       {core.bool ignoreCustomDataSourceLinks, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1618,7 +1618,7 @@
       core.String profileId, core.String experimentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1686,7 +1686,7 @@
       core.String profileId, core.String experimentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1752,7 +1752,7 @@
       core.String webPropertyId, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1824,7 +1824,7 @@
       core.String accountId, core.String webPropertyId, core.String profileId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1898,7 +1898,7 @@
       core.String experimentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1973,7 +1973,7 @@
       core.String experimentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2044,7 +2044,7 @@
   async.Future<Filter> delete(core.String accountId, core.String filterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2095,7 +2095,7 @@
   async.Future<Filter> get(core.String accountId, core.String filterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2146,7 +2146,7 @@
   async.Future<Filter> insert(Filter request, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2200,7 +2200,7 @@
   async.Future<Filters> list(core.String accountId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2256,7 +2256,7 @@
       Filter request, core.String accountId, core.String filterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2313,7 +2313,7 @@
       Filter request, core.String accountId, core.String filterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2378,7 +2378,7 @@
       core.String profileId, core.String goalId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2444,7 +2444,7 @@
       core.String webPropertyId, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2518,7 +2518,7 @@
       core.String accountId, core.String webPropertyId, core.String profileId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2588,7 +2588,7 @@
       core.String webPropertyId, core.String profileId, core.String goalId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2659,7 +2659,7 @@
       core.String webPropertyId, core.String profileId, core.String goalId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2738,7 +2738,7 @@
       core.String profileId, core.String linkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2810,7 +2810,7 @@
       core.String webPropertyId, core.String profileId, core.String linkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2879,7 +2879,7 @@
       core.String accountId, core.String webPropertyId, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2953,7 +2953,7 @@
       core.String accountId, core.String webPropertyId, core.String profileId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3032,7 +3032,7 @@
       core.String linkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3111,7 +3111,7 @@
       core.String linkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3185,7 +3185,7 @@
       core.String profileId, core.String linkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3253,7 +3253,7 @@
       core.String accountId, core.String webPropertyId, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3327,7 +3327,7 @@
       core.String accountId, core.String webPropertyId, core.String profileId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3401,7 +3401,7 @@
       core.String linkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3473,7 +3473,7 @@
       core.String accountId, core.String webPropertyId, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3537,7 +3537,7 @@
       core.String accountId, core.String webPropertyId, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3596,7 +3596,7 @@
       Profile request, core.String accountId, core.String webPropertyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3661,7 +3661,7 @@
   async.Future<Profiles> list(core.String accountId, core.String webPropertyId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3724,7 +3724,7 @@
       core.String webPropertyId, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3788,7 +3788,7 @@
       core.String webPropertyId, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3856,7 +3856,7 @@
       core.String remarketingAudienceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3919,7 +3919,7 @@
       core.String webPropertyId, core.String remarketingAudienceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3980,7 +3980,7 @@
       core.String accountId, core.String webPropertyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4048,7 +4048,7 @@
       core.String type,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4119,7 +4119,7 @@
       core.String remarketingAudienceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4188,7 +4188,7 @@
       core.String remarketingAudienceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4257,7 +4257,7 @@
   async.Future<Segments> list(
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4315,7 +4315,7 @@
       core.String profileId, core.String unsampledReportId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4386,7 +4386,7 @@
       core.String unsampledReportId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4452,7 +4452,7 @@
       core.String accountId, core.String webPropertyId, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4525,7 +4525,7 @@
       core.String accountId, core.String webPropertyId, core.String profileId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4605,7 +4605,7 @@
       core.String customDataSourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4676,7 +4676,7 @@
       core.String customDataSourceId, core.String uploadId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4748,7 +4748,7 @@
       core.String customDataSourceId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4825,7 +4825,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4911,7 +4911,7 @@
       core.String webPropertyAdWordsLinkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4973,7 +4973,7 @@
       core.String webPropertyId, core.String webPropertyAdWordsLinkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5033,7 +5033,7 @@
       core.String accountId, core.String webPropertyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5097,7 +5097,7 @@
       core.String accountId, core.String webPropertyId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5164,7 +5164,7 @@
       core.String webPropertyAdWordsLinkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5232,7 +5232,7 @@
       core.String webPropertyAdWordsLinkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5302,7 +5302,7 @@
       core.String accountId, core.String webPropertyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5355,7 +5355,7 @@
   async.Future<Webproperty> insert(Webproperty request, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5411,7 +5411,7 @@
   async.Future<Webproperties> list(core.String accountId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5467,7 +5467,7 @@
       Webproperty request, core.String accountId, core.String webPropertyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5524,7 +5524,7 @@
       Webproperty request, core.String accountId, core.String webPropertyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5586,7 +5586,7 @@
       core.String accountId, core.String webPropertyId, core.String linkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5647,7 +5647,7 @@
       EntityUserLink request, core.String accountId, core.String webPropertyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5712,7 +5712,7 @@
       core.String accountId, core.String webPropertyId,
       {core.int max_results, core.int start_index, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5775,7 +5775,7 @@
       core.String accountId, core.String webPropertyId, core.String linkId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5848,7 +5848,7 @@
   /// this method will complete with the same error.
   async.Future<Columns> list(core.String reportType, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5898,7 +5898,7 @@
   async.Future<AccountTicket> createAccountTicket(AccountTicket request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5942,7 +5942,7 @@
       AccountTreeRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6208,7 +6208,7 @@
   AccountSummaries.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new AccountSummary.fromJson(value))
+          .map<AccountSummary>((value) => new AccountSummary.fromJson(value))
           .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
@@ -6300,7 +6300,8 @@
     }
     if (_json.containsKey("webProperties")) {
       webProperties = _json["webProperties"]
-          .map((value) => new WebPropertySummary.fromJson(value))
+          .map<WebPropertySummary>(
+              (value) => new WebPropertySummary.fromJson(value))
           .toList();
     }
   }
@@ -6679,8 +6680,9 @@
 
   Accounts.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Account.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Account>((value) => new Account.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
       itemsPerPage = _json["itemsPerPage"];
@@ -6870,8 +6872,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Column.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Column>((value) => new Column.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -7162,7 +7165,8 @@
   CustomDataSources.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new CustomDataSource.fromJson(value))
+          .map<CustomDataSource>(
+              (value) => new CustomDataSource.fromJson(value))
           .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
@@ -7414,7 +7418,7 @@
   CustomDimensions.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new CustomDimension.fromJson(value))
+          .map<CustomDimension>((value) => new CustomDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
@@ -7693,7 +7697,7 @@
   CustomMetrics.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new CustomMetric.fromJson(value))
+          .map<CustomMetric>((value) => new CustomMetric.fromJson(value))
           .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
@@ -7801,7 +7805,7 @@
   EntityAdWordsLink.fromJson(core.Map _json) {
     if (_json.containsKey("adWordsAccounts")) {
       adWordsAccounts = _json["adWordsAccounts"]
-          .map((value) => new AdWordsAccount.fromJson(value))
+          .map<AdWordsAccount>((value) => new AdWordsAccount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("entity")) {
@@ -7887,7 +7891,8 @@
   EntityAdWordsLinks.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new EntityAdWordsLink.fromJson(value))
+          .map<EntityAdWordsLink>(
+              (value) => new EntityAdWordsLink.fromJson(value))
           .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
@@ -8122,7 +8127,7 @@
   EntityUserLinks.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new EntityUserLink.fromJson(value))
+          .map<EntityUserLink>((value) => new EntityUserLink.fromJson(value))
           .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
@@ -8487,7 +8492,8 @@
     }
     if (_json.containsKey("variations")) {
       variations = _json["variations"]
-          .map((value) => new ExperimentVariations.fromJson(value))
+          .map<ExperimentVariations>(
+              (value) => new ExperimentVariations.fromJson(value))
           .toList();
     }
     if (_json.containsKey("webPropertyId")) {
@@ -8631,7 +8637,7 @@
   Experiments.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Experiment.fromJson(value))
+          .map<Experiment>((value) => new Experiment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
@@ -9390,8 +9396,9 @@
 
   Filters.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Filter.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Filter>((value) => new Filter.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
       itemsPerPage = _json["itemsPerPage"];
@@ -9553,7 +9560,8 @@
   GaDataDataTableRows.fromJson(core.Map _json) {
     if (_json.containsKey("c")) {
       c = _json["c"]
-          .map((value) => new GaDataDataTableRowsC.fromJson(value))
+          .map<GaDataDataTableRowsC>(
+              (value) => new GaDataDataTableRowsC.fromJson(value))
           .toList();
     }
   }
@@ -9577,12 +9585,14 @@
   GaDataDataTable.fromJson(core.Map _json) {
     if (_json.containsKey("cols")) {
       cols = _json["cols"]
-          .map((value) => new GaDataDataTableCols.fromJson(value))
+          .map<GaDataDataTableCols>(
+              (value) => new GaDataDataTableCols.fromJson(value))
           .toList();
     }
     if (_json.containsKey("rows")) {
       rows = _json["rows"]
-          .map((value) => new GaDataDataTableRows.fromJson(value))
+          .map<GaDataDataTableRows>(
+              (value) => new GaDataDataTableRows.fromJson(value))
           .toList();
     }
   }
@@ -9848,7 +9858,8 @@
   GaData.fromJson(core.Map _json) {
     if (_json.containsKey("columnHeaders")) {
       columnHeaders = _json["columnHeaders"]
-          .map((value) => new GaDataColumnHeaders.fromJson(value))
+          .map<GaDataColumnHeaders>(
+              (value) => new GaDataColumnHeaders.fromJson(value))
           .toList();
     }
     if (_json.containsKey("containsSampledData")) {
@@ -10033,7 +10044,8 @@
   GoalEventDetails.fromJson(core.Map _json) {
     if (_json.containsKey("eventConditions")) {
       eventConditions = _json["eventConditions"]
-          .map((value) => new GoalEventDetailsEventConditions.fromJson(value))
+          .map<GoalEventDetailsEventConditions>(
+              (value) => new GoalEventDetailsEventConditions.fromJson(value))
           .toList();
     }
     if (_json.containsKey("useEventValue")) {
@@ -10160,7 +10172,8 @@
     }
     if (_json.containsKey("steps")) {
       steps = _json["steps"]
-          .map((value) => new GoalUrlDestinationDetailsSteps.fromJson(value))
+          .map<GoalUrlDestinationDetailsSteps>(
+              (value) => new GoalUrlDestinationDetailsSteps.fromJson(value))
           .toList();
     }
     if (_json.containsKey("url")) {
@@ -10473,7 +10486,9 @@
 
   Goals.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Goal.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Goal>((value) => new Goal.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
       itemsPerPage = _json["itemsPerPage"];
@@ -10972,7 +10987,8 @@
   McfDataRows.fromJson(core.Map _json) {
     if (_json.containsKey("conversionPathValue")) {
       conversionPathValue = _json["conversionPathValue"]
-          .map((value) => new McfDataRowsConversionPathValue.fromJson(value))
+          .map<McfDataRowsConversionPathValue>(
+              (value) => new McfDataRowsConversionPathValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("primitiveValue")) {
@@ -11056,7 +11072,8 @@
   McfData.fromJson(core.Map _json) {
     if (_json.containsKey("columnHeaders")) {
       columnHeaders = _json["columnHeaders"]
-          .map((value) => new McfDataColumnHeaders.fromJson(value))
+          .map<McfDataColumnHeaders>(
+              (value) => new McfDataColumnHeaders.fromJson(value))
           .toList();
     }
     if (_json.containsKey("containsSampledData")) {
@@ -11085,8 +11102,9 @@
     }
     if (_json.containsKey("rows")) {
       rows = _json["rows"]
-          .map((value) =>
-              value.map((value) => new McfDataRows.fromJson(value)).toList())
+          .map<core.List<McfDataRows>>((value) => value
+              .map<McfDataRows>((value) => new McfDataRows.fromJson(value))
+              .toList())
           .toList();
     }
     if (_json.containsKey("sampleSize")) {
@@ -11631,7 +11649,8 @@
   ProfileFilterLinks.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ProfileFilterLink.fromJson(value))
+          .map<ProfileFilterLink>(
+              (value) => new ProfileFilterLink.fromJson(value))
           .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
@@ -11863,8 +11882,9 @@
 
   Profiles.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Profile.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Profile>((value) => new Profile.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
       itemsPerPage = _json["itemsPerPage"];
@@ -12140,7 +12160,8 @@
   RealtimeData.fromJson(core.Map _json) {
     if (_json.containsKey("columnHeaders")) {
       columnHeaders = _json["columnHeaders"]
-          .map((value) => new RealtimeDataColumnHeaders.fromJson(value))
+          .map<RealtimeDataColumnHeaders>(
+              (value) => new RealtimeDataColumnHeaders.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -12379,7 +12400,8 @@
     }
     if (_json.containsKey("linkedAdAccounts")) {
       linkedAdAccounts = _json["linkedAdAccounts"]
-          .map((value) => new LinkedForeignAccount.fromJson(value))
+          .map<LinkedForeignAccount>(
+              (value) => new LinkedForeignAccount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("linkedViews")) {
@@ -12490,7 +12512,8 @@
   RemarketingAudiences.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new RemarketingAudience.fromJson(value))
+          .map<RemarketingAudience>(
+              (value) => new RemarketingAudience.fromJson(value))
           .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
@@ -12679,8 +12702,9 @@
 
   Segments.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Segment.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Segment>((value) => new Segment.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
       itemsPerPage = _json["itemsPerPage"];
@@ -13024,7 +13048,7 @@
   UnsampledReports.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new UnsampledReport.fromJson(value))
+          .map<UnsampledReport>((value) => new UnsampledReport.fromJson(value))
           .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
@@ -13193,8 +13217,9 @@
 
   Uploads.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Upload.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Upload>((value) => new Upload.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
       itemsPerPage = _json["itemsPerPage"];
@@ -13398,7 +13423,7 @@
     }
     if (_json.containsKey("profiles")) {
       profiles = _json["profiles"]
-          .map((value) => new ProfileSummary.fromJson(value))
+          .map<ProfileSummary>((value) => new ProfileSummary.fromJson(value))
           .toList();
     }
     if (_json.containsKey("starred")) {
@@ -13478,7 +13503,7 @@
   Webproperties.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Webproperty.fromJson(value))
+          .map<Webproperty>((value) => new Webproperty.fromJson(value))
           .toList();
     }
     if (_json.containsKey("itemsPerPage")) {
diff --git a/generated/googleapis/lib/analyticsreporting/v4.dart b/generated/googleapis/lib/analyticsreporting/v4.dart
index 0e41eaa..fb9412e 100644
--- a/generated/googleapis/lib/analyticsreporting/v4.dart
+++ b/generated/googleapis/lib/analyticsreporting/v4.dart
@@ -58,7 +58,7 @@
   async.Future<GetReportsResponse> batchGet(GetReportsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -198,8 +198,9 @@
 
   CohortGroup.fromJson(core.Map _json) {
     if (_json.containsKey("cohorts")) {
-      cohorts =
-          _json["cohorts"].map((value) => new Cohort.fromJson(value)).toList();
+      cohorts = _json["cohorts"]
+          .map<Cohort>((value) => new Cohort.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("lifetimeValue")) {
       lifetimeValue = _json["lifetimeValue"];
@@ -299,7 +300,8 @@
   DateRangeValues.fromJson(core.Map _json) {
     if (_json.containsKey("pivotValueRegions")) {
       pivotValueRegions = _json["pivotValueRegions"]
-          .map((value) => new PivotValueRegion.fromJson(value))
+          .map<PivotValueRegion>(
+              (value) => new PivotValueRegion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("values")) {
@@ -506,7 +508,7 @@
   DimensionFilterClause.fromJson(core.Map _json) {
     if (_json.containsKey("filters")) {
       filters = _json["filters"]
-          .map((value) => new DimensionFilter.fromJson(value))
+          .map<DimensionFilter>((value) => new DimensionFilter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("operator")) {
@@ -594,7 +596,7 @@
   GetReportsRequest.fromJson(core.Map _json) {
     if (_json.containsKey("reportRequests")) {
       reportRequests = _json["reportRequests"]
-          .map((value) => new ReportRequest.fromJson(value))
+          .map<ReportRequest>((value) => new ReportRequest.fromJson(value))
           .toList();
     }
     if (_json.containsKey("useResourceQuotas")) {
@@ -637,8 +639,9 @@
       queryCost = _json["queryCost"];
     }
     if (_json.containsKey("reports")) {
-      reports =
-          _json["reports"].map((value) => new Report.fromJson(value)).toList();
+      reports = _json["reports"]
+          .map<Report>((value) => new Report.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("resourceQuotasRemaining")) {
       resourceQuotasRemaining = new ResourceQuotasRemaining.fromJson(
@@ -811,7 +814,7 @@
   MetricFilterClause.fromJson(core.Map _json) {
     if (_json.containsKey("filters")) {
       filters = _json["filters"]
-          .map((value) => new MetricFilter.fromJson(value))
+          .map<MetricFilter>((value) => new MetricFilter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("operator")) {
@@ -845,12 +848,13 @@
   MetricHeader.fromJson(core.Map _json) {
     if (_json.containsKey("metricHeaderEntries")) {
       metricHeaderEntries = _json["metricHeaderEntries"]
-          .map((value) => new MetricHeaderEntry.fromJson(value))
+          .map<MetricHeaderEntry>(
+              (value) => new MetricHeaderEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("pivotHeaders")) {
       pivotHeaders = _json["pivotHeaders"]
-          .map((value) => new PivotHeader.fromJson(value))
+          .map<PivotHeader>((value) => new PivotHeader.fromJson(value))
           .toList();
     }
   }
@@ -920,7 +924,8 @@
   OrFiltersForSegment.fromJson(core.Map _json) {
     if (_json.containsKey("segmentFilterClauses")) {
       segmentFilterClauses = _json["segmentFilterClauses"]
-          .map((value) => new SegmentFilterClause.fromJson(value))
+          .map<SegmentFilterClause>(
+              (value) => new SegmentFilterClause.fromJson(value))
           .toList();
     }
   }
@@ -1055,20 +1060,22 @@
   Pivot.fromJson(core.Map _json) {
     if (_json.containsKey("dimensionFilterClauses")) {
       dimensionFilterClauses = _json["dimensionFilterClauses"]
-          .map((value) => new DimensionFilterClause.fromJson(value))
+          .map<DimensionFilterClause>(
+              (value) => new DimensionFilterClause.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("maxGroupCount")) {
       maxGroupCount = _json["maxGroupCount"];
     }
     if (_json.containsKey("metrics")) {
-      metrics =
-          _json["metrics"].map((value) => new Metric.fromJson(value)).toList();
+      metrics = _json["metrics"]
+          .map<Metric>((value) => new Metric.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("startGroup")) {
       startGroup = _json["startGroup"];
@@ -1112,7 +1119,8 @@
   PivotHeader.fromJson(core.Map _json) {
     if (_json.containsKey("pivotHeaderEntries")) {
       pivotHeaderEntries = _json["pivotHeaderEntries"]
-          .map((value) => new PivotHeaderEntry.fromJson(value))
+          .map<PivotHeaderEntry>(
+              (value) => new PivotHeaderEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("totalPivotGroupsCount")) {
@@ -1305,20 +1313,21 @@
     }
     if (_json.containsKey("maximums")) {
       maximums = _json["maximums"]
-          .map((value) => new DateRangeValues.fromJson(value))
+          .map<DateRangeValues>((value) => new DateRangeValues.fromJson(value))
           .toList();
     }
     if (_json.containsKey("minimums")) {
       minimums = _json["minimums"]
-          .map((value) => new DateRangeValues.fromJson(value))
+          .map<DateRangeValues>((value) => new DateRangeValues.fromJson(value))
           .toList();
     }
     if (_json.containsKey("rowCount")) {
       rowCount = _json["rowCount"];
     }
     if (_json.containsKey("rows")) {
-      rows =
-          _json["rows"].map((value) => new ReportRow.fromJson(value)).toList();
+      rows = _json["rows"]
+          .map<ReportRow>((value) => new ReportRow.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("samplesReadCounts")) {
       samplesReadCounts = _json["samplesReadCounts"];
@@ -1328,7 +1337,7 @@
     }
     if (_json.containsKey("totals")) {
       totals = _json["totals"]
-          .map((value) => new DateRangeValues.fromJson(value))
+          .map<DateRangeValues>((value) => new DateRangeValues.fromJson(value))
           .toList();
     }
   }
@@ -1496,17 +1505,18 @@
     }
     if (_json.containsKey("dateRanges")) {
       dateRanges = _json["dateRanges"]
-          .map((value) => new DateRange.fromJson(value))
+          .map<DateRange>((value) => new DateRange.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensionFilterClauses")) {
       dimensionFilterClauses = _json["dimensionFilterClauses"]
-          .map((value) => new DimensionFilterClause.fromJson(value))
+          .map<DimensionFilterClause>(
+              (value) => new DimensionFilterClause.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("filtersExpression")) {
@@ -1523,16 +1533,18 @@
     }
     if (_json.containsKey("metricFilterClauses")) {
       metricFilterClauses = _json["metricFilterClauses"]
-          .map((value) => new MetricFilterClause.fromJson(value))
+          .map<MetricFilterClause>(
+              (value) => new MetricFilterClause.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metrics")) {
-      metrics =
-          _json["metrics"].map((value) => new Metric.fromJson(value)).toList();
+      metrics = _json["metrics"]
+          .map<Metric>((value) => new Metric.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("orderBys")) {
       orderBys = _json["orderBys"]
-          .map((value) => new OrderBy.fromJson(value))
+          .map<OrderBy>((value) => new OrderBy.fromJson(value))
           .toList();
     }
     if (_json.containsKey("pageSize")) {
@@ -1542,15 +1554,16 @@
       pageToken = _json["pageToken"];
     }
     if (_json.containsKey("pivots")) {
-      pivots =
-          _json["pivots"].map((value) => new Pivot.fromJson(value)).toList();
+      pivots = _json["pivots"]
+          .map<Pivot>((value) => new Pivot.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("samplingLevel")) {
       samplingLevel = _json["samplingLevel"];
     }
     if (_json.containsKey("segments")) {
       segments = _json["segments"]
-          .map((value) => new Segment.fromJson(value))
+          .map<Segment>((value) => new Segment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("viewId")) {
@@ -1636,7 +1649,7 @@
     }
     if (_json.containsKey("metrics")) {
       metrics = _json["metrics"]
-          .map((value) => new DateRangeValues.fromJson(value))
+          .map<DateRangeValues>((value) => new DateRangeValues.fromJson(value))
           .toList();
     }
   }
@@ -1733,7 +1746,7 @@
   SegmentDefinition.fromJson(core.Map _json) {
     if (_json.containsKey("segmentFilters")) {
       segmentFilters = _json["segmentFilters"]
-          .map((value) => new SegmentFilter.fromJson(value))
+          .map<SegmentFilter>((value) => new SegmentFilter.fromJson(value))
           .toList();
     }
   }
@@ -2074,7 +2087,8 @@
     }
     if (_json.containsKey("orFiltersForSegment")) {
       orFiltersForSegment = _json["orFiltersForSegment"]
-          .map((value) => new OrFiltersForSegment.fromJson(value))
+          .map<OrFiltersForSegment>(
+              (value) => new OrFiltersForSegment.fromJson(value))
           .toList();
     }
   }
@@ -2112,7 +2126,8 @@
     }
     if (_json.containsKey("segmentSequenceSteps")) {
       segmentSequenceSteps = _json["segmentSequenceSteps"]
-          .map((value) => new SegmentSequenceStep.fromJson(value))
+          .map<SegmentSequenceStep>(
+              (value) => new SegmentSequenceStep.fromJson(value))
           .toList();
     }
   }
@@ -2143,7 +2158,8 @@
   SimpleSegment.fromJson(core.Map _json) {
     if (_json.containsKey("orFiltersForSegment")) {
       orFiltersForSegment = _json["orFiltersForSegment"]
-          .map((value) => new OrFiltersForSegment.fromJson(value))
+          .map<OrFiltersForSegment>(
+              (value) => new OrFiltersForSegment.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/androiddeviceprovisioning/v1.dart b/generated/googleapis/lib/androiddeviceprovisioning/v1.dart
index 15845fc..249ad92 100644
--- a/generated/googleapis/lib/androiddeviceprovisioning/v1.dart
+++ b/generated/googleapis/lib/androiddeviceprovisioning/v1.dart
@@ -63,7 +63,7 @@
   async.Future<CustomerListCustomersResponse> list(
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -123,7 +123,7 @@
   async.Future<Configuration> create(Configuration request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -175,7 +175,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -220,7 +220,7 @@
   /// this method will complete with the same error.
   async.Future<Configuration> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -266,7 +266,7 @@
   async.Future<CustomerListConfigurationsResponse> list(core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -323,7 +323,7 @@
   async.Future<Configuration> patch(Configuration request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -388,7 +388,7 @@
       CustomerApplyConfigurationRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -437,7 +437,7 @@
   /// this method will complete with the same error.
   async.Future<Device> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -488,7 +488,7 @@
   async.Future<CustomerListDevicesResponse> list(core.String parent,
       {core.String pageToken, core.String pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -544,7 +544,7 @@
       CustomerRemoveConfigurationRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -603,7 +603,7 @@
       CustomerUnclaimDeviceRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -661,7 +661,7 @@
   async.Future<CustomerListDpcsResponse> list(core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -713,7 +713,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -784,7 +784,7 @@
       CreateCustomerRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -834,7 +834,7 @@
   async.Future<ListCustomersResponse> list(core.String partnerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -889,7 +889,7 @@
       ClaimDeviceRequest request, core.String partnerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -941,7 +941,7 @@
       ClaimDevicesRequest request, core.String partnerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -993,7 +993,7 @@
       FindDevicesByDeviceIdentifierRequest request, core.String partnerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1046,7 +1046,7 @@
       FindDevicesByOwnerRequest request, core.String partnerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1095,7 +1095,7 @@
   /// this method will complete with the same error.
   async.Future<Device> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1146,7 +1146,7 @@
       core.String metadataOwnerId, core.String deviceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1204,7 +1204,7 @@
       UnclaimDeviceRequest request, core.String partnerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1256,7 +1256,7 @@
       UnclaimDevicesRequest request, core.String partnerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1308,7 +1308,7 @@
       UpdateDeviceMetadataInBatchRequest request, core.String partnerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1426,7 +1426,7 @@
   ClaimDevicesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("claims")) {
       claims = _json["claims"]
-          .map((value) => new PartnerClaim.fromJson(value))
+          .map<PartnerClaim>((value) => new PartnerClaim.fromJson(value))
           .toList();
     }
   }
@@ -1711,7 +1711,7 @@
   CustomerListConfigurationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("configurations")) {
       configurations = _json["configurations"]
-          .map((value) => new Configuration.fromJson(value))
+          .map<Configuration>((value) => new Configuration.fromJson(value))
           .toList();
     }
   }
@@ -1741,7 +1741,7 @@
   CustomerListCustomersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("customers")) {
       customers = _json["customers"]
-          .map((value) => new Company.fromJson(value))
+          .map<Company>((value) => new Company.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -1775,8 +1775,9 @@
 
   CustomerListDevicesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("devices")) {
-      devices =
-          _json["devices"].map((value) => new Device.fromJson(value)).toList();
+      devices = _json["devices"]
+          .map<Device>((value) => new Device.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -1806,7 +1807,8 @@
 
   CustomerListDpcsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("dpcs")) {
-      dpcs = _json["dpcs"].map((value) => new Dpc.fromJson(value)).toList();
+      dpcs =
+          _json["dpcs"].map<Dpc>((value) => new Dpc.fromJson(value)).toList();
     }
   }
 
@@ -1901,7 +1903,7 @@
   Device.fromJson(core.Map _json) {
     if (_json.containsKey("claims")) {
       claims = _json["claims"]
-          .map((value) => new DeviceClaim.fromJson(value))
+          .map<DeviceClaim>((value) => new DeviceClaim.fromJson(value))
           .toList();
     }
     if (_json.containsKey("configuration")) {
@@ -2169,7 +2171,8 @@
   DevicesLongRunningOperationResponse.fromJson(core.Map _json) {
     if (_json.containsKey("perDeviceStatus")) {
       perDeviceStatus = _json["perDeviceStatus"]
-          .map((value) => new OperationPerDevice.fromJson(value))
+          .map<OperationPerDevice>(
+              (value) => new OperationPerDevice.fromJson(value))
           .toList();
     }
     if (_json.containsKey("successCount")) {
@@ -2317,8 +2320,9 @@
 
   FindDevicesByDeviceIdentifierResponse.fromJson(core.Map _json) {
     if (_json.containsKey("devices")) {
-      devices =
-          _json["devices"].map((value) => new Device.fromJson(value)).toList();
+      devices = _json["devices"]
+          .map<Device>((value) => new Device.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -2403,8 +2407,9 @@
 
   FindDevicesByOwnerResponse.fromJson(core.Map _json) {
     if (_json.containsKey("devices")) {
-      devices =
-          _json["devices"].map((value) => new Device.fromJson(value)).toList();
+      devices = _json["devices"]
+          .map<Device>((value) => new Device.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -2434,7 +2439,7 @@
   ListCustomersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("customers")) {
       customers = _json["customers"]
-          .map((value) => new Company.fromJson(value))
+          .map<Company>((value) => new Company.fromJson(value))
           .toList();
     }
   }
@@ -2898,7 +2903,7 @@
   UnclaimDevicesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("unclaims")) {
       unclaims = _json["unclaims"]
-          .map((value) => new PartnerUnclaim.fromJson(value))
+          .map<PartnerUnclaim>((value) => new PartnerUnclaim.fromJson(value))
           .toList();
     }
   }
@@ -2923,7 +2928,8 @@
   UpdateDeviceMetadataInBatchRequest.fromJson(core.Map _json) {
     if (_json.containsKey("updates")) {
       updates = _json["updates"]
-          .map((value) => new UpdateMetadataArguments.fromJson(value))
+          .map<UpdateMetadataArguments>(
+              (value) => new UpdateMetadataArguments.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/androidenterprise/v1.dart b/generated/googleapis/lib/androidenterprise/v1.dart
index 23b6d2f..fc9c5e7 100644
--- a/generated/googleapis/lib/androidenterprise/v1.dart
+++ b/generated/googleapis/lib/androidenterprise/v1.dart
@@ -86,7 +86,7 @@
       core.String enterpriseId, core.String userId, core.String deviceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -149,7 +149,7 @@
       core.String enterpriseId, core.String userId, core.String deviceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -207,7 +207,7 @@
       core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -270,7 +270,7 @@
       core.String userId, core.String deviceId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -341,7 +341,7 @@
       core.String enterpriseId, core.String userId, core.String deviceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -412,7 +412,7 @@
       core.String userId, core.String deviceId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -479,7 +479,7 @@
   async.Future acknowledgeNotificationSet(
       {core.String notificationSetId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -531,7 +531,7 @@
       core.String enterpriseToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -583,7 +583,7 @@
       AdministratorWebTokenSpec request, core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -631,7 +631,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String enterpriseId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -678,7 +678,7 @@
   async.Future<Enterprise> enroll(Enterprise request, core.String token,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -733,7 +733,7 @@
   async.Future<SignupInfo> generateSignupUrl(
       {core.String callbackUrl, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -776,7 +776,7 @@
   async.Future<Enterprise> get(core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -820,7 +820,7 @@
       core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -886,7 +886,7 @@
   async.Future<ServiceAccount> getServiceAccount(core.String enterpriseId,
       {core.String keyType, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -935,7 +935,7 @@
   async.Future<StoreLayout> getStoreLayout(core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -983,7 +983,7 @@
   async.Future<Enterprise> insert(Enterprise request, core.String token,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1034,7 +1034,7 @@
   async.Future<EnterprisesListResponse> list(core.String domain,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1104,7 +1104,7 @@
   async.Future<NotificationSet> pullNotificationSet(
       {core.String requestMode, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1149,7 +1149,7 @@
       sendTestPushNotification(core.String enterpriseId,
           {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1199,7 +1199,7 @@
       EnterpriseAccount request, core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1253,7 +1253,7 @@
       AndroidDevicePolicyConfig request, core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1311,7 +1311,7 @@
       StoreLayout request, core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1356,7 +1356,7 @@
   /// this method will complete with the same error.
   async.Future unenroll(core.String enterpriseId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1413,7 +1413,7 @@
       core.String enterpriseId, core.String userId, core.String entitlementId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1475,7 +1475,7 @@
       core.String enterpriseId, core.String userId, core.String entitlementId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1532,7 +1532,7 @@
       core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1597,7 +1597,7 @@
       core.String userId, core.String entitlementId,
       {core.bool install, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1670,7 +1670,7 @@
       core.String enterpriseId, core.String userId, core.String entitlementId,
       {core.bool install, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1740,7 +1740,7 @@
       core.String enterpriseId, core.String groupLicenseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1790,7 +1790,7 @@
   async.Future<GroupLicensesListResponse> list(core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1848,7 +1848,7 @@
       core.String enterpriseId, core.String groupLicenseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1912,7 +1912,7 @@
       core.String deviceId, core.String installId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1981,7 +1981,7 @@
       core.String deviceId, core.String installId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2045,7 +2045,7 @@
       core.String enterpriseId, core.String userId, core.String deviceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2112,7 +2112,7 @@
       core.String userId, core.String deviceId, core.String installId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2186,7 +2186,7 @@
       core.String userId, core.String deviceId, core.String installId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2262,7 +2262,7 @@
       core.String deviceId, core.String managedConfigurationForDeviceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2335,7 +2335,7 @@
       core.String managedConfigurationForDeviceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2401,7 +2401,7 @@
       core.String enterpriseId, core.String userId, core.String deviceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2472,7 +2472,7 @@
       core.String managedConfigurationForDeviceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2550,7 +2550,7 @@
       core.String managedConfigurationForDeviceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2625,7 +2625,7 @@
       core.String managedConfigurationForUserId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2689,7 +2689,7 @@
       core.String userId, core.String managedConfigurationForUserId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2748,7 +2748,7 @@
       core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2815,7 +2815,7 @@
       core.String managedConfigurationForUserId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2889,7 +2889,7 @@
       core.String managedConfigurationForUserId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2959,7 +2959,7 @@
       core.String enterpriseId, core.String productId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3020,7 +3020,7 @@
   async.Future<Permission> get(core.String permissionId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3081,7 +3081,7 @@
       core.String productId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3151,7 +3151,7 @@
       core.String enterpriseId, core.String productId,
       {core.String languageCode, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3210,7 +3210,7 @@
   async.Future<Product> get(core.String enterpriseId, core.String productId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3273,7 +3273,7 @@
       core.String enterpriseId, core.String productId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3329,7 +3329,7 @@
       core.String enterpriseId, core.String productId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3407,7 +3407,7 @@
       core.String token,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3468,7 +3468,7 @@
   async.Future unapprove(core.String enterpriseId, core.String productId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3530,7 +3530,7 @@
   async.Future delete(core.String enterpriseId, core.String keyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3590,7 +3590,7 @@
       ServiceAccountKey request, core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3642,7 +3642,7 @@
   async.Future<ServiceAccountKeysListResponse> list(core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3698,7 +3698,7 @@
       core.String enterpriseId, core.String pageId, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3759,7 +3759,7 @@
       core.String enterpriseId, core.String pageId, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3818,7 +3818,7 @@
       StoreCluster request, core.String enterpriseId, core.String pageId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3874,7 +3874,7 @@
       core.String enterpriseId, core.String pageId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3932,7 +3932,7 @@
       core.String enterpriseId, core.String pageId, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3996,7 +3996,7 @@
       core.String enterpriseId, core.String pageId, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4060,7 +4060,7 @@
   async.Future delete(core.String enterpriseId, core.String pageId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4113,7 +4113,7 @@
   async.Future<StorePage> get(core.String enterpriseId, core.String pageId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4164,7 +4164,7 @@
   async.Future<StorePage> insert(StorePage request, core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4212,7 +4212,7 @@
   async.Future<StoreLayoutPagesListResponse> list(core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4263,7 +4263,7 @@
       StorePage request, core.String enterpriseId, core.String pageId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4320,7 +4320,7 @@
       StorePage request, core.String enterpriseId, core.String pageId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4378,7 +4378,7 @@
   async.Future delete(core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4436,7 +4436,7 @@
       core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4493,7 +4493,7 @@
       core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4545,7 +4545,7 @@
   async.Future<User> get(core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4597,7 +4597,7 @@
       core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4655,7 +4655,7 @@
   async.Future<User> insert(User request, core.String enterpriseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4708,7 +4708,7 @@
       core.String enterpriseId, core.String email,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4767,7 +4767,7 @@
       User request, core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4823,7 +4823,7 @@
   async.Future revokeDeviceAccess(core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4875,7 +4875,7 @@
   async.Future revokeToken(core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4935,7 +4935,7 @@
       ProductSet request, core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4998,7 +4998,7 @@
       User request, core.String enterpriseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5191,7 +5191,8 @@
     }
     if (_json.containsKey("restrictions")) {
       restrictions = _json["restrictions"]
-          .map((value) => new AppRestrictionsSchemaRestriction.fromJson(value))
+          .map<AppRestrictionsSchemaRestriction>(
+              (value) => new AppRestrictionsSchemaRestriction.fromJson(value))
           .toList();
     }
   }
@@ -5294,7 +5295,8 @@
     }
     if (_json.containsKey("nestedRestriction")) {
       nestedRestriction = _json["nestedRestriction"]
-          .map((value) => new AppRestrictionsSchemaRestriction.fromJson(value))
+          .map<AppRestrictionsSchemaRestriction>(
+              (value) => new AppRestrictionsSchemaRestriction.fromJson(value))
           .toList();
     }
     if (_json.containsKey("restrictionType")) {
@@ -5565,7 +5567,7 @@
     }
     if (_json.containsKey("variableSet")) {
       variableSet = _json["variableSet"]
-          .map((value) => new VariableSet.fromJson(value))
+          .map<VariableSet>((value) => new VariableSet.fromJson(value))
           .toList();
     }
   }
@@ -5702,8 +5704,9 @@
 
   DevicesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("device")) {
-      device =
-          _json["device"].map((value) => new Device.fromJson(value)).toList();
+      device = _json["device"]
+          .map<Device>((value) => new Device.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -5759,7 +5762,7 @@
   Enterprise.fromJson(core.Map _json) {
     if (_json.containsKey("administrator")) {
       administrator = _json["administrator"]
-          .map((value) => new Administrator.fromJson(value))
+          .map<Administrator>((value) => new Administrator.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -5847,7 +5850,7 @@
   EnterprisesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("enterprise")) {
       enterprise = _json["enterprise"]
-          .map((value) => new Enterprise.fromJson(value))
+          .map<Enterprise>((value) => new Enterprise.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -5985,7 +5988,7 @@
   EntitlementsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entitlement")) {
       entitlement = _json["entitlement"]
-          .map((value) => new Entitlement.fromJson(value))
+          .map<Entitlement>((value) => new Entitlement.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -6137,7 +6140,8 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("user")) {
-      user = _json["user"].map((value) => new User.fromJson(value)).toList();
+      user =
+          _json["user"].map<User>((value) => new User.fromJson(value)).toList();
     }
   }
 
@@ -6168,7 +6172,7 @@
   GroupLicensesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("groupLicense")) {
       groupLicense = _json["groupLicense"]
-          .map((value) => new GroupLicense.fromJson(value))
+          .map<GroupLicense>((value) => new GroupLicense.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -6345,8 +6349,9 @@
 
   InstallsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("install")) {
-      install =
-          _json["install"].map((value) => new Install.fromJson(value)).toList();
+      install = _json["install"]
+          .map<Install>((value) => new Install.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -6429,7 +6434,7 @@
     }
     if (_json.containsKey("managedProperty")) {
       managedProperty = _json["managedProperty"]
-          .map((value) => new ManagedProperty.fromJson(value))
+          .map<ManagedProperty>((value) => new ManagedProperty.fromJson(value))
           .toList();
     }
     if (_json.containsKey("productId")) {
@@ -6474,7 +6479,8 @@
     }
     if (_json.containsKey("managedConfigurationForDevice")) {
       managedConfigurationForDevice = _json["managedConfigurationForDevice"]
-          .map((value) => new ManagedConfiguration.fromJson(value))
+          .map<ManagedConfiguration>(
+              (value) => new ManagedConfiguration.fromJson(value))
           .toList();
     }
   }
@@ -6511,7 +6517,8 @@
     }
     if (_json.containsKey("managedConfigurationForUser")) {
       managedConfigurationForUser = _json["managedConfigurationForUser"]
-          .map((value) => new ManagedConfiguration.fromJson(value))
+          .map<ManagedConfiguration>(
+              (value) => new ManagedConfiguration.fromJson(value))
           .toList();
     }
   }
@@ -6563,7 +6570,7 @@
     }
     if (_json.containsKey("managedProperty")) {
       managedProperty = _json["managedProperty"]
-          .map((value) => new ManagedProperty.fromJson(value))
+          .map<ManagedProperty>((value) => new ManagedProperty.fromJson(value))
           .toList();
     }
     if (_json.containsKey("mcmId")) {
@@ -6615,7 +6622,8 @@
     }
     if (_json.containsKey("managedConfigurationsSettings")) {
       managedConfigurationsSettings = _json["managedConfigurationsSettings"]
-          .map((value) => new ManagedConfigurationsSettings.fromJson(value))
+          .map<ManagedConfigurationsSettings>(
+              (value) => new ManagedConfigurationsSettings.fromJson(value))
           .toList();
     }
   }
@@ -6681,7 +6689,8 @@
     }
     if (_json.containsKey("valueBundleArray")) {
       valueBundleArray = _json["valueBundleArray"]
-          .map((value) => new ManagedPropertyBundle.fromJson(value))
+          .map<ManagedPropertyBundle>(
+              (value) => new ManagedPropertyBundle.fromJson(value))
           .toList();
     }
     if (_json.containsKey("valueInteger")) {
@@ -6734,7 +6743,7 @@
   ManagedPropertyBundle.fromJson(core.Map _json) {
     if (_json.containsKey("managedProperty")) {
       managedProperty = _json["managedProperty"]
-          .map((value) => new ManagedProperty.fromJson(value))
+          .map<ManagedProperty>((value) => new ManagedProperty.fromJson(value))
           .toList();
     }
   }
@@ -6990,7 +6999,7 @@
     }
     if (_json.containsKey("notification")) {
       notification = _json["notification"]
-          .map((value) => new Notification.fromJson(value))
+          .map<Notification>((value) => new Notification.fromJson(value))
           .toList();
     }
     if (_json.containsKey("notificationSetId")) {
@@ -7133,7 +7142,7 @@
     }
     if (_json.containsKey("productPolicy")) {
       productPolicy = _json["productPolicy"]
-          .map((value) => new ProductPolicy.fromJson(value))
+          .map<ProductPolicy>((value) => new ProductPolicy.fromJson(value))
           .toList();
     }
   }
@@ -7249,7 +7258,7 @@
   Product.fromJson(core.Map _json) {
     if (_json.containsKey("appVersion")) {
       appVersion = _json["appVersion"]
-          .map((value) => new AppVersion.fromJson(value))
+          .map<AppVersion>((value) => new AppVersion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("authorName")) {
@@ -7290,7 +7299,8 @@
     }
     if (_json.containsKey("permissions")) {
       permissions = _json["permissions"]
-          .map((value) => new ProductPermission.fromJson(value))
+          .map<ProductPermission>(
+              (value) => new ProductPermission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("productId")) {
@@ -7527,7 +7537,8 @@
     }
     if (_json.containsKey("permission")) {
       permission = _json["permission"]
-          .map((value) => new ProductPermission.fromJson(value))
+          .map<ProductPermission>(
+              (value) => new ProductPermission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("productId")) {
@@ -7643,7 +7654,8 @@
     }
     if (_json.containsKey("productVisibility")) {
       productVisibility = _json["productVisibility"]
-          .map((value) => new ProductVisibility.fromJson(value))
+          .map<ProductVisibility>(
+              (value) => new ProductVisibility.fromJson(value))
           .toList();
     }
   }
@@ -7844,8 +7856,9 @@
       pageInfo = new PageInfo.fromJson(_json["pageInfo"]);
     }
     if (_json.containsKey("product")) {
-      product =
-          _json["product"].map((value) => new Product.fromJson(value)).toList();
+      product = _json["product"]
+          .map<Product>((value) => new Product.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("tokenPagination")) {
       tokenPagination = new TokenPagination.fromJson(_json["tokenPagination"]);
@@ -7990,7 +8003,8 @@
   ServiceAccountKeysListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("serviceAccountKey")) {
       serviceAccountKey = _json["serviceAccountKey"]
-          .map((value) => new ServiceAccountKey.fromJson(value))
+          .map<ServiceAccountKey>(
+              (value) => new ServiceAccountKey.fromJson(value))
           .toList();
     }
   }
@@ -8091,7 +8105,7 @@
     }
     if (_json.containsKey("name")) {
       name = _json["name"]
-          .map((value) => new LocalizedText.fromJson(value))
+          .map<LocalizedText>((value) => new LocalizedText.fromJson(value))
           .toList();
     }
     if (_json.containsKey("orderInPage")) {
@@ -8188,7 +8202,7 @@
   StoreLayoutClustersListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("cluster")) {
       cluster = _json["cluster"]
-          .map((value) => new StoreCluster.fromJson(value))
+          .map<StoreCluster>((value) => new StoreCluster.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -8225,8 +8239,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("page")) {
-      page =
-          _json["page"].map((value) => new StorePage.fromJson(value)).toList();
+      page = _json["page"]
+          .map<StorePage>((value) => new StorePage.fromJson(value))
+          .toList();
     }
   }
 
@@ -8283,7 +8298,7 @@
     }
     if (_json.containsKey("name")) {
       name = _json["name"]
-          .map((value) => new LocalizedText.fromJson(value))
+          .map<LocalizedText>((value) => new LocalizedText.fromJson(value))
           .toList();
     }
   }
@@ -8497,7 +8512,8 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("user")) {
-      user = _json["user"].map((value) => new User.fromJson(value)).toList();
+      user =
+          _json["user"].map<User>((value) => new User.fromJson(value)).toList();
     }
   }
 
diff --git a/generated/googleapis/lib/androidmanagement/v1.dart b/generated/googleapis/lib/androidmanagement/v1.dart
index 4230ae0..3c7e839 100644
--- a/generated/googleapis/lib/androidmanagement/v1.dart
+++ b/generated/googleapis/lib/androidmanagement/v1.dart
@@ -81,7 +81,7 @@
       core.String projectId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -134,7 +134,7 @@
   /// this method will complete with the same error.
   async.Future<Enterprise> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -184,7 +184,7 @@
   async.Future<Enterprise> patch(Enterprise request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -246,7 +246,7 @@
   async.Future<Application> get(core.String name,
       {core.String languageCode, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -303,7 +303,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -347,7 +347,7 @@
   /// this method will complete with the same error.
   async.Future<Device> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -396,7 +396,7 @@
   async.Future<Operation> issueCommand(Command request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -452,7 +452,7 @@
   async.Future<ListDevicesResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -509,7 +509,7 @@
   async.Future<Device> patch(Device request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -574,7 +574,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> cancel(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -621,7 +621,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -667,7 +667,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -728,7 +728,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -792,7 +792,7 @@
       EnrollmentToken request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -842,7 +842,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -894,7 +894,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -938,7 +938,7 @@
   /// this method will complete with the same error.
   async.Future<Policy> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -989,7 +989,7 @@
   async.Future<ListPoliciesResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1046,7 +1046,7 @@
   async.Future<Policy> patch(Policy request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1107,7 +1107,7 @@
   async.Future<WebToken> create(WebToken request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1168,7 +1168,7 @@
   async.Future<SignupUrl> create(
       {core.String callbackUrl, core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1275,7 +1275,7 @@
   Application.fromJson(core.Map _json) {
     if (_json.containsKey("managedProperties")) {
       managedProperties = _json["managedProperties"]
-          .map((value) => new ManagedProperty.fromJson(value))
+          .map<ManagedProperty>((value) => new ManagedProperty.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -1283,7 +1283,8 @@
     }
     if (_json.containsKey("permissions")) {
       permissions = _json["permissions"]
-          .map((value) => new ApplicationPermission.fromJson(value))
+          .map<ApplicationPermission>(
+              (value) => new ApplicationPermission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("title")) {
@@ -1442,7 +1443,7 @@
     }
     if (_json.containsKey("permissionGrants")) {
       permissionGrants = _json["permissionGrants"]
-          .map((value) => new PermissionGrant.fromJson(value))
+          .map<PermissionGrant>((value) => new PermissionGrant.fromJson(value))
           .toList();
     }
   }
@@ -1753,7 +1754,7 @@
     }
     if (_json.containsKey("displays")) {
       displays = _json["displays"]
-          .map((value) => new Display.fromJson(value))
+          .map<Display>((value) => new Display.fromJson(value))
           .toList();
     }
     if (_json.containsKey("enrollmentTime")) {
@@ -1770,7 +1771,7 @@
     }
     if (_json.containsKey("hardwareStatusSamples")) {
       hardwareStatusSamples = _json["hardwareStatusSamples"]
-          .map((value) => new HardwareStatus.fromJson(value))
+          .map<HardwareStatus>((value) => new HardwareStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("lastPolicyComplianceReportTime")) {
@@ -1784,7 +1785,7 @@
     }
     if (_json.containsKey("memoryEvents")) {
       memoryEvents = _json["memoryEvents"]
-          .map((value) => new MemoryEvent.fromJson(value))
+          .map<MemoryEvent>((value) => new MemoryEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("memoryInfo")) {
@@ -1798,7 +1799,8 @@
     }
     if (_json.containsKey("nonComplianceDetails")) {
       nonComplianceDetails = _json["nonComplianceDetails"]
-          .map((value) => new NonComplianceDetail.fromJson(value))
+          .map<NonComplianceDetail>(
+              (value) => new NonComplianceDetail.fromJson(value))
           .toList();
     }
     if (_json.containsKey("policyCompliant")) {
@@ -1809,7 +1811,8 @@
     }
     if (_json.containsKey("powerManagementEvents")) {
       powerManagementEvents = _json["powerManagementEvents"]
-          .map((value) => new PowerManagementEvent.fromJson(value))
+          .map<PowerManagementEvent>(
+              (value) => new PowerManagementEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("previousDeviceNames")) {
@@ -2573,8 +2576,9 @@
 
   ListDevicesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("devices")) {
-      devices =
-          _json["devices"].map((value) => new Device.fromJson(value)).toList();
+      devices = _json["devices"]
+          .map<Device>((value) => new Device.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -2610,7 +2614,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -2644,8 +2648,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("policies")) {
-      policies =
-          _json["policies"].map((value) => new Policy.fromJson(value)).toList();
+      policies = _json["policies"]
+          .map<Policy>((value) => new Policy.fromJson(value))
+          .toList();
     }
   }
 
@@ -2714,7 +2719,8 @@
     }
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new ManagedPropertyEntry.fromJson(value))
+          .map<ManagedPropertyEntry>(
+              (value) => new ManagedPropertyEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("key")) {
@@ -2722,7 +2728,7 @@
     }
     if (_json.containsKey("nestedProperties")) {
       nestedProperties = _json["nestedProperties"]
-          .map((value) => new ManagedProperty.fromJson(value))
+          .map<ManagedProperty>((value) => new ManagedProperty.fromJson(value))
           .toList();
     }
     if (_json.containsKey("title")) {
@@ -3729,7 +3735,8 @@
     }
     if (_json.containsKey("applications")) {
       applications = _json["applications"]
-          .map((value) => new ApplicationPolicy.fromJson(value))
+          .map<ApplicationPolicy>(
+              (value) => new ApplicationPolicy.fromJson(value))
           .toList();
     }
     if (_json.containsKey("autoTimeRequired")) {
@@ -3756,7 +3763,7 @@
     }
     if (_json.containsKey("complianceRules")) {
       complianceRules = _json["complianceRules"]
-          .map((value) => new ComplianceRule.fromJson(value))
+          .map<ComplianceRule>((value) => new ComplianceRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("createWindowsDisabled")) {
@@ -3845,7 +3852,8 @@
     }
     if (_json.containsKey("persistentPreferredActivities")) {
       persistentPreferredActivities = _json["persistentPreferredActivities"]
-          .map((value) => new PersistentPreferredActivity.fromJson(value))
+          .map<PersistentPreferredActivity>(
+              (value) => new PersistentPreferredActivity.fromJson(value))
           .toList();
     }
     if (_json.containsKey("recommendedGlobalProxy")) {
diff --git a/generated/googleapis/lib/androidpublisher/v2.dart b/generated/googleapis/lib/androidpublisher/v2.dart
index 52d967e..123a7e7 100644
--- a/generated/googleapis/lib/androidpublisher/v2.dart
+++ b/generated/googleapis/lib/androidpublisher/v2.dart
@@ -88,7 +88,7 @@
   async.Future<AppEdit> commit(core.String packageName, core.String editId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -140,7 +140,7 @@
   async.Future delete(core.String packageName, core.String editId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -194,7 +194,7 @@
   async.Future<AppEdit> get(core.String packageName, core.String editId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -245,7 +245,7 @@
   async.Future<AppEdit> insert(AppEdit request, core.String packageName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -295,7 +295,7 @@
   async.Future<AppEdit> validate(core.String packageName, core.String editId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -361,7 +361,7 @@
       core.int apkVersionCode, core.String language,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -426,7 +426,7 @@
       core.String packageName, core.String editId, core.int apkVersionCode,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -494,7 +494,7 @@
       core.int apkVersionCode, core.String language,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -559,7 +559,7 @@
       core.String packageName, core.String editId, core.int apkVersionCode,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -627,7 +627,7 @@
       core.String editId, core.int apkVersionCode, core.String language,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -702,7 +702,7 @@
       core.String editId, core.int apkVersionCode, core.String language,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -780,7 +780,7 @@
       core.String editId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -835,7 +835,7 @@
       core.String packageName, core.String editId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -893,7 +893,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -989,7 +989,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1082,7 +1082,7 @@
   async.Future<AppDetails> get(core.String packageName, core.String editId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1137,7 +1137,7 @@
       AppDetails request, core.String packageName, core.String editId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1195,7 +1195,7 @@
       AppDetails request, core.String packageName, core.String editId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1266,7 +1266,7 @@
       core.int apkVersionCode, core.String expansionFileType,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1344,7 +1344,7 @@
       core.String expansionFileType,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1424,7 +1424,7 @@
       core.String expansionFileType,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1508,7 +1508,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1617,7 +1617,7 @@
       core.String language, core.String imageType, core.String imageId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1702,7 +1702,7 @@
       core.String editId, core.String language, core.String imageType,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1780,7 +1780,7 @@
       core.String editId, core.String language, core.String imageType,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1867,7 +1867,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1960,7 +1960,7 @@
       core.String packageName, core.String editId, core.String language,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2016,7 +2016,7 @@
   async.Future deleteall(core.String packageName, core.String editId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2075,7 +2075,7 @@
       core.String packageName, core.String editId, core.String language,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2132,7 +2132,7 @@
       core.String packageName, core.String editId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2192,7 +2192,7 @@
       core.String editId, core.String language,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2258,7 +2258,7 @@
       core.String editId, core.String language,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2326,7 +2326,7 @@
       core.String packageName, core.String editId, core.String track,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2387,7 +2387,7 @@
       core.String editId, core.String track,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2451,7 +2451,7 @@
       core.String editId, core.String track,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2522,7 +2522,7 @@
       core.String packageName, core.String editId, core.String track,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2579,7 +2579,7 @@
       core.String packageName, core.String editId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2640,7 +2640,7 @@
       core.String editId, core.String track,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2708,7 +2708,7 @@
       core.String editId, core.String track,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2784,7 +2784,7 @@
       core.String token,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2847,7 +2847,7 @@
   async.Future delete(core.String packageName, core.String sku,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2899,7 +2899,7 @@
   async.Future<InAppProduct> get(core.String packageName, core.String sku,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2956,7 +2956,7 @@
       InAppProduct request, core.String packageName,
       {core.bool autoConvertMissingPrices, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3018,7 +3018,7 @@
       core.String token,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3083,7 +3083,7 @@
       InAppProduct request, core.String packageName, core.String sku,
       {core.bool autoConvertMissingPrices, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3150,7 +3150,7 @@
       InAppProduct request, core.String packageName, core.String sku,
       {core.bool autoConvertMissingPrices, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3234,7 +3234,7 @@
       core.String packageName, core.String productId, core.String token,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3301,7 +3301,7 @@
       core.String packageName, core.String subscriptionId, core.String token,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3371,7 +3371,7 @@
       core.String token,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3438,7 +3438,7 @@
       core.String packageName, core.String subscriptionId, core.String token,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3498,7 +3498,7 @@
       core.String packageName, core.String subscriptionId, core.String token,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3562,7 +3562,7 @@
       core.String packageName, core.String subscriptionId, core.String token,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3652,7 +3652,7 @@
       core.String token,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3723,7 +3723,7 @@
   async.Future<Review> get(core.String packageName, core.String reviewId,
       {core.String translationLanguage, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3787,7 +3787,7 @@
       core.String translationLanguage,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3848,7 +3848,7 @@
       core.String packageName, core.String reviewId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3992,7 +3992,7 @@
     }
     if (_json.containsKey("listings")) {
       listings = _json["listings"]
-          .map((value) => new ApkListing.fromJson(value))
+          .map<ApkListing>((value) => new ApkListing.fromJson(value))
           .toList();
     }
   }
@@ -4067,7 +4067,8 @@
 
   ApksListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("apks")) {
-      apks = _json["apks"].map((value) => new Apk.fromJson(value)).toList();
+      apks =
+          _json["apks"].map<Apk>((value) => new Apk.fromJson(value)).toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -4457,7 +4458,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new Entitlement.fromJson(value))
+          .map<Entitlement>((value) => new Entitlement.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tokenPagination")) {
@@ -4629,7 +4630,8 @@
     }
     if (_json.containsKey("usesPermissions")) {
       usesPermissions = _json["usesPermissions"]
-          .map((value) => new ExternallyHostedApkUsesPermission.fromJson(value))
+          .map<ExternallyHostedApkUsesPermission>(
+              (value) => new ExternallyHostedApkUsesPermission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("versionCode")) {
@@ -4772,8 +4774,9 @@
 
   ImagesDeleteAllResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deleted")) {
-      deleted =
-          _json["deleted"].map((value) => new Image.fromJson(value)).toList();
+      deleted = _json["deleted"]
+          .map<Image>((value) => new Image.fromJson(value))
+          .toList();
     }
   }
 
@@ -4794,8 +4797,9 @@
 
   ImagesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("images")) {
-      images =
-          _json["images"].map((value) => new Image.fromJson(value)).toList();
+      images = _json["images"]
+          .map<Image>((value) => new Image.fromJson(value))
+          .toList();
     }
   }
 
@@ -5001,7 +5005,7 @@
   InappproductsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("inappproduct")) {
       inappproduct = _json["inappproduct"]
-          .map((value) => new InAppProduct.fromJson(value))
+          .map<InAppProduct>((value) => new InAppProduct.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -5108,7 +5112,7 @@
     }
     if (_json.containsKey("listings")) {
       listings = _json["listings"]
-          .map((value) => new Listing.fromJson(value))
+          .map<Listing>((value) => new Listing.fromJson(value))
           .toList();
     }
   }
@@ -5365,7 +5369,7 @@
     }
     if (_json.containsKey("comments")) {
       comments = _json["comments"]
-          .map((value) => new Comment.fromJson(value))
+          .map<Comment>((value) => new Comment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("reviewId")) {
@@ -5432,8 +5436,9 @@
       pageInfo = new PageInfo.fromJson(_json["pageInfo"]);
     }
     if (_json.containsKey("reviews")) {
-      reviews =
-          _json["reviews"].map((value) => new Review.fromJson(value)).toList();
+      reviews = _json["reviews"]
+          .map<Review>((value) => new Review.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("tokenPagination")) {
       tokenPagination = new TokenPagination.fromJson(_json["tokenPagination"]);
@@ -5521,7 +5526,7 @@
     }
     if (_json.containsKey("prorations")) {
       prorations = _json["prorations"]
-          .map((value) => new Prorate.fromJson(value))
+          .map<Prorate>((value) => new Prorate.fromJson(value))
           .toList();
     }
     if (_json.containsKey("start")) {
@@ -5938,8 +5943,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("tracks")) {
-      tracks =
-          _json["tracks"].map((value) => new Track.fromJson(value)).toList();
+      tracks = _json["tracks"]
+          .map<Track>((value) => new Track.fromJson(value))
+          .toList();
     }
   }
 
@@ -6156,7 +6162,7 @@
     }
     if (_json.containsKey("voidedPurchases")) {
       voidedPurchases = _json["voidedPurchases"]
-          .map((value) => new VoidedPurchase.fromJson(value))
+          .map<VoidedPurchase>((value) => new VoidedPurchase.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/appengine/v1.dart b/generated/googleapis/lib/appengine/v1.dart
index 6049461..42c691e 100644
--- a/generated/googleapis/lib/appengine/v1.dart
+++ b/generated/googleapis/lib/appengine/v1.dart
@@ -85,7 +85,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> create(Application request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -128,7 +128,7 @@
   /// this method will complete with the same error.
   async.Future<Application> get(core.String appsId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -180,7 +180,7 @@
   async.Future<Operation> patch(Application request, core.String appsId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -236,7 +236,7 @@
       RepairApplicationRequest request, core.String appsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -293,7 +293,7 @@
       AuthorizedCertificate request, core.String appsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -346,7 +346,7 @@
       core.String appsId, core.String authorizedCertificatesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -406,7 +406,7 @@
       core.String appsId, core.String authorizedCertificatesId,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -472,7 +472,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -542,7 +542,7 @@
       core.String appsId, core.String authorizedCertificatesId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -610,7 +610,7 @@
   async.Future<ListAuthorizedDomainsResponse> list(core.String appsId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -682,7 +682,7 @@
   async.Future<Operation> create(DomainMapping request, core.String appsId,
       {core.String overrideStrategy, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -739,7 +739,7 @@
       core.String appsId, core.String domainMappingsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -792,7 +792,7 @@
       core.String appsId, core.String domainMappingsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -846,7 +846,7 @@
   async.Future<ListDomainMappingsResponse> list(core.String appsId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -909,7 +909,7 @@
       DomainMapping request, core.String appsId, core.String domainMappingsId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -987,7 +987,7 @@
       BatchUpdateIngressRulesRequest request, core.String appsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1039,7 +1039,7 @@
   async.Future<FirewallRule> create(FirewallRule request, core.String appsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1090,7 +1090,7 @@
   async.Future<Empty> delete(core.String appsId, core.String ingressRulesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1142,7 +1142,7 @@
   async.Future<FirewallRule> get(core.String appsId, core.String ingressRulesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1203,7 +1203,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1266,7 +1266,7 @@
       FirewallRule request, core.String appsId, core.String ingressRulesId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1329,7 +1329,7 @@
   async.Future<Location> get(core.String appsId, core.String locationsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1388,7 +1388,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1450,7 +1450,7 @@
   async.Future<Operation> get(core.String appsId, core.String operationsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1516,7 +1516,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1581,7 +1581,7 @@
   async.Future<Operation> delete(core.String appsId, core.String servicesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1633,7 +1633,7 @@
   async.Future<Service> get(core.String appsId, core.String servicesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1687,7 +1687,7 @@
   async.Future<ListServicesResponse> list(core.String appsId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1758,7 +1758,7 @@
       Service request, core.String appsId, core.String servicesId,
       {core.bool migrateTraffic, core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1832,7 +1832,7 @@
       Version request, core.String appsId, core.String servicesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1891,7 +1891,7 @@
       core.String appsId, core.String servicesId, core.String versionsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1957,7 +1957,7 @@
       core.String appsId, core.String servicesId, core.String versionsId,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2030,7 +2030,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2132,7 +2132,7 @@
       core.String servicesId, core.String versionsId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2218,7 +2218,7 @@
       core.String instancesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2289,7 +2289,7 @@
       core.String versionsId, core.String instancesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2356,7 +2356,7 @@
       core.String versionsId, core.String instancesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2427,7 +2427,7 @@
       core.String appsId, core.String servicesId, core.String versionsId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2665,7 +2665,7 @@
     }
     if (_json.containsKey("dispatchRules")) {
       dispatchRules = _json["dispatchRules"]
-          .map((value) => new UrlDispatchRule.fromJson(value))
+          .map<UrlDispatchRule>((value) => new UrlDispatchRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("featureSettings")) {
@@ -3071,7 +3071,7 @@
   BatchUpdateIngressRulesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("ingressRules")) {
       ingressRules = _json["ingressRules"]
-          .map((value) => new FirewallRule.fromJson(value))
+          .map<FirewallRule>((value) => new FirewallRule.fromJson(value))
           .toList();
     }
   }
@@ -3097,7 +3097,7 @@
   BatchUpdateIngressRulesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("ingressRules")) {
       ingressRules = _json["ingressRules"]
-          .map((value) => new FirewallRule.fromJson(value))
+          .map<FirewallRule>((value) => new FirewallRule.fromJson(value))
           .toList();
     }
   }
@@ -3419,7 +3419,7 @@
     }
     if (_json.containsKey("resourceRecords")) {
       resourceRecords = _json["resourceRecords"]
-          .map((value) => new ResourceRecord.fromJson(value))
+          .map<ResourceRecord>((value) => new ResourceRecord.fromJson(value))
           .toList();
     }
     if (_json.containsKey("sslSettings")) {
@@ -4045,7 +4045,8 @@
   ListAuthorizedCertificatesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("certificates")) {
       certificates = _json["certificates"]
-          .map((value) => new AuthorizedCertificate.fromJson(value))
+          .map<AuthorizedCertificate>(
+              (value) => new AuthorizedCertificate.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4080,7 +4081,8 @@
   ListAuthorizedDomainsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("domains")) {
       domains = _json["domains"]
-          .map((value) => new AuthorizedDomain.fromJson(value))
+          .map<AuthorizedDomain>(
+              (value) => new AuthorizedDomain.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4114,7 +4116,7 @@
   ListDomainMappingsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("domainMappings")) {
       domainMappings = _json["domainMappings"]
-          .map((value) => new DomainMapping.fromJson(value))
+          .map<DomainMapping>((value) => new DomainMapping.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4149,7 +4151,7 @@
   ListIngressRulesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("ingressRules")) {
       ingressRules = _json["ingressRules"]
-          .map((value) => new FirewallRule.fromJson(value))
+          .map<FirewallRule>((value) => new FirewallRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4184,7 +4186,7 @@
   ListInstancesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("instances")) {
       instances = _json["instances"]
-          .map((value) => new Instance.fromJson(value))
+          .map<Instance>((value) => new Instance.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4218,7 +4220,7 @@
   ListLocationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new Location.fromJson(value))
+          .map<Location>((value) => new Location.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4255,7 +4257,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -4290,7 +4292,7 @@
     }
     if (_json.containsKey("services")) {
       services = _json["services"]
-          .map((value) => new Service.fromJson(value))
+          .map<Service>((value) => new Service.fromJson(value))
           .toList();
     }
   }
@@ -4324,7 +4326,7 @@
     }
     if (_json.containsKey("versions")) {
       versions = _json["versions"]
-          .map((value) => new Version.fromJson(value))
+          .map<Version>((value) => new Version.fromJson(value))
           .toList();
     }
   }
@@ -5331,8 +5333,9 @@
       memoryGb = _json["memoryGb"];
     }
     if (_json.containsKey("volumes")) {
-      volumes =
-          _json["volumes"].map((value) => new Volume.fromJson(value)).toList();
+      volumes = _json["volumes"]
+          .map<Volume>((value) => new Volume.fromJson(value))
+          .toList();
     }
   }
 
@@ -6102,12 +6105,13 @@
     }
     if (_json.containsKey("errorHandlers")) {
       errorHandlers = _json["errorHandlers"]
-          .map((value) => new ErrorHandler.fromJson(value))
+          .map<ErrorHandler>((value) => new ErrorHandler.fromJson(value))
           .toList();
     }
     if (_json.containsKey("handlers")) {
-      handlers =
-          _json["handlers"].map((value) => new UrlMap.fromJson(value)).toList();
+      handlers = _json["handlers"]
+          .map<UrlMap>((value) => new UrlMap.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("healthCheck")) {
       healthCheck = new HealthCheck.fromJson(_json["healthCheck"]);
@@ -6123,7 +6127,7 @@
     }
     if (_json.containsKey("libraries")) {
       libraries = _json["libraries"]
-          .map((value) => new Library.fromJson(value))
+          .map<Library>((value) => new Library.fromJson(value))
           .toList();
     }
     if (_json.containsKey("livenessCheck")) {
diff --git a/generated/googleapis/lib/appsactivity/v1.dart b/generated/googleapis/lib/appsactivity/v1.dart
index aa42ae2..6fce00d 100644
--- a/generated/googleapis/lib/appsactivity/v1.dart
+++ b/generated/googleapis/lib/appsactivity/v1.dart
@@ -86,7 +86,7 @@
       core.String userId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -147,7 +147,7 @@
     }
     if (_json.containsKey("singleEvents")) {
       singleEvents = _json["singleEvents"]
-          .map((value) => new Event.fromJson(value))
+          .map<Event>((value) => new Event.fromJson(value))
           .toList();
     }
   }
@@ -229,7 +229,8 @@
     }
     if (_json.containsKey("permissionChanges")) {
       permissionChanges = _json["permissionChanges"]
-          .map((value) => new PermissionChange.fromJson(value))
+          .map<PermissionChange>(
+              (value) => new PermissionChange.fromJson(value))
           .toList();
     }
     if (_json.containsKey("primaryEventType")) {
@@ -295,7 +296,7 @@
   ListActivitiesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("activities")) {
       activities = _json["activities"]
-          .map((value) => new Activity.fromJson(value))
+          .map<Activity>((value) => new Activity.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -331,12 +332,12 @@
   Move.fromJson(core.Map _json) {
     if (_json.containsKey("addedParents")) {
       addedParents = _json["addedParents"]
-          .map((value) => new Parent.fromJson(value))
+          .map<Parent>((value) => new Parent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("removedParents")) {
       removedParents = _json["removedParents"]
-          .map((value) => new Parent.fromJson(value))
+          .map<Parent>((value) => new Parent.fromJson(value))
           .toList();
     }
   }
@@ -495,12 +496,12 @@
   PermissionChange.fromJson(core.Map _json) {
     if (_json.containsKey("addedPermissions")) {
       addedPermissions = _json["addedPermissions"]
-          .map((value) => new Permission.fromJson(value))
+          .map<Permission>((value) => new Permission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("removedPermissions")) {
       removedPermissions = _json["removedPermissions"]
-          .map((value) => new Permission.fromJson(value))
+          .map<Permission>((value) => new Permission.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/appstate/v1.dart b/generated/googleapis/lib/appstate/v1.dart
index 2cd721d..58a11a2 100644
--- a/generated/googleapis/lib/appstate/v1.dart
+++ b/generated/googleapis/lib/appstate/v1.dart
@@ -60,7 +60,7 @@
   async.Future<WriteResult> clear(core.int stateKey,
       {core.String currentDataVersion, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -108,7 +108,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.int stateKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -154,7 +154,7 @@
   /// this method will complete with the same error.
   async.Future<GetResponse> get(core.int stateKey, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -198,7 +198,7 @@
   async.Future<ListResponse> list(
       {core.bool includeData, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -252,7 +252,7 @@
   async.Future<WriteResult> update(UpdateRequest request, core.int stateKey,
       {core.String currentStateVersion, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -351,7 +351,7 @@
   ListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new GetResponse.fromJson(value))
+          .map<GetResponse>((value) => new GetResponse.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
diff --git a/generated/googleapis/lib/bigquery/v2.dart b/generated/googleapis/lib/bigquery/v2.dart
index 8c4517b..1a8719b 100644
--- a/generated/googleapis/lib/bigquery/v2.dart
+++ b/generated/googleapis/lib/bigquery/v2.dart
@@ -97,7 +97,7 @@
   async.Future delete(core.String projectId, core.String datasetId,
       {core.bool deleteContents, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -153,7 +153,7 @@
   async.Future<Dataset> get(core.String projectId, core.String datasetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -204,7 +204,7 @@
   async.Future<Dataset> insert(Dataset request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -269,7 +269,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -333,7 +333,7 @@
       Dataset request, core.String projectId, core.String datasetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -392,7 +392,7 @@
       Dataset request, core.String projectId, core.String datasetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -458,7 +458,7 @@
       core.String projectId, core.String jobId,
       {core.String location, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -518,7 +518,7 @@
   async.Future<Job> get(core.String projectId, core.String jobId,
       {core.String location, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -592,7 +592,7 @@
       core.int timeoutMs,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -666,7 +666,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -750,7 +750,7 @@
       core.List<core.String> stateFilter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -811,7 +811,7 @@
   async.Future<QueryResponse> query(QueryRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -866,7 +866,7 @@
       core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -915,7 +915,7 @@
   async.Future<ProjectList> list(
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -978,7 +978,7 @@
       core.String tableId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1057,7 +1057,7 @@
       core.String startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1134,7 +1134,7 @@
       core.String projectId, core.String datasetId, core.String tableId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1200,7 +1200,7 @@
       core.String projectId, core.String datasetId, core.String tableId,
       {core.String selectedFields, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1262,7 +1262,7 @@
       Table request, core.String projectId, core.String datasetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1323,7 +1323,7 @@
   async.Future<TableList> list(core.String projectId, core.String datasetId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1389,7 +1389,7 @@
       core.String datasetId, core.String tableId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1455,7 +1455,7 @@
       core.String datasetId, core.String tableId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1626,7 +1626,7 @@
   BigtableColumnFamily.fromJson(core.Map _json) {
     if (_json.containsKey("columns")) {
       columns = _json["columns"]
-          .map((value) => new BigtableColumn.fromJson(value))
+          .map<BigtableColumn>((value) => new BigtableColumn.fromJson(value))
           .toList();
     }
     if (_json.containsKey("encoding")) {
@@ -1692,7 +1692,8 @@
   BigtableOptions.fromJson(core.Map _json) {
     if (_json.containsKey("columnFamilies")) {
       columnFamilies = _json["columnFamilies"]
-          .map((value) => new BigtableColumnFamily.fromJson(value))
+          .map<BigtableColumnFamily>(
+              (value) => new BigtableColumnFamily.fromJson(value))
           .toList();
     }
     if (_json.containsKey("ignoreUnspecifiedColumnFamilies")) {
@@ -1958,7 +1959,7 @@
   Dataset.fromJson(core.Map _json) {
     if (_json.containsKey("access")) {
       access = _json["access"]
-          .map((value) => new DatasetAccess.fromJson(value))
+          .map<DatasetAccess>((value) => new DatasetAccess.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creationTime")) {
@@ -2141,7 +2142,8 @@
   DatasetList.fromJson(core.Map _json) {
     if (_json.containsKey("datasets")) {
       datasets = _json["datasets"]
-          .map((value) => new DatasetListDatasets.fromJson(value))
+          .map<DatasetListDatasets>(
+              (value) => new DatasetListDatasets.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -2472,7 +2474,8 @@
     }
     if (_json.containsKey("steps")) {
       steps = _json["steps"]
-          .map((value) => new ExplainQueryStep.fromJson(value))
+          .map<ExplainQueryStep>(
+              (value) => new ExplainQueryStep.fromJson(value))
           .toList();
     }
     if (_json.containsKey("waitMsAvg")) {
@@ -2820,7 +2823,7 @@
     }
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new ErrorProto.fromJson(value))
+          .map<ErrorProto>((value) => new ErrorProto.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -2842,8 +2845,9 @@
       pageToken = _json["pageToken"];
     }
     if (_json.containsKey("rows")) {
-      rows =
-          _json["rows"].map((value) => new TableRow.fromJson(value)).toList();
+      rows = _json["rows"]
+          .map<TableRow>((value) => new TableRow.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("schema")) {
       schema = new TableSchema.fromJson(_json["schema"]);
@@ -3722,7 +3726,7 @@
     }
     if (_json.containsKey("queryParameters")) {
       queryParameters = _json["queryParameters"]
-          .map((value) => new QueryParameter.fromJson(value))
+          .map<QueryParameter>((value) => new QueryParameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("schemaUpdateOptions")) {
@@ -3747,7 +3751,8 @@
     }
     if (_json.containsKey("userDefinedFunctionResources")) {
       userDefinedFunctionResources = _json["userDefinedFunctionResources"]
-          .map((value) => new UserDefinedFunctionResource.fromJson(value))
+          .map<UserDefinedFunctionResource>(
+              (value) => new UserDefinedFunctionResource.fromJson(value))
           .toList();
     }
     if (_json.containsKey("writeDisposition")) {
@@ -3878,7 +3883,7 @@
     }
     if (_json.containsKey("sourceTables")) {
       sourceTables = _json["sourceTables"]
-          .map((value) => new TableReference.fromJson(value))
+          .map<TableReference>((value) => new TableReference.fromJson(value))
           .toList();
     }
     if (_json.containsKey("writeDisposition")) {
@@ -4030,7 +4035,7 @@
     }
     if (_json.containsKey("jobs")) {
       jobs = _json["jobs"]
-          .map((value) => new JobListJobs.fromJson(value))
+          .map<JobListJobs>((value) => new JobListJobs.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4286,12 +4291,13 @@
     }
     if (_json.containsKey("queryPlan")) {
       queryPlan = _json["queryPlan"]
-          .map((value) => new ExplainQueryStage.fromJson(value))
+          .map<ExplainQueryStage>(
+              (value) => new ExplainQueryStage.fromJson(value))
           .toList();
     }
     if (_json.containsKey("referencedTables")) {
       referencedTables = _json["referencedTables"]
-          .map((value) => new TableReference.fromJson(value))
+          .map<TableReference>((value) => new TableReference.fromJson(value))
           .toList();
     }
     if (_json.containsKey("schema")) {
@@ -4302,7 +4308,8 @@
     }
     if (_json.containsKey("timeline")) {
       timeline = _json["timeline"]
-          .map((value) => new QueryTimelineSample.fromJson(value))
+          .map<QueryTimelineSample>(
+              (value) => new QueryTimelineSample.fromJson(value))
           .toList();
     }
     if (_json.containsKey("totalBytesBilled")) {
@@ -4316,7 +4323,7 @@
     }
     if (_json.containsKey("undeclaredQueryParameters")) {
       undeclaredQueryParameters = _json["undeclaredQueryParameters"]
-          .map((value) => new QueryParameter.fromJson(value))
+          .map<QueryParameter>((value) => new QueryParameter.fromJson(value))
           .toList();
     }
   }
@@ -4484,7 +4491,7 @@
     }
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new ErrorProto.fromJson(value))
+          .map<ErrorProto>((value) => new ErrorProto.fromJson(value))
           .toList();
     }
     if (_json.containsKey("state")) {
@@ -4633,7 +4640,8 @@
     }
     if (_json.containsKey("projects")) {
       projects = _json["projects"]
-          .map((value) => new ProjectListProjects.fromJson(value))
+          .map<ProjectListProjects>(
+              (value) => new ProjectListProjects.fromJson(value))
           .toList();
     }
     if (_json.containsKey("totalItems")) {
@@ -4787,7 +4795,8 @@
     }
     if (_json.containsKey("structTypes")) {
       structTypes = _json["structTypes"]
-          .map((value) => new QueryParameterTypeStructTypes.fromJson(value))
+          .map<QueryParameterTypeStructTypes>(
+              (value) => new QueryParameterTypeStructTypes.fromJson(value))
           .toList();
     }
     if (_json.containsKey("type")) {
@@ -4828,7 +4837,8 @@
   QueryParameterValue.fromJson(core.Map _json) {
     if (_json.containsKey("arrayValues")) {
       arrayValues = _json["arrayValues"]
-          .map((value) => new QueryParameterValue.fromJson(value))
+          .map<QueryParameterValue>(
+              (value) => new QueryParameterValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("structValues")) {
@@ -4954,7 +4964,7 @@
     }
     if (_json.containsKey("queryParameters")) {
       queryParameters = _json["queryParameters"]
-          .map((value) => new QueryParameter.fromJson(value))
+          .map<QueryParameter>((value) => new QueryParameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("timeoutMs")) {
@@ -5070,7 +5080,7 @@
     }
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new ErrorProto.fromJson(value))
+          .map<ErrorProto>((value) => new ErrorProto.fromJson(value))
           .toList();
     }
     if (_json.containsKey("jobComplete")) {
@@ -5089,8 +5099,9 @@
       pageToken = _json["pageToken"];
     }
     if (_json.containsKey("rows")) {
-      rows =
-          _json["rows"].map((value) => new TableRow.fromJson(value)).toList();
+      rows = _json["rows"]
+          .map<TableRow>((value) => new TableRow.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("schema")) {
       schema = new TableSchema.fromJson(_json["schema"]);
@@ -5577,7 +5588,8 @@
     }
     if (_json.containsKey("rows")) {
       rows = _json["rows"]
-          .map((value) => new TableDataInsertAllRequestRows.fromJson(value))
+          .map<TableDataInsertAllRequestRows>(
+              (value) => new TableDataInsertAllRequestRows.fromJson(value))
           .toList();
     }
     if (_json.containsKey("skipInvalidRows")) {
@@ -5622,7 +5634,7 @@
   TableDataInsertAllResponseInsertErrors.fromJson(core.Map _json) {
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new ErrorProto.fromJson(value))
+          .map<ErrorProto>((value) => new ErrorProto.fromJson(value))
           .toList();
     }
     if (_json.containsKey("index")) {
@@ -5655,7 +5667,7 @@
   TableDataInsertAllResponse.fromJson(core.Map _json) {
     if (_json.containsKey("insertErrors")) {
       insertErrors = _json["insertErrors"]
-          .map((value) =>
+          .map<TableDataInsertAllResponseInsertErrors>((value) =>
               new TableDataInsertAllResponseInsertErrors.fromJson(value))
           .toList();
     }
@@ -5709,8 +5721,9 @@
       pageToken = _json["pageToken"];
     }
     if (_json.containsKey("rows")) {
-      rows =
-          _json["rows"].map((value) => new TableRow.fromJson(value)).toList();
+      rows = _json["rows"]
+          .map<TableRow>((value) => new TableRow.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("totalRows")) {
       totalRows = _json["totalRows"];
@@ -5771,7 +5784,8 @@
     }
     if (_json.containsKey("fields")) {
       fields = _json["fields"]
-          .map((value) => new TableFieldSchema.fromJson(value))
+          .map<TableFieldSchema>(
+              (value) => new TableFieldSchema.fromJson(value))
           .toList();
     }
     if (_json.containsKey("mode")) {
@@ -5967,7 +5981,7 @@
     }
     if (_json.containsKey("tables")) {
       tables = _json["tables"]
-          .map((value) => new TableListTables.fromJson(value))
+          .map<TableListTables>((value) => new TableListTables.fromJson(value))
           .toList();
     }
     if (_json.containsKey("totalItems")) {
@@ -6048,7 +6062,9 @@
 
   TableRow.fromJson(core.Map _json) {
     if (_json.containsKey("f")) {
-      f = _json["f"].map((value) => new TableCell.fromJson(value)).toList();
+      f = _json["f"]
+          .map<TableCell>((value) => new TableCell.fromJson(value))
+          .toList();
     }
   }
 
@@ -6071,7 +6087,8 @@
   TableSchema.fromJson(core.Map _json) {
     if (_json.containsKey("fields")) {
       fields = _json["fields"]
-          .map((value) => new TableFieldSchema.fromJson(value))
+          .map<TableFieldSchema>(
+              (value) => new TableFieldSchema.fromJson(value))
           .toList();
     }
   }
@@ -6200,7 +6217,8 @@
     }
     if (_json.containsKey("userDefinedFunctionResources")) {
       userDefinedFunctionResources = _json["userDefinedFunctionResources"]
-          .map((value) => new UserDefinedFunctionResource.fromJson(value))
+          .map<UserDefinedFunctionResource>(
+              (value) => new UserDefinedFunctionResource.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/bigquerydatatransfer/v1.dart b/generated/googleapis/lib/bigquerydatatransfer/v1.dart
index 7c78d75..d9f8602 100644
--- a/generated/googleapis/lib/bigquerydatatransfer/v1.dart
+++ b/generated/googleapis/lib/bigquerydatatransfer/v1.dart
@@ -87,7 +87,7 @@
       CheckValidCredsRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -138,7 +138,7 @@
   /// this method will complete with the same error.
   async.Future<DataSource> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -195,7 +195,7 @@
   async.Future<ListDataSourcesResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -258,7 +258,7 @@
   /// this method will complete with the same error.
   async.Future<Location> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -311,7 +311,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -382,7 +382,7 @@
       CheckValidCredsRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -434,7 +434,7 @@
   /// this method will complete with the same error.
   async.Future<DataSource> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -491,7 +491,7 @@
   async.Future<ListDataSourcesResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -578,7 +578,7 @@
       TransferConfig request, core.String parent,
       {core.String authorizationCode, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -633,7 +633,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -679,7 +679,7 @@
   /// this method will complete with the same error.
   async.Future<TransferConfig> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -740,7 +740,7 @@
       core.List<core.String> dataSourceIds,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -827,7 +827,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -888,7 +888,7 @@
       ScheduleTransferRunsRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -952,7 +952,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -998,7 +998,7 @@
   /// this method will complete with the same error.
   async.Future<TransferRun> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1068,7 +1068,7 @@
       core.String runAttempt,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1152,7 +1152,7 @@
       core.List<core.String> messageTypes,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1243,7 +1243,7 @@
       TransferConfig request, core.String parent,
       {core.String authorizationCode, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1297,7 +1297,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1342,7 +1342,7 @@
   /// this method will complete with the same error.
   async.Future<TransferConfig> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1403,7 +1403,7 @@
       core.List<core.String> dataSourceIds,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1489,7 +1489,7 @@
       core.String authorizationCode,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1549,7 +1549,7 @@
       ScheduleTransferRunsRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1611,7 +1611,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1657,7 +1657,7 @@
   /// this method will complete with the same error.
   async.Future<TransferRun> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1726,7 +1726,7 @@
       core.String runAttempt,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1810,7 +1810,7 @@
       core.List<core.String> messageTypes,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2031,7 +2031,8 @@
     }
     if (_json.containsKey("parameters")) {
       parameters = _json["parameters"]
-          .map((value) => new DataSourceParameter.fromJson(value))
+          .map<DataSourceParameter>(
+              (value) => new DataSourceParameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("scopes")) {
@@ -2191,7 +2192,8 @@
     }
     if (_json.containsKey("fields")) {
       fields = _json["fields"]
-          .map((value) => new DataSourceParameter.fromJson(value))
+          .map<DataSourceParameter>(
+              (value) => new DataSourceParameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("immutable")) {
@@ -2318,7 +2320,7 @@
   ListDataSourcesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("dataSources")) {
       dataSources = _json["dataSources"]
-          .map((value) => new DataSource.fromJson(value))
+          .map<DataSource>((value) => new DataSource.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2353,7 +2355,7 @@
   ListLocationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new Location.fromJson(value))
+          .map<Location>((value) => new Location.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2393,7 +2395,7 @@
     }
     if (_json.containsKey("transferConfigs")) {
       transferConfigs = _json["transferConfigs"]
-          .map((value) => new TransferConfig.fromJson(value))
+          .map<TransferConfig>((value) => new TransferConfig.fromJson(value))
           .toList();
     }
   }
@@ -2431,7 +2433,7 @@
     }
     if (_json.containsKey("transferMessages")) {
       transferMessages = _json["transferMessages"]
-          .map((value) => new TransferMessage.fromJson(value))
+          .map<TransferMessage>((value) => new TransferMessage.fromJson(value))
           .toList();
     }
   }
@@ -2469,7 +2471,7 @@
     }
     if (_json.containsKey("transferRuns")) {
       transferRuns = _json["transferRuns"]
-          .map((value) => new TransferRun.fromJson(value))
+          .map<TransferRun>((value) => new TransferRun.fromJson(value))
           .toList();
     }
   }
@@ -2589,7 +2591,7 @@
   ScheduleTransferRunsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("runs")) {
       runs = _json["runs"]
-          .map((value) => new TransferRun.fromJson(value))
+          .map<TransferRun>((value) => new TransferRun.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/blogger/v3.dart b/generated/googleapis/lib/blogger/v3.dart
index a7e0d8a..3c39a60 100644
--- a/generated/googleapis/lib/blogger/v3.dart
+++ b/generated/googleapis/lib/blogger/v3.dart
@@ -72,7 +72,7 @@
   async.Future<BlogUserInfo> get(core.String userId, core.String blogId,
       {core.int maxPosts, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -139,7 +139,7 @@
   async.Future<Blog> get(core.String blogId,
       {core.int maxPosts, core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -195,7 +195,7 @@
   async.Future<Blog> getByUrl(core.String url,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -264,7 +264,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -330,7 +330,7 @@
       core.String blogId, core.String postId, core.String commentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -388,7 +388,7 @@
       core.String blogId, core.String postId, core.String commentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -458,7 +458,7 @@
       core.String blogId, core.String postId, core.String commentId,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -545,7 +545,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -636,7 +636,7 @@
       core.List<core.String> status,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -702,7 +702,7 @@
       core.String blogId, core.String postId, core.String commentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -762,7 +762,7 @@
       core.String blogId, core.String postId, core.String commentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -825,7 +825,7 @@
   async.Future<Pageviews> get(core.String blogId,
       {core.List<core.String> range, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -877,7 +877,7 @@
   async.Future delete(core.String blogId, core.String pageId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -936,7 +936,7 @@
   async.Future<Page> get(core.String blogId, core.String pageId,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -992,7 +992,7 @@
   async.Future<Page> insert(Page request, core.String blogId,
       {core.bool isDraft, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1061,7 +1061,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1129,7 +1129,7 @@
   async.Future<Page> patch(Page request, core.String blogId, core.String pageId,
       {core.bool publish_1, core.bool revert_1, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1189,7 +1189,7 @@
   async.Future<Page> publish(core.String blogId, core.String pageId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1241,7 +1241,7 @@
   async.Future<Page> revert(core.String blogId, core.String pageId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1302,7 +1302,7 @@
       Page request, core.String blogId, core.String pageId,
       {core.bool publish_1, core.bool revert_1, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1377,7 +1377,7 @@
       core.String userId, core.String blogId, core.String postId,
       {core.int maxComments, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1478,7 +1478,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1561,7 +1561,7 @@
   async.Future delete(core.String blogId, core.String postId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1634,7 +1634,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1706,7 +1706,7 @@
   async.Future<Post> getByPath(core.String blogId, core.String path,
       {core.int maxComments, core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1773,7 +1773,7 @@
       core.bool isDraft,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1870,7 +1870,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1967,7 +1967,7 @@
       core.bool revert_1,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2042,7 +2042,7 @@
   async.Future<Post> publish(core.String blogId, core.String postId,
       {core.DateTime publishDate, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2097,7 +2097,7 @@
   async.Future<Post> revert(core.String blogId, core.String postId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2158,7 +2158,7 @@
   async.Future<PostList> search(core.String blogId, core.String q,
       {core.bool fetchBodies, core.String orderBy, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2237,7 +2237,7 @@
       core.bool revert_1,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2309,7 +2309,7 @@
   /// this method will complete with the same error.
   async.Future<User> get(core.String userId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2422,7 +2422,9 @@
 
   BlogPosts.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Post.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Post>((value) => new Post.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("selfLink")) {
       selfLink = _json["selfLink"];
@@ -2593,11 +2595,13 @@
   BlogList.fromJson(core.Map _json) {
     if (_json.containsKey("blogUserInfos")) {
       blogUserInfos = _json["blogUserInfos"]
-          .map((value) => new BlogUserInfo.fromJson(value))
+          .map<BlogUserInfo>((value) => new BlogUserInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Blog.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Blog>((value) => new Blog.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3006,8 +3010,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Comment.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Comment>((value) => new Comment.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3280,7 +3285,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Page.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3358,7 +3365,7 @@
     }
     if (_json.containsKey("counts")) {
       counts = _json["counts"]
-          .map((value) => new PageviewsCounts.fromJson(value))
+          .map<PageviewsCounts>((value) => new PageviewsCounts.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3564,8 +3571,9 @@
 
   PostReplies.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Comment.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Comment>((value) => new Comment.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("selfLink")) {
       selfLink = _json["selfLink"];
@@ -3672,7 +3680,7 @@
     }
     if (_json.containsKey("images")) {
       images = _json["images"]
-          .map((value) => new PostImages.fromJson(value))
+          .map<PostImages>((value) => new PostImages.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3797,7 +3805,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Post.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Post>((value) => new Post.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3939,7 +3949,7 @@
   PostUserInfosList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new PostUserInfo.fromJson(value))
+          .map<PostUserInfo>((value) => new PostUserInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
diff --git a/generated/googleapis/lib/books/v1.dart b/generated/googleapis/lib/books/v1.dart
index 1e1ca2d..2d2e4e5 100644
--- a/generated/googleapis/lib/books/v1.dart
+++ b/generated/googleapis/lib/books/v1.dart
@@ -78,7 +78,7 @@
   async.Future<Bookshelf> get(core.String userId, core.String shelf,
       {core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -132,7 +132,7 @@
   async.Future<Bookshelves> list(core.String userId,
       {core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -200,7 +200,7 @@
       core.int startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -279,7 +279,7 @@
       core.String uploadClientToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -329,7 +329,7 @@
   /// this method will complete with the same error.
   async.Future deleteBook(core.String volumeId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -374,7 +374,7 @@
       BooksCloudloadingResource request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -424,7 +424,7 @@
   async.Future<Metadata> listOfflineMetadata(core.String cpksver,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -474,7 +474,7 @@
   async.Future<FamilyInfo> getFamilyInfo(
       {core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -523,7 +523,7 @@
       core.String volumeId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -580,7 +580,7 @@
       core.String volumeId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -648,7 +648,7 @@
   async.Future<Layersummary> get(core.String volumeId, core.String summaryId,
       {core.String contentVersion, core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -716,7 +716,7 @@
       core.String source,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -810,7 +810,7 @@
       core.int w,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -928,7 +928,7 @@
       core.int w,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1029,7 +1029,7 @@
       core.String volumeId, core.String layerId, core.String annotationId,
       {core.String locale, core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1136,7 +1136,7 @@
       core.String volumeAnnotationsVersion,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1228,7 +1228,7 @@
   /// this method will complete with the same error.
   async.Future<Usersettings> getUserSettings({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1276,7 +1276,7 @@
       core.List<core.String> volumeIds, core.String cpksver,
       {core.String locale, core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1347,7 +1347,7 @@
       core.String volumeId, core.String nonce, core.String cpksver,
       {core.String licenseTypes, core.String locale, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1433,7 +1433,7 @@
       core.List<core.String> volumeIds,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1502,7 +1502,7 @@
   async.Future<Usersettings> updateUserSettings(Usersettings request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1565,7 +1565,7 @@
   async.Future delete(core.String annotationId,
       {core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1627,7 +1627,7 @@
       core.String source,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1716,7 +1716,7 @@
       core.String volumeId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1789,7 +1789,7 @@
       core.List<core.String> layerIds, core.String volumeId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1841,7 +1841,7 @@
   async.Future<Annotation> update(Annotation request, core.String annotationId,
       {core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1909,7 +1909,7 @@
   async.Future addVolume(core.String shelf, core.String volumeId,
       {core.String reason, core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1966,7 +1966,7 @@
   async.Future clearVolumes(core.String shelf,
       {core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2019,7 +2019,7 @@
   async.Future<Bookshelf> get(core.String shelf,
       {core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2064,7 +2064,7 @@
   /// this method will complete with the same error.
   async.Future<Bookshelves> list({core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2114,7 +2114,7 @@
       core.String shelf, core.String volumeId, core.int volumePosition,
       {core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2178,7 +2178,7 @@
   async.Future removeVolume(core.String shelf, core.String volumeId,
       {core.String reason, core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2267,7 +2267,7 @@
       core.int startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2345,7 +2345,7 @@
   async.Future<ReadingPosition> get(core.String volumeId,
       {core.String contentVersion, core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2419,7 +2419,7 @@
       core.String source,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2497,7 +2497,7 @@
   async.Future<Notification> get(core.String notificationId,
       {core.String locale, core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2554,7 +2554,7 @@
   async.Future<Category> listCategories(
       {core.String locale, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2616,7 +2616,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2691,7 +2691,7 @@
       core.String source,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2764,7 +2764,7 @@
       core.String volumeId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2845,7 +2845,7 @@
       core.String serial,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2924,7 +2924,7 @@
       core.String serial,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2991,7 +2991,7 @@
   async.Future<Series> get(core.List<core.String> seriesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3047,7 +3047,7 @@
   async.Future<Seriesmembership> get(core.String seriesId,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3134,7 +3134,7 @@
       core.bool userLibraryConsistentRead,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3264,7 +3264,7 @@
       core.int startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3376,7 +3376,7 @@
       core.String source,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3461,7 +3461,7 @@
       core.int startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3542,7 +3542,7 @@
       core.String source,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3602,7 +3602,7 @@
       core.String rating, core.String volumeId,
       {core.String locale, core.String source, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3684,7 +3684,7 @@
       core.List<core.String> volumeId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4180,7 +4180,7 @@
   Annotations.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Annotation.fromJson(value))
+          .map<Annotation>((value) => new Annotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4274,7 +4274,8 @@
     }
     if (_json.containsKey("layers")) {
       layers = _json["layers"]
-          .map((value) => new AnnotationsSummaryLayers.fromJson(value))
+          .map<AnnotationsSummaryLayers>(
+              (value) => new AnnotationsSummaryLayers.fromJson(value))
           .toList();
     }
   }
@@ -4311,7 +4312,7 @@
   Annotationsdata.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Annotationdata.fromJson(value))
+          .map<Annotationdata>((value) => new Annotationdata.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4573,8 +4574,9 @@
 
   Bookshelves.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Bookshelf.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Bookshelf>((value) => new Bookshelf.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -4641,7 +4643,7 @@
   Category.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new CategoryItems.fromJson(value))
+          .map<CategoryItems>((value) => new CategoryItems.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -5040,7 +5042,7 @@
     }
     if (_json.containsKey("examples")) {
       examples = _json["examples"]
-          .map((value) =>
+          .map<DictlayerdataDictWordsSensesDefinitionsExamples>((value) =>
               new DictlayerdataDictWordsSensesDefinitionsExamples.fromJson(
                   value))
           .toList();
@@ -5160,13 +5162,13 @@
   DictlayerdataDictWordsSenses.fromJson(core.Map _json) {
     if (_json.containsKey("conjugations")) {
       conjugations = _json["conjugations"]
-          .map((value) =>
+          .map<DictlayerdataDictWordsSensesConjugations>((value) =>
               new DictlayerdataDictWordsSensesConjugations.fromJson(value))
           .toList();
     }
     if (_json.containsKey("definitions")) {
       definitions = _json["definitions"]
-          .map((value) =>
+          .map<DictlayerdataDictWordsSensesDefinitions>((value) =>
               new DictlayerdataDictWordsSensesDefinitions.fromJson(value))
           .toList();
     }
@@ -5187,7 +5189,7 @@
     }
     if (_json.containsKey("synonyms")) {
       synonyms = _json["synonyms"]
-          .map((value) =>
+          .map<DictlayerdataDictWordsSensesSynonyms>((value) =>
               new DictlayerdataDictWordsSensesSynonyms.fromJson(value))
           .toList();
     }
@@ -5270,17 +5272,20 @@
   DictlayerdataDictWords.fromJson(core.Map _json) {
     if (_json.containsKey("derivatives")) {
       derivatives = _json["derivatives"]
-          .map((value) => new DictlayerdataDictWordsDerivatives.fromJson(value))
+          .map<DictlayerdataDictWordsDerivatives>(
+              (value) => new DictlayerdataDictWordsDerivatives.fromJson(value))
           .toList();
     }
     if (_json.containsKey("examples")) {
       examples = _json["examples"]
-          .map((value) => new DictlayerdataDictWordsExamples.fromJson(value))
+          .map<DictlayerdataDictWordsExamples>(
+              (value) => new DictlayerdataDictWordsExamples.fromJson(value))
           .toList();
     }
     if (_json.containsKey("senses")) {
       senses = _json["senses"]
-          .map((value) => new DictlayerdataDictWordsSenses.fromJson(value))
+          .map<DictlayerdataDictWordsSenses>(
+              (value) => new DictlayerdataDictWordsSenses.fromJson(value))
           .toList();
     }
     if (_json.containsKey("source")) {
@@ -5321,7 +5326,8 @@
     }
     if (_json.containsKey("words")) {
       words = _json["words"]
-          .map((value) => new DictlayerdataDictWords.fromJson(value))
+          .map<DictlayerdataDictWords>(
+              (value) => new DictlayerdataDictWords.fromJson(value))
           .toList();
     }
   }
@@ -5460,8 +5466,9 @@
       uid = _json["uid"];
     }
     if (_json.containsKey("volumes")) {
-      volumes =
-          _json["volumes"].map((value) => new Volume.fromJson(value)).toList();
+      volumes = _json["volumes"]
+          .map<Volume>((value) => new Volume.fromJson(value))
+          .toList();
     }
   }
 
@@ -5503,7 +5510,8 @@
   Discoveryclusters.fromJson(core.Map _json) {
     if (_json.containsKey("clusters")) {
       clusters = _json["clusters"]
-          .map((value) => new DiscoveryclustersClusters.fromJson(value))
+          .map<DiscoveryclustersClusters>(
+              (value) => new DiscoveryclustersClusters.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -5668,7 +5676,8 @@
   DownloadAccesses.fromJson(core.Map _json) {
     if (_json.containsKey("downloadAccessList")) {
       downloadAccessList = _json["downloadAccessList"]
-          .map((value) => new DownloadAccessRestriction.fromJson(value))
+          .map<DownloadAccessRestriction>(
+              (value) => new DownloadAccessRestriction.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -5987,8 +5996,9 @@
   GeolayerdataGeo.fromJson(core.Map _json) {
     if (_json.containsKey("boundary")) {
       boundary = _json["boundary"]
-          .map((value) => value
-              .map((value) => new GeolayerdataGeoBoundary.fromJson(value))
+          .map<core.List<GeolayerdataGeoBoundary>>((value) => value
+              .map<GeolayerdataGeoBoundary>(
+                  (value) => new GeolayerdataGeoBoundary.fromJson(value))
               .toList())
           .toList();
     }
@@ -6098,7 +6108,7 @@
   Layersummaries.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Layersummary.fromJson(value))
+          .map<Layersummary>((value) => new Layersummary.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -6319,7 +6329,7 @@
   Metadata.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new MetadataItems.fromJson(value))
+          .map<MetadataItems>((value) => new MetadataItems.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -6534,7 +6544,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new OffersItemsItems.fromJson(value))
+          .map<OffersItemsItems>(
+              (value) => new OffersItemsItems.fromJson(value))
           .toList();
     }
   }
@@ -6570,7 +6581,7 @@
   Offers.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new OffersItems.fromJson(value))
+          .map<OffersItems>((value) => new OffersItems.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -6943,7 +6954,7 @@
     }
     if (_json.containsKey("series")) {
       series = _json["series"]
-          .map((value) => new SeriesSeries.fromJson(value))
+          .map<SeriesSeries>((value) => new SeriesSeries.fromJson(value))
           .toList();
     }
   }
@@ -6974,8 +6985,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("member")) {
-      member =
-          _json["member"].map((value) => new Volume.fromJson(value)).toList();
+      member = _json["member"]
+          .map<Volume>((value) => new Volume.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -7513,7 +7525,8 @@
   VolumeLayerInfo.fromJson(core.Map _json) {
     if (_json.containsKey("layers")) {
       layers = _json["layers"]
-          .map((value) => new VolumeLayerInfoLayers.fromJson(value))
+          .map<VolumeLayerInfoLayers>(
+              (value) => new VolumeLayerInfoLayers.fromJson(value))
           .toList();
     }
   }
@@ -7818,7 +7831,8 @@
     }
     if (_json.containsKey("offers")) {
       offers = _json["offers"]
-          .map((value) => new VolumeSaleInfoOffers.fromJson(value))
+          .map<VolumeSaleInfoOffers>(
+              (value) => new VolumeSaleInfoOffers.fromJson(value))
           .toList();
     }
     if (_json.containsKey("onSaleDate")) {
@@ -8527,7 +8541,7 @@
     }
     if (_json.containsKey("industryIdentifiers")) {
       industryIdentifiers = _json["industryIdentifiers"]
-          .map((value) =>
+          .map<VolumeVolumeInfoIndustryIdentifiers>((value) =>
               new VolumeVolumeInfoIndustryIdentifiers.fromJson(value))
           .toList();
     }
@@ -8806,8 +8820,9 @@
 
   Volume2.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Volume.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Volume>((value) => new Volume.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -9049,7 +9064,8 @@
   Volumeannotations.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Volumeannotation.fromJson(value))
+          .map<Volumeannotation>(
+              (value) => new Volumeannotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -9103,8 +9119,9 @@
 
   Volumes.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Volume.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Volume>((value) => new Volume.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -9177,7 +9194,8 @@
   VolumeseriesinfoVolumeSeries.fromJson(core.Map _json) {
     if (_json.containsKey("issue")) {
       issue = _json["issue"]
-          .map((value) => new VolumeseriesinfoVolumeSeriesIssue.fromJson(value))
+          .map<VolumeseriesinfoVolumeSeriesIssue>(
+              (value) => new VolumeseriesinfoVolumeSeriesIssue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("orderNumber")) {
@@ -9236,7 +9254,8 @@
     }
     if (_json.containsKey("volumeSeries")) {
       volumeSeries = _json["volumeSeries"]
-          .map((value) => new VolumeseriesinfoVolumeSeries.fromJson(value))
+          .map<VolumeseriesinfoVolumeSeries>(
+              (value) => new VolumeseriesinfoVolumeSeries.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/calendar/v3.dart b/generated/googleapis/lib/calendar/v3.dart
index 7f2c951..8b4c03f 100644
--- a/generated/googleapis/lib/calendar/v3.dart
+++ b/generated/googleapis/lib/calendar/v3.dart
@@ -68,7 +68,7 @@
   async.Future delete(core.String calendarId, core.String ruleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -123,7 +123,7 @@
   async.Future<AclRule> get(core.String calendarId, core.String ruleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -179,7 +179,7 @@
   async.Future<AclRule> insert(AclRule request, core.String calendarId,
       {core.bool sendNotifications, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -255,7 +255,7 @@
       core.String syncToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -321,7 +321,7 @@
       AclRule request, core.String calendarId, core.String ruleId,
       {core.bool sendNotifications, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -387,7 +387,7 @@
       AclRule request, core.String calendarId, core.String ruleId,
       {core.bool sendNotifications, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -471,7 +471,7 @@
       core.String syncToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -536,7 +536,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String calendarId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -584,7 +584,7 @@
   async.Future<CalendarListEntry> get(core.String calendarId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -633,7 +633,7 @@
   async.Future<CalendarListEntry> insert(CalendarListEntry request,
       {core.bool colorRgbFormat, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -718,7 +718,7 @@
       core.String syncToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -787,7 +787,7 @@
       CalendarListEntry request, core.String calendarId,
       {core.bool colorRgbFormat, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -847,7 +847,7 @@
       CalendarListEntry request, core.String calendarId,
       {core.bool colorRgbFormat, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -938,7 +938,7 @@
       core.String syncToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1005,7 +1005,7 @@
   /// this method will complete with the same error.
   async.Future clear(core.String calendarId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1051,7 +1051,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String calendarId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1097,7 +1097,7 @@
   /// this method will complete with the same error.
   async.Future<Calendar> get(core.String calendarId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1139,7 +1139,7 @@
   /// this method will complete with the same error.
   async.Future<Calendar> insert(Calendar request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1186,7 +1186,7 @@
   async.Future<Calendar> patch(Calendar request, core.String calendarId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1236,7 +1236,7 @@
   async.Future<Calendar> update(Calendar request, core.String calendarId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1285,7 +1285,7 @@
   /// this method will complete with the same error.
   async.Future stop(Channel request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1333,7 +1333,7 @@
   /// this method will complete with the same error.
   async.Future<Colors> get({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1384,7 +1384,7 @@
   async.Future delete(core.String calendarId, core.String eventId,
       {core.bool sendNotifications, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1459,7 +1459,7 @@
       core.String timeZone,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1534,7 +1534,7 @@
       core.bool supportsAttachments,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1613,7 +1613,7 @@
       core.bool supportsAttachments,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1721,7 +1721,7 @@
       core.String timeZone,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1920,7 +1920,7 @@
       core.DateTime updatedMin,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2025,7 +2025,7 @@
       core.String calendarId, core.String eventId, core.String destination,
       {core.bool sendNotifications, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2119,7 +2119,7 @@
       core.bool supportsAttachments,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2193,7 +2193,7 @@
   async.Future<Event> quickAdd(core.String calendarId, core.String text,
       {core.bool sendNotifications, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2282,7 +2282,7 @@
       core.bool supportsAttachments,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2473,7 +2473,7 @@
       core.DateTime updatedMin,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2578,7 +2578,7 @@
   async.Future<FreeBusyResponse> query(FreeBusyRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2626,7 +2626,7 @@
   /// this method will complete with the same error.
   async.Future<Setting> get(core.String setting, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2685,7 +2685,7 @@
       core.String syncToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2752,7 +2752,7 @@
       core.String syncToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2812,8 +2812,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new AclRule.fromJson(value)).toList();
+      items = _json["items"]
+          .map<AclRule>((value) => new AclRule.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3071,7 +3072,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new CalendarListEntry.fromJson(value))
+          .map<CalendarListEntry>(
+              (value) => new CalendarListEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3118,7 +3120,8 @@
   CalendarListEntryNotificationSettings.fromJson(core.Map _json) {
     if (_json.containsKey("notifications")) {
       notifications = _json["notifications"]
-          .map((value) => new CalendarNotification.fromJson(value))
+          .map<CalendarNotification>(
+              (value) => new CalendarNotification.fromJson(value))
           .toList();
     }
   }
@@ -3237,7 +3240,7 @@
     }
     if (_json.containsKey("defaultReminders")) {
       defaultReminders = _json["defaultReminders"]
-          .map((value) => new EventReminder.fromJson(value))
+          .map<EventReminder>((value) => new EventReminder.fromJson(value))
           .toList();
     }
     if (_json.containsKey("deleted")) {
@@ -3660,7 +3663,7 @@
     }
     if (_json.containsKey("entryPoints")) {
       entryPoints = _json["entryPoints"]
-          .map((value) => new EntryPoint.fromJson(value))
+          .map<EntryPoint>((value) => new EntryPoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("notes")) {
@@ -4338,7 +4341,7 @@
   EventReminders.fromJson(core.Map _json) {
     if (_json.containsKey("overrides")) {
       overrides = _json["overrides"]
-          .map((value) => new EventReminder.fromJson(value))
+          .map<EventReminder>((value) => new EventReminder.fromJson(value))
           .toList();
     }
     if (_json.containsKey("useDefault")) {
@@ -4592,12 +4595,12 @@
     }
     if (_json.containsKey("attachments")) {
       attachments = _json["attachments"]
-          .map((value) => new EventAttachment.fromJson(value))
+          .map<EventAttachment>((value) => new EventAttachment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("attendees")) {
       attendees = _json["attendees"]
-          .map((value) => new EventAttendee.fromJson(value))
+          .map<EventAttendee>((value) => new EventAttendee.fromJson(value))
           .toList();
     }
     if (_json.containsKey("attendeesOmitted")) {
@@ -5146,7 +5149,7 @@
     }
     if (_json.containsKey("defaultReminders")) {
       defaultReminders = _json["defaultReminders"]
-          .map((value) => new EventReminder.fromJson(value))
+          .map<EventReminder>((value) => new EventReminder.fromJson(value))
           .toList();
     }
     if (_json.containsKey("description")) {
@@ -5156,7 +5159,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Event.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Event>((value) => new Event.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -5230,12 +5235,14 @@
 
   FreeBusyCalendar.fromJson(core.Map _json) {
     if (_json.containsKey("busy")) {
-      busy =
-          _json["busy"].map((value) => new TimePeriod.fromJson(value)).toList();
+      busy = _json["busy"]
+          .map<TimePeriod>((value) => new TimePeriod.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("errors")) {
-      errors =
-          _json["errors"].map((value) => new Error.fromJson(value)).toList();
+      errors = _json["errors"]
+          .map<Error>((value) => new Error.fromJson(value))
+          .toList();
     }
   }
 
@@ -5266,8 +5273,9 @@
       calendars = _json["calendars"];
     }
     if (_json.containsKey("errors")) {
-      errors =
-          _json["errors"].map((value) => new Error.fromJson(value)).toList();
+      errors = _json["errors"]
+          .map<Error>((value) => new Error.fromJson(value))
+          .toList();
     }
   }
 
@@ -5317,7 +5325,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new FreeBusyRequestItem.fromJson(value))
+          .map<FreeBusyRequestItem>(
+              (value) => new FreeBusyRequestItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("timeMax")) {
@@ -5525,8 +5534,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Setting.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Setting>((value) => new Setting.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
diff --git a/generated/googleapis/lib/civicinfo/v2.dart b/generated/googleapis/lib/civicinfo/v2.dart
index f5d2a96..0f51141 100644
--- a/generated/googleapis/lib/civicinfo/v2.dart
+++ b/generated/googleapis/lib/civicinfo/v2.dart
@@ -61,7 +61,7 @@
   async.Future<DivisionSearchResponse> search(DivisionSearchRequest request,
       {core.String query, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -114,7 +114,7 @@
       ElectionsQueryRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -176,7 +176,7 @@
       core.bool returnAllAvailableData,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -259,7 +259,7 @@
       core.List<core.String> roles,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -335,7 +335,7 @@
       core.List<core.String> roles,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -411,8 +411,9 @@
       name = _json["name"];
     }
     if (_json.containsKey("sources")) {
-      sources =
-          _json["sources"].map((value) => new Source.fromJson(value)).toList();
+      sources = _json["sources"]
+          .map<Source>((value) => new Source.fromJson(value))
+          .toList();
     }
   }
 
@@ -509,7 +510,8 @@
     }
     if (_json.containsKey("electionOfficials")) {
       electionOfficials = _json["electionOfficials"]
-          .map((value) => new ElectionOfficial.fromJson(value))
+          .map<ElectionOfficial>(
+              (value) => new ElectionOfficial.fromJson(value))
           .toList();
     }
     if (_json.containsKey("electionRegistrationConfirmationUrl")) {
@@ -627,7 +629,7 @@
     }
     if (_json.containsKey("channels")) {
       channels = _json["channels"]
-          .map((value) => new Channel.fromJson(value))
+          .map<Channel>((value) => new Channel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("email")) {
@@ -825,7 +827,7 @@
     }
     if (_json.containsKey("candidates")) {
       candidates = _json["candidates"]
-          .map((value) => new Candidate.fromJson(value))
+          .map<Candidate>((value) => new Candidate.fromJson(value))
           .toList();
     }
     if (_json.containsKey("district")) {
@@ -886,8 +888,9 @@
       roles = _json["roles"];
     }
     if (_json.containsKey("sources")) {
-      sources =
-          _json["sources"].map((value) => new Source.fromJson(value)).toList();
+      sources = _json["sources"]
+          .map<Source>((value) => new Source.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("special")) {
       special = _json["special"];
@@ -1057,7 +1060,8 @@
     }
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) => new DivisionSearchResult.fromJson(value))
+          .map<DivisionSearchResult>(
+              (value) => new DivisionSearchResult.fromJson(value))
           .toList();
     }
   }
@@ -1269,7 +1273,7 @@
   ElectionsQueryResponse.fromJson(core.Map _json) {
     if (_json.containsKey("elections")) {
       elections = _json["elections"]
-          .map((value) => new Election.fromJson(value))
+          .map<Election>((value) => new Election.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1444,8 +1448,9 @@
       roles = _json["roles"];
     }
     if (_json.containsKey("sources")) {
-      sources =
-          _json["sources"].map((value) => new Source.fromJson(value)).toList();
+      sources = _json["sources"]
+          .map<Source>((value) => new Source.fromJson(value))
+          .toList();
     }
   }
 
@@ -1505,12 +1510,13 @@
   Official.fromJson(core.Map _json) {
     if (_json.containsKey("address")) {
       address = _json["address"]
-          .map((value) => new SimpleAddressType.fromJson(value))
+          .map<SimpleAddressType>(
+              (value) => new SimpleAddressType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("channels")) {
       channels = _json["channels"]
-          .map((value) => new Channel.fromJson(value))
+          .map<Channel>((value) => new Channel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("emails")) {
@@ -1623,8 +1629,9 @@
       pollingHours = _json["pollingHours"];
     }
     if (_json.containsKey("sources")) {
-      sources =
-          _json["sources"].map((value) => new Source.fromJson(value)).toList();
+      sources = _json["sources"]
+          .map<Source>((value) => new Source.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("startDate")) {
       startDate = _json["startDate"];
@@ -1934,12 +1941,13 @@
                   new GeographicDivision.fromJson(item));
     }
     if (_json.containsKey("offices")) {
-      offices =
-          _json["offices"].map((value) => new Office.fromJson(value)).toList();
+      offices = _json["offices"]
+          .map<Office>((value) => new Office.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("officials")) {
       officials = _json["officials"]
-          .map((value) => new Official.fromJson(value))
+          .map<Official>((value) => new Official.fromJson(value))
           .toList();
     }
   }
@@ -2023,12 +2031,13 @@
           new SimpleAddressType.fromJson(_json["normalizedInput"]);
     }
     if (_json.containsKey("offices")) {
-      offices =
-          _json["offices"].map((value) => new Office.fromJson(value)).toList();
+      offices = _json["offices"]
+          .map<Office>((value) => new Office.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("officials")) {
       officials = _json["officials"]
-          .map((value) => new Official.fromJson(value))
+          .map<Official>((value) => new Official.fromJson(value))
           .toList();
     }
   }
@@ -2244,17 +2253,17 @@
   VoterInfoResponse.fromJson(core.Map _json) {
     if (_json.containsKey("contests")) {
       contests = _json["contests"]
-          .map((value) => new Contest.fromJson(value))
+          .map<Contest>((value) => new Contest.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dropOffLocations")) {
       dropOffLocations = _json["dropOffLocations"]
-          .map((value) => new PollingLocation.fromJson(value))
+          .map<PollingLocation>((value) => new PollingLocation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("earlyVoteSites")) {
       earlyVoteSites = _json["earlyVoteSites"]
-          .map((value) => new PollingLocation.fromJson(value))
+          .map<PollingLocation>((value) => new PollingLocation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("election")) {
@@ -2272,12 +2281,12 @@
     }
     if (_json.containsKey("otherElections")) {
       otherElections = _json["otherElections"]
-          .map((value) => new Election.fromJson(value))
+          .map<Election>((value) => new Election.fromJson(value))
           .toList();
     }
     if (_json.containsKey("pollingLocations")) {
       pollingLocations = _json["pollingLocations"]
-          .map((value) => new PollingLocation.fromJson(value))
+          .map<PollingLocation>((value) => new PollingLocation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("precinctId")) {
@@ -2285,7 +2294,8 @@
     }
     if (_json.containsKey("state")) {
       state = _json["state"]
-          .map((value) => new AdministrationRegion.fromJson(value))
+          .map<AdministrationRegion>(
+              (value) => new AdministrationRegion.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/classroom/v1.dart b/generated/googleapis/lib/classroom/v1.dart
index 8753cfa..3e4e21e 100644
--- a/generated/googleapis/lib/classroom/v1.dart
+++ b/generated/googleapis/lib/classroom/v1.dart
@@ -158,7 +158,7 @@
   /// this method will complete with the same error.
   async.Future<Course> create(Course request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -209,7 +209,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -260,7 +260,7 @@
   /// this method will complete with the same error.
   async.Future<Course> get(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -349,7 +349,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -440,7 +440,7 @@
   async.Future<Course> patch(Course request, core.String id,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -502,7 +502,7 @@
   async.Future<Course> update(Course request, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -569,7 +569,7 @@
   async.Future<CourseAlias> create(CourseAlias request, core.String courseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -631,7 +631,7 @@
   async.Future<Empty> delete(core.String courseId, core.String alias,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -703,7 +703,7 @@
   async.Future<ListCourseAliasesResponse> list(core.String courseId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -776,7 +776,7 @@
   async.Future<Announcement> create(Announcement request, core.String courseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -842,7 +842,7 @@
   async.Future<Empty> delete(core.String courseId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -903,7 +903,7 @@
   async.Future<Announcement> get(core.String courseId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -993,7 +993,7 @@
       core.List<core.String> announcementStates,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1071,7 +1071,7 @@
       core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1156,7 +1156,7 @@
       Announcement request, core.String courseId, core.String id,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1243,7 +1243,7 @@
   async.Future<CourseWork> create(CourseWork request, core.String courseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1309,7 +1309,7 @@
   async.Future<Empty> delete(core.String courseId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1370,7 +1370,7 @@
   async.Future<CourseWork> get(core.String courseId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1461,7 +1461,7 @@
       core.List<core.String> courseWorkStates,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1538,7 +1538,7 @@
       core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1638,7 +1638,7 @@
       CourseWork request, core.String courseId, core.String id,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1715,7 +1715,7 @@
       core.String courseId, core.String courseWorkId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1831,7 +1831,7 @@
       core.String late,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1927,7 +1927,7 @@
       core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2021,7 +2021,7 @@
       core.String courseId, core.String courseWorkId, core.String id,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2112,7 +2112,7 @@
       core.String courseId, core.String courseWorkId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2202,7 +2202,7 @@
       core.String courseId, core.String courseWorkId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2289,7 +2289,7 @@
       core.String courseId, core.String courseWorkId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2375,7 +2375,7 @@
   async.Future<Student> create(Student request, core.String courseId,
       {core.String enrollmentCode, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2443,7 +2443,7 @@
   async.Future<Empty> delete(core.String courseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2509,7 +2509,7 @@
   async.Future<Student> get(core.String courseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2578,7 +2578,7 @@
   async.Future<ListStudentsResponse> list(core.String courseId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2653,7 +2653,7 @@
   async.Future<Teacher> create(Teacher request, core.String courseId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2720,7 +2720,7 @@
   async.Future<Empty> delete(core.String courseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2786,7 +2786,7 @@
   async.Future<Teacher> get(core.String courseId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2855,7 +2855,7 @@
   async.Future<ListTeachersResponse> list(core.String courseId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2922,7 +2922,7 @@
   async.Future<Topic> get(core.String courseId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2994,7 +2994,7 @@
   async.Future<ListTopicResponse> list(core.String courseId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3063,7 +3063,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> accept(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3116,7 +3116,7 @@
   /// this method will complete with the same error.
   async.Future<Invitation> create(Invitation request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3165,7 +3165,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3213,7 +3213,7 @@
   /// this method will complete with the same error.
   async.Future<Invitation> get(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3290,7 +3290,7 @@
       core.String courseId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3378,7 +3378,7 @@
   async.Future<Registration> create(Registration request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3423,7 +3423,7 @@
   async.Future<Empty> delete(core.String registrationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3489,7 +3489,7 @@
   /// this method will complete with the same error.
   async.Future<UserProfile> get(core.String userId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3572,7 +3572,7 @@
       GuardianInvitation request, core.String studentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3638,7 +3638,7 @@
       core.String studentId, core.String invitationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3737,7 +3737,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3831,7 +3831,7 @@
       core.String studentId, core.String invitationId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3918,7 +3918,7 @@
   async.Future<Empty> delete(core.String studentId, core.String guardianId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3988,7 +3988,7 @@
   async.Future<Guardian> get(core.String studentId, core.String guardianId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4085,7 +4085,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4227,7 +4227,7 @@
     }
     if (_json.containsKey("materials")) {
       materials = _json["materials"]
-          .map((value) => new Material.fromJson(value))
+          .map<Material>((value) => new Material.fromJson(value))
           .toList();
     }
     if (_json.containsKey("scheduledTime")) {
@@ -4328,7 +4328,7 @@
   AssignmentSubmission.fromJson(core.Map _json) {
     if (_json.containsKey("attachments")) {
       attachments = _json["attachments"]
-          .map((value) => new Attachment.fromJson(value))
+          .map<Attachment>((value) => new Attachment.fromJson(value))
           .toList();
     }
   }
@@ -4589,7 +4589,8 @@
     }
     if (_json.containsKey("courseMaterialSets")) {
       courseMaterialSets = _json["courseMaterialSets"]
-          .map((value) => new CourseMaterialSet.fromJson(value))
+          .map<CourseMaterialSet>(
+              (value) => new CourseMaterialSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("courseState")) {
@@ -4809,7 +4810,7 @@
   CourseMaterialSet.fromJson(core.Map _json) {
     if (_json.containsKey("materials")) {
       materials = _json["materials"]
-          .map((value) => new CourseMaterial.fromJson(value))
+          .map<CourseMaterial>((value) => new CourseMaterial.fromJson(value))
           .toList();
     }
     if (_json.containsKey("title")) {
@@ -5035,7 +5036,7 @@
     }
     if (_json.containsKey("materials")) {
       materials = _json["materials"]
-          .map((value) => new Material.fromJson(value))
+          .map<Material>((value) => new Material.fromJson(value))
           .toList();
     }
     if (_json.containsKey("maxPoints")) {
@@ -5787,7 +5788,7 @@
   ListAnnouncementsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("announcements")) {
       announcements = _json["announcements"]
-          .map((value) => new Announcement.fromJson(value))
+          .map<Announcement>((value) => new Announcement.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5823,7 +5824,7 @@
   ListCourseAliasesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("aliases")) {
       aliases = _json["aliases"]
-          .map((value) => new CourseAlias.fromJson(value))
+          .map<CourseAlias>((value) => new CourseAlias.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5858,7 +5859,7 @@
   ListCourseWorkResponse.fromJson(core.Map _json) {
     if (_json.containsKey("courseWork")) {
       courseWork = _json["courseWork"]
-          .map((value) => new CourseWork.fromJson(value))
+          .map<CourseWork>((value) => new CourseWork.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5893,8 +5894,9 @@
 
   ListCoursesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("courses")) {
-      courses =
-          _json["courses"].map((value) => new Course.fromJson(value)).toList();
+      courses = _json["courses"]
+          .map<Course>((value) => new Course.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -5928,7 +5930,8 @@
   ListGuardianInvitationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("guardianInvitations")) {
       guardianInvitations = _json["guardianInvitations"]
-          .map((value) => new GuardianInvitation.fromJson(value))
+          .map<GuardianInvitation>(
+              (value) => new GuardianInvitation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5965,7 +5968,7 @@
   ListGuardiansResponse.fromJson(core.Map _json) {
     if (_json.containsKey("guardians")) {
       guardians = _json["guardians"]
-          .map((value) => new Guardian.fromJson(value))
+          .map<Guardian>((value) => new Guardian.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -6000,7 +6003,7 @@
   ListInvitationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("invitations")) {
       invitations = _json["invitations"]
-          .map((value) => new Invitation.fromJson(value))
+          .map<Invitation>((value) => new Invitation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -6039,7 +6042,8 @@
     }
     if (_json.containsKey("studentSubmissions")) {
       studentSubmissions = _json["studentSubmissions"]
-          .map((value) => new StudentSubmission.fromJson(value))
+          .map<StudentSubmission>(
+              (value) => new StudentSubmission.fromJson(value))
           .toList();
     }
   }
@@ -6075,7 +6079,7 @@
     }
     if (_json.containsKey("students")) {
       students = _json["students"]
-          .map((value) => new Student.fromJson(value))
+          .map<Student>((value) => new Student.fromJson(value))
           .toList();
     }
   }
@@ -6110,7 +6114,7 @@
     }
     if (_json.containsKey("teachers")) {
       teachers = _json["teachers"]
-          .map((value) => new Teacher.fromJson(value))
+          .map<Teacher>((value) => new Teacher.fromJson(value))
           .toList();
     }
   }
@@ -6144,7 +6148,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("topic")) {
-      topic = _json["topic"].map((value) => new Topic.fromJson(value)).toList();
+      topic = _json["topic"]
+          .map<Topic>((value) => new Topic.fromJson(value))
+          .toList();
     }
   }
 
@@ -6269,7 +6275,7 @@
   ModifyAttachmentsRequest.fromJson(core.Map _json) {
     if (_json.containsKey("addAttachments")) {
       addAttachments = _json["addAttachments"]
-          .map((value) => new Attachment.fromJson(value))
+          .map<Attachment>((value) => new Attachment.fromJson(value))
           .toList();
     }
   }
@@ -6886,7 +6892,8 @@
     }
     if (_json.containsKey("submissionHistory")) {
       submissionHistory = _json["submissionHistory"]
-          .map((value) => new SubmissionHistory.fromJson(value))
+          .map<SubmissionHistory>(
+              (value) => new SubmissionHistory.fromJson(value))
           .toList();
     }
     if (_json.containsKey("updateTime")) {
@@ -7216,7 +7223,8 @@
     }
     if (_json.containsKey("permissions")) {
       permissions = _json["permissions"]
-          .map((value) => new GlobalPermission.fromJson(value))
+          .map<GlobalPermission>(
+              (value) => new GlobalPermission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("photoUrl")) {
diff --git a/generated/googleapis/lib/cloudbilling/v1.dart b/generated/googleapis/lib/cloudbilling/v1.dart
index 8cbf241..d291d71 100644
--- a/generated/googleapis/lib/cloudbilling/v1.dart
+++ b/generated/googleapis/lib/cloudbilling/v1.dart
@@ -66,7 +66,7 @@
   /// this method will complete with the same error.
   async.Future<BillingAccount> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -117,7 +117,7 @@
   async.Future<ListBillingAccountsResponse> list(
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -186,7 +186,7 @@
   async.Future<ListProjectBillingInfoResponse> list(core.String name,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -247,7 +247,7 @@
   async.Future<ProjectBillingInfo> getBillingInfo(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -329,7 +329,7 @@
       ProjectBillingInfo request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -389,7 +389,7 @@
   async.Future<ListServicesResponse> list(
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -476,7 +476,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -685,7 +685,7 @@
   ListBillingAccountsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("billingAccounts")) {
       billingAccounts = _json["billingAccounts"]
-          .map((value) => new BillingAccount.fromJson(value))
+          .map<BillingAccount>((value) => new BillingAccount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -727,7 +727,8 @@
     }
     if (_json.containsKey("projectBillingInfo")) {
       projectBillingInfo = _json["projectBillingInfo"]
-          .map((value) => new ProjectBillingInfo.fromJson(value))
+          .map<ProjectBillingInfo>(
+              (value) => new ProjectBillingInfo.fromJson(value))
           .toList();
     }
   }
@@ -764,7 +765,7 @@
     }
     if (_json.containsKey("services")) {
       services = _json["services"]
-          .map((value) => new Service.fromJson(value))
+          .map<Service>((value) => new Service.fromJson(value))
           .toList();
     }
   }
@@ -799,7 +800,8 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("skus")) {
-      skus = _json["skus"].map((value) => new Sku.fromJson(value)).toList();
+      skus =
+          _json["skus"].map<Sku>((value) => new Sku.fromJson(value)).toList();
     }
   }
 
@@ -930,7 +932,7 @@
     }
     if (_json.containsKey("tieredRates")) {
       tieredRates = _json["tieredRates"]
-          .map((value) => new TierRate.fromJson(value))
+          .map<TierRate>((value) => new TierRate.fromJson(value))
           .toList();
     }
     if (_json.containsKey("usageUnit")) {
@@ -1190,7 +1192,7 @@
     }
     if (_json.containsKey("pricingInfo")) {
       pricingInfo = _json["pricingInfo"]
-          .map((value) => new PricingInfo.fromJson(value))
+          .map<PricingInfo>((value) => new PricingInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("serviceProviderName")) {
diff --git a/generated/googleapis/lib/cloudbuild/v1.dart b/generated/googleapis/lib/cloudbuild/v1.dart
index a7ac5e6..55d24dc 100644
--- a/generated/googleapis/lib/cloudbuild/v1.dart
+++ b/generated/googleapis/lib/cloudbuild/v1.dart
@@ -68,7 +68,7 @@
   async.Future<Empty> cancel(CancelOperationRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -116,7 +116,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -179,7 +179,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -253,7 +253,7 @@
       CancelBuildRequest request, core.String projectId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -312,7 +312,7 @@
   async.Future<Operation> create(Build request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -365,7 +365,7 @@
   async.Future<Build> get(core.String projectId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -426,7 +426,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -513,7 +513,7 @@
       RetryBuildRequest request, core.String projectId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -577,7 +577,7 @@
   async.Future<BuildTrigger> create(BuildTrigger request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -629,7 +629,7 @@
   async.Future<Empty> delete(core.String projectId, core.String triggerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -682,7 +682,7 @@
   async.Future<BuildTrigger> get(core.String projectId, core.String triggerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -733,7 +733,7 @@
   async.Future<ListBuildTriggersResponse> list(core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -786,7 +786,7 @@
       BuildTrigger request, core.String projectId, core.String triggerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -843,7 +843,7 @@
       RepoSource request, core.String projectId, core.String triggerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1041,8 +1041,9 @@
       results = new Results.fromJson(_json["results"]);
     }
     if (_json.containsKey("secrets")) {
-      secrets =
-          _json["secrets"].map((value) => new Secret.fromJson(value)).toList();
+      secrets = _json["secrets"]
+          .map<Secret>((value) => new Secret.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("source")) {
       source = new Source.fromJson(_json["source"]);
@@ -1061,8 +1062,9 @@
       statusDetail = _json["statusDetail"];
     }
     if (_json.containsKey("steps")) {
-      steps =
-          _json["steps"].map((value) => new BuildStep.fromJson(value)).toList();
+      steps = _json["steps"]
+          .map<BuildStep>((value) => new BuildStep.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("substitutions")) {
       substitutions = _json["substitutions"];
@@ -1383,8 +1385,9 @@
       timing = new TimeSpan.fromJson(_json["timing"]);
     }
     if (_json.containsKey("volumes")) {
-      volumes =
-          _json["volumes"].map((value) => new Volume.fromJson(value)).toList();
+      volumes = _json["volumes"]
+          .map<Volume>((value) => new Volume.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("waitFor")) {
       waitFor = _json["waitFor"];
@@ -1624,8 +1627,9 @@
 
   FileHashes.fromJson(core.Map _json) {
     if (_json.containsKey("fileHash")) {
-      fileHash =
-          _json["fileHash"].map((value) => new Hash.fromJson(value)).toList();
+      fileHash = _json["fileHash"]
+          .map<Hash>((value) => new Hash.fromJson(value))
+          .toList();
     }
   }
 
@@ -1692,7 +1696,7 @@
   ListBuildTriggersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("triggers")) {
       triggers = _json["triggers"]
-          .map((value) => new BuildTrigger.fromJson(value))
+          .map<BuildTrigger>((value) => new BuildTrigger.fromJson(value))
           .toList();
     }
   }
@@ -1719,8 +1723,9 @@
 
   ListBuildsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("builds")) {
-      builds =
-          _json["builds"].map((value) => new Build.fromJson(value)).toList();
+      builds = _json["builds"]
+          .map<Build>((value) => new Build.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -1756,7 +1761,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -1946,7 +1951,7 @@
     }
     if (_json.containsKey("images")) {
       images = _json["images"]
-          .map((value) => new BuiltImage.fromJson(value))
+          .map<BuiltImage>((value) => new BuiltImage.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/clouddebugger/v2.dart b/generated/googleapis/lib/clouddebugger/v2.dart
index 17b4660..81b0eeb 100644
--- a/generated/googleapis/lib/clouddebugger/v2.dart
+++ b/generated/googleapis/lib/clouddebugger/v2.dart
@@ -85,7 +85,7 @@
       RegisterDebuggeeRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -165,7 +165,7 @@
       core.String waitToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -231,7 +231,7 @@
       core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -314,7 +314,7 @@
       core.String clientVersion,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -375,7 +375,7 @@
   async.Future<Empty> delete(core.String debuggeeId, core.String breakpointId,
       {core.String clientVersion, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -433,7 +433,7 @@
       core.String debuggeeId, core.String breakpointId,
       {core.String clientVersion, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -519,7 +519,7 @@
       core.bool stripResults,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -588,7 +588,7 @@
       Breakpoint request, core.String debuggeeId,
       {core.String clientVersion, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -782,7 +782,7 @@
     }
     if (_json.containsKey("evaluatedExpressions")) {
       evaluatedExpressions = _json["evaluatedExpressions"]
-          .map((value) => new Variable.fromJson(value))
+          .map<Variable>((value) => new Variable.fromJson(value))
           .toList();
     }
     if (_json.containsKey("expressions")) {
@@ -811,7 +811,7 @@
     }
     if (_json.containsKey("stackFrames")) {
       stackFrames = _json["stackFrames"]
-          .map((value) => new StackFrame.fromJson(value))
+          .map<StackFrame>((value) => new StackFrame.fromJson(value))
           .toList();
     }
     if (_json.containsKey("status")) {
@@ -822,7 +822,7 @@
     }
     if (_json.containsKey("variableTable")) {
       variableTable = _json["variableTable"]
-          .map((value) => new Variable.fromJson(value))
+          .map<Variable>((value) => new Variable.fromJson(value))
           .toList();
     }
   }
@@ -1071,7 +1071,8 @@
     }
     if (_json.containsKey("extSourceContexts")) {
       extSourceContexts = _json["extSourceContexts"]
-          .map((value) => new ExtendedSourceContext.fromJson(value))
+          .map<ExtendedSourceContext>(
+              (value) => new ExtendedSourceContext.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -1091,7 +1092,7 @@
     }
     if (_json.containsKey("sourceContexts")) {
       sourceContexts = _json["sourceContexts"]
-          .map((value) => new SourceContext.fromJson(value))
+          .map<SourceContext>((value) => new SourceContext.fromJson(value))
           .toList();
     }
     if (_json.containsKey("status")) {
@@ -1378,7 +1379,7 @@
   ListActiveBreakpointsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("breakpoints")) {
       breakpoints = _json["breakpoints"]
-          .map((value) => new Breakpoint.fromJson(value))
+          .map<Breakpoint>((value) => new Breakpoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextWaitToken")) {
@@ -1425,7 +1426,7 @@
   ListBreakpointsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("breakpoints")) {
       breakpoints = _json["breakpoints"]
-          .map((value) => new Breakpoint.fromJson(value))
+          .map<Breakpoint>((value) => new Breakpoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextWaitToken")) {
@@ -1460,7 +1461,7 @@
   ListDebuggeesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("debuggees")) {
       debuggees = _json["debuggees"]
-          .map((value) => new Debuggee.fromJson(value))
+          .map<Debuggee>((value) => new Debuggee.fromJson(value))
           .toList();
     }
   }
@@ -1721,15 +1722,16 @@
   StackFrame.fromJson(core.Map _json) {
     if (_json.containsKey("arguments")) {
       arguments = _json["arguments"]
-          .map((value) => new Variable.fromJson(value))
+          .map<Variable>((value) => new Variable.fromJson(value))
           .toList();
     }
     if (_json.containsKey("function")) {
       function = _json["function"];
     }
     if (_json.containsKey("locals")) {
-      locals =
-          _json["locals"].map((value) => new Variable.fromJson(value)).toList();
+      locals = _json["locals"]
+          .map<Variable>((value) => new Variable.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("location")) {
       location = new SourceLocation.fromJson(_json["location"]);
@@ -2009,7 +2011,7 @@
   Variable.fromJson(core.Map _json) {
     if (_json.containsKey("members")) {
       members = _json["members"]
-          .map((value) => new Variable.fromJson(value))
+          .map<Variable>((value) => new Variable.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
diff --git a/generated/googleapis/lib/cloudfunctions/v1.dart b/generated/googleapis/lib/cloudfunctions/v1.dart
index 04c6aa7..92e170c 100644
--- a/generated/googleapis/lib/cloudfunctions/v1.dart
+++ b/generated/googleapis/lib/cloudfunctions/v1.dart
@@ -59,7 +59,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -122,7 +122,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -203,7 +203,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -269,7 +269,7 @@
       CallFunctionRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -323,7 +323,7 @@
   async.Future<Operation> create(CloudFunction request, core.String location,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -374,7 +374,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -428,7 +428,7 @@
       GenerateDownloadUrlRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -500,7 +500,7 @@
       GenerateUploadUrlRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -550,7 +550,7 @@
   /// this method will complete with the same error.
   async.Future<CloudFunction> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -605,7 +605,7 @@
   async.Future<ListFunctionsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -663,7 +663,7 @@
   async.Future<Operation> patch(CloudFunction request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1170,7 +1170,7 @@
   ListFunctionsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("functions")) {
       functions = _json["functions"]
-          .map((value) => new CloudFunction.fromJson(value))
+          .map<CloudFunction>((value) => new CloudFunction.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -1204,7 +1204,7 @@
   ListLocationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new Location.fromJson(value))
+          .map<Location>((value) => new Location.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -1241,7 +1241,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/cloudiot/v1.dart b/generated/googleapis/lib/cloudiot/v1.dart
index 9a6c6c5..f7e1e7b 100644
--- a/generated/googleapis/lib/cloudiot/v1.dart
+++ b/generated/googleapis/lib/cloudiot/v1.dart
@@ -88,7 +88,7 @@
       DeviceRegistry request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -138,7 +138,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -183,7 +183,7 @@
   /// this method will complete with the same error.
   async.Future<DeviceRegistry> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -235,7 +235,7 @@
       GetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -296,7 +296,7 @@
   async.Future<ListDeviceRegistriesResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -360,7 +360,7 @@
   async.Future<DeviceRegistry> patch(DeviceRegistry request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -417,7 +417,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -474,7 +474,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -544,7 +544,7 @@
   async.Future<Device> create(Device request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -595,7 +595,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -647,7 +647,7 @@
   async.Future<Device> get(core.String name,
       {core.String fieldMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -726,7 +726,7 @@
       core.List<core.String> deviceNumIds,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -795,7 +795,7 @@
       ModifyCloudToDeviceConfigRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -856,7 +856,7 @@
   async.Future<Device> patch(Device request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -924,7 +924,7 @@
   async.Future<ListDeviceConfigVersionsResponse> list(core.String name,
       {core.int numVersions, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -992,7 +992,7 @@
   async.Future<ListDeviceStatesResponse> list(core.String name,
       {core.int numStates, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1087,7 +1087,7 @@
   AuditConfig.fromJson(core.Map _json) {
     if (_json.containsKey("auditLogConfigs")) {
       auditLogConfigs = _json["auditLogConfigs"]
-          .map((value) => new AuditLogConfig.fromJson(value))
+          .map<AuditLogConfig>((value) => new AuditLogConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("service")) {
@@ -1331,7 +1331,8 @@
     }
     if (_json.containsKey("credentials")) {
       credentials = _json["credentials"]
-          .map((value) => new DeviceCredential.fromJson(value))
+          .map<DeviceCredential>(
+              (value) => new DeviceCredential.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -1591,12 +1592,14 @@
   DeviceRegistry.fromJson(core.Map _json) {
     if (_json.containsKey("credentials")) {
       credentials = _json["credentials"]
-          .map((value) => new RegistryCredential.fromJson(value))
+          .map<RegistryCredential>(
+              (value) => new RegistryCredential.fromJson(value))
           .toList();
     }
     if (_json.containsKey("eventNotificationConfigs")) {
       eventNotificationConfigs = _json["eventNotificationConfigs"]
-          .map((value) => new EventNotificationConfig.fromJson(value))
+          .map<EventNotificationConfig>(
+              (value) => new EventNotificationConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("httpConfig")) {
@@ -1795,7 +1798,7 @@
   ListDeviceConfigVersionsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deviceConfigs")) {
       deviceConfigs = _json["deviceConfigs"]
-          .map((value) => new DeviceConfig.fromJson(value))
+          .map<DeviceConfig>((value) => new DeviceConfig.fromJson(value))
           .toList();
     }
   }
@@ -1826,7 +1829,7 @@
   ListDeviceRegistriesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deviceRegistries")) {
       deviceRegistries = _json["deviceRegistries"]
-          .map((value) => new DeviceRegistry.fromJson(value))
+          .map<DeviceRegistry>((value) => new DeviceRegistry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -1860,7 +1863,7 @@
   ListDeviceStatesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deviceStates")) {
       deviceStates = _json["deviceStates"]
-          .map((value) => new DeviceState.fromJson(value))
+          .map<DeviceState>((value) => new DeviceState.fromJson(value))
           .toList();
     }
   }
@@ -1889,8 +1892,9 @@
 
   ListDevicesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("devices")) {
-      devices =
-          _json["devices"].map((value) => new Device.fromJson(value)).toList();
+      devices = _json["devices"]
+          .map<Device>((value) => new Device.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -2053,12 +2057,12 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("auditConfigs")) {
       auditConfigs = _json["auditConfigs"]
-          .map((value) => new AuditConfig.fromJson(value))
+          .map<AuditConfig>((value) => new AuditConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
diff --git a/generated/googleapis/lib/cloudkms/v1.dart b/generated/googleapis/lib/cloudkms/v1.dart
index dda8d86..2257fdf 100644
--- a/generated/googleapis/lib/cloudkms/v1.dart
+++ b/generated/googleapis/lib/cloudkms/v1.dart
@@ -69,7 +69,7 @@
   /// this method will complete with the same error.
   async.Future<Location> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -122,7 +122,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -193,7 +193,7 @@
   async.Future<KeyRing> create(KeyRing request, core.String parent,
       {core.String keyRingId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -243,7 +243,7 @@
   /// this method will complete with the same error.
   async.Future<KeyRing> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -291,7 +291,7 @@
   async.Future<Policy> getIamPolicy(core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -346,7 +346,7 @@
   async.Future<ListKeyRingsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -403,7 +403,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -463,7 +463,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -534,7 +534,7 @@
   async.Future<CryptoKey> create(CryptoKey request, core.String parent,
       {core.String cryptoKeyId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -592,7 +592,7 @@
       DecryptRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -647,7 +647,7 @@
       EncryptRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -695,7 +695,7 @@
   /// this method will complete with the same error.
   async.Future<CryptoKey> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -744,7 +744,7 @@
   async.Future<Policy> getIamPolicy(core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -800,7 +800,7 @@
   async.Future<ListCryptoKeysResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -858,7 +858,7 @@
   async.Future<CryptoKey> patch(CryptoKey request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -915,7 +915,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -976,7 +976,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1030,7 +1030,7 @@
       UpdateCryptoKeyPrimaryVersionRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1096,7 +1096,7 @@
       CryptoKeyVersion request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1160,7 +1160,7 @@
       DestroyCryptoKeyVersionRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1207,7 +1207,7 @@
   /// this method will complete with the same error.
   async.Future<CryptoKeyVersion> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1263,7 +1263,7 @@
   async.Future<ListCryptoKeyVersionsResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1331,7 +1331,7 @@
       CryptoKeyVersion request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1391,7 +1391,7 @@
       RestoreCryptoKeyVersionRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1485,7 +1485,7 @@
   AuditConfig.fromJson(core.Map _json) {
     if (_json.containsKey("auditLogConfigs")) {
       auditLogConfigs = _json["auditLogConfigs"]
-          .map((value) => new AuditLogConfig.fromJson(value))
+          .map<AuditLogConfig>((value) => new AuditLogConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("service")) {
@@ -2050,7 +2050,8 @@
   ListCryptoKeyVersionsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("cryptoKeyVersions")) {
       cryptoKeyVersions = _json["cryptoKeyVersions"]
-          .map((value) => new CryptoKeyVersion.fromJson(value))
+          .map<CryptoKeyVersion>(
+              (value) => new CryptoKeyVersion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2095,7 +2096,7 @@
   ListCryptoKeysResponse.fromJson(core.Map _json) {
     if (_json.containsKey("cryptoKeys")) {
       cryptoKeys = _json["cryptoKeys"]
-          .map((value) => new CryptoKey.fromJson(value))
+          .map<CryptoKey>((value) => new CryptoKey.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2140,7 +2141,7 @@
   ListKeyRingsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("keyRings")) {
       keyRings = _json["keyRings"]
-          .map((value) => new KeyRing.fromJson(value))
+          .map<KeyRing>((value) => new KeyRing.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2180,7 +2181,7 @@
   ListLocationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new Location.fromJson(value))
+          .map<Location>((value) => new Location.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2328,12 +2329,12 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("auditConfigs")) {
       auditConfigs = _json["auditConfigs"]
-          .map((value) => new AuditConfig.fromJson(value))
+          .map<AuditConfig>((value) => new AuditConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
diff --git a/generated/googleapis/lib/cloudresourcemanager/v1.dart b/generated/googleapis/lib/cloudresourcemanager/v1.dart
index 88f4749..29c9634 100644
--- a/generated/googleapis/lib/cloudresourcemanager/v1.dart
+++ b/generated/googleapis/lib/cloudresourcemanager/v1.dart
@@ -69,7 +69,7 @@
       ClearOrgPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -124,7 +124,7 @@
       GetEffectiveOrgPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -181,7 +181,7 @@
       GetOrgPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -235,7 +235,7 @@
           core.String resource,
           {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -288,7 +288,7 @@
       ListOrgPoliciesRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -345,7 +345,7 @@
       SetOrgPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -404,7 +404,7 @@
   /// this method will complete with the same error.
   async.Future<Lien> create(Lien request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -451,7 +451,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -508,7 +508,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -565,7 +565,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -618,7 +618,7 @@
       ClearOrgPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -668,7 +668,7 @@
   /// this method will complete with the same error.
   async.Future<Organization> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -718,7 +718,7 @@
       GetEffectiveOrgPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -777,7 +777,7 @@
       GetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -834,7 +834,7 @@
       GetOrgPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -888,7 +888,7 @@
           core.String resource,
           {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -941,7 +941,7 @@
       ListOrgPoliciesRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -996,7 +996,7 @@
       SearchOrganizationsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1052,7 +1052,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1109,7 +1109,7 @@
       SetOrgPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1167,7 +1167,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1226,7 +1226,7 @@
       ClearOrgPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1284,7 +1284,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> create(Project request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1352,7 +1352,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String projectId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1399,7 +1399,7 @@
   /// this method will complete with the same error.
   async.Future<Project> get(core.String projectId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1450,7 +1450,7 @@
       GetAncestryRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1505,7 +1505,7 @@
       GetEffectiveOrgPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1565,7 +1565,7 @@
       GetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1622,7 +1622,7 @@
       GetOrgPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1722,7 +1722,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1777,7 +1777,7 @@
           core.String resource,
           {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1830,7 +1830,7 @@
       ListOrgPoliciesRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1925,7 +1925,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1982,7 +1982,7 @@
       SetOrgPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2037,7 +2037,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2097,7 +2097,7 @@
       UndeleteProjectRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2152,7 +2152,7 @@
   async.Future<Project> update(Project request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2269,7 +2269,7 @@
   AuditConfig.fromJson(core.Map _json) {
     if (_json.containsKey("auditLogConfigs")) {
       auditLogConfigs = _json["auditLogConfigs"]
-          .map((value) => new AuditLogConfig.fromJson(value))
+          .map<AuditLogConfig>((value) => new AuditLogConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("service")) {
@@ -2783,7 +2783,7 @@
   GetAncestryResponse.fromJson(core.Map _json) {
     if (_json.containsKey("ancestor")) {
       ancestor = _json["ancestor"]
-          .map((value) => new Ancestor.fromJson(value))
+          .map<Ancestor>((value) => new Ancestor.fromJson(value))
           .toList();
     }
   }
@@ -2996,7 +2996,7 @@
   ListAvailableOrgPolicyConstraintsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("constraints")) {
       constraints = _json["constraints"]
-          .map((value) => new Constraint.fromJson(value))
+          .map<Constraint>((value) => new Constraint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -3056,7 +3056,9 @@
 
   ListLiensResponse.fromJson(core.Map _json) {
     if (_json.containsKey("liens")) {
-      liens = _json["liens"].map((value) => new Lien.fromJson(value)).toList();
+      liens = _json["liens"]
+          .map<Lien>((value) => new Lien.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -3130,7 +3132,7 @@
     }
     if (_json.containsKey("policies")) {
       policies = _json["policies"]
-          .map((value) => new OrgPolicy.fromJson(value))
+          .map<OrgPolicy>((value) => new OrgPolicy.fromJson(value))
           .toList();
     }
   }
@@ -3342,7 +3344,7 @@
     }
     if (_json.containsKey("projects")) {
       projects = _json["projects"]
-          .map((value) => new Project.fromJson(value))
+          .map<Project>((value) => new Project.fromJson(value))
           .toList();
     }
   }
@@ -3723,12 +3725,12 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("auditConfigs")) {
       auditConfigs = _json["auditConfigs"]
-          .map((value) => new AuditConfig.fromJson(value))
+          .map<AuditConfig>((value) => new AuditConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -4078,7 +4080,7 @@
     }
     if (_json.containsKey("organizations")) {
       organizations = _json["organizations"]
-          .map((value) => new Organization.fromJson(value))
+          .map<Organization>((value) => new Organization.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/cloudresourcemanager/v2beta1.dart b/generated/googleapis/lib/cloudresourcemanager/v2beta1.dart
index e192646..be90b52 100644
--- a/generated/googleapis/lib/cloudresourcemanager/v2beta1.dart
+++ b/generated/googleapis/lib/cloudresourcemanager/v2beta1.dart
@@ -89,7 +89,7 @@
   async.Future<Operation> create(Folder request,
       {core.String parent, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -144,7 +144,7 @@
   /// this method will complete with the same error.
   async.Future<Folder> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -192,7 +192,7 @@
   /// this method will complete with the same error.
   async.Future<Folder> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -245,7 +245,7 @@
       GetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -320,7 +320,7 @@
       core.String parent,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -392,7 +392,7 @@
   async.Future<Operation> move(MoveFolderRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -460,7 +460,7 @@
   async.Future<Folder> patch(Folder request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -514,7 +514,7 @@
   async.Future<SearchFoldersResponse> search(SearchFoldersRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -567,7 +567,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -625,7 +625,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -687,7 +687,7 @@
   async.Future<Folder> undelete(UndeleteFolderRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -783,7 +783,7 @@
   AuditConfig.fromJson(core.Map _json) {
     if (_json.containsKey("auditLogConfigs")) {
       auditLogConfigs = _json["auditLogConfigs"]
-          .map((value) => new AuditLogConfig.fromJson(value))
+          .map<AuditLogConfig>((value) => new AuditLogConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("service")) {
@@ -1125,8 +1125,9 @@
 
   ListFoldersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("folders")) {
-      folders =
-          _json["folders"].map((value) => new Folder.fromJson(value)).toList();
+      folders = _json["folders"]
+          .map<Folder>((value) => new Folder.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -1322,12 +1323,12 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("auditConfigs")) {
       auditConfigs = _json["auditConfigs"]
-          .map((value) => new AuditConfig.fromJson(value))
+          .map<AuditConfig>((value) => new AuditConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -1479,8 +1480,9 @@
 
   SearchFoldersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("folders")) {
-      folders =
-          _json["folders"].map((value) => new Folder.fromJson(value)).toList();
+      folders = _json["folders"]
+          .map<Folder>((value) => new Folder.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
diff --git a/generated/googleapis/lib/cloudshell/v1.dart b/generated/googleapis/lib/cloudshell/v1.dart
index 0f5ad91..550256c 100644
--- a/generated/googleapis/lib/cloudshell/v1.dart
+++ b/generated/googleapis/lib/cloudshell/v1.dart
@@ -68,7 +68,7 @@
   async.Future<Empty> cancel(CancelOperationRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -117,7 +117,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -162,7 +162,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -225,7 +225,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -362,7 +362,7 @@
     }
     if (_json.containsKey("publicKeys")) {
       publicKeys = _json["publicKeys"]
-          .map((value) => new PublicKey.fromJson(value))
+          .map<PublicKey>((value) => new PublicKey.fromJson(value))
           .toList();
     }
     if (_json.containsKey("sshHost")) {
@@ -427,7 +427,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/cloudtrace/v1.dart b/generated/googleapis/lib/cloudtrace/v1.dart
index 3863162..de95ed3 100644
--- a/generated/googleapis/lib/cloudtrace/v1.dart
+++ b/generated/googleapis/lib/cloudtrace/v1.dart
@@ -77,7 +77,7 @@
   async.Future<Empty> patchTraces(Traces request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -133,7 +133,7 @@
   async.Future<Trace> get(core.String projectId, core.String traceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -260,7 +260,7 @@
       core.String orderBy,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -346,8 +346,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("traces")) {
-      traces =
-          _json["traces"].map((value) => new Trace.fromJson(value)).toList();
+      traces = _json["traces"]
+          .map<Trace>((value) => new Trace.fromJson(value))
+          .toList();
     }
   }
 
@@ -385,8 +386,9 @@
       projectId = _json["projectId"];
     }
     if (_json.containsKey("spans")) {
-      spans =
-          _json["spans"].map((value) => new TraceSpan.fromJson(value)).toList();
+      spans = _json["spans"]
+          .map<TraceSpan>((value) => new TraceSpan.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("traceId")) {
       traceId = _json["traceId"];
@@ -552,8 +554,9 @@
 
   Traces.fromJson(core.Map _json) {
     if (_json.containsKey("traces")) {
-      traces =
-          _json["traces"].map((value) => new Trace.fromJson(value)).toList();
+      traces = _json["traces"]
+          .map<Trace>((value) => new Trace.fromJson(value))
+          .toList();
     }
   }
 
diff --git a/generated/googleapis/lib/cloudtrace/v2.dart b/generated/googleapis/lib/cloudtrace/v2.dart
index 1393d50..67dc393 100644
--- a/generated/googleapis/lib/cloudtrace/v2.dart
+++ b/generated/googleapis/lib/cloudtrace/v2.dart
@@ -80,7 +80,7 @@
       BatchWriteSpansRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -145,7 +145,7 @@
   async.Future<Span> createSpan(Span request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -305,7 +305,9 @@
 
   BatchWriteSpansRequest.fromJson(core.Map _json) {
     if (_json.containsKey("spans")) {
-      spans = _json["spans"].map((value) => new Span.fromJson(value)).toList();
+      spans = _json["spans"]
+          .map<Span>((value) => new Span.fromJson(value))
+          .toList();
     }
   }
 
@@ -415,7 +417,8 @@
       droppedLinksCount = _json["droppedLinksCount"];
     }
     if (_json.containsKey("link")) {
-      link = _json["link"].map((value) => new Link.fromJson(value)).toList();
+      link =
+          _json["link"].map<Link>((value) => new Link.fromJson(value)).toList();
     }
   }
 
@@ -787,7 +790,7 @@
     }
     if (_json.containsKey("frame")) {
       frame = _json["frame"]
-          .map((value) => new StackFrame.fromJson(value))
+          .map<StackFrame>((value) => new StackFrame.fromJson(value))
           .toList();
     }
   }
@@ -1014,7 +1017,7 @@
     }
     if (_json.containsKey("timeEvent")) {
       timeEvent = _json["timeEvent"]
-          .map((value) => new TimeEvent.fromJson(value))
+          .map<TimeEvent>((value) => new TimeEvent.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/compute/v1.dart b/generated/googleapis/lib/compute/v1.dart
index 1872a21..7ba5aad 100644
--- a/generated/googleapis/lib/compute/v1.dart
+++ b/generated/googleapis/lib/compute/v1.dart
@@ -211,7 +211,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -278,7 +278,7 @@
       core.String project, core.String zone, core.String acceleratorType,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -386,7 +386,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -505,7 +505,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -582,7 +582,7 @@
       core.String project, core.String region, core.String address,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -647,7 +647,7 @@
       core.String project, core.String region, core.String address,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -722,7 +722,7 @@
       Address request, core.String project, core.String region,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -832,7 +832,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -951,7 +951,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1030,7 +1030,7 @@
       core.String project, core.String zone, core.String autoscaler,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1096,7 +1096,7 @@
       core.String project, core.String zone, core.String autoscaler,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1171,7 +1171,7 @@
       Autoscaler request, core.String project, core.String zone,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1281,7 +1281,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1368,7 +1368,7 @@
       Autoscaler request, core.String project, core.String zone,
       {core.String autoscaler, core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1451,7 +1451,7 @@
       Autoscaler request, core.String project, core.String zone,
       {core.String autoscaler, core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1533,7 +1533,7 @@
   async.Future<Operation> delete(core.String project, core.String backendBucket,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1591,7 +1591,7 @@
       core.String project, core.String backendBucket,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1657,7 +1657,7 @@
   async.Future<Operation> insert(BackendBucket request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1759,7 +1759,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1837,7 +1837,7 @@
       BackendBucket request, core.String project, core.String backendBucket,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1913,7 +1913,7 @@
       BackendBucket request, core.String project, core.String backendBucket,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2026,7 +2026,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2102,7 +2102,7 @@
       core.String project, core.String backendService,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2160,7 +2160,7 @@
       core.String project, core.String backendService,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2219,7 +2219,7 @@
       core.String backendService,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2292,7 +2292,7 @@
   async.Future<Operation> insert(BackendService request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2395,7 +2395,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2476,7 +2476,7 @@
       BackendService request, core.String project, core.String backendService,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2554,7 +2554,7 @@
       BackendService request, core.String project, core.String backendService,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2666,7 +2666,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2731,7 +2731,7 @@
       core.String project, core.String zone, core.String diskType,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2839,7 +2839,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2958,7 +2958,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3039,7 +3039,7 @@
       Snapshot request, core.String project, core.String zone, core.String disk,
       {core.bool guestFlush, core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3126,7 +3126,7 @@
       core.String project, core.String zone, core.String disk,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3192,7 +3192,7 @@
       core.String project, core.String zone, core.String disk,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3272,7 +3272,7 @@
       Disk request, core.String project, core.String zone,
       {core.String requestId, core.String sourceImage, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3385,7 +3385,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3471,7 +3471,7 @@
       core.String project, core.String zone, core.String disk,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3556,7 +3556,7 @@
       core.String project, core.String zone, core.String resource,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3640,7 +3640,7 @@
   async.Future<Operation> delete(core.String project, core.String firewall,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3696,7 +3696,7 @@
   async.Future<Firewall> get(core.String project, core.String firewall,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3762,7 +3762,7 @@
   async.Future<Operation> insert(Firewall request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3863,7 +3863,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3941,7 +3941,7 @@
       Firewall request, core.String project, core.String firewall,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4018,7 +4018,7 @@
       Firewall request, core.String project, core.String firewall,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4130,7 +4130,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4209,7 +4209,7 @@
       core.String project, core.String region, core.String forwardingRule,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4274,7 +4274,7 @@
       core.String project, core.String region, core.String forwardingRule,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4349,7 +4349,7 @@
       ForwardingRule request, core.String project, core.String region,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4460,7 +4460,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4547,7 +4547,7 @@
       core.String project, core.String region, core.String forwardingRule,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4631,7 +4631,7 @@
   async.Future<Operation> delete(core.String project, core.String address,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4688,7 +4688,7 @@
   async.Future<Address> get(core.String project, core.String address,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4754,7 +4754,7 @@
   async.Future<Operation> insert(Address request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4855,7 +4855,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4936,7 +4936,7 @@
       core.String project, core.String forwardingRule,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4994,7 +4994,7 @@
       core.String project, core.String forwardingRule,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5060,7 +5060,7 @@
   async.Future<Operation> insert(ForwardingRule request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5163,7 +5163,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5242,7 +5242,7 @@
       TargetReference request, core.String project, core.String forwardingRule,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5356,7 +5356,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5414,7 +5414,7 @@
   async.Future delete(core.String project, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5470,7 +5470,7 @@
   async.Future<Operation> get(core.String project, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5571,7 +5571,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5650,7 +5650,7 @@
   async.Future<Operation> delete(core.String project, core.String healthCheck,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5707,7 +5707,7 @@
   async.Future<HealthCheck> get(core.String project, core.String healthCheck,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5773,7 +5773,7 @@
   async.Future<Operation> insert(HealthCheck request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5875,7 +5875,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5953,7 +5953,7 @@
       HealthCheck request, core.String project, core.String healthCheck,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6029,7 +6029,7 @@
       HealthCheck request, core.String project, core.String healthCheck,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6109,7 +6109,7 @@
       core.String project, core.String httpHealthCheck,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6167,7 +6167,7 @@
       core.String project, core.String httpHealthCheck,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6233,7 +6233,7 @@
   async.Future<Operation> insert(HttpHealthCheck request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6336,7 +6336,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6415,7 +6415,7 @@
       HttpHealthCheck request, core.String project, core.String httpHealthCheck,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6491,7 +6491,7 @@
       HttpHealthCheck request, core.String project, core.String httpHealthCheck,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6571,7 +6571,7 @@
       core.String project, core.String httpsHealthCheck,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6629,7 +6629,7 @@
       core.String project, core.String httpsHealthCheck,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6695,7 +6695,7 @@
   async.Future<Operation> insert(HttpsHealthCheck request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6798,7 +6798,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6877,7 +6877,7 @@
       core.String httpsHealthCheck,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6953,7 +6953,7 @@
       core.String httpsHealthCheck,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7031,7 +7031,7 @@
   async.Future<Operation> delete(core.String project, core.String image,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7105,7 +7105,7 @@
       DeprecationStatus request, core.String project, core.String image,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7166,7 +7166,7 @@
   async.Future<Image> get(core.String project, core.String image,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7220,7 +7220,7 @@
   async.Future<Image> getFromFamily(core.String project, core.String family,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7288,7 +7288,7 @@
   async.Future<Operation> insert(Image request, core.String project,
       {core.bool forceCreate, core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7397,7 +7397,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7461,7 +7461,7 @@
       GlobalSetLabelsRequest request, core.String project, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7560,7 +7560,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7674,7 +7674,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7753,7 +7753,7 @@
       core.String project, core.String zone, core.String instanceGroupManager,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7848,7 +7848,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7917,7 +7917,7 @@
       core.String project, core.String zone, core.String instanceGroupManager,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8001,7 +8001,7 @@
       InstanceGroupManager request, core.String project, core.String zone,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8112,7 +8112,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8198,7 +8198,7 @@
           core.String pageToken,
           core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8303,7 +8303,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8397,7 +8397,7 @@
       core.String instanceGroupManager, core.int size,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8487,7 +8487,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8579,7 +8579,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8675,7 +8675,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8787,7 +8787,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8866,7 +8866,7 @@
       core.String project, core.String zone, core.String instanceGroup,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8930,7 +8930,7 @@
       core.String project, core.String zone, core.String instanceGroup,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9004,7 +9004,7 @@
       InstanceGroup request, core.String project, core.String zone,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9114,7 +9114,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9238,7 +9238,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9340,7 +9340,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9427,7 +9427,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9515,7 +9515,7 @@
       core.String project, core.String instanceTemplate,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9573,7 +9573,7 @@
       core.String project, core.String instanceTemplate,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9641,7 +9641,7 @@
   async.Future<Operation> insert(InstanceTemplate request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9744,7 +9744,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9838,7 +9838,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9954,7 +9954,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10036,7 +10036,7 @@
       core.String zone, core.String instance,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10119,7 +10119,7 @@
       core.String project, core.String zone, core.String instance,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10206,7 +10206,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10295,7 +10295,7 @@
       core.String instance, core.String deviceName,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10366,7 +10366,7 @@
       core.String project, core.String zone, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10437,7 +10437,7 @@
       core.String project, core.String zone, core.String instance,
       {core.int port, core.String start_1, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10519,7 +10519,7 @@
       Instance request, core.String project, core.String zone,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10629,7 +10629,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10751,7 +10751,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10840,7 +10840,7 @@
       core.String project, core.String zone, core.String instance,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10924,7 +10924,7 @@
       core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11017,7 +11017,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11107,7 +11107,7 @@
       core.String project, core.String zone, core.String instance,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11196,7 +11196,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11281,7 +11281,7 @@
       core.String project, core.String zone, core.String instance,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11366,7 +11366,7 @@
       core.String zone, core.String instance,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11456,7 +11456,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11540,7 +11540,7 @@
       core.String zone, core.String instance,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11629,7 +11629,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11713,7 +11713,7 @@
       Tags request, core.String project, core.String zone, core.String instance,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11796,7 +11796,7 @@
       core.String project, core.String zone, core.String instance,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11882,7 +11882,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11969,7 +11969,7 @@
       core.String project, core.String zone, core.String instance,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12060,7 +12060,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12184,7 +12184,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12263,7 +12263,7 @@
       core.String interconnectAttachment,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12329,7 +12329,7 @@
       core.String region, core.String interconnectAttachment,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12405,7 +12405,7 @@
       InterconnectAttachment request, core.String project, core.String region,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12517,7 +12517,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12593,7 +12593,7 @@
       core.String project, core.String interconnectLocation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12695,7 +12695,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12776,7 +12776,7 @@
   async.Future<Operation> delete(core.String project, core.String interconnect,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12833,7 +12833,7 @@
   async.Future<Interconnect> get(core.String project, core.String interconnect,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12899,7 +12899,7 @@
   async.Future<Operation> insert(Interconnect request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13000,7 +13000,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13078,7 +13078,7 @@
       Interconnect request, core.String project, core.String interconnect,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13143,7 +13143,7 @@
   async.Future<License> get(core.String project, core.String license,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13249,7 +13249,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13316,7 +13316,7 @@
       core.String project, core.String zone, core.String machineType,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13424,7 +13424,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13512,7 +13512,7 @@
       core.String project, core.String network,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13585,7 +13585,7 @@
   async.Future<Operation> delete(core.String project, core.String network,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13642,7 +13642,7 @@
   async.Future<Network> get(core.String project, core.String network,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13708,7 +13708,7 @@
   async.Future<Operation> insert(Network request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13809,7 +13809,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13886,7 +13886,7 @@
       Network request, core.String project, core.String network,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13961,7 +13961,7 @@
       core.String project, core.String network,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14035,7 +14035,7 @@
       core.String project, core.String network,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14108,7 +14108,7 @@
   async.Future<Operation> disableXpnHost(core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14173,7 +14173,7 @@
       ProjectsDisableXpnResourceRequest request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14237,7 +14237,7 @@
   async.Future<Operation> enableXpnHost(core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14303,7 +14303,7 @@
       ProjectsEnableXpnResourceRequest request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14353,7 +14353,7 @@
   /// this method will complete with the same error.
   async.Future<Project> get(core.String project, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14398,7 +14398,7 @@
   /// this method will complete with the same error.
   async.Future<Project> getXpnHost(core.String project, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14456,7 +14456,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14528,7 +14528,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14603,7 +14603,7 @@
   async.Future<Operation> moveDisk(DiskMoveRequest request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14671,7 +14671,7 @@
       InstanceMoveRequest request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14739,7 +14739,7 @@
       Metadata request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14809,7 +14809,7 @@
       UsageExportLocation request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14887,7 +14887,7 @@
       core.String project, core.String region, core.String autoscaler,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14952,7 +14952,7 @@
       core.String project, core.String region, core.String autoscaler,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -15027,7 +15027,7 @@
       Autoscaler request, core.String project, core.String region,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -15138,7 +15138,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -15225,7 +15225,7 @@
       Autoscaler request, core.String project, core.String region,
       {core.String autoscaler, core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -15308,7 +15308,7 @@
       Autoscaler request, core.String project, core.String region,
       {core.String autoscaler, core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -15395,7 +15395,7 @@
       core.String project, core.String region, core.String backendService,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -15460,7 +15460,7 @@
       core.String project, core.String region, core.String backendService,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -15529,7 +15529,7 @@
       core.String backendService,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -15611,7 +15611,7 @@
       BackendService request, core.String project, core.String region,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -15722,7 +15722,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -15811,7 +15811,7 @@
       core.String region, core.String backendService,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -15897,7 +15897,7 @@
       core.String region, core.String backendService,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -16015,7 +16015,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -16082,7 +16082,7 @@
       core.String project, core.String region, core.String commitment,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -16157,7 +16157,7 @@
       Commitment request, core.String project, core.String region,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -16267,7 +16267,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -16375,7 +16375,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -16457,7 +16457,7 @@
       core.String project, core.String region, core.String instanceGroupManager,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -16552,7 +16552,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -16620,7 +16620,7 @@
       core.String project, core.String region, core.String instanceGroupManager,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -16702,7 +16702,7 @@
       InstanceGroupManager request, core.String project, core.String region,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -16813,7 +16813,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -16897,7 +16897,7 @@
           core.String pageToken,
           core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -17002,7 +17002,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -17096,7 +17096,7 @@
       core.String instanceGroupManager, core.int size,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -17185,7 +17185,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -17273,7 +17273,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -17348,7 +17348,7 @@
       core.String project, core.String region, core.String instanceGroup,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -17457,7 +17457,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -17583,7 +17583,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -17680,7 +17680,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -17754,7 +17754,7 @@
       core.String project, core.String region, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -17818,7 +17818,7 @@
       core.String project, core.String region, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -17927,7 +17927,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18000,7 +18000,7 @@
   async.Future<Region> get(core.String project, core.String region,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18100,7 +18100,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18213,7 +18213,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18290,7 +18290,7 @@
       core.String project, core.String region, core.String router,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18356,7 +18356,7 @@
       core.String project, core.String region, core.String router,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18418,7 +18418,7 @@
       core.String project, core.String region, core.String router,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18494,7 +18494,7 @@
       Router request, core.String project, core.String region,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18604,7 +18604,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18691,7 +18691,7 @@
       core.String region, core.String router,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18762,7 +18762,7 @@
       core.String project, core.String region, core.String router,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18844,7 +18844,7 @@
       core.String region, core.String router,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18927,7 +18927,7 @@
   async.Future<Operation> delete(core.String project, core.String route,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -18984,7 +18984,7 @@
   async.Future<Route> get(core.String project, core.String route,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -19050,7 +19050,7 @@
   async.Future<Operation> insert(Route request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -19151,7 +19151,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -19236,7 +19236,7 @@
   async.Future<Operation> delete(core.String project, core.String snapshot,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -19293,7 +19293,7 @@
   async.Future<Snapshot> get(core.String project, core.String snapshot,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -19394,7 +19394,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -19458,7 +19458,7 @@
       GlobalSetLabelsRequest request, core.String project, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -19535,7 +19535,7 @@
       core.String project, core.String sslCertificate,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -19593,7 +19593,7 @@
       core.String project, core.String sslCertificate,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -19659,7 +19659,7 @@
   async.Future<Operation> insert(SslCertificate request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -19762,7 +19762,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -19876,7 +19876,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -19955,7 +19955,7 @@
       core.String project, core.String region, core.String subnetwork,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20039,7 +20039,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20109,7 +20109,7 @@
       core.String project, core.String region, core.String subnetwork,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20184,7 +20184,7 @@
       Subnetwork request, core.String project, core.String region,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20294,7 +20294,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20384,7 +20384,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20470,7 +20470,7 @@
       core.String project, core.String targetHttpProxy,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20528,7 +20528,7 @@
       core.String project, core.String targetHttpProxy,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20594,7 +20594,7 @@
   async.Future<Operation> insert(TargetHttpProxy request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20697,7 +20697,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20774,7 +20774,7 @@
       UrlMapReference request, core.String project, core.String targetHttpProxy,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20855,7 +20855,7 @@
       core.String project, core.String targetHttpsProxy,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20913,7 +20913,7 @@
       core.String project, core.String targetHttpsProxy,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -20979,7 +20979,7 @@
   async.Future<Operation> insert(TargetHttpsProxy request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -21082,7 +21082,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -21163,7 +21163,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -21240,7 +21240,7 @@
       core.String project, core.String targetHttpsProxy,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -21353,7 +21353,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -21432,7 +21432,7 @@
       core.String project, core.String zone, core.String targetInstance,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -21498,7 +21498,7 @@
       core.String project, core.String zone, core.String targetInstance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -21573,7 +21573,7 @@
       TargetInstance request, core.String project, core.String zone,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -21684,7 +21684,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -21779,7 +21779,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -21863,7 +21863,7 @@
       core.String project, core.String region, core.String targetPool,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -21975,7 +21975,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -22054,7 +22054,7 @@
       core.String project, core.String region, core.String targetPool,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -22120,7 +22120,7 @@
       core.String project, core.String region, core.String targetPool,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -22186,7 +22186,7 @@
       core.String project, core.String region, core.String targetPool,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -22266,7 +22266,7 @@
       TargetPool request, core.String project, core.String region,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -22377,7 +22377,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -22466,7 +22466,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -22554,7 +22554,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -22640,7 +22640,7 @@
       core.String project, core.String region, core.String targetPool,
       {core.double failoverRatio, core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -22729,7 +22729,7 @@
       core.String project, core.String targetSslProxy,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -22787,7 +22787,7 @@
       core.String project, core.String targetSslProxy,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -22853,7 +22853,7 @@
   async.Future<Operation> insert(TargetSslProxy request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -22956,7 +22956,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -23037,7 +23037,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -23117,7 +23117,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -23197,7 +23197,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -23278,7 +23278,7 @@
       core.String project, core.String targetTcpProxy,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -23336,7 +23336,7 @@
       core.String project, core.String targetTcpProxy,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -23402,7 +23402,7 @@
   async.Future<Operation> insert(TargetTcpProxy request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -23505,7 +23505,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -23586,7 +23586,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -23666,7 +23666,7 @@
       {core.String requestId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -23781,7 +23781,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -23860,7 +23860,7 @@
       core.String project, core.String region, core.String targetVpnGateway,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -23926,7 +23926,7 @@
       core.String project, core.String region, core.String targetVpnGateway,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24001,7 +24001,7 @@
       TargetVpnGateway request, core.String project, core.String region,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24113,7 +24113,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24198,7 +24198,7 @@
   async.Future<Operation> delete(core.String project, core.String urlMap,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24255,7 +24255,7 @@
   async.Future<UrlMap> get(core.String project, core.String urlMap,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24321,7 +24321,7 @@
   async.Future<Operation> insert(UrlMap request, core.String project,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24392,7 +24392,7 @@
       CacheInvalidationRule request, core.String project, core.String urlMap,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24499,7 +24499,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24577,7 +24577,7 @@
       UrlMap request, core.String project, core.String urlMap,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24653,7 +24653,7 @@
       UrlMap request, core.String project, core.String urlMap,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24717,7 +24717,7 @@
       UrlMapsValidateRequest request, core.String project, core.String urlMap,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24827,7 +24827,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24904,7 +24904,7 @@
       core.String project, core.String region, core.String vpnTunnel,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -24970,7 +24970,7 @@
       core.String project, core.String region, core.String vpnTunnel,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -25045,7 +25045,7 @@
       VpnTunnel request, core.String project, core.String region,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -25156,7 +25156,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -25230,7 +25230,7 @@
       core.String project, core.String zone, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -25294,7 +25294,7 @@
       core.String project, core.String zone, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -25403,7 +25403,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -25476,7 +25476,7 @@
   async.Future<Zone> get(core.String project, core.String zone,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -25576,7 +25576,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -25832,7 +25832,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<AcceleratorTypeAggregatedListWarningData>((value) =>
               new AcceleratorTypeAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -26020,7 +26020,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new AcceleratorTypeListWarningData.fromJson(value))
+          .map<AcceleratorTypeListWarningData>(
+              (value) => new AcceleratorTypeListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -26077,7 +26078,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new AcceleratorType.fromJson(value))
+          .map<AcceleratorType>((value) => new AcceleratorType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -26203,7 +26204,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<AcceleratorTypesScopedListWarningData>((value) =>
               new AcceleratorTypesScopedListWarningData.fromJson(value))
           .toList();
     }
@@ -26241,7 +26242,7 @@
   AcceleratorTypesScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("acceleratorTypes")) {
       acceleratorTypes = _json["acceleratorTypes"]
-          .map((value) => new AcceleratorType.fromJson(value))
+          .map<AcceleratorType>((value) => new AcceleratorType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -26591,7 +26592,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new AddressAggregatedListWarningData.fromJson(value))
+          .map<AddressAggregatedListWarningData>(
+              (value) => new AddressAggregatedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -26776,7 +26778,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new AddressListWarningData.fromJson(value))
+          .map<AddressListWarningData>(
+              (value) => new AddressListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -26832,8 +26835,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Address.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Address>((value) => new Address.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -26958,7 +26962,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new AddressesScopedListWarningData.fromJson(value))
+          .map<AddressesScopedListWarningData>(
+              (value) => new AddressesScopedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -26995,7 +27000,7 @@
   AddressesScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("addresses")) {
       addresses = _json["addresses"]
-          .map((value) => new Address.fromJson(value))
+          .map<Address>((value) => new Address.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -27454,7 +27459,8 @@
     }
     if (_json.containsKey("statusDetails")) {
       statusDetails = _json["statusDetails"]
-          .map((value) => new AutoscalerStatusDetails.fromJson(value))
+          .map<AutoscalerStatusDetails>(
+              (value) => new AutoscalerStatusDetails.fromJson(value))
           .toList();
     }
     if (_json.containsKey("target")) {
@@ -27592,7 +27598,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<AutoscalerAggregatedListWarningData>((value) =>
               new AutoscalerAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -27778,7 +27784,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new AutoscalerListWarningData.fromJson(value))
+          .map<AutoscalerListWarningData>(
+              (value) => new AutoscalerListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -27835,7 +27842,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Autoscaler.fromJson(value))
+          .map<Autoscaler>((value) => new Autoscaler.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -28008,7 +28015,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new AutoscalersScopedListWarningData.fromJson(value))
+          .map<AutoscalersScopedListWarningData>(
+              (value) => new AutoscalersScopedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -28045,7 +28053,7 @@
   AutoscalersScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("autoscalers")) {
       autoscalers = _json["autoscalers"]
-          .map((value) => new Autoscaler.fromJson(value))
+          .map<Autoscaler>((value) => new Autoscaler.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -28112,7 +28120,7 @@
     }
     if (_json.containsKey("customMetricUtilizations")) {
       customMetricUtilizations = _json["customMetricUtilizations"]
-          .map((value) =>
+          .map<AutoscalingPolicyCustomMetricUtilization>((value) =>
               new AutoscalingPolicyCustomMetricUtilization.fromJson(value))
           .toList();
     }
@@ -28590,7 +28598,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new BackendBucketListWarningData.fromJson(value))
+          .map<BackendBucketListWarningData>(
+              (value) => new BackendBucketListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -28646,7 +28655,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new BackendBucket.fromJson(value))
+          .map<BackendBucket>((value) => new BackendBucket.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -28836,7 +28845,7 @@
     }
     if (_json.containsKey("backends")) {
       backends = _json["backends"]
-          .map((value) => new Backend.fromJson(value))
+          .map<Backend>((value) => new Backend.fromJson(value))
           .toList();
     }
     if (_json.containsKey("cdnPolicy")) {
@@ -29052,7 +29061,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<BackendServiceAggregatedListWarningData>((value) =>
               new BackendServiceAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -29191,7 +29200,7 @@
   BackendServiceGroupHealth.fromJson(core.Map _json) {
     if (_json.containsKey("healthStatus")) {
       healthStatus = _json["healthStatus"]
-          .map((value) => new HealthStatus.fromJson(value))
+          .map<HealthStatus>((value) => new HealthStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -29341,7 +29350,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new BackendServiceListWarningData.fromJson(value))
+          .map<BackendServiceListWarningData>(
+              (value) => new BackendServiceListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -29398,7 +29408,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new BackendService.fromJson(value))
+          .map<BackendService>((value) => new BackendService.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -29524,7 +29534,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<BackendServicesScopedListWarningData>((value) =>
               new BackendServicesScopedListWarningData.fromJson(value))
           .toList();
     }
@@ -29562,7 +29572,7 @@
   BackendServicesScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("backendServices")) {
       backendServices = _json["backendServices"]
-          .map((value) => new BackendService.fromJson(value))
+          .map<BackendService>((value) => new BackendService.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -29786,7 +29796,8 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new ResourceCommitment.fromJson(value))
+          .map<ResourceCommitment>(
+              (value) => new ResourceCommitment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selfLink")) {
@@ -29932,7 +29943,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<CommitmentAggregatedListWarningData>((value) =>
               new CommitmentAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -30118,7 +30129,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new CommitmentListWarningData.fromJson(value))
+          .map<CommitmentListWarningData>(
+              (value) => new CommitmentListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -30175,7 +30187,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Commitment.fromJson(value))
+          .map<Commitment>((value) => new Commitment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -30301,7 +30313,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new CommitmentsScopedListWarningData.fromJson(value))
+          .map<CommitmentsScopedListWarningData>(
+              (value) => new CommitmentsScopedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -30338,7 +30351,7 @@
   CommitmentsScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("commitments")) {
       commitments = _json["commitments"]
-          .map((value) => new Commitment.fromJson(value))
+          .map<Commitment>((value) => new Commitment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -30933,7 +30946,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new DiskAggregatedListWarningData.fromJson(value))
+          .map<DiskAggregatedListWarningData>(
+              (value) => new DiskAggregatedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -31118,7 +31132,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new DiskListWarningData.fromJson(value))
+          .map<DiskListWarningData>(
+              (value) => new DiskListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -31174,7 +31189,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Disk.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Disk>((value) => new Disk.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -31448,7 +31465,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new DiskTypeAggregatedListWarningData.fromJson(value))
+          .map<DiskTypeAggregatedListWarningData>(
+              (value) => new DiskTypeAggregatedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -31632,7 +31650,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new DiskTypeListWarningData.fromJson(value))
+          .map<DiskTypeListWarningData>(
+              (value) => new DiskTypeListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -31688,8 +31707,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new DiskType.fromJson(value)).toList();
+      items = _json["items"]
+          .map<DiskType>((value) => new DiskType.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -31814,7 +31834,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new DiskTypesScopedListWarningData.fromJson(value))
+          .map<DiskTypesScopedListWarningData>(
+              (value) => new DiskTypesScopedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -31851,7 +31872,7 @@
   DiskTypesScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("diskTypes")) {
       diskTypes = _json["diskTypes"]
-          .map((value) => new DiskType.fromJson(value))
+          .map<DiskType>((value) => new DiskType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -31978,7 +31999,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new DisksScopedListWarningData.fromJson(value))
+          .map<DisksScopedListWarningData>(
+              (value) => new DisksScopedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -32014,7 +32036,9 @@
 
   DisksScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("disks")) {
-      disks = _json["disks"].map((value) => new Disk.fromJson(value)).toList();
+      disks = _json["disks"]
+          .map<Disk>((value) => new Disk.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("warning")) {
       warning = new DisksScopedListWarning.fromJson(_json["warning"]);
@@ -32236,7 +32260,7 @@
   Firewall.fromJson(core.Map _json) {
     if (_json.containsKey("allowed")) {
       allowed = _json["allowed"]
-          .map((value) => new FirewallAllowed.fromJson(value))
+          .map<FirewallAllowed>((value) => new FirewallAllowed.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creationTimestamp")) {
@@ -32244,7 +32268,7 @@
     }
     if (_json.containsKey("denied")) {
       denied = _json["denied"]
-          .map((value) => new FirewallDenied.fromJson(value))
+          .map<FirewallDenied>((value) => new FirewallDenied.fromJson(value))
           .toList();
     }
     if (_json.containsKey("description")) {
@@ -32432,7 +32456,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new FirewallListWarningData.fromJson(value))
+          .map<FirewallListWarningData>(
+              (value) => new FirewallListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -32488,8 +32513,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Firewall.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Firewall>((value) => new Firewall.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -32890,7 +32916,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<ForwardingRuleAggregatedListWarningData>((value) =>
               new ForwardingRuleAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -33077,7 +33103,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new ForwardingRuleListWarningData.fromJson(value))
+          .map<ForwardingRuleListWarningData>(
+              (value) => new ForwardingRuleListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -33133,7 +33160,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ForwardingRule.fromJson(value))
+          .map<ForwardingRule>((value) => new ForwardingRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -33259,7 +33286,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<ForwardingRulesScopedListWarningData>((value) =>
               new ForwardingRulesScopedListWarningData.fromJson(value))
           .toList();
     }
@@ -33297,7 +33324,7 @@
   ForwardingRulesScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("forwardingRules")) {
       forwardingRules = _json["forwardingRules"]
-          .map((value) => new ForwardingRule.fromJson(value))
+          .map<ForwardingRule>((value) => new ForwardingRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -33779,7 +33806,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new HealthCheckListWarningData.fromJson(value))
+          .map<HealthCheckListWarningData>(
+              (value) => new HealthCheckListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -33835,7 +33863,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new HealthCheck.fromJson(value))
+          .map<HealthCheck>((value) => new HealthCheck.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -34234,7 +34262,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new HttpHealthCheckListWarningData.fromJson(value))
+          .map<HttpHealthCheckListWarningData>(
+              (value) => new HttpHealthCheckListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -34290,7 +34319,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new HttpHealthCheck.fromJson(value))
+          .map<HttpHealthCheck>((value) => new HttpHealthCheck.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -34564,7 +34593,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new HttpsHealthCheckListWarningData.fromJson(value))
+          .map<HttpsHealthCheckListWarningData>(
+              (value) => new HttpsHealthCheckListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -34620,7 +34650,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new HttpsHealthCheck.fromJson(value))
+          .map<HttpsHealthCheck>(
+              (value) => new HttpsHealthCheck.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -34874,7 +34905,7 @@
     }
     if (_json.containsKey("guestOsFeatures")) {
       guestOsFeatures = _json["guestOsFeatures"]
-          .map((value) => new GuestOsFeature.fromJson(value))
+          .map<GuestOsFeature>((value) => new GuestOsFeature.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -35096,7 +35127,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new ImageListWarningData.fromJson(value))
+          .map<ImageListWarningData>(
+              (value) => new ImageListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -35151,7 +35183,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Image.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Image>((value) => new Image.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -35360,12 +35394,13 @@
     }
     if (_json.containsKey("disks")) {
       disks = _json["disks"]
-          .map((value) => new AttachedDisk.fromJson(value))
+          .map<AttachedDisk>((value) => new AttachedDisk.fromJson(value))
           .toList();
     }
     if (_json.containsKey("guestAccelerators")) {
       guestAccelerators = _json["guestAccelerators"]
-          .map((value) => new AcceleratorConfig.fromJson(value))
+          .map<AcceleratorConfig>(
+              (value) => new AcceleratorConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -35394,7 +35429,8 @@
     }
     if (_json.containsKey("networkInterfaces")) {
       networkInterfaces = _json["networkInterfaces"]
-          .map((value) => new NetworkInterface.fromJson(value))
+          .map<NetworkInterface>(
+              (value) => new NetworkInterface.fromJson(value))
           .toList();
     }
     if (_json.containsKey("scheduling")) {
@@ -35405,7 +35441,7 @@
     }
     if (_json.containsKey("serviceAccounts")) {
       serviceAccounts = _json["serviceAccounts"]
-          .map((value) => new ServiceAccount.fromJson(value))
+          .map<ServiceAccount>((value) => new ServiceAccount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("startRestricted")) {
@@ -35590,7 +35626,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new InstanceAggregatedListWarningData.fromJson(value))
+          .map<InstanceAggregatedListWarningData>(
+              (value) => new InstanceAggregatedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -35784,7 +35821,7 @@
     }
     if (_json.containsKey("namedPorts")) {
       namedPorts = _json["namedPorts"]
-          .map((value) => new NamedPort.fromJson(value))
+          .map<NamedPort>((value) => new NamedPort.fromJson(value))
           .toList();
     }
     if (_json.containsKey("network")) {
@@ -35937,7 +35974,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<InstanceGroupAggregatedListWarningData>((value) =>
               new InstanceGroupAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -36125,7 +36162,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new InstanceGroupListWarningData.fromJson(value))
+          .map<InstanceGroupListWarningData>(
+              (value) => new InstanceGroupListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -36182,7 +36220,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new InstanceGroup.fromJson(value))
+          .map<InstanceGroup>((value) => new InstanceGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -36341,7 +36379,7 @@
     }
     if (_json.containsKey("namedPorts")) {
       namedPorts = _json["namedPorts"]
-          .map((value) => new NamedPort.fromJson(value))
+          .map<NamedPort>((value) => new NamedPort.fromJson(value))
           .toList();
     }
     if (_json.containsKey("region")) {
@@ -36606,7 +36644,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<InstanceGroupManagerAggregatedListWarningData>((value) =>
               new InstanceGroupManagerAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -36794,7 +36832,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<InstanceGroupManagerListWarningData>((value) =>
               new InstanceGroupManagerListWarningData.fromJson(value))
           .toList();
     }
@@ -36852,7 +36890,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new InstanceGroupManager.fromJson(value))
+          .map<InstanceGroupManager>(
+              (value) => new InstanceGroupManager.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -36949,7 +36988,7 @@
   InstanceGroupManagersListManagedInstancesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("managedInstances")) {
       managedInstances = _json["managedInstances"]
-          .map((value) => new ManagedInstance.fromJson(value))
+          .map<ManagedInstance>((value) => new ManagedInstance.fromJson(value))
           .toList();
     }
   }
@@ -37072,7 +37111,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<InstanceGroupManagersScopedListWarningData>((value) =>
               new InstanceGroupManagersScopedListWarningData.fromJson(value))
           .toList();
     }
@@ -37111,7 +37150,8 @@
   InstanceGroupManagersScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("instanceGroupManagers")) {
       instanceGroupManagers = _json["instanceGroupManagers"]
-          .map((value) => new InstanceGroupManager.fromJson(value))
+          .map<InstanceGroupManager>(
+              (value) => new InstanceGroupManager.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -37214,7 +37254,8 @@
   InstanceGroupsAddInstancesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("instances")) {
       instances = _json["instances"]
-          .map((value) => new InstanceReference.fromJson(value))
+          .map<InstanceReference>(
+              (value) => new InstanceReference.fromJson(value))
           .toList();
     }
   }
@@ -37312,7 +37353,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<InstanceGroupsListInstancesWarningData>((value) =>
               new InstanceGroupsListInstancesWarningData.fromJson(value))
           .toList();
     }
@@ -37370,7 +37411,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new InstanceWithNamedPorts.fromJson(value))
+          .map<InstanceWithNamedPorts>(
+              (value) => new InstanceWithNamedPorts.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -37449,7 +37491,8 @@
   InstanceGroupsRemoveInstancesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("instances")) {
       instances = _json["instances"]
-          .map((value) => new InstanceReference.fromJson(value))
+          .map<InstanceReference>(
+              (value) => new InstanceReference.fromJson(value))
           .toList();
     }
   }
@@ -37548,7 +37591,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<InstanceGroupsScopedListWarningData>((value) =>
               new InstanceGroupsScopedListWarningData.fromJson(value))
           .toList();
     }
@@ -37587,7 +37630,7 @@
   InstanceGroupsScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("instanceGroups")) {
       instanceGroups = _json["instanceGroups"]
-          .map((value) => new InstanceGroup.fromJson(value))
+          .map<InstanceGroup>((value) => new InstanceGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -37637,7 +37680,7 @@
     }
     if (_json.containsKey("namedPorts")) {
       namedPorts = _json["namedPorts"]
-          .map((value) => new NamedPort.fromJson(value))
+          .map<NamedPort>((value) => new NamedPort.fromJson(value))
           .toList();
     }
   }
@@ -37739,7 +37782,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new InstanceListWarningData.fromJson(value))
+          .map<InstanceListWarningData>(
+              (value) => new InstanceListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -37795,8 +37839,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Instance.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Instance>((value) => new Instance.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -37920,7 +37965,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new InstanceListReferrersWarningData.fromJson(value))
+          .map<InstanceListReferrersWarningData>(
+              (value) => new InstanceListReferrersWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -37976,8 +38022,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Reference.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Reference>((value) => new Reference.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -38127,12 +38174,13 @@
     }
     if (_json.containsKey("disks")) {
       disks = _json["disks"]
-          .map((value) => new AttachedDisk.fromJson(value))
+          .map<AttachedDisk>((value) => new AttachedDisk.fromJson(value))
           .toList();
     }
     if (_json.containsKey("guestAccelerators")) {
       guestAccelerators = _json["guestAccelerators"]
-          .map((value) => new AcceleratorConfig.fromJson(value))
+          .map<AcceleratorConfig>(
+              (value) => new AcceleratorConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("labels")) {
@@ -38149,7 +38197,8 @@
     }
     if (_json.containsKey("networkInterfaces")) {
       networkInterfaces = _json["networkInterfaces"]
-          .map((value) => new NetworkInterface.fromJson(value))
+          .map<NetworkInterface>(
+              (value) => new NetworkInterface.fromJson(value))
           .toList();
     }
     if (_json.containsKey("scheduling")) {
@@ -38157,7 +38206,7 @@
     }
     if (_json.containsKey("serviceAccounts")) {
       serviceAccounts = _json["serviceAccounts"]
-          .map((value) => new ServiceAccount.fromJson(value))
+          .map<ServiceAccount>((value) => new ServiceAccount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tags")) {
@@ -38405,7 +38454,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new InstanceTemplateListWarningData.fromJson(value))
+          .map<InstanceTemplateListWarningData>(
+              (value) => new InstanceTemplateListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -38462,7 +38512,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new InstanceTemplate.fromJson(value))
+          .map<InstanceTemplate>(
+              (value) => new InstanceTemplate.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -38531,7 +38582,7 @@
     }
     if (_json.containsKey("namedPorts")) {
       namedPorts = _json["namedPorts"]
-          .map((value) => new NamedPort.fromJson(value))
+          .map<NamedPort>((value) => new NamedPort.fromJson(value))
           .toList();
     }
     if (_json.containsKey("status")) {
@@ -38640,7 +38691,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new InstancesScopedListWarningData.fromJson(value))
+          .map<InstancesScopedListWarningData>(
+              (value) => new InstancesScopedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -38677,7 +38729,7 @@
   InstancesScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("instances")) {
       instances = _json["instances"]
-          .map((value) => new Instance.fromJson(value))
+          .map<Instance>((value) => new Instance.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -38747,7 +38799,8 @@
   InstancesSetMachineResourcesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("guestAccelerators")) {
       guestAccelerators = _json["guestAccelerators"]
-          .map((value) => new AcceleratorConfig.fromJson(value))
+          .map<AcceleratorConfig>(
+              (value) => new AcceleratorConfig.fromJson(value))
           .toList();
     }
   }
@@ -38856,7 +38909,7 @@
   InstancesStartWithEncryptionKeyRequest.fromJson(core.Map _json) {
     if (_json.containsKey("disks")) {
       disks = _json["disks"]
-          .map(
+          .map<CustomerEncryptionKeyProtectedDisk>(
               (value) => new CustomerEncryptionKeyProtectedDisk.fromJson(value))
           .toList();
     }
@@ -38984,7 +39037,8 @@
     }
     if (_json.containsKey("circuitInfos")) {
       circuitInfos = _json["circuitInfos"]
-          .map((value) => new InterconnectCircuitInfo.fromJson(value))
+          .map<InterconnectCircuitInfo>(
+              (value) => new InterconnectCircuitInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creationTimestamp")) {
@@ -38998,7 +39052,8 @@
     }
     if (_json.containsKey("expectedOutages")) {
       expectedOutages = _json["expectedOutages"]
-          .map((value) => new InterconnectOutageNotification.fromJson(value))
+          .map<InterconnectOutageNotification>(
+              (value) => new InterconnectOutageNotification.fromJson(value))
           .toList();
     }
     if (_json.containsKey("googleIpAddress")) {
@@ -39370,7 +39425,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<InterconnectAttachmentAggregatedListWarningData>((value) =>
               new InterconnectAttachmentAggregatedListWarningData.fromJson(
                   value))
           .toList();
@@ -39559,7 +39614,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<InterconnectAttachmentListWarningData>((value) =>
               new InterconnectAttachmentListWarningData.fromJson(value))
           .toList();
     }
@@ -39618,7 +39673,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new InterconnectAttachment.fromJson(value))
+          .map<InterconnectAttachment>(
+              (value) => new InterconnectAttachment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -39770,7 +39826,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<InterconnectAttachmentsScopedListWarningData>((value) =>
               new InterconnectAttachmentsScopedListWarningData.fromJson(value))
           .toList();
     }
@@ -39808,7 +39864,8 @@
   InterconnectAttachmentsScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("interconnectAttachments")) {
       interconnectAttachments = _json["interconnectAttachments"]
-          .map((value) => new InterconnectAttachment.fromJson(value))
+          .map<InterconnectAttachment>(
+              (value) => new InterconnectAttachment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -39958,7 +40015,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new InterconnectListWarningData.fromJson(value))
+          .map<InterconnectListWarningData>(
+              (value) => new InterconnectListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -40015,7 +40073,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Interconnect.fromJson(value))
+          .map<Interconnect>((value) => new Interconnect.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -40166,7 +40224,8 @@
     }
     if (_json.containsKey("regionInfos")) {
       regionInfos = _json["regionInfos"]
-          .map((value) => new InterconnectLocationRegionInfo.fromJson(value))
+          .map<InterconnectLocationRegionInfo>(
+              (value) => new InterconnectLocationRegionInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selfLink")) {
@@ -40307,7 +40366,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<InterconnectLocationListWarningData>((value) =>
               new InterconnectLocationListWarningData.fromJson(value))
           .toList();
     }
@@ -40365,7 +40424,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new InterconnectLocation.fromJson(value))
+          .map<InterconnectLocation>(
+              (value) => new InterconnectLocation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -40729,7 +40789,8 @@
     }
     if (_json.containsKey("scratchDisks")) {
       scratchDisks = _json["scratchDisks"]
-          .map((value) => new MachineTypeScratchDisks.fromJson(value))
+          .map<MachineTypeScratchDisks>(
+              (value) => new MachineTypeScratchDisks.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selfLink")) {
@@ -40876,7 +40937,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<MachineTypeAggregatedListWarningData>((value) =>
               new MachineTypeAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -41062,7 +41123,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new MachineTypeListWarningData.fromJson(value))
+          .map<MachineTypeListWarningData>(
+              (value) => new MachineTypeListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -41119,7 +41181,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new MachineType.fromJson(value))
+          .map<MachineType>((value) => new MachineType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -41245,7 +41307,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new MachineTypesScopedListWarningData.fromJson(value))
+          .map<MachineTypesScopedListWarningData>(
+              (value) => new MachineTypesScopedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -41282,7 +41345,7 @@
   MachineTypesScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("machineTypes")) {
       machineTypes = _json["machineTypes"]
-          .map((value) => new MachineType.fromJson(value))
+          .map<MachineType>((value) => new MachineType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -41460,7 +41523,7 @@
   ManagedInstanceLastAttemptErrors.fromJson(core.Map _json) {
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) =>
+          .map<ManagedInstanceLastAttemptErrorsErrors>((value) =>
               new ManagedInstanceLastAttemptErrorsErrors.fromJson(value))
           .toList();
     }
@@ -41568,7 +41631,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new MetadataItems.fromJson(value))
+          .map<MetadataItems>((value) => new MetadataItems.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -41713,7 +41776,7 @@
     }
     if (_json.containsKey("peerings")) {
       peerings = _json["peerings"]
-          .map((value) => new NetworkPeering.fromJson(value))
+          .map<NetworkPeering>((value) => new NetworkPeering.fromJson(value))
           .toList();
     }
     if (_json.containsKey("routingConfig")) {
@@ -41827,12 +41890,12 @@
   NetworkInterface.fromJson(core.Map _json) {
     if (_json.containsKey("accessConfigs")) {
       accessConfigs = _json["accessConfigs"]
-          .map((value) => new AccessConfig.fromJson(value))
+          .map<AccessConfig>((value) => new AccessConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("aliasIpRanges")) {
       aliasIpRanges = _json["aliasIpRanges"]
-          .map((value) => new AliasIpRange.fromJson(value))
+          .map<AliasIpRange>((value) => new AliasIpRange.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -41965,7 +42028,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new NetworkListWarningData.fromJson(value))
+          .map<NetworkListWarningData>(
+              (value) => new NetworkListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -42021,8 +42085,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Network.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Network>((value) => new Network.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -42289,7 +42354,8 @@
   OperationError.fromJson(core.Map _json) {
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new OperationErrorErrors.fromJson(value))
+          .map<OperationErrorErrors>(
+              (value) => new OperationErrorErrors.fromJson(value))
           .toList();
     }
   }
@@ -42386,7 +42452,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new OperationWarningsData.fromJson(value))
+          .map<OperationWarningsData>(
+              (value) => new OperationWarningsData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -42585,7 +42652,8 @@
     }
     if (_json.containsKey("warnings")) {
       warnings = _json["warnings"]
-          .map((value) => new OperationWarnings.fromJson(value))
+          .map<OperationWarnings>(
+              (value) => new OperationWarnings.fromJson(value))
           .toList();
     }
     if (_json.containsKey("zone")) {
@@ -42752,7 +42820,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map(
+          .map<OperationAggregatedListWarningData>(
               (value) => new OperationAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -42939,7 +43007,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new OperationListWarningData.fromJson(value))
+          .map<OperationListWarningData>(
+              (value) => new OperationListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -42996,8 +43065,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Operation.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Operation>((value) => new Operation.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -43122,7 +43192,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new OperationsScopedListWarningData.fromJson(value))
+          .map<OperationsScopedListWarningData>(
+              (value) => new OperationsScopedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -43159,7 +43230,7 @@
   OperationsScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -43219,7 +43290,7 @@
     }
     if (_json.containsKey("pathRules")) {
       pathRules = _json["pathRules"]
-          .map((value) => new PathRule.fromJson(value))
+          .map<PathRule>((value) => new PathRule.fromJson(value))
           .toList();
     }
   }
@@ -43357,8 +43428,9 @@
       name = _json["name"];
     }
     if (_json.containsKey("quotas")) {
-      quotas =
-          _json["quotas"].map((value) => new Quota.fromJson(value)).toList();
+      quotas = _json["quotas"]
+          .map<Quota>((value) => new Quota.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("selfLink")) {
       selfLink = _json["selfLink"];
@@ -43486,7 +43558,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new XpnResourceId.fromJson(value))
+          .map<XpnResourceId>((value) => new XpnResourceId.fromJson(value))
           .toList();
     }
   }
@@ -43732,8 +43804,9 @@
       name = _json["name"];
     }
     if (_json.containsKey("quotas")) {
-      quotas =
-          _json["quotas"].map((value) => new Quota.fromJson(value)).toList();
+      quotas = _json["quotas"]
+          .map<Quota>((value) => new Quota.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("selfLink")) {
       selfLink = _json["selfLink"];
@@ -43866,7 +43939,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new RegionAutoscalerListWarningData.fromJson(value))
+          .map<RegionAutoscalerListWarningData>(
+              (value) => new RegionAutoscalerListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -43922,7 +43996,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Autoscaler.fromJson(value))
+          .map<Autoscaler>((value) => new Autoscaler.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -44047,7 +44121,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map(
+          .map<RegionInstanceGroupListWarningData>(
               (value) => new RegionInstanceGroupListWarningData.fromJson(value))
           .toList();
     }
@@ -44104,7 +44178,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new InstanceGroup.fromJson(value))
+          .map<InstanceGroup>((value) => new InstanceGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -44229,7 +44303,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<RegionInstanceGroupManagerListWarningData>((value) =>
               new RegionInstanceGroupManagerListWarningData.fromJson(value))
           .toList();
     }
@@ -44288,7 +44362,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new InstanceGroupManager.fromJson(value))
+          .map<InstanceGroupManager>(
+              (value) => new InstanceGroupManager.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -44386,7 +44461,7 @@
   RegionInstanceGroupManagersListInstancesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("managedInstances")) {
       managedInstances = _json["managedInstances"]
-          .map((value) => new ManagedInstance.fromJson(value))
+          .map<ManagedInstance>((value) => new ManagedInstance.fromJson(value))
           .toList();
     }
   }
@@ -44574,7 +44649,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<RegionInstanceGroupsListInstancesWarningData>((value) =>
               new RegionInstanceGroupsListInstancesWarningData.fromJson(value))
           .toList();
     }
@@ -44630,7 +44705,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new InstanceWithNamedPorts.fromJson(value))
+          .map<InstanceWithNamedPorts>(
+              (value) => new InstanceWithNamedPorts.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -44738,7 +44814,7 @@
     }
     if (_json.containsKey("namedPorts")) {
       namedPorts = _json["namedPorts"]
-          .map((value) => new NamedPort.fromJson(value))
+          .map<NamedPort>((value) => new NamedPort.fromJson(value))
           .toList();
     }
   }
@@ -44840,7 +44916,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new RegionListWarningData.fromJson(value))
+          .map<RegionListWarningData>(
+              (value) => new RegionListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -44896,8 +44973,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Region.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Region>((value) => new Region.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -45084,7 +45162,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new RouteWarningsData.fromJson(value))
+          .map<RouteWarningsData>(
+              (value) => new RouteWarningsData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -45250,7 +45329,7 @@
     }
     if (_json.containsKey("warnings")) {
       warnings = _json["warnings"]
-          .map((value) => new RouteWarnings.fromJson(value))
+          .map<RouteWarnings>((value) => new RouteWarnings.fromJson(value))
           .toList();
     }
   }
@@ -45396,7 +45475,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new RouteListWarningData.fromJson(value))
+          .map<RouteListWarningData>(
+              (value) => new RouteListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -45451,7 +45531,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Route.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Route>((value) => new Route.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -45549,7 +45631,7 @@
     }
     if (_json.containsKey("bgpPeers")) {
       bgpPeers = _json["bgpPeers"]
-          .map((value) => new RouterBgpPeer.fromJson(value))
+          .map<RouterBgpPeer>((value) => new RouterBgpPeer.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creationTimestamp")) {
@@ -45563,7 +45645,7 @@
     }
     if (_json.containsKey("interfaces")) {
       interfaces = _json["interfaces"]
-          .map((value) => new RouterInterface.fromJson(value))
+          .map<RouterInterface>((value) => new RouterInterface.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -45707,7 +45789,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new RouterAggregatedListWarningData.fromJson(value))
+          .map<RouterAggregatedListWarningData>(
+              (value) => new RouterAggregatedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -46046,7 +46129,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new RouterListWarningData.fromJson(value))
+          .map<RouterListWarningData>(
+              (value) => new RouterListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -46101,8 +46185,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Router.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Router>((value) => new Router.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -46159,17 +46244,18 @@
   RouterStatus.fromJson(core.Map _json) {
     if (_json.containsKey("bestRoutes")) {
       bestRoutes = _json["bestRoutes"]
-          .map((value) => new Route.fromJson(value))
+          .map<Route>((value) => new Route.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bestRoutesForRouter")) {
       bestRoutesForRouter = _json["bestRoutesForRouter"]
-          .map((value) => new Route.fromJson(value))
+          .map<Route>((value) => new Route.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bgpPeerStatus")) {
       bgpPeerStatus = _json["bgpPeerStatus"]
-          .map((value) => new RouterStatusBgpPeerStatus.fromJson(value))
+          .map<RouterStatusBgpPeerStatus>(
+              (value) => new RouterStatusBgpPeerStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("network")) {
@@ -46240,7 +46326,7 @@
   RouterStatusBgpPeerStatus.fromJson(core.Map _json) {
     if (_json.containsKey("advertisedRoutes")) {
       advertisedRoutes = _json["advertisedRoutes"]
-          .map((value) => new Route.fromJson(value))
+          .map<Route>((value) => new Route.fromJson(value))
           .toList();
     }
     if (_json.containsKey("ipAddress")) {
@@ -46445,7 +46531,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new RoutersScopedListWarningData.fromJson(value))
+          .map<RoutersScopedListWarningData>(
+              (value) => new RoutersScopedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -46481,8 +46568,9 @@
 
   RoutersScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("routers")) {
-      routers =
-          _json["routers"].map((value) => new Router.fromJson(value)).toList();
+      routers = _json["routers"]
+          .map<Router>((value) => new Router.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("warning")) {
       warning = new RoutersScopedListWarning.fromJson(_json["warning"]);
@@ -47032,7 +47120,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new SnapshotListWarningData.fromJson(value))
+          .map<SnapshotListWarningData>(
+              (value) => new SnapshotListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -47087,8 +47176,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Snapshot.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Snapshot>((value) => new Snapshot.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -47313,7 +47403,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new SslCertificateListWarningData.fromJson(value))
+          .map<SslCertificateListWarningData>(
+              (value) => new SslCertificateListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -47369,7 +47460,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new SslCertificate.fromJson(value))
+          .map<SslCertificate>((value) => new SslCertificate.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -47508,7 +47599,8 @@
     }
     if (_json.containsKey("secondaryIpRanges")) {
       secondaryIpRanges = _json["secondaryIpRanges"]
-          .map((value) => new SubnetworkSecondaryRange.fromJson(value))
+          .map<SubnetworkSecondaryRange>(
+              (value) => new SubnetworkSecondaryRange.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selfLink")) {
@@ -47643,7 +47735,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<SubnetworkAggregatedListWarningData>((value) =>
               new SubnetworkAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -47829,7 +47921,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new SubnetworkListWarningData.fromJson(value))
+          .map<SubnetworkListWarningData>(
+              (value) => new SubnetworkListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -47886,7 +47979,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Subnetwork.fromJson(value))
+          .map<Subnetwork>((value) => new Subnetwork.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -48073,7 +48166,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new SubnetworksScopedListWarningData.fromJson(value))
+          .map<SubnetworksScopedListWarningData>(
+              (value) => new SubnetworksScopedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -48109,7 +48203,7 @@
   SubnetworksScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("subnetworks")) {
       subnetworks = _json["subnetworks"]
-          .map((value) => new Subnetwork.fromJson(value))
+          .map<Subnetwork>((value) => new Subnetwork.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -48440,7 +48534,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new TargetHttpProxyListWarningData.fromJson(value))
+          .map<TargetHttpProxyListWarningData>(
+              (value) => new TargetHttpProxyListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -48497,7 +48592,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new TargetHttpProxy.fromJson(value))
+          .map<TargetHttpProxy>((value) => new TargetHttpProxy.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -48751,7 +48846,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new TargetHttpsProxyListWarningData.fromJson(value))
+          .map<TargetHttpsProxyListWarningData>(
+              (value) => new TargetHttpsProxyListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -48808,7 +48904,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new TargetHttpsProxy.fromJson(value))
+          .map<TargetHttpsProxy>(
+              (value) => new TargetHttpsProxy.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -49051,7 +49148,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<TargetInstanceAggregatedListWarningData>((value) =>
               new TargetInstanceAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -49237,7 +49334,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new TargetInstanceListWarningData.fromJson(value))
+          .map<TargetInstanceListWarningData>(
+              (value) => new TargetInstanceListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -49293,7 +49391,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new TargetInstance.fromJson(value))
+          .map<TargetInstance>((value) => new TargetInstance.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -49419,7 +49517,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<TargetInstancesScopedListWarningData>((value) =>
               new TargetInstancesScopedListWarningData.fromJson(value))
           .toList();
     }
@@ -49457,7 +49555,7 @@
   TargetInstancesScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("targetInstances")) {
       targetInstances = _json["targetInstances"]
-          .map((value) => new TargetInstance.fromJson(value))
+          .map<TargetInstance>((value) => new TargetInstance.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -49737,7 +49835,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<TargetPoolAggregatedListWarningData>((value) =>
               new TargetPoolAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -49852,7 +49950,7 @@
   TargetPoolInstanceHealth.fromJson(core.Map _json) {
     if (_json.containsKey("healthStatus")) {
       healthStatus = _json["healthStatus"]
-          .map((value) => new HealthStatus.fromJson(value))
+          .map<HealthStatus>((value) => new HealthStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -49957,7 +50055,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new TargetPoolListWarningData.fromJson(value))
+          .map<TargetPoolListWarningData>(
+              (value) => new TargetPoolListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -50014,7 +50113,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new TargetPool.fromJson(value))
+          .map<TargetPool>((value) => new TargetPool.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -50065,7 +50164,8 @@
   TargetPoolsAddHealthCheckRequest.fromJson(core.Map _json) {
     if (_json.containsKey("healthChecks")) {
       healthChecks = _json["healthChecks"]
-          .map((value) => new HealthCheckReference.fromJson(value))
+          .map<HealthCheckReference>(
+              (value) => new HealthCheckReference.fromJson(value))
           .toList();
     }
   }
@@ -50095,7 +50195,8 @@
   TargetPoolsAddInstanceRequest.fromJson(core.Map _json) {
     if (_json.containsKey("instances")) {
       instances = _json["instances"]
-          .map((value) => new InstanceReference.fromJson(value))
+          .map<InstanceReference>(
+              (value) => new InstanceReference.fromJson(value))
           .toList();
     }
   }
@@ -50124,7 +50225,8 @@
   TargetPoolsRemoveHealthCheckRequest.fromJson(core.Map _json) {
     if (_json.containsKey("healthChecks")) {
       healthChecks = _json["healthChecks"]
-          .map((value) => new HealthCheckReference.fromJson(value))
+          .map<HealthCheckReference>(
+              (value) => new HealthCheckReference.fromJson(value))
           .toList();
     }
   }
@@ -50149,7 +50251,8 @@
   TargetPoolsRemoveInstanceRequest.fromJson(core.Map _json) {
     if (_json.containsKey("instances")) {
       instances = _json["instances"]
-          .map((value) => new InstanceReference.fromJson(value))
+          .map<InstanceReference>(
+              (value) => new InstanceReference.fromJson(value))
           .toList();
     }
   }
@@ -50248,7 +50351,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new TargetPoolsScopedListWarningData.fromJson(value))
+          .map<TargetPoolsScopedListWarningData>(
+              (value) => new TargetPoolsScopedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -50285,7 +50389,7 @@
   TargetPoolsScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("targetPools")) {
       targetPools = _json["targetPools"]
-          .map((value) => new TargetPool.fromJson(value))
+          .map<TargetPool>((value) => new TargetPool.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -50593,7 +50697,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new TargetSslProxyListWarningData.fromJson(value))
+          .map<TargetSslProxyListWarningData>(
+              (value) => new TargetSslProxyListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -50649,7 +50754,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new TargetSslProxy.fromJson(value))
+          .map<TargetSslProxy>((value) => new TargetSslProxy.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -50923,7 +51028,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new TargetTcpProxyListWarningData.fromJson(value))
+          .map<TargetTcpProxyListWarningData>(
+              (value) => new TargetTcpProxyListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -50979,7 +51085,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new TargetTcpProxy.fromJson(value))
+          .map<TargetTcpProxy>((value) => new TargetTcpProxy.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -51239,7 +51345,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<TargetVpnGatewayAggregatedListWarningData>((value) =>
               new TargetVpnGatewayAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -51426,7 +51532,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new TargetVpnGatewayListWarningData.fromJson(value))
+          .map<TargetVpnGatewayListWarningData>(
+              (value) => new TargetVpnGatewayListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -51483,7 +51590,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new TargetVpnGateway.fromJson(value))
+          .map<TargetVpnGateway>(
+              (value) => new TargetVpnGateway.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -51609,7 +51717,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) =>
+          .map<TargetVpnGatewaysScopedListWarningData>((value) =>
               new TargetVpnGatewaysScopedListWarningData.fromJson(value))
           .toList();
     }
@@ -51647,7 +51755,8 @@
   TargetVpnGatewaysScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("targetVpnGateways")) {
       targetVpnGateways = _json["targetVpnGateways"]
-          .map((value) => new TargetVpnGateway.fromJson(value))
+          .map<TargetVpnGateway>(
+              (value) => new TargetVpnGateway.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -51787,7 +51896,7 @@
     }
     if (_json.containsKey("hostRules")) {
       hostRules = _json["hostRules"]
-          .map((value) => new HostRule.fromJson(value))
+          .map<HostRule>((value) => new HostRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -51801,7 +51910,7 @@
     }
     if (_json.containsKey("pathMatchers")) {
       pathMatchers = _json["pathMatchers"]
-          .map((value) => new PathMatcher.fromJson(value))
+          .map<PathMatcher>((value) => new PathMatcher.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selfLink")) {
@@ -51809,7 +51918,7 @@
     }
     if (_json.containsKey("tests")) {
       tests = _json["tests"]
-          .map((value) => new UrlMapTest.fromJson(value))
+          .map<UrlMapTest>((value) => new UrlMapTest.fromJson(value))
           .toList();
     }
   }
@@ -51938,7 +52047,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new UrlMapListWarningData.fromJson(value))
+          .map<UrlMapListWarningData>(
+              (value) => new UrlMapListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -51993,8 +52103,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new UrlMap.fromJson(value)).toList();
+      items = _json["items"]
+          .map<UrlMap>((value) => new UrlMap.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -52130,7 +52241,7 @@
     }
     if (_json.containsKey("testFailures")) {
       testFailures = _json["testFailures"]
-          .map((value) => new TestFailure.fromJson(value))
+          .map<TestFailure>((value) => new TestFailure.fromJson(value))
           .toList();
     }
     if (_json.containsKey("testPassed")) {
@@ -52524,7 +52635,7 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map(
+          .map<VpnTunnelAggregatedListWarningData>(
               (value) => new VpnTunnelAggregatedListWarningData.fromJson(value))
           .toList();
     }
@@ -52709,7 +52820,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new VpnTunnelListWarningData.fromJson(value))
+          .map<VpnTunnelListWarningData>(
+              (value) => new VpnTunnelListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -52764,8 +52876,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new VpnTunnel.fromJson(value)).toList();
+      items = _json["items"]
+          .map<VpnTunnel>((value) => new VpnTunnel.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -52890,7 +53003,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new VpnTunnelsScopedListWarningData.fromJson(value))
+          .map<VpnTunnelsScopedListWarningData>(
+              (value) => new VpnTunnelsScopedListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -52927,7 +53041,7 @@
   VpnTunnelsScopedList.fromJson(core.Map _json) {
     if (_json.containsKey("vpnTunnels")) {
       vpnTunnels = _json["vpnTunnels"]
-          .map((value) => new VpnTunnel.fromJson(value))
+          .map<VpnTunnel>((value) => new VpnTunnel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warning")) {
@@ -53032,7 +53146,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new XpnHostListWarningData.fromJson(value))
+          .map<XpnHostListWarningData>(
+              (value) => new XpnHostListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -53087,8 +53202,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Project.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Project>((value) => new Project.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -53358,7 +53474,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new ZoneListWarningData.fromJson(value))
+          .map<ZoneListWarningData>(
+              (value) => new ZoneListWarningData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -53413,7 +53530,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Zone.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Zone>((value) => new Zone.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
diff --git a/generated/googleapis/lib/container/v1.dart b/generated/googleapis/lib/container/v1.dart
index 31cc62b..48ecb6b 100644
--- a/generated/googleapis/lib/container/v1.dart
+++ b/generated/googleapis/lib/container/v1.dart
@@ -76,7 +76,7 @@
       core.String projectId, core.String zone,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -146,7 +146,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -214,7 +214,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -292,7 +292,7 @@
       CreateClusterRequest request, core.String projectId, core.String zone,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -361,7 +361,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -423,7 +423,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -487,7 +487,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -552,7 +552,7 @@
       core.String projectId, core.String zone,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -612,7 +612,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -680,7 +680,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -748,7 +748,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -816,7 +816,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -884,7 +884,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -955,7 +955,7 @@
       core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1025,7 +1025,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1093,7 +1093,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1161,7 +1161,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1229,7 +1229,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1309,7 +1309,7 @@
       core.String nodePoolId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1382,7 +1382,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1450,7 +1450,7 @@
       core.String clusterId, core.String nodePoolId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1519,7 +1519,7 @@
       core.String clusterId, core.String nodePoolId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1586,7 +1586,7 @@
       core.String projectId, core.String zone, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1658,7 +1658,7 @@
       core.String nodePoolId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1737,7 +1737,7 @@
       core.String nodePoolId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1816,7 +1816,7 @@
       core.String nodePoolId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1895,7 +1895,7 @@
       core.String nodePoolId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1974,7 +1974,7 @@
       core.String projectId, core.String zone, core.String operationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2040,7 +2040,7 @@
       core.String projectId, core.String zone, core.String operationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2100,7 +2100,7 @@
       core.String projectId, core.String zone,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2612,7 +2612,7 @@
     }
     if (_json.containsKey("nodePools")) {
       nodePools = _json["nodePools"]
-          .map((value) => new NodePool.fromJson(value))
+          .map<NodePool>((value) => new NodePool.fromJson(value))
           .toList();
     }
     if (_json.containsKey("resourceLabels")) {
@@ -3284,7 +3284,7 @@
   ListClustersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("clusters")) {
       clusters = _json["clusters"]
-          .map((value) => new Cluster.fromJson(value))
+          .map<Cluster>((value) => new Cluster.fromJson(value))
           .toList();
     }
     if (_json.containsKey("missingZones")) {
@@ -3315,7 +3315,7 @@
   ListNodePoolsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("nodePools")) {
       nodePools = _json["nodePools"]
-          .map((value) => new NodePool.fromJson(value))
+          .map<NodePool>((value) => new NodePool.fromJson(value))
           .toList();
     }
   }
@@ -3347,7 +3347,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -3511,7 +3511,7 @@
   MasterAuthorizedNetworksConfig.fromJson(core.Map _json) {
     if (_json.containsKey("cidrBlocks")) {
       cidrBlocks = _json["cidrBlocks"]
-          .map((value) => new CidrBlock.fromJson(value))
+          .map<CidrBlock>((value) => new CidrBlock.fromJson(value))
           .toList();
     }
     if (_json.containsKey("enabled")) {
@@ -3706,7 +3706,8 @@
   NodeConfig.fromJson(core.Map _json) {
     if (_json.containsKey("accelerators")) {
       accelerators = _json["accelerators"]
-          .map((value) => new AcceleratorConfig.fromJson(value))
+          .map<AcceleratorConfig>(
+              (value) => new AcceleratorConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("diskSizeGb")) {
diff --git a/generated/googleapis/lib/content/v2.dart b/generated/googleapis/lib/content/v2.dart
index cf849c0..0c31141 100644
--- a/generated/googleapis/lib/content/v2.dart
+++ b/generated/googleapis/lib/content/v2.dart
@@ -65,7 +65,7 @@
   /// this method will complete with the same error.
   async.Future<AccountsAuthInfoResponse> authinfo({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -115,7 +115,7 @@
       core.String merchantId, core.String accountId,
       {core.bool overwrite, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -173,7 +173,7 @@
       {core.bool dryRun,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -226,7 +226,7 @@
   async.Future delete(core.String merchantId, core.String accountId,
       {core.bool dryRun, core.bool force, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -286,7 +286,7 @@
   async.Future<Account> get(core.String merchantId, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -339,7 +339,7 @@
   async.Future<Account> insert(Account request, core.String merchantId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -394,7 +394,7 @@
   async.Future<AccountsListResponse> list(core.String merchantId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -452,7 +452,7 @@
       Account request, core.String merchantId, core.String accountId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -515,7 +515,7 @@
       Account request, core.String merchantId, core.String accountId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -574,7 +574,7 @@
       AccountstatusesCustomBatchRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -622,7 +622,7 @@
   async.Future<AccountStatus> get(core.String merchantId, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -676,7 +676,7 @@
   async.Future<AccountstatusesListResponse> list(core.String merchantId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -737,7 +737,7 @@
       {core.bool dryRun,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -789,7 +789,7 @@
   async.Future<AccountTax> get(core.String merchantId, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -844,7 +844,7 @@
   async.Future<AccounttaxListResponse> list(core.String merchantId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -904,7 +904,7 @@
       AccountTax request, core.String merchantId, core.String accountId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -968,7 +968,7 @@
       AccountTax request, core.String merchantId, core.String accountId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1030,7 +1030,7 @@
       {core.bool dryRun,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1080,7 +1080,7 @@
   async.Future delete(core.String merchantId, core.String datafeedId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1136,7 +1136,7 @@
   async.Future<Datafeed> get(core.String merchantId, core.String datafeedId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1189,7 +1189,7 @@
   async.Future<Datafeed> insert(Datafeed request, core.String merchantId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1244,7 +1244,7 @@
   async.Future<DatafeedsListResponse> list(core.String merchantId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1302,7 +1302,7 @@
       Datafeed request, core.String merchantId, core.String datafeedId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1364,7 +1364,7 @@
       Datafeed request, core.String merchantId, core.String datafeedId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1424,7 +1424,7 @@
       DatafeedstatusesCustomBatchRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1482,7 +1482,7 @@
       core.String merchantId, core.String datafeedId,
       {core.String country, core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1542,7 +1542,7 @@
   async.Future<DatafeedstatusesListResponse> list(core.String merchantId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1604,7 +1604,7 @@
       {core.bool dryRun,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1665,7 +1665,7 @@
       core.String merchantId, core.String storeCode, core.String productId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1738,7 +1738,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1796,7 +1796,7 @@
       core.String merchantId, core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1852,7 +1852,7 @@
       OrdersCancelRequest request, core.String merchantId, core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1912,7 +1912,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1969,7 +1969,7 @@
       OrdersCreateTestOrderRequest request, core.String merchantId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2017,7 +2017,7 @@
       OrdersCustomBatchRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2064,7 +2064,7 @@
   async.Future<Order> get(core.String merchantId, core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2116,7 +2116,7 @@
       core.String merchantId, core.String merchantOrderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2175,7 +2175,7 @@
       core.String merchantId, core.String templateName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2232,7 +2232,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2329,7 +2329,7 @@
       core.List<core.String> statuses,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2399,7 +2399,7 @@
       OrdersRefundRequest request, core.String merchantId, core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2459,7 +2459,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2520,7 +2520,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2582,7 +2582,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2643,7 +2643,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2704,7 +2704,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2766,7 +2766,7 @@
           core.String orderId,
           {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2827,7 +2827,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2888,7 +2888,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2951,7 +2951,7 @@
       {core.bool dryRun,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3001,7 +3001,7 @@
   async.Future delete(core.String merchantId, core.String productId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3057,7 +3057,7 @@
   async.Future<Product> get(core.String merchantId, core.String productId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3112,7 +3112,7 @@
   async.Future<Product> insert(Product request, core.String merchantId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3174,7 +3174,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3239,7 +3239,7 @@
       {core.bool includeAttributes,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3292,7 +3292,7 @@
   async.Future<ProductStatus> get(core.String merchantId, core.String productId,
       {core.bool includeAttributes, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3360,7 +3360,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3430,7 +3430,7 @@
       {core.bool dryRun,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3483,7 +3483,7 @@
       core.String merchantId, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3532,7 +3532,7 @@
   async.Future<ShippingsettingsGetSupportedCarriersResponse>
       getsupportedcarriers(core.String merchantId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3577,7 +3577,7 @@
   async.Future<ShippingsettingsGetSupportedHolidaysResponse>
       getsupportedholidays(core.String merchantId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3628,7 +3628,7 @@
   async.Future<ShippingsettingsListResponse> list(core.String merchantId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3689,7 +3689,7 @@
       ShippingSettings request, core.String merchantId, core.String accountId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3753,7 +3753,7 @@
       ShippingSettings request, core.String merchantId, core.String accountId,
       {core.bool dryRun, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3843,7 +3843,8 @@
     }
     if (_json.containsKey("adwordsLinks")) {
       adwordsLinks = _json["adwordsLinks"]
-          .map((value) => new AccountAdwordsLink.fromJson(value))
+          .map<AccountAdwordsLink>(
+              (value) => new AccountAdwordsLink.fromJson(value))
           .toList();
     }
     if (_json.containsKey("googleMyBusinessLink")) {
@@ -3867,7 +3868,7 @@
     }
     if (_json.containsKey("users")) {
       users = _json["users"]
-          .map((value) => new AccountUser.fromJson(value))
+          .map<AccountUser>((value) => new AccountUser.fromJson(value))
           .toList();
     }
     if (_json.containsKey("websiteUrl")) {
@@ -3875,7 +3876,8 @@
     }
     if (_json.containsKey("youtubeChannelLinks")) {
       youtubeChannelLinks = _json["youtubeChannelLinks"]
-          .map((value) => new AccountYouTubeChannelLink.fromJson(value))
+          .map<AccountYouTubeChannelLink>(
+              (value) => new AccountYouTubeChannelLink.fromJson(value))
           .toList();
     }
   }
@@ -4053,12 +4055,14 @@
     }
     if (_json.containsKey("accountLevelIssues")) {
       accountLevelIssues = _json["accountLevelIssues"]
-          .map((value) => new AccountStatusAccountLevelIssue.fromJson(value))
+          .map<AccountStatusAccountLevelIssue>(
+              (value) => new AccountStatusAccountLevelIssue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dataQualityIssues")) {
       dataQualityIssues = _json["dataQualityIssues"]
-          .map((value) => new AccountStatusDataQualityIssue.fromJson(value))
+          .map<AccountStatusDataQualityIssue>(
+              (value) => new AccountStatusDataQualityIssue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4196,7 +4200,8 @@
     }
     if (_json.containsKey("exampleItems")) {
       exampleItems = _json["exampleItems"]
-          .map((value) => new AccountStatusExampleItem.fromJson(value))
+          .map<AccountStatusExampleItem>(
+              (value) => new AccountStatusExampleItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -4341,7 +4346,8 @@
     }
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new AccountTaxTaxRule.fromJson(value))
+          .map<AccountTaxTaxRule>(
+              (value) => new AccountTaxTaxRule.fromJson(value))
           .toList();
     }
   }
@@ -4512,7 +4518,8 @@
   AccountsAuthInfoResponse.fromJson(core.Map _json) {
     if (_json.containsKey("accountIdentifiers")) {
       accountIdentifiers = _json["accountIdentifiers"]
-          .map((value) => new AccountIdentifier.fromJson(value))
+          .map<AccountIdentifier>(
+              (value) => new AccountIdentifier.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4566,7 +4573,8 @@
   AccountsCustomBatchRequest.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new AccountsCustomBatchRequestEntry.fromJson(value))
+          .map<AccountsCustomBatchRequestEntry>(
+              (value) => new AccountsCustomBatchRequestEntry.fromJson(value))
           .toList();
     }
   }
@@ -4673,7 +4681,8 @@
   AccountsCustomBatchResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new AccountsCustomBatchResponseEntry.fromJson(value))
+          .map<AccountsCustomBatchResponseEntry>(
+              (value) => new AccountsCustomBatchResponseEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4766,7 +4775,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new Account.fromJson(value))
+          .map<Account>((value) => new Account.fromJson(value))
           .toList();
     }
   }
@@ -4796,7 +4805,7 @@
   AccountstatusesCustomBatchRequest.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) =>
+          .map<AccountstatusesCustomBatchRequestEntry>((value) =>
               new AccountstatusesCustomBatchRequestEntry.fromJson(value))
           .toList();
     }
@@ -4875,7 +4884,7 @@
   AccountstatusesCustomBatchResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) =>
+          .map<AccountstatusesCustomBatchResponseEntry>((value) =>
               new AccountstatusesCustomBatchResponseEntry.fromJson(value))
           .toList();
     }
@@ -4959,7 +4968,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new AccountStatus.fromJson(value))
+          .map<AccountStatus>((value) => new AccountStatus.fromJson(value))
           .toList();
     }
   }
@@ -4989,7 +4998,8 @@
   AccounttaxCustomBatchRequest.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new AccounttaxCustomBatchRequestEntry.fromJson(value))
+          .map<AccounttaxCustomBatchRequestEntry>(
+              (value) => new AccounttaxCustomBatchRequestEntry.fromJson(value))
           .toList();
     }
   }
@@ -5074,7 +5084,7 @@
   AccounttaxCustomBatchResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map(
+          .map<AccounttaxCustomBatchResponseEntry>(
               (value) => new AccounttaxCustomBatchResponseEntry.fromJson(value))
           .toList();
     }
@@ -5167,7 +5177,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new AccountTax.fromJson(value))
+          .map<AccountTax>((value) => new AccountTax.fromJson(value))
           .toList();
     }
   }
@@ -5389,7 +5399,7 @@
     }
     if (_json.containsKey("targets")) {
       targets = _json["targets"]
-          .map((value) => new DatafeedTarget.fromJson(value))
+          .map<DatafeedTarget>((value) => new DatafeedTarget.fromJson(value))
           .toList();
     }
   }
@@ -5628,7 +5638,8 @@
     }
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new DatafeedStatusError.fromJson(value))
+          .map<DatafeedStatusError>(
+              (value) => new DatafeedStatusError.fromJson(value))
           .toList();
     }
     if (_json.containsKey("itemsTotal")) {
@@ -5651,7 +5662,8 @@
     }
     if (_json.containsKey("warnings")) {
       warnings = _json["warnings"]
-          .map((value) => new DatafeedStatusError.fromJson(value))
+          .map<DatafeedStatusError>(
+              (value) => new DatafeedStatusError.fromJson(value))
           .toList();
     }
   }
@@ -5718,7 +5730,8 @@
     }
     if (_json.containsKey("examples")) {
       examples = _json["examples"]
-          .map((value) => new DatafeedStatusExample.fromJson(value))
+          .map<DatafeedStatusExample>(
+              (value) => new DatafeedStatusExample.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -5849,7 +5862,8 @@
   DatafeedsCustomBatchRequest.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new DatafeedsCustomBatchRequestEntry.fromJson(value))
+          .map<DatafeedsCustomBatchRequestEntry>(
+              (value) => new DatafeedsCustomBatchRequestEntry.fromJson(value))
           .toList();
     }
   }
@@ -5934,7 +5948,8 @@
   DatafeedsCustomBatchResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new DatafeedsCustomBatchResponseEntry.fromJson(value))
+          .map<DatafeedsCustomBatchResponseEntry>(
+              (value) => new DatafeedsCustomBatchResponseEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -6017,7 +6032,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new Datafeed.fromJson(value))
+          .map<Datafeed>((value) => new Datafeed.fromJson(value))
           .toList();
     }
   }
@@ -6047,7 +6062,7 @@
   DatafeedstatusesCustomBatchRequest.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) =>
+          .map<DatafeedstatusesCustomBatchRequestEntry>((value) =>
               new DatafeedstatusesCustomBatchRequestEntry.fromJson(value))
           .toList();
     }
@@ -6146,7 +6161,7 @@
   DatafeedstatusesCustomBatchResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) =>
+          .map<DatafeedstatusesCustomBatchResponseEntry>((value) =>
               new DatafeedstatusesCustomBatchResponseEntry.fromJson(value))
           .toList();
     }
@@ -6230,7 +6245,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new DatafeedStatus.fromJson(value))
+          .map<DatafeedStatus>((value) => new DatafeedStatus.fromJson(value))
           .toList();
     }
   }
@@ -6270,7 +6285,7 @@
   DeliveryTime.fromJson(core.Map _json) {
     if (_json.containsKey("holidayCutoffs")) {
       holidayCutoffs = _json["holidayCutoffs"]
-          .map((value) => new HolidayCutoff.fromJson(value))
+          .map<HolidayCutoff>((value) => new HolidayCutoff.fromJson(value))
           .toList();
     }
     if (_json.containsKey("maxTransitTimeInDays")) {
@@ -6357,8 +6372,9 @@
       code = _json["code"];
     }
     if (_json.containsKey("errors")) {
-      errors =
-          _json["errors"].map((value) => new Error.fromJson(value)).toList();
+      errors = _json["errors"]
+          .map<Error>((value) => new Error.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("message")) {
       message = _json["message"];
@@ -6420,7 +6436,7 @@
   Headers.fromJson(core.Map _json) {
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new LocationIdSet.fromJson(value))
+          .map<LocationIdSet>((value) => new LocationIdSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("numberOfItems")) {
@@ -6430,12 +6446,14 @@
       postalCodeGroupNames = _json["postalCodeGroupNames"];
     }
     if (_json.containsKey("prices")) {
-      prices =
-          _json["prices"].map((value) => new Price.fromJson(value)).toList();
+      prices = _json["prices"]
+          .map<Price>((value) => new Price.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("weights")) {
-      weights =
-          _json["weights"].map((value) => new Weight.fromJson(value)).toList();
+      weights = _json["weights"]
+          .map<Weight>((value) => new Weight.fromJson(value))
+          .toList();
     }
   }
 
@@ -6749,7 +6767,8 @@
   InventoryCustomBatchRequest.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new InventoryCustomBatchRequestEntry.fromJson(value))
+          .map<InventoryCustomBatchRequestEntry>(
+              (value) => new InventoryCustomBatchRequestEntry.fromJson(value))
           .toList();
     }
   }
@@ -6837,7 +6856,8 @@
   InventoryCustomBatchResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new InventoryCustomBatchResponseEntry.fromJson(value))
+          .map<InventoryCustomBatchResponseEntry>(
+              (value) => new InventoryCustomBatchResponseEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -7213,7 +7233,7 @@
     }
     if (_json.containsKey("lineItems")) {
       lineItems = _json["lineItems"]
-          .map((value) => new OrderLineItem.fromJson(value))
+          .map<OrderLineItem>((value) => new OrderLineItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("merchantId")) {
@@ -7236,17 +7256,17 @@
     }
     if (_json.containsKey("promotions")) {
       promotions = _json["promotions"]
-          .map((value) => new OrderPromotion.fromJson(value))
+          .map<OrderPromotion>((value) => new OrderPromotion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("refunds")) {
       refunds = _json["refunds"]
-          .map((value) => new OrderRefund.fromJson(value))
+          .map<OrderRefund>((value) => new OrderRefund.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shipments")) {
       shipments = _json["shipments"]
-          .map((value) => new OrderShipment.fromJson(value))
+          .map<OrderShipment>((value) => new OrderShipment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shippingCost")) {
@@ -7611,12 +7631,14 @@
   OrderLineItem.fromJson(core.Map _json) {
     if (_json.containsKey("annotations")) {
       annotations = _json["annotations"]
-          .map((value) => new OrderMerchantProvidedAnnotation.fromJson(value))
+          .map<OrderMerchantProvidedAnnotation>(
+              (value) => new OrderMerchantProvidedAnnotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("cancellations")) {
       cancellations = _json["cancellations"]
-          .map((value) => new OrderCancellation.fromJson(value))
+          .map<OrderCancellation>(
+              (value) => new OrderCancellation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -7651,7 +7673,7 @@
     }
     if (_json.containsKey("returns")) {
       returns = _json["returns"]
-          .map((value) => new OrderReturn.fromJson(value))
+          .map<OrderReturn>((value) => new OrderReturn.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shippingDetails")) {
@@ -7812,7 +7834,7 @@
     }
     if (_json.containsKey("variantAttributes")) {
       variantAttributes = _json["variantAttributes"]
-          .map((value) =>
+          .map<OrderLineItemProductVariantAttribute>((value) =>
               new OrderLineItemProductVariantAttribute.fromJson(value))
           .toList();
     }
@@ -8176,7 +8198,8 @@
   OrderPromotion.fromJson(core.Map _json) {
     if (_json.containsKey("benefits")) {
       benefits = _json["benefits"]
-          .map((value) => new OrderPromotionBenefit.fromJson(value))
+          .map<OrderPromotionBenefit>(
+              (value) => new OrderPromotionBenefit.fromJson(value))
           .toList();
     }
     if (_json.containsKey("effectiveDates")) {
@@ -8462,7 +8485,8 @@
     }
     if (_json.containsKey("lineItems")) {
       lineItems = _json["lineItems"]
-          .map((value) => new OrderShipmentLineItemShipment.fromJson(value))
+          .map<OrderShipmentLineItemShipment>(
+              (value) => new OrderShipmentLineItemShipment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("status")) {
@@ -8898,7 +8922,8 @@
   OrdersCustomBatchRequest.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new OrdersCustomBatchRequestEntry.fromJson(value))
+          .map<OrdersCustomBatchRequestEntry>(
+              (value) => new OrdersCustomBatchRequestEntry.fromJson(value))
           .toList();
     }
   }
@@ -9573,7 +9598,8 @@
   OrdersCustomBatchRequestEntrySetLineItemMetadata.fromJson(core.Map _json) {
     if (_json.containsKey("annotations")) {
       annotations = _json["annotations"]
-          .map((value) => new OrderMerchantProvidedAnnotation.fromJson(value))
+          .map<OrderMerchantProvidedAnnotation>(
+              (value) => new OrderMerchantProvidedAnnotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("lineItemId")) {
@@ -9630,7 +9656,8 @@
     }
     if (_json.containsKey("lineItems")) {
       lineItems = _json["lineItems"]
-          .map((value) => new OrderShipmentLineItemShipment.fromJson(value))
+          .map<OrderShipmentLineItemShipment>(
+              (value) => new OrderShipmentLineItemShipment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shipmentId")) {
@@ -9638,9 +9665,10 @@
     }
     if (_json.containsKey("shipmentInfos")) {
       shipmentInfos = _json["shipmentInfos"]
-          .map((value) =>
-              new OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo
-                  .fromJson(value))
+          .map<OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo>(
+              (value) =>
+                  new OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo
+                      .fromJson(value))
           .toList();
     }
     if (_json.containsKey("trackingId")) {
@@ -9831,7 +9859,8 @@
   OrdersCustomBatchResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new OrdersCustomBatchResponseEntry.fromJson(value))
+          .map<OrdersCustomBatchResponseEntry>(
+              (value) => new OrdersCustomBatchResponseEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -10115,8 +10144,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("resources")) {
-      resources =
-          _json["resources"].map((value) => new Order.fromJson(value)).toList();
+      resources = _json["resources"]
+          .map<Order>((value) => new Order.fromJson(value))
+          .toList();
     }
   }
 
@@ -10577,7 +10607,8 @@
   OrdersSetLineItemMetadataRequest.fromJson(core.Map _json) {
     if (_json.containsKey("annotations")) {
       annotations = _json["annotations"]
-          .map((value) => new OrderMerchantProvidedAnnotation.fromJson(value))
+          .map<OrderMerchantProvidedAnnotation>(
+              (value) => new OrderMerchantProvidedAnnotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("lineItemId")) {
@@ -10675,7 +10706,8 @@
     }
     if (_json.containsKey("lineItems")) {
       lineItems = _json["lineItems"]
-          .map((value) => new OrderShipmentLineItemShipment.fromJson(value))
+          .map<OrderShipmentLineItemShipment>(
+              (value) => new OrderShipmentLineItemShipment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("operationId")) {
@@ -10686,9 +10718,10 @@
     }
     if (_json.containsKey("shipmentInfos")) {
       shipmentInfos = _json["shipmentInfos"]
-          .map((value) =>
-              new OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo
-                  .fromJson(value))
+          .map<OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo>(
+              (value) =>
+                  new OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo
+                      .fromJson(value))
           .toList();
     }
     if (_json.containsKey("trackingId")) {
@@ -11026,7 +11059,7 @@
     }
     if (_json.containsKey("postalCodeRanges")) {
       postalCodeRanges = _json["postalCodeRanges"]
-          .map((value) => new PostalCodeRange.fromJson(value))
+          .map<PostalCodeRange>((value) => new PostalCodeRange.fromJson(value))
           .toList();
     }
   }
@@ -11394,7 +11427,7 @@
     }
     if (_json.containsKey("aspects")) {
       aspects = _json["aspects"]
-          .map((value) => new ProductAspect.fromJson(value))
+          .map<ProductAspect>((value) => new ProductAspect.fromJson(value))
           .toList();
     }
     if (_json.containsKey("availability")) {
@@ -11420,12 +11453,14 @@
     }
     if (_json.containsKey("customAttributes")) {
       customAttributes = _json["customAttributes"]
-          .map((value) => new ProductCustomAttribute.fromJson(value))
+          .map<ProductCustomAttribute>(
+              (value) => new ProductCustomAttribute.fromJson(value))
           .toList();
     }
     if (_json.containsKey("customGroups")) {
       customGroups = _json["customGroups"]
-          .map((value) => new ProductCustomGroup.fromJson(value))
+          .map<ProductCustomGroup>(
+              (value) => new ProductCustomGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("customLabel0")) {
@@ -11448,7 +11483,8 @@
     }
     if (_json.containsKey("destinations")) {
       destinations = _json["destinations"]
-          .map((value) => new ProductDestination.fromJson(value))
+          .map<ProductDestination>(
+              (value) => new ProductDestination.fromJson(value))
           .toList();
     }
     if (_json.containsKey("displayAdsId")) {
@@ -11555,7 +11591,7 @@
     }
     if (_json.containsKey("shipping")) {
       shipping = _json["shipping"]
-          .map((value) => new ProductShipping.fromJson(value))
+          .map<ProductShipping>((value) => new ProductShipping.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shippingHeight")) {
@@ -11591,7 +11627,7 @@
     }
     if (_json.containsKey("taxes")) {
       taxes = _json["taxes"]
-          .map((value) => new ProductTax.fromJson(value))
+          .map<ProductTax>((value) => new ProductTax.fromJson(value))
           .toList();
     }
     if (_json.containsKey("title")) {
@@ -11609,8 +11645,9 @@
       validatedDestinations = _json["validatedDestinations"];
     }
     if (_json.containsKey("warnings")) {
-      warnings =
-          _json["warnings"].map((value) => new Error.fromJson(value)).toList();
+      warnings = _json["warnings"]
+          .map<Error>((value) => new Error.fromJson(value))
+          .toList();
     }
   }
 
@@ -11950,7 +11987,8 @@
   ProductCustomGroup.fromJson(core.Map _json) {
     if (_json.containsKey("attributes")) {
       attributes = _json["attributes"]
-          .map((value) => new ProductCustomAttribute.fromJson(value))
+          .map<ProductCustomAttribute>(
+              (value) => new ProductCustomAttribute.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -12195,12 +12233,14 @@
     }
     if (_json.containsKey("dataQualityIssues")) {
       dataQualityIssues = _json["dataQualityIssues"]
-          .map((value) => new ProductStatusDataQualityIssue.fromJson(value))
+          .map<ProductStatusDataQualityIssue>(
+              (value) => new ProductStatusDataQualityIssue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("destinationStatuses")) {
       destinationStatuses = _json["destinationStatuses"]
-          .map((value) => new ProductStatusDestinationStatus.fromJson(value))
+          .map<ProductStatusDestinationStatus>(
+              (value) => new ProductStatusDestinationStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("googleExpirationDate")) {
@@ -12208,7 +12248,8 @@
     }
     if (_json.containsKey("itemLevelIssues")) {
       itemLevelIssues = _json["itemLevelIssues"]
-          .map((value) => new ProductStatusItemLevelIssue.fromJson(value))
+          .map<ProductStatusItemLevelIssue>(
+              (value) => new ProductStatusItemLevelIssue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -12609,7 +12650,8 @@
   ProductsCustomBatchRequest.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new ProductsCustomBatchRequestEntry.fromJson(value))
+          .map<ProductsCustomBatchRequestEntry>(
+              (value) => new ProductsCustomBatchRequestEntry.fromJson(value))
           .toList();
     }
   }
@@ -12695,7 +12737,8 @@
   ProductsCustomBatchResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new ProductsCustomBatchResponseEntry.fromJson(value))
+          .map<ProductsCustomBatchResponseEntry>(
+              (value) => new ProductsCustomBatchResponseEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -12788,7 +12831,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new Product.fromJson(value))
+          .map<Product>((value) => new Product.fromJson(value))
           .toList();
     }
   }
@@ -12818,7 +12861,7 @@
   ProductstatusesCustomBatchRequest.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) =>
+          .map<ProductstatusesCustomBatchRequestEntry>((value) =>
               new ProductstatusesCustomBatchRequestEntry.fromJson(value))
           .toList();
     }
@@ -12902,7 +12945,7 @@
   ProductstatusesCustomBatchResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) =>
+          .map<ProductstatusesCustomBatchResponseEntry>((value) =>
               new ProductstatusesCustomBatchResponseEntry.fromJson(value))
           .toList();
     }
@@ -12995,7 +13038,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new ProductStatus.fromJson(value))
+          .map<ProductStatus>((value) => new ProductStatus.fromJson(value))
           .toList();
     }
   }
@@ -13047,7 +13090,7 @@
     }
     if (_json.containsKey("carrierRates")) {
       carrierRates = _json["carrierRates"]
-          .map((value) => new CarrierRate.fromJson(value))
+          .map<CarrierRate>((value) => new CarrierRate.fromJson(value))
           .toList();
     }
     if (_json.containsKey("mainTable")) {
@@ -13057,8 +13100,9 @@
       singleValue = new Value.fromJson(_json["singleValue"]);
     }
     if (_json.containsKey("subtables")) {
-      subtables =
-          _json["subtables"].map((value) => new Table.fromJson(value)).toList();
+      subtables = _json["subtables"]
+          .map<Table>((value) => new Table.fromJson(value))
+          .toList();
     }
   }
 
@@ -13095,7 +13139,9 @@
 
   Row.fromJson(core.Map _json) {
     if (_json.containsKey("cells")) {
-      cells = _json["cells"].map((value) => new Value.fromJson(value)).toList();
+      cells = _json["cells"]
+          .map<Value>((value) => new Value.fromJson(value))
+          .toList();
     }
   }
 
@@ -13162,7 +13208,7 @@
     }
     if (_json.containsKey("rateGroups")) {
       rateGroups = _json["rateGroups"]
-          .map((value) => new RateGroup.fromJson(value))
+          .map<RateGroup>((value) => new RateGroup.fromJson(value))
           .toList();
     }
   }
@@ -13217,12 +13263,12 @@
     }
     if (_json.containsKey("postalCodeGroups")) {
       postalCodeGroups = _json["postalCodeGroups"]
-          .map((value) => new PostalCodeGroup.fromJson(value))
+          .map<PostalCodeGroup>((value) => new PostalCodeGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("services")) {
       services = _json["services"]
-          .map((value) => new Service.fromJson(value))
+          .map<Service>((value) => new Service.fromJson(value))
           .toList();
     }
   }
@@ -13253,7 +13299,7 @@
   ShippingsettingsCustomBatchRequest.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) =>
+          .map<ShippingsettingsCustomBatchRequestEntry>((value) =>
               new ShippingsettingsCustomBatchRequestEntry.fromJson(value))
           .toList();
     }
@@ -13341,7 +13387,7 @@
   ShippingsettingsCustomBatchResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) =>
+          .map<ShippingsettingsCustomBatchResponseEntry>((value) =>
               new ShippingsettingsCustomBatchResponseEntry.fromJson(value))
           .toList();
     }
@@ -13428,7 +13474,7 @@
   ShippingsettingsGetSupportedCarriersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("carriers")) {
       carriers = _json["carriers"]
-          .map((value) => new CarriersCarrier.fromJson(value))
+          .map<CarriersCarrier>((value) => new CarriersCarrier.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -13462,7 +13508,7 @@
   ShippingsettingsGetSupportedHolidaysResponse.fromJson(core.Map _json) {
     if (_json.containsKey("holidays")) {
       holidays = _json["holidays"]
-          .map((value) => new HolidaysHoliday.fromJson(value))
+          .map<HolidaysHoliday>((value) => new HolidaysHoliday.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -13503,7 +13549,8 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new ShippingSettings.fromJson(value))
+          .map<ShippingSettings>(
+              (value) => new ShippingSettings.fromJson(value))
           .toList();
     }
   }
@@ -13552,7 +13599,8 @@
       rowHeaders = new Headers.fromJson(_json["rowHeaders"]);
     }
     if (_json.containsKey("rows")) {
-      rows = _json["rows"].map((value) => new Row.fromJson(value)).toList();
+      rows =
+          _json["rows"].map<Row>((value) => new Row.fromJson(value)).toList();
     }
   }
 
@@ -13620,7 +13668,8 @@
     }
     if (_json.containsKey("lineItems")) {
       lineItems = _json["lineItems"]
-          .map((value) => new TestOrderLineItem.fromJson(value))
+          .map<TestOrderLineItem>(
+              (value) => new TestOrderLineItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("notificationMode")) {
@@ -13635,7 +13684,7 @@
     }
     if (_json.containsKey("promotions")) {
       promotions = _json["promotions"]
-          .map((value) => new OrderPromotion.fromJson(value))
+          .map<OrderPromotion>((value) => new OrderPromotion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shippingCost")) {
@@ -13871,7 +13920,7 @@
     }
     if (_json.containsKey("variantAttributes")) {
       variantAttributes = _json["variantAttributes"]
-          .map((value) =>
+          .map<OrderLineItemProductVariantAttribute>((value) =>
               new OrderLineItemProductVariantAttribute.fromJson(value))
           .toList();
     }
diff --git a/generated/googleapis/lib/content/v2sandbox.dart b/generated/googleapis/lib/content/v2sandbox.dart
index cadbdac..d2d9e8f 100644
--- a/generated/googleapis/lib/content/v2sandbox.dart
+++ b/generated/googleapis/lib/content/v2sandbox.dart
@@ -63,7 +63,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -121,7 +121,7 @@
       core.String merchantId, core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -177,7 +177,7 @@
       OrdersCancelRequest request, core.String merchantId, core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -237,7 +237,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -294,7 +294,7 @@
       OrdersCreateTestOrderRequest request, core.String merchantId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -342,7 +342,7 @@
       OrdersCustomBatchRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -389,7 +389,7 @@
   async.Future<Order> get(core.String merchantId, core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -441,7 +441,7 @@
       core.String merchantId, core.String merchantOrderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -500,7 +500,7 @@
       core.String merchantId, core.String templateName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -557,7 +557,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -654,7 +654,7 @@
       core.List<core.String> statuses,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -724,7 +724,7 @@
       OrdersRefundRequest request, core.String merchantId, core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -784,7 +784,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -845,7 +845,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -907,7 +907,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -968,7 +968,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1029,7 +1029,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1091,7 +1091,7 @@
           core.String orderId,
           {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1152,7 +1152,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1213,7 +1213,7 @@
       core.String orderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1307,8 +1307,9 @@
       code = _json["code"];
     }
     if (_json.containsKey("errors")) {
-      errors =
-          _json["errors"].map((value) => new Error.fromJson(value)).toList();
+      errors = _json["errors"]
+          .map<Error>((value) => new Error.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("message")) {
       message = _json["message"];
@@ -1418,7 +1419,7 @@
     }
     if (_json.containsKey("lineItems")) {
       lineItems = _json["lineItems"]
-          .map((value) => new OrderLineItem.fromJson(value))
+          .map<OrderLineItem>((value) => new OrderLineItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("merchantId")) {
@@ -1441,17 +1442,17 @@
     }
     if (_json.containsKey("promotions")) {
       promotions = _json["promotions"]
-          .map((value) => new OrderPromotion.fromJson(value))
+          .map<OrderPromotion>((value) => new OrderPromotion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("refunds")) {
       refunds = _json["refunds"]
-          .map((value) => new OrderRefund.fromJson(value))
+          .map<OrderRefund>((value) => new OrderRefund.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shipments")) {
       shipments = _json["shipments"]
-          .map((value) => new OrderShipment.fromJson(value))
+          .map<OrderShipment>((value) => new OrderShipment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shippingCost")) {
@@ -1816,12 +1817,14 @@
   OrderLineItem.fromJson(core.Map _json) {
     if (_json.containsKey("annotations")) {
       annotations = _json["annotations"]
-          .map((value) => new OrderMerchantProvidedAnnotation.fromJson(value))
+          .map<OrderMerchantProvidedAnnotation>(
+              (value) => new OrderMerchantProvidedAnnotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("cancellations")) {
       cancellations = _json["cancellations"]
-          .map((value) => new OrderCancellation.fromJson(value))
+          .map<OrderCancellation>(
+              (value) => new OrderCancellation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -1856,7 +1859,7 @@
     }
     if (_json.containsKey("returns")) {
       returns = _json["returns"]
-          .map((value) => new OrderReturn.fromJson(value))
+          .map<OrderReturn>((value) => new OrderReturn.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shippingDetails")) {
@@ -2017,7 +2020,7 @@
     }
     if (_json.containsKey("variantAttributes")) {
       variantAttributes = _json["variantAttributes"]
-          .map((value) =>
+          .map<OrderLineItemProductVariantAttribute>((value) =>
               new OrderLineItemProductVariantAttribute.fromJson(value))
           .toList();
     }
@@ -2381,7 +2384,8 @@
   OrderPromotion.fromJson(core.Map _json) {
     if (_json.containsKey("benefits")) {
       benefits = _json["benefits"]
-          .map((value) => new OrderPromotionBenefit.fromJson(value))
+          .map<OrderPromotionBenefit>(
+              (value) => new OrderPromotionBenefit.fromJson(value))
           .toList();
     }
     if (_json.containsKey("effectiveDates")) {
@@ -2667,7 +2671,8 @@
     }
     if (_json.containsKey("lineItems")) {
       lineItems = _json["lineItems"]
-          .map((value) => new OrderShipmentLineItemShipment.fromJson(value))
+          .map<OrderShipmentLineItemShipment>(
+              (value) => new OrderShipmentLineItemShipment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("status")) {
@@ -3103,7 +3108,8 @@
   OrdersCustomBatchRequest.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new OrdersCustomBatchRequestEntry.fromJson(value))
+          .map<OrdersCustomBatchRequestEntry>(
+              (value) => new OrdersCustomBatchRequestEntry.fromJson(value))
           .toList();
     }
   }
@@ -3778,7 +3784,8 @@
   OrdersCustomBatchRequestEntrySetLineItemMetadata.fromJson(core.Map _json) {
     if (_json.containsKey("annotations")) {
       annotations = _json["annotations"]
-          .map((value) => new OrderMerchantProvidedAnnotation.fromJson(value))
+          .map<OrderMerchantProvidedAnnotation>(
+              (value) => new OrderMerchantProvidedAnnotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("lineItemId")) {
@@ -3835,7 +3842,8 @@
     }
     if (_json.containsKey("lineItems")) {
       lineItems = _json["lineItems"]
-          .map((value) => new OrderShipmentLineItemShipment.fromJson(value))
+          .map<OrderShipmentLineItemShipment>(
+              (value) => new OrderShipmentLineItemShipment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shipmentId")) {
@@ -3843,9 +3851,10 @@
     }
     if (_json.containsKey("shipmentInfos")) {
       shipmentInfos = _json["shipmentInfos"]
-          .map((value) =>
-              new OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo
-                  .fromJson(value))
+          .map<OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo>(
+              (value) =>
+                  new OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo
+                      .fromJson(value))
           .toList();
     }
     if (_json.containsKey("trackingId")) {
@@ -4036,7 +4045,8 @@
   OrdersCustomBatchResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new OrdersCustomBatchResponseEntry.fromJson(value))
+          .map<OrdersCustomBatchResponseEntry>(
+              (value) => new OrdersCustomBatchResponseEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4320,8 +4330,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("resources")) {
-      resources =
-          _json["resources"].map((value) => new Order.fromJson(value)).toList();
+      resources = _json["resources"]
+          .map<Order>((value) => new Order.fromJson(value))
+          .toList();
     }
   }
 
@@ -4782,7 +4793,8 @@
   OrdersSetLineItemMetadataRequest.fromJson(core.Map _json) {
     if (_json.containsKey("annotations")) {
       annotations = _json["annotations"]
-          .map((value) => new OrderMerchantProvidedAnnotation.fromJson(value))
+          .map<OrderMerchantProvidedAnnotation>(
+              (value) => new OrderMerchantProvidedAnnotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("lineItemId")) {
@@ -4880,7 +4892,8 @@
     }
     if (_json.containsKey("lineItems")) {
       lineItems = _json["lineItems"]
-          .map((value) => new OrderShipmentLineItemShipment.fromJson(value))
+          .map<OrderShipmentLineItemShipment>(
+              (value) => new OrderShipmentLineItemShipment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("operationId")) {
@@ -4891,9 +4904,10 @@
     }
     if (_json.containsKey("shipmentInfos")) {
       shipmentInfos = _json["shipmentInfos"]
-          .map((value) =>
-              new OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo
-                  .fromJson(value))
+          .map<OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo>(
+              (value) =>
+                  new OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo
+                      .fromJson(value))
           .toList();
     }
     if (_json.containsKey("trackingId")) {
@@ -5285,7 +5299,8 @@
     }
     if (_json.containsKey("lineItems")) {
       lineItems = _json["lineItems"]
-          .map((value) => new TestOrderLineItem.fromJson(value))
+          .map<TestOrderLineItem>(
+              (value) => new TestOrderLineItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("notificationMode")) {
@@ -5300,7 +5315,7 @@
     }
     if (_json.containsKey("promotions")) {
       promotions = _json["promotions"]
-          .map((value) => new OrderPromotion.fromJson(value))
+          .map<OrderPromotion>((value) => new OrderPromotion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shippingCost")) {
@@ -5536,7 +5551,7 @@
     }
     if (_json.containsKey("variantAttributes")) {
       variantAttributes = _json["variantAttributes"]
-          .map((value) =>
+          .map<OrderLineItemProductVariantAttribute>((value) =>
               new OrderLineItemProductVariantAttribute.fromJson(value))
           .toList();
     }
diff --git a/generated/googleapis/lib/customsearch/v1.dart b/generated/googleapis/lib/customsearch/v1.dart
index 2ee68b5..ac72730 100644
--- a/generated/googleapis/lib/customsearch/v1.dart
+++ b/generated/googleapis/lib/customsearch/v1.dart
@@ -235,7 +235,7 @@
       core.int start,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -395,8 +395,9 @@
   Context.fromJson(core.Map _json) {
     if (_json.containsKey("facets")) {
       facets = _json["facets"]
-          .map((value) =>
-              value.map((value) => new ContextFacets.fromJson(value)).toList())
+          .map<core.List<ContextFacets>>((value) => value
+              .map<ContextFacets>((value) => new ContextFacets.fromJson(value))
+              .toList())
           .toList();
     }
     if (_json.containsKey("title")) {
@@ -509,7 +510,8 @@
   Promotion.fromJson(core.Map _json) {
     if (_json.containsKey("bodyLines")) {
       bodyLines = _json["bodyLines"]
-          .map((value) => new PromotionBodyLines.fromJson(value))
+          .map<PromotionBodyLines>(
+              (value) => new PromotionBodyLines.fromJson(value))
           .toList();
     }
     if (_json.containsKey("displayLink")) {
@@ -972,7 +974,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new ResultLabels.fromJson(value))
+          .map<ResultLabels>((value) => new ResultLabels.fromJson(value))
           .toList();
     }
     if (_json.containsKey("link")) {
@@ -1159,15 +1161,16 @@
       context = new Context.fromJson(_json["context"]);
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Result.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Result>((value) => new Result.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("promotions")) {
       promotions = _json["promotions"]
-          .map((value) => new Promotion.fromJson(value))
+          .map<Promotion>((value) => new Promotion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("queries")) {
@@ -1175,7 +1178,7 @@
               core.List<Query>>(
           _json["queries"],
           (core.List<core.Map<core.String, core.Object>> item) =>
-              item.map((value) => new Query.fromJson(value)).toList());
+              item.map<Query>((value) => new Query.fromJson(value)).toList());
     }
     if (_json.containsKey("searchInformation")) {
       searchInformation =
diff --git a/generated/googleapis/lib/dataproc/v1.dart b/generated/googleapis/lib/dataproc/v1.dart
index 83c97e9..aae84a4 100644
--- a/generated/googleapis/lib/dataproc/v1.dart
+++ b/generated/googleapis/lib/dataproc/v1.dart
@@ -85,7 +85,7 @@
       Cluster request, core.String projectId, core.String region,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -148,7 +148,7 @@
       core.String projectId, core.String region, core.String clusterName,
       {core.String clusterUuid, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -215,7 +215,7 @@
       core.String projectId, core.String region, core.String clusterName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -280,7 +280,7 @@
       core.String projectId, core.String region, core.String clusterName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -358,7 +358,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -469,7 +469,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -552,7 +552,7 @@
       core.String region, core.String jobId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -618,7 +618,7 @@
       core.String projectId, core.String region, core.String jobId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -679,7 +679,7 @@
       core.String projectId, core.String region, core.String jobId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -767,7 +767,7 @@
       core.String jobStateMatcher,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -848,7 +848,7 @@
       Job request, core.String projectId, core.String region, core.String jobId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -915,7 +915,7 @@
       SubmitJobRequest request, core.String projectId, core.String region,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -983,7 +983,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> cancel(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1029,7 +1029,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1074,7 +1074,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1135,7 +1135,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1284,7 +1284,7 @@
     }
     if (_json.containsKey("statusHistory")) {
       statusHistory = _json["statusHistory"]
-          .map((value) => new ClusterStatus.fromJson(value))
+          .map<ClusterStatus>((value) => new ClusterStatus.fromJson(value))
           .toList();
     }
   }
@@ -1375,7 +1375,8 @@
     }
     if (_json.containsKey("initializationActions")) {
       initializationActions = _json["initializationActions"]
-          .map((value) => new NodeInitializationAction.fromJson(value))
+          .map<NodeInitializationAction>(
+              (value) => new NodeInitializationAction.fromJson(value))
           .toList();
     }
     if (_json.containsKey("masterConfig")) {
@@ -1505,7 +1506,8 @@
     }
     if (_json.containsKey("statusHistory")) {
       statusHistory = _json["statusHistory"]
-          .map((value) => new ClusterOperationStatus.fromJson(value))
+          .map<ClusterOperationStatus>(
+              (value) => new ClusterOperationStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warnings")) {
@@ -2118,7 +2120,8 @@
   InstanceGroupConfig.fromJson(core.Map _json) {
     if (_json.containsKey("accelerators")) {
       accelerators = _json["accelerators"]
-          .map((value) => new AcceleratorConfig.fromJson(value))
+          .map<AcceleratorConfig>(
+              (value) => new AcceleratorConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("diskConfig")) {
@@ -2283,12 +2286,12 @@
     }
     if (_json.containsKey("statusHistory")) {
       statusHistory = _json["statusHistory"]
-          .map((value) => new JobStatus.fromJson(value))
+          .map<JobStatus>((value) => new JobStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("yarnApplications")) {
       yarnApplications = _json["yarnApplications"]
-          .map((value) => new YarnApplication.fromJson(value))
+          .map<YarnApplication>((value) => new YarnApplication.fromJson(value))
           .toList();
     }
   }
@@ -2537,7 +2540,7 @@
   ListClustersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("clusters")) {
       clusters = _json["clusters"]
-          .map((value) => new Cluster.fromJson(value))
+          .map<Cluster>((value) => new Cluster.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2572,7 +2575,8 @@
 
   ListJobsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("jobs")) {
-      jobs = _json["jobs"].map((value) => new Job.fromJson(value)).toList();
+      jobs =
+          _json["jobs"].map<Job>((value) => new Job.fromJson(value)).toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -2608,7 +2612,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/datastore/v1.dart b/generated/googleapis/lib/datastore/v1.dart
index b37b15f..fdbe9f0 100644
--- a/generated/googleapis/lib/datastore/v1.dart
+++ b/generated/googleapis/lib/datastore/v1.dart
@@ -67,7 +67,7 @@
       AllocateIdsRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -118,7 +118,7 @@
       BeginTransactionRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -171,7 +171,7 @@
       CommitRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -222,7 +222,7 @@
       LookupRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -274,7 +274,7 @@
       ReserveIdsRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -325,7 +325,7 @@
       RollbackRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -376,7 +376,7 @@
       RunQueryRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -440,7 +440,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> cancel(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -486,7 +486,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -532,7 +532,7 @@
   async.Future<GoogleLongrunningOperation> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -596,7 +596,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -642,7 +642,8 @@
 
   AllocateIdsRequest.fromJson(core.Map _json) {
     if (_json.containsKey("keys")) {
-      keys = _json["keys"].map((value) => new Key.fromJson(value)).toList();
+      keys =
+          _json["keys"].map<Key>((value) => new Key.fromJson(value)).toList();
     }
   }
 
@@ -666,7 +667,8 @@
 
   AllocateIdsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("keys")) {
-      keys = _json["keys"].map((value) => new Key.fromJson(value)).toList();
+      keys =
+          _json["keys"].map<Key>((value) => new Key.fromJson(value)).toList();
     }
   }
 
@@ -691,8 +693,9 @@
 
   ArrayValue.fromJson(core.Map _json) {
     if (_json.containsKey("values")) {
-      values =
-          _json["values"].map((value) => new Value.fromJson(value)).toList();
+      values = _json["values"]
+          .map<Value>((value) => new Value.fromJson(value))
+          .toList();
     }
   }
 
@@ -810,7 +813,7 @@
     }
     if (_json.containsKey("mutations")) {
       mutations = _json["mutations"]
-          .map((value) => new Mutation.fromJson(value))
+          .map<Mutation>((value) => new Mutation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("transaction")) {
@@ -853,7 +856,7 @@
     }
     if (_json.containsKey("mutationResults")) {
       mutationResults = _json["mutationResults"]
-          .map((value) => new MutationResult.fromJson(value))
+          .map<MutationResult>((value) => new MutationResult.fromJson(value))
           .toList();
     }
   }
@@ -889,8 +892,9 @@
 
   CompositeFilter.fromJson(core.Map _json) {
     if (_json.containsKey("filters")) {
-      filters =
-          _json["filters"].map((value) => new Filter.fromJson(value)).toList();
+      filters = _json["filters"]
+          .map<Filter>((value) => new Filter.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("op")) {
       op = _json["op"];
@@ -1417,7 +1421,8 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new GoogleLongrunningOperation.fromJson(value))
+          .map<GoogleLongrunningOperation>(
+              (value) => new GoogleLongrunningOperation.fromJson(value))
           .toList();
     }
   }
@@ -1561,7 +1566,8 @@
     }
     if (_json.containsKey("positionalBindings")) {
       positionalBindings = _json["positionalBindings"]
-          .map((value) => new GqlQueryParameter.fromJson(value))
+          .map<GqlQueryParameter>(
+              (value) => new GqlQueryParameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("queryString")) {
@@ -1668,7 +1674,7 @@
     }
     if (_json.containsKey("path")) {
       path = _json["path"]
-          .map((value) => new PathElement.fromJson(value))
+          .map<PathElement>((value) => new PathElement.fromJson(value))
           .toList();
     }
   }
@@ -1758,7 +1764,8 @@
 
   LookupRequest.fromJson(core.Map _json) {
     if (_json.containsKey("keys")) {
-      keys = _json["keys"].map((value) => new Key.fromJson(value)).toList();
+      keys =
+          _json["keys"].map<Key>((value) => new Key.fromJson(value)).toList();
     }
     if (_json.containsKey("readOptions")) {
       readOptions = new ReadOptions.fromJson(_json["readOptions"]);
@@ -1799,17 +1806,18 @@
 
   LookupResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deferred")) {
-      deferred =
-          _json["deferred"].map((value) => new Key.fromJson(value)).toList();
+      deferred = _json["deferred"]
+          .map<Key>((value) => new Key.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("found")) {
       found = _json["found"]
-          .map((value) => new EntityResult.fromJson(value))
+          .map<EntityResult>((value) => new EntityResult.fromJson(value))
           .toList();
     }
     if (_json.containsKey("missing")) {
       missing = _json["missing"]
-          .map((value) => new EntityResult.fromJson(value))
+          .map<EntityResult>((value) => new EntityResult.fromJson(value))
           .toList();
     }
   }
@@ -2240,7 +2248,8 @@
   Query.fromJson(core.Map _json) {
     if (_json.containsKey("distinctOn")) {
       distinctOn = _json["distinctOn"]
-          .map((value) => new PropertyReference.fromJson(value))
+          .map<PropertyReference>(
+              (value) => new PropertyReference.fromJson(value))
           .toList();
     }
     if (_json.containsKey("endCursor")) {
@@ -2251,7 +2260,7 @@
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"]
-          .map((value) => new KindExpression.fromJson(value))
+          .map<KindExpression>((value) => new KindExpression.fromJson(value))
           .toList();
     }
     if (_json.containsKey("limit")) {
@@ -2262,12 +2271,12 @@
     }
     if (_json.containsKey("order")) {
       order = _json["order"]
-          .map((value) => new PropertyOrder.fromJson(value))
+          .map<PropertyOrder>((value) => new PropertyOrder.fromJson(value))
           .toList();
     }
     if (_json.containsKey("projection")) {
       projection = _json["projection"]
-          .map((value) => new Projection.fromJson(value))
+          .map<Projection>((value) => new Projection.fromJson(value))
           .toList();
     }
     if (_json.containsKey("startCursor")) {
@@ -2388,7 +2397,7 @@
     }
     if (_json.containsKey("entityResults")) {
       entityResults = _json["entityResults"]
-          .map((value) => new EntityResult.fromJson(value))
+          .map<EntityResult>((value) => new EntityResult.fromJson(value))
           .toList();
     }
     if (_json.containsKey("moreResults")) {
@@ -2542,7 +2551,8 @@
       databaseId = _json["databaseId"];
     }
     if (_json.containsKey("keys")) {
-      keys = _json["keys"].map((value) => new Key.fromJson(value)).toList();
+      keys =
+          _json["keys"].map<Key>((value) => new Key.fromJson(value)).toList();
     }
   }
 
diff --git a/generated/googleapis/lib/deploymentmanager/v2.dart b/generated/googleapis/lib/deploymentmanager/v2.dart
index e387940..280dac4 100644
--- a/generated/googleapis/lib/deploymentmanager/v2.dart
+++ b/generated/googleapis/lib/deploymentmanager/v2.dart
@@ -83,7 +83,7 @@
       core.String project, core.String deployment,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -145,7 +145,7 @@
   async.Future<Operation> delete(core.String project, core.String deployment,
       {core.String deletePolicy, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -201,7 +201,7 @@
   async.Future<Deployment> get(core.String project, core.String deployment,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -255,7 +255,7 @@
   async.Future<Policy> getIamPolicy(core.String project, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -318,7 +318,7 @@
   async.Future<Operation> insert(Deployment request, core.String project,
       {core.bool preview, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -419,7 +419,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -507,7 +507,7 @@
       core.bool preview,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -576,7 +576,7 @@
       Policy request, core.String project, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -637,7 +637,7 @@
       core.String project, core.String deployment,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -697,7 +697,7 @@
       TestPermissionsRequest request, core.String project, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -782,7 +782,7 @@
       core.bool preview,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -857,7 +857,7 @@
       core.String project, core.String deployment, core.String manifest,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -966,7 +966,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1037,7 +1037,7 @@
   async.Future<Operation> get(core.String project, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1137,7 +1137,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1206,7 +1206,7 @@
       core.String project, core.String deployment, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1315,7 +1315,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1434,7 +1434,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1508,7 +1508,7 @@
   AuditConfig.fromJson(core.Map _json) {
     if (_json.containsKey("auditLogConfigs")) {
       auditLogConfigs = _json["auditLogConfigs"]
-          .map((value) => new AuditLogConfig.fromJson(value))
+          .map<AuditLogConfig>((value) => new AuditLogConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("exemptedMembers")) {
@@ -1840,7 +1840,8 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new DeploymentLabelEntry.fromJson(value))
+          .map<DeploymentLabelEntry>(
+              (value) => new DeploymentLabelEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("manifest")) {
@@ -1956,7 +1957,8 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new DeploymentUpdateLabelEntry.fromJson(value))
+          .map<DeploymentUpdateLabelEntry>(
+              (value) => new DeploymentUpdateLabelEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("manifest")) {
@@ -2061,7 +2063,7 @@
   DeploymentsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deployments")) {
       deployments = _json["deployments"]
-          .map((value) => new Deployment.fromJson(value))
+          .map<Deployment>((value) => new Deployment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2406,7 +2408,7 @@
     }
     if (_json.containsKey("imports")) {
       imports = _json["imports"]
-          .map((value) => new ImportFile.fromJson(value))
+          .map<ImportFile>((value) => new ImportFile.fromJson(value))
           .toList();
     }
     if (_json.containsKey("insertTime")) {
@@ -2468,7 +2470,7 @@
   ManifestsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("manifests")) {
       manifests = _json["manifests"]
-          .map((value) => new Manifest.fromJson(value))
+          .map<Manifest>((value) => new Manifest.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2542,7 +2544,8 @@
   OperationError.fromJson(core.Map _json) {
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new OperationErrorErrors.fromJson(value))
+          .map<OperationErrorErrors>(
+              (value) => new OperationErrorErrors.fromJson(value))
           .toList();
     }
   }
@@ -2615,7 +2618,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new OperationWarningsData.fromJson(value))
+          .map<OperationWarningsData>(
+              (value) => new OperationWarningsData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -2810,7 +2814,8 @@
     }
     if (_json.containsKey("warnings")) {
       warnings = _json["warnings"]
-          .map((value) => new OperationWarnings.fromJson(value))
+          .map<OperationWarnings>(
+              (value) => new OperationWarnings.fromJson(value))
           .toList();
     }
     if (_json.containsKey("zone")) {
@@ -2911,7 +2916,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -2997,12 +3002,12 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("auditConfigs")) {
       auditConfigs = _json["auditConfigs"]
-          .map((value) => new AuditConfig.fromJson(value))
+          .map<AuditConfig>((value) => new AuditConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -3012,7 +3017,9 @@
       iamOwned = _json["iamOwned"];
     }
     if (_json.containsKey("rules")) {
-      rules = _json["rules"].map((value) => new Rule.fromJson(value)).toList();
+      rules = _json["rules"]
+          .map<Rule>((value) => new Rule.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("version")) {
       version = _json["version"];
@@ -3103,7 +3110,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new ResourceWarningsData.fromJson(value))
+          .map<ResourceWarningsData>(
+              (value) => new ResourceWarningsData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -3211,7 +3219,8 @@
     }
     if (_json.containsKey("warnings")) {
       warnings = _json["warnings"]
-          .map((value) => new ResourceWarnings.fromJson(value))
+          .map<ResourceWarnings>(
+              (value) => new ResourceWarnings.fromJson(value))
           .toList();
     }
   }
@@ -3335,7 +3344,8 @@
   ResourceUpdateError.fromJson(core.Map _json) {
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new ResourceUpdateErrorErrors.fromJson(value))
+          .map<ResourceUpdateErrorErrors>(
+              (value) => new ResourceUpdateErrorErrors.fromJson(value))
           .toList();
     }
   }
@@ -3408,7 +3418,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new ResourceUpdateWarningsData.fromJson(value))
+          .map<ResourceUpdateWarningsData>(
+              (value) => new ResourceUpdateWarningsData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -3490,7 +3501,8 @@
     }
     if (_json.containsKey("warnings")) {
       warnings = _json["warnings"]
-          .map((value) => new ResourceUpdateWarnings.fromJson(value))
+          .map<ResourceUpdateWarnings>(
+              (value) => new ResourceUpdateWarnings.fromJson(value))
           .toList();
     }
   }
@@ -3543,7 +3555,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new Resource.fromJson(value))
+          .map<Resource>((value) => new Resource.fromJson(value))
           .toList();
     }
   }
@@ -3598,7 +3610,7 @@
     }
     if (_json.containsKey("conditions")) {
       conditions = _json["conditions"]
-          .map((value) => new Condition.fromJson(value))
+          .map<Condition>((value) => new Condition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("description")) {
@@ -3609,7 +3621,7 @@
     }
     if (_json.containsKey("logConfigs")) {
       logConfigs = _json["logConfigs"]
-          .map((value) => new LogConfig.fromJson(value))
+          .map<LogConfig>((value) => new LogConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("notIns")) {
@@ -3667,7 +3679,7 @@
     }
     if (_json.containsKey("imports")) {
       imports = _json["imports"]
-          .map((value) => new ImportFile.fromJson(value))
+          .map<ImportFile>((value) => new ImportFile.fromJson(value))
           .toList();
     }
   }
@@ -3806,7 +3818,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("types")) {
-      types = _json["types"].map((value) => new Type.fromJson(value)).toList();
+      types = _json["types"]
+          .map<Type>((value) => new Type.fromJson(value))
+          .toList();
     }
   }
 
diff --git a/generated/googleapis/lib/dfareporting/v2_8.dart b/generated/googleapis/lib/dfareporting/v2_8.dart
index 945371d..c647ae6 100644
--- a/generated/googleapis/lib/dfareporting/v2_8.dart
+++ b/generated/googleapis/lib/dfareporting/v2_8.dart
@@ -175,7 +175,7 @@
       core.String profileId, core.String summaryAccountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -234,7 +234,7 @@
       core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -283,7 +283,7 @@
   async.Future<AccountPermissionGroupsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -338,7 +338,7 @@
   async.Future<AccountPermission> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -387,7 +387,7 @@
   async.Future<AccountPermissionsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -442,7 +442,7 @@
   async.Future<AccountUserProfile> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -494,7 +494,7 @@
       AccountUserProfile request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -584,7 +584,7 @@
       core.String userRoleId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -663,7 +663,7 @@
       AccountUserProfile request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -718,7 +718,7 @@
       AccountUserProfile request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -774,7 +774,7 @@
   async.Future<Account> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -858,7 +858,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -929,7 +929,7 @@
       Account request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -983,7 +983,7 @@
   async.Future<Account> update(Account request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1039,7 +1039,7 @@
   async.Future<Ad> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1090,7 +1090,7 @@
   async.Future<Ad> insert(Ad request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1234,7 +1234,7 @@
       core.List<core.String> type,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1352,7 +1352,7 @@
   async.Future<Ad> patch(Ad request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1405,7 +1405,7 @@
   async.Future<Ad> update(Ad request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1459,7 +1459,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1512,7 +1512,7 @@
   async.Future<AdvertiserGroup> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1564,7 +1564,7 @@
       AdvertiserGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1644,7 +1644,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1714,7 +1714,7 @@
       AdvertiserGroup request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1769,7 +1769,7 @@
       AdvertiserGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1825,7 +1825,7 @@
   async.Future<Advertiser> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1876,7 +1876,7 @@
   async.Future<Advertiser> insert(Advertiser request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1981,7 +1981,7 @@
       core.String subaccountId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2069,7 +2069,7 @@
       Advertiser request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2123,7 +2123,7 @@
   async.Future<Advertiser> update(Advertiser request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2177,7 +2177,7 @@
   async.Future<BrowsersListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2238,7 +2238,7 @@
       core.String campaignId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2309,7 +2309,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2377,7 +2377,7 @@
   async.Future<Campaign> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2434,7 +2434,7 @@
       core.String defaultLandingPageName, core.String defaultLandingPageUrl,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2549,7 +2549,7 @@
       core.String subaccountId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2640,7 +2640,7 @@
       Campaign request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2694,7 +2694,7 @@
   async.Future<Campaign> update(Campaign request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2750,7 +2750,7 @@
   async.Future<ChangeLog> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2899,7 +2899,7 @@
       core.List<core.String> userProfileIds,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2992,7 +2992,7 @@
       core.List<core.String> regionDartIds,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3057,7 +3057,7 @@
   async.Future<ConnectionType> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3106,7 +3106,7 @@
   async.Future<ConnectionTypesListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3159,7 +3159,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3212,7 +3212,7 @@
   async.Future<ContentCategory> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3264,7 +3264,7 @@
       ContentCategory request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3344,7 +3344,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3414,7 +3414,7 @@
       ContentCategory request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3469,7 +3469,7 @@
       ContentCategory request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3526,7 +3526,7 @@
       ConversionsBatchInsertRequest request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3578,7 +3578,7 @@
       ConversionsBatchUpdateRequest request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3635,7 +3635,7 @@
   async.Future<Country> get(core.String profileId, core.String dartId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3684,7 +3684,7 @@
   async.Future<CountriesListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3748,7 +3748,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3828,7 +3828,7 @@
       core.String profileId, core.String creativeFieldId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3889,7 +3889,7 @@
       core.String profileId, core.String creativeFieldId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3948,7 +3948,7 @@
       core.String profileId, core.String creativeFieldId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4031,7 +4031,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4108,7 +4108,7 @@
       core.String profileId, core.String creativeFieldId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4170,7 +4170,7 @@
       core.String profileId, core.String creativeFieldId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4229,7 +4229,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4282,7 +4282,7 @@
   async.Future<CreativeField> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4334,7 +4334,7 @@
       CreativeField request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4419,7 +4419,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4491,7 +4491,7 @@
       CreativeField request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4546,7 +4546,7 @@
       CreativeField request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4602,7 +4602,7 @@
   async.Future<CreativeGroup> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4654,7 +4654,7 @@
       CreativeGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4743,7 +4743,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4818,7 +4818,7 @@
       CreativeGroup request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4873,7 +4873,7 @@
       CreativeGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4929,7 +4929,7 @@
   async.Future<Creative> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4980,7 +4980,7 @@
   async.Future<Creative> insert(Creative request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5094,7 +5094,7 @@
       core.List<core.String> types,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5192,7 +5192,7 @@
       Creative request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5246,7 +5246,7 @@
   async.Future<Creative> update(Creative request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5308,7 +5308,7 @@
       DimensionValueRequest request, core.String profileId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5371,7 +5371,7 @@
   async.Future<DirectorySiteContact> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5457,7 +5457,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5532,7 +5532,7 @@
   async.Future<DirectorySite> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5584,7 +5584,7 @@
       DirectorySite request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5689,7 +5689,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5801,7 +5801,7 @@
       core.String name, core.String objectType,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5866,7 +5866,7 @@
       DynamicTargetingKey request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5932,7 +5932,7 @@
       core.String objectType,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5996,7 +5996,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6049,7 +6049,7 @@
   async.Future<EventTag> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6100,7 +6100,7 @@
   async.Future<EventTag> insert(EventTag request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6204,7 +6204,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6284,7 +6284,7 @@
       EventTag request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6338,7 +6338,7 @@
   async.Future<EventTag> update(EventTag request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6405,7 +6405,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6487,7 +6487,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6554,7 +6554,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6610,7 +6610,7 @@
       {core.String floodlightActivityId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6661,7 +6661,7 @@
   async.Future<FloodlightActivity> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6713,7 +6713,7 @@
       FloodlightActivity request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6829,7 +6829,7 @@
       core.String tagString,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6926,7 +6926,7 @@
       FloodlightActivity request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6981,7 +6981,7 @@
       FloodlightActivity request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7039,7 +7039,7 @@
       core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7091,7 +7091,7 @@
       FloodlightActivityGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7192,7 +7192,7 @@
       core.String type,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7271,7 +7271,7 @@
       FloodlightActivityGroup request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7326,7 +7326,7 @@
       FloodlightActivityGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7384,7 +7384,7 @@
       core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7436,7 +7436,7 @@
   async.Future<FloodlightConfigurationsListResponse> list(core.String profileId,
       {core.List<core.String> ids, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7491,7 +7491,7 @@
       FloodlightConfiguration request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7546,7 +7546,7 @@
       FloodlightConfiguration request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7605,7 +7605,7 @@
       core.String profileId, core.String projectId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7701,7 +7701,7 @@
       core.String type,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7788,7 +7788,7 @@
       core.String profileId, core.String campaignId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7849,7 +7849,7 @@
       core.String profileId, core.String campaignId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7908,7 +7908,7 @@
       LandingPage request, core.String profileId, core.String campaignId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7964,7 +7964,7 @@
       core.String profileId, core.String campaignId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8023,7 +8023,7 @@
       core.String campaignId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8085,7 +8085,7 @@
       LandingPage request, core.String profileId, core.String campaignId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8144,7 +8144,7 @@
   async.Future<LanguagesListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8195,7 +8195,7 @@
   async.Future<MetrosListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8248,7 +8248,7 @@
   async.Future<MobileCarrier> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8297,7 +8297,7 @@
   async.Future<MobileCarriersListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8353,7 +8353,7 @@
       core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8402,7 +8402,7 @@
   async.Future<OperatingSystemVersionsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8457,7 +8457,7 @@
   async.Future<OperatingSystem> get(core.String profileId, core.String dartId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8506,7 +8506,7 @@
   async.Future<OperatingSystemsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8563,7 +8563,7 @@
       core.String profileId, core.String projectId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8664,7 +8664,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8753,7 +8753,7 @@
       core.String profileId, core.String projectId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8844,7 +8844,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8923,7 +8923,7 @@
   async.Future<PlacementGroup> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8975,7 +8975,7 @@
       PlacementGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9119,7 +9119,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9227,7 +9227,7 @@
       PlacementGroup request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9282,7 +9282,7 @@
       PlacementGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9337,7 +9337,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9390,7 +9390,7 @@
   async.Future<PlacementStrategy> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9442,7 +9442,7 @@
       PlacementStrategy request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9523,7 +9523,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9593,7 +9593,7 @@
       PlacementStrategy request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9648,7 +9648,7 @@
       PlacementStrategy request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9715,7 +9715,7 @@
       core.List<core.String> tagFormats,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9772,7 +9772,7 @@
   async.Future<Placement> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9823,7 +9823,7 @@
   async.Future<Placement> insert(Placement request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9971,7 +9971,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10087,7 +10087,7 @@
       Placement request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10141,7 +10141,7 @@
   async.Future<Placement> update(Placement request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10197,7 +10197,7 @@
   async.Future<PlatformType> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10246,7 +10246,7 @@
   async.Future<PlatformTypesListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10300,7 +10300,7 @@
   async.Future<PostalCode> get(core.String profileId, core.String code,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10349,7 +10349,7 @@
   async.Future<PostalCodesListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10402,7 +10402,7 @@
   async.Future<Project> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10486,7 +10486,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10558,7 +10558,7 @@
   async.Future<RegionsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10613,7 +10613,7 @@
       core.String profileId, core.String remarketingListId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10668,7 +10668,7 @@
       core.String profileId, core.String remarketingListId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10723,7 +10723,7 @@
       RemarketingListShare request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10780,7 +10780,7 @@
   async.Future<RemarketingList> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10832,7 +10832,7 @@
       RemarketingList request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10919,7 +10919,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10996,7 +10996,7 @@
       RemarketingList request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11051,7 +11051,7 @@
       RemarketingList request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11109,7 +11109,7 @@
   async.Future delete(core.String profileId, core.String reportId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11162,7 +11162,7 @@
   async.Future<Report> get(core.String profileId, core.String reportId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11213,7 +11213,7 @@
   async.Future<Report> insert(Report request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11287,7 +11287,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11352,7 +11352,7 @@
       Report request, core.String profileId, core.String reportId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11408,7 +11408,7 @@
   async.Future<File> run(core.String profileId, core.String reportId,
       {core.bool synchronous, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11466,7 +11466,7 @@
       Report request, core.String profileId, core.String reportId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11529,7 +11529,7 @@
   async.Future<CompatibleFields> query(Report request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11598,7 +11598,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11680,7 +11680,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11750,7 +11750,7 @@
   async.Future<Site> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11801,7 +11801,7 @@
   async.Future<Site> insert(Site request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11910,7 +11910,7 @@
       core.bool unmappedSite,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12010,7 +12010,7 @@
   async.Future<Site> patch(Site request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12064,7 +12064,7 @@
   async.Future<Site> update(Site request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12120,7 +12120,7 @@
   async.Future<Size> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12171,7 +12171,7 @@
   async.Future<Size> insert(Size request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12233,7 +12233,7 @@
       core.int width,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12298,7 +12298,7 @@
   async.Future<Subaccount> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12349,7 +12349,7 @@
   async.Future<Subaccount> insert(Subaccount request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12429,7 +12429,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12497,7 +12497,7 @@
       Subaccount request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12551,7 +12551,7 @@
   async.Future<Subaccount> update(Subaccount request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12609,7 +12609,7 @@
       core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12696,7 +12696,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12773,7 +12773,7 @@
   async.Future<TargetingTemplate> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12825,7 +12825,7 @@
       TargetingTemplate request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12908,7 +12908,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12981,7 +12981,7 @@
       TargetingTemplate request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13036,7 +13036,7 @@
       TargetingTemplate request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13089,7 +13089,7 @@
   /// this method will complete with the same error.
   async.Future<UserProfile> get(core.String profileId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13129,7 +13129,7 @@
   /// this method will complete with the same error.
   async.Future<UserProfileList> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13179,7 +13179,7 @@
       core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13228,7 +13228,7 @@
   async.Future<UserRolePermissionGroupsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13283,7 +13283,7 @@
   async.Future<UserRolePermission> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13334,7 +13334,7 @@
   async.Future<UserRolePermissionsListResponse> list(core.String profileId,
       {core.List<core.String> ids, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13389,7 +13389,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13442,7 +13442,7 @@
   async.Future<UserRole> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13493,7 +13493,7 @@
   async.Future<UserRole> insert(UserRole request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13580,7 +13580,7 @@
       core.String subaccountId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13654,7 +13654,7 @@
       UserRole request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13708,7 +13708,7 @@
   async.Future<UserRole> update(UserRole request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13764,7 +13764,7 @@
   async.Future<VideoFormat> get(core.String profileId, core.int id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13813,7 +13813,7 @@
   async.Future<VideoFormatsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14317,7 +14317,8 @@
   AccountPermissionGroupsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("accountPermissionGroups")) {
       accountPermissionGroups = _json["accountPermissionGroups"]
-          .map((value) => new AccountPermissionGroup.fromJson(value))
+          .map<AccountPermissionGroup>(
+              (value) => new AccountPermissionGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -14353,7 +14354,8 @@
   AccountPermissionsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("accountPermissions")) {
       accountPermissions = _json["accountPermissions"]
-          .map((value) => new AccountPermission.fromJson(value))
+          .map<AccountPermission>(
+              (value) => new AccountPermission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -14587,7 +14589,8 @@
   AccountUserProfilesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("accountUserProfiles")) {
       accountUserProfiles = _json["accountUserProfiles"]
-          .map((value) => new AccountUserProfile.fromJson(value))
+          .map<AccountUserProfile>(
+              (value) => new AccountUserProfile.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -14632,7 +14635,7 @@
   AccountsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("accounts")) {
       accounts = _json["accounts"]
-          .map((value) => new Account.fromJson(value))
+          .map<Account>((value) => new Account.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -14676,7 +14679,7 @@
   Activities.fromJson(core.Map _json) {
     if (_json.containsKey("filters")) {
       filters = _json["filters"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -14930,7 +14933,8 @@
     }
     if (_json.containsKey("creativeGroupAssignments")) {
       creativeGroupAssignments = _json["creativeGroupAssignments"]
-          .map((value) => new CreativeGroupAssignment.fromJson(value))
+          .map<CreativeGroupAssignment>(
+              (value) => new CreativeGroupAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeRotation")) {
@@ -14958,7 +14962,8 @@
     }
     if (_json.containsKey("eventTagOverrides")) {
       eventTagOverrides = _json["eventTagOverrides"]
-          .map((value) => new EventTagOverride.fromJson(value))
+          .map<EventTagOverride>(
+              (value) => new EventTagOverride.fromJson(value))
           .toList();
     }
     if (_json.containsKey("geoTargeting")) {
@@ -14990,7 +14995,8 @@
     }
     if (_json.containsKey("placementAssignments")) {
       placementAssignments = _json["placementAssignments"]
-          .map((value) => new PlacementAssignment.fromJson(value))
+          .map<PlacementAssignment>(
+              (value) => new PlacementAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("remarketingListExpression")) {
@@ -15329,7 +15335,7 @@
 
   AdsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("ads")) {
-      ads = _json["ads"].map((value) => new Ad.fromJson(value)).toList();
+      ads = _json["ads"].map<Ad>((value) => new Ad.fromJson(value)).toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -15606,7 +15612,7 @@
   AdvertiserGroupsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("advertiserGroups")) {
       advertiserGroups = _json["advertiserGroups"]
-          .map((value) => new AdvertiserGroup.fromJson(value))
+          .map<AdvertiserGroup>((value) => new AdvertiserGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -15651,7 +15657,7 @@
   AdvertisersListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("advertisers")) {
       advertisers = _json["advertisers"]
-          .map((value) => new Advertiser.fromJson(value))
+          .map<Advertiser>((value) => new Advertiser.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -15742,7 +15748,7 @@
   AudienceSegmentGroup.fromJson(core.Map _json) {
     if (_json.containsKey("audienceSegments")) {
       audienceSegments = _json["audienceSegments"]
-          .map((value) => new AudienceSegment.fromJson(value))
+          .map<AudienceSegment>((value) => new AudienceSegment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -15868,7 +15874,7 @@
   BrowsersListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("browsers")) {
       browsers = _json["browsers"]
-          .map((value) => new Browser.fromJson(value))
+          .map<Browser>((value) => new Browser.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -16006,10 +16012,11 @@
           _json["adBlockingConfiguration"]);
     }
     if (_json.containsKey("additionalCreativeOptimizationConfigurations")) {
-      additionalCreativeOptimizationConfigurations = _json[
-              "additionalCreativeOptimizationConfigurations"]
-          .map((value) => new CreativeOptimizationConfiguration.fromJson(value))
-          .toList();
+      additionalCreativeOptimizationConfigurations =
+          _json["additionalCreativeOptimizationConfigurations"]
+              .map<CreativeOptimizationConfiguration>((value) =>
+                  new CreativeOptimizationConfiguration.fromJson(value))
+              .toList();
     }
     if (_json.containsKey("advertiserGroupId")) {
       advertiserGroupId = _json["advertiserGroupId"];
@@ -16026,7 +16033,8 @@
     }
     if (_json.containsKey("audienceSegmentGroups")) {
       audienceSegmentGroups = _json["audienceSegmentGroups"]
-          .map((value) => new AudienceSegmentGroup.fromJson(value))
+          .map<AudienceSegmentGroup>(
+              (value) => new AudienceSegmentGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("billingInvoiceCode")) {
@@ -16061,7 +16069,8 @@
     }
     if (_json.containsKey("eventTagOverrides")) {
       eventTagOverrides = _json["eventTagOverrides"]
-          .map((value) => new EventTagOverride.fromJson(value))
+          .map<EventTagOverride>(
+              (value) => new EventTagOverride.fromJson(value))
           .toList();
     }
     if (_json.containsKey("externalId")) {
@@ -16253,7 +16262,8 @@
   CampaignCreativeAssociationsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("campaignCreativeAssociations")) {
       campaignCreativeAssociations = _json["campaignCreativeAssociations"]
-          .map((value) => new CampaignCreativeAssociation.fromJson(value))
+          .map<CampaignCreativeAssociation>(
+              (value) => new CampaignCreativeAssociation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -16299,7 +16309,7 @@
   CampaignsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("campaigns")) {
       campaigns = _json["campaigns"]
-          .map((value) => new Campaign.fromJson(value))
+          .map<Campaign>((value) => new Campaign.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -16487,7 +16497,7 @@
   ChangeLogsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("changeLogs")) {
       changeLogs = _json["changeLogs"]
-          .map((value) => new ChangeLog.fromJson(value))
+          .map<ChangeLog>((value) => new ChangeLog.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -16528,8 +16538,9 @@
 
   CitiesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("cities")) {
-      cities =
-          _json["cities"].map((value) => new City.fromJson(value)).toList();
+      cities = _json["cities"]
+          .map<City>((value) => new City.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -16841,7 +16852,7 @@
     }
     if (_json.containsKey("enabledSizes")) {
       enabledSizes = _json["enabledSizes"]
-          .map((value) => new Size.fromJson(value))
+          .map<Size>((value) => new Size.fromJson(value))
           .toList();
     }
     if (_json.containsKey("imageOnly")) {
@@ -17016,7 +17027,7 @@
   ConnectionTypesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("connectionTypes")) {
       connectionTypes = _json["connectionTypes"]
-          .map((value) => new ConnectionType.fromJson(value))
+          .map<ConnectionType>((value) => new ConnectionType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -17055,7 +17066,7 @@
   ContentCategoriesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("contentCategories")) {
       contentCategories = _json["contentCategories"]
-          .map((value) => new ContentCategory.fromJson(value))
+          .map<ContentCategory>((value) => new ContentCategory.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -17212,7 +17223,8 @@
     }
     if (_json.containsKey("customVariables")) {
       customVariables = _json["customVariables"]
-          .map((value) => new CustomFloodlightVariable.fromJson(value))
+          .map<CustomFloodlightVariable>(
+              (value) => new CustomFloodlightVariable.fromJson(value))
           .toList();
     }
     if (_json.containsKey("encryptedUserId")) {
@@ -17372,7 +17384,7 @@
     }
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new ConversionError.fromJson(value))
+          .map<ConversionError>((value) => new ConversionError.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -17415,7 +17427,7 @@
   ConversionsBatchInsertRequest.fromJson(core.Map _json) {
     if (_json.containsKey("conversions")) {
       conversions = _json["conversions"]
-          .map((value) => new Conversion.fromJson(value))
+          .map<Conversion>((value) => new Conversion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("encryptionInfo")) {
@@ -17467,7 +17479,8 @@
     }
     if (_json.containsKey("status")) {
       status = _json["status"]
-          .map((value) => new ConversionStatus.fromJson(value))
+          .map<ConversionStatus>(
+              (value) => new ConversionStatus.fromJson(value))
           .toList();
     }
   }
@@ -17506,7 +17519,7 @@
   ConversionsBatchUpdateRequest.fromJson(core.Map _json) {
     if (_json.containsKey("conversions")) {
       conversions = _json["conversions"]
-          .map((value) => new Conversion.fromJson(value))
+          .map<Conversion>((value) => new Conversion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("encryptionInfo")) {
@@ -17558,7 +17571,8 @@
     }
     if (_json.containsKey("status")) {
       status = _json["status"]
-          .map((value) => new ConversionStatus.fromJson(value))
+          .map<ConversionStatus>(
+              (value) => new ConversionStatus.fromJson(value))
           .toList();
     }
   }
@@ -17593,7 +17607,7 @@
   CountriesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("countries")) {
       countries = _json["countries"]
-          .map((value) => new Country.fromJson(value))
+          .map<Country>((value) => new Country.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -18113,7 +18127,7 @@
     }
     if (_json.containsKey("clickTags")) {
       clickTags = _json["clickTags"]
-          .map((value) => new ClickTag.fromJson(value))
+          .map<ClickTag>((value) => new ClickTag.fromJson(value))
           .toList();
     }
     if (_json.containsKey("commercialId")) {
@@ -18130,7 +18144,8 @@
     }
     if (_json.containsKey("counterCustomEvents")) {
       counterCustomEvents = _json["counterCustomEvents"]
-          .map((value) => new CreativeCustomEvent.fromJson(value))
+          .map<CreativeCustomEvent>(
+              (value) => new CreativeCustomEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeAssetSelection")) {
@@ -18139,12 +18154,13 @@
     }
     if (_json.containsKey("creativeAssets")) {
       creativeAssets = _json["creativeAssets"]
-          .map((value) => new CreativeAsset.fromJson(value))
+          .map<CreativeAsset>((value) => new CreativeAsset.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeFieldAssignments")) {
       creativeFieldAssignments = _json["creativeFieldAssignments"]
-          .map((value) => new CreativeFieldAssignment.fromJson(value))
+          .map<CreativeFieldAssignment>(
+              (value) => new CreativeFieldAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("customKeyValues")) {
@@ -18155,7 +18171,8 @@
     }
     if (_json.containsKey("exitCustomEvents")) {
       exitCustomEvents = _json["exitCustomEvents"]
-          .map((value) => new CreativeCustomEvent.fromJson(value))
+          .map<CreativeCustomEvent>(
+              (value) => new CreativeCustomEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("fsCommand")) {
@@ -18245,12 +18262,14 @@
     }
     if (_json.containsKey("thirdPartyUrls")) {
       thirdPartyUrls = _json["thirdPartyUrls"]
-          .map((value) => new ThirdPartyTrackingUrl.fromJson(value))
+          .map<ThirdPartyTrackingUrl>(
+              (value) => new ThirdPartyTrackingUrl.fromJson(value))
           .toList();
     }
     if (_json.containsKey("timerCustomEvents")) {
       timerCustomEvents = _json["timerCustomEvents"]
-          .map((value) => new CreativeCustomEvent.fromJson(value))
+          .map<CreativeCustomEvent>(
+              (value) => new CreativeCustomEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("totalFileSize")) {
@@ -19150,7 +19169,7 @@
     }
     if (_json.containsKey("clickTags")) {
       clickTags = _json["clickTags"]
-          .map((value) => new ClickTag.fromJson(value))
+          .map<ClickTag>((value) => new ClickTag.fromJson(value))
           .toList();
     }
     if (_json.containsKey("detectedFeatures")) {
@@ -19218,7 +19237,9 @@
       defaultAssetId = _json["defaultAssetId"];
     }
     if (_json.containsKey("rules")) {
-      rules = _json["rules"].map((value) => new Rule.fromJson(value)).toList();
+      rules = _json["rules"]
+          .map<Rule>((value) => new Rule.fromJson(value))
+          .toList();
     }
   }
 
@@ -19315,12 +19336,14 @@
     }
     if (_json.containsKey("companionCreativeOverrides")) {
       companionCreativeOverrides = _json["companionCreativeOverrides"]
-          .map((value) => new CompanionClickThroughOverride.fromJson(value))
+          .map<CompanionClickThroughOverride>(
+              (value) => new CompanionClickThroughOverride.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeGroupAssignments")) {
       creativeGroupAssignments = _json["creativeGroupAssignments"]
-          .map((value) => new CreativeGroupAssignment.fromJson(value))
+          .map<CreativeGroupAssignment>(
+              (value) => new CreativeGroupAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeId")) {
@@ -19335,7 +19358,8 @@
     }
     if (_json.containsKey("richMediaExitOverrides")) {
       richMediaExitOverrides = _json["richMediaExitOverrides"]
-          .map((value) => new RichMediaExitOverride.fromJson(value))
+          .map<RichMediaExitOverride>(
+              (value) => new RichMediaExitOverride.fromJson(value))
           .toList();
     }
     if (_json.containsKey("sequence")) {
@@ -19705,7 +19729,8 @@
   CreativeFieldValuesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("creativeFieldValues")) {
       creativeFieldValues = _json["creativeFieldValues"]
-          .map((value) => new CreativeFieldValue.fromJson(value))
+          .map<CreativeFieldValue>(
+              (value) => new CreativeFieldValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -19750,7 +19775,7 @@
   CreativeFieldsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("creativeFields")) {
       creativeFields = _json["creativeFields"]
-          .map((value) => new CreativeField.fromJson(value))
+          .map<CreativeField>((value) => new CreativeField.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -19928,7 +19953,7 @@
   CreativeGroupsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("creativeGroups")) {
       creativeGroups = _json["creativeGroups"]
-          .map((value) => new CreativeGroup.fromJson(value))
+          .map<CreativeGroup>((value) => new CreativeGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -19990,7 +20015,8 @@
     }
     if (_json.containsKey("optimizationActivitys")) {
       optimizationActivitys = _json["optimizationActivitys"]
-          .map((value) => new OptimizationActivity.fromJson(value))
+          .map<OptimizationActivity>(
+              (value) => new OptimizationActivity.fromJson(value))
           .toList();
     }
     if (_json.containsKey("optimizationModel")) {
@@ -20049,7 +20075,8 @@
   CreativeRotation.fromJson(core.Map _json) {
     if (_json.containsKey("creativeAssignments")) {
       creativeAssignments = _json["creativeAssignments"]
-          .map((value) => new CreativeAssignment.fromJson(value))
+          .map<CreativeAssignment>(
+              (value) => new CreativeAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeOptimizationConfigurationId")) {
@@ -20136,7 +20163,7 @@
   CreativesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("creatives")) {
       creatives = _json["creatives"]
-          .map((value) => new Creative.fromJson(value))
+          .map<Creative>((value) => new Creative.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -20191,24 +20218,25 @@
   CrossDimensionReachReportCompatibleFields.fromJson(core.Map _json) {
     if (_json.containsKey("breakdown")) {
       breakdown = _json["breakdown"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("metrics")) {
-      metrics =
-          _json["metrics"].map((value) => new Metric.fromJson(value)).toList();
+      metrics = _json["metrics"]
+          .map<Metric>((value) => new Metric.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("overlapMetrics")) {
       overlapMetrics = _json["overlapMetrics"]
-          .map((value) => new Metric.fromJson(value))
+          .map<Metric>((value) => new Metric.fromJson(value))
           .toList();
     }
   }
@@ -20397,7 +20425,7 @@
   CustomRichMediaEvents.fromJson(core.Map _json) {
     if (_json.containsKey("filteredEventIds")) {
       filteredEventIds = _json["filteredEventIds"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -20891,7 +20919,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -20952,7 +20980,7 @@
     }
     if (_json.containsKey("filters")) {
       filters = _json["filters"]
-          .map((value) => new DimensionFilter.fromJson(value))
+          .map<DimensionFilter>((value) => new DimensionFilter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -21104,7 +21132,8 @@
     }
     if (_json.containsKey("contactAssignments")) {
       contactAssignments = _json["contactAssignments"]
-          .map((value) => new DirectorySiteContactAssignment.fromJson(value))
+          .map<DirectorySiteContactAssignment>(
+              (value) => new DirectorySiteContactAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("countryId")) {
@@ -21365,7 +21394,8 @@
   DirectorySiteContactsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("directorySiteContacts")) {
       directorySiteContacts = _json["directorySiteContacts"]
-          .map((value) => new DirectorySiteContact.fromJson(value))
+          .map<DirectorySiteContact>(
+              (value) => new DirectorySiteContact.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -21489,7 +21519,7 @@
   DirectorySitesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("directorySites")) {
       directorySites = _json["directorySites"]
-          .map((value) => new DirectorySite.fromJson(value))
+          .map<DirectorySite>((value) => new DirectorySite.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -21595,7 +21625,8 @@
   DynamicTargetingKeysListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("dynamicTargetingKeys")) {
       dynamicTargetingKeys = _json["dynamicTargetingKeys"]
-          .map((value) => new DynamicTargetingKey.fromJson(value))
+          .map<DynamicTargetingKey>(
+              (value) => new DynamicTargetingKey.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -21938,7 +21969,7 @@
   EventTagsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("eventTags")) {
       eventTags = _json["eventTags"]
-          .map((value) => new EventTag.fromJson(value))
+          .map<EventTag>((value) => new EventTag.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -22132,7 +22163,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new File.fromJson(value)).toList();
+      items = _json["items"]
+          .map<File>((value) => new File.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -22264,7 +22297,8 @@
   FloodlightActivitiesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("floodlightActivities")) {
       floodlightActivities = _json["floodlightActivities"]
-          .map((value) => new FloodlightActivity.fromJson(value))
+          .map<FloodlightActivity>(
+              (value) => new FloodlightActivity.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -22447,7 +22481,8 @@
     }
     if (_json.containsKey("defaultTags")) {
       defaultTags = _json["defaultTags"]
-          .map((value) => new FloodlightActivityDynamicTag.fromJson(value))
+          .map<FloodlightActivityDynamicTag>(
+              (value) => new FloodlightActivityDynamicTag.fromJson(value))
           .toList();
     }
     if (_json.containsKey("expectedUrl")) {
@@ -22496,7 +22531,7 @@
     }
     if (_json.containsKey("publisherTags")) {
       publisherTags = _json["publisherTags"]
-          .map((value) =>
+          .map<FloodlightActivityPublisherDynamicTag>((value) =>
               new FloodlightActivityPublisherDynamicTag.fromJson(value))
           .toList();
     }
@@ -22825,7 +22860,8 @@
   FloodlightActivityGroupsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("floodlightActivityGroups")) {
       floodlightActivityGroups = _json["floodlightActivityGroups"]
-          .map((value) => new FloodlightActivityGroup.fromJson(value))
+          .map<FloodlightActivityGroup>(
+              (value) => new FloodlightActivityGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -23050,14 +23086,16 @@
     }
     if (_json.containsKey("thirdPartyAuthenticationTokens")) {
       thirdPartyAuthenticationTokens = _json["thirdPartyAuthenticationTokens"]
-          .map((value) => new ThirdPartyAuthenticationToken.fromJson(value))
+          .map<ThirdPartyAuthenticationToken>(
+              (value) => new ThirdPartyAuthenticationToken.fromJson(value))
           .toList();
     }
     if (_json.containsKey("userDefinedVariableConfigurations")) {
-      userDefinedVariableConfigurations = _json[
-              "userDefinedVariableConfigurations"]
-          .map((value) => new UserDefinedVariableConfiguration.fromJson(value))
-          .toList();
+      userDefinedVariableConfigurations =
+          _json["userDefinedVariableConfigurations"]
+              .map<UserDefinedVariableConfiguration>((value) =>
+                  new UserDefinedVariableConfiguration.fromJson(value))
+              .toList();
     }
   }
 
@@ -23141,7 +23179,8 @@
   FloodlightConfigurationsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("floodlightConfigurations")) {
       floodlightConfigurations = _json["floodlightConfigurations"]
-          .map((value) => new FloodlightConfiguration.fromJson(value))
+          .map<FloodlightConfiguration>(
+              (value) => new FloodlightConfiguration.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -23187,20 +23226,21 @@
   FloodlightReportCompatibleFields.fromJson(core.Map _json) {
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("metrics")) {
-      metrics =
-          _json["metrics"].map((value) => new Metric.fromJson(value)).toList();
+      metrics = _json["metrics"]
+          .map<Metric>((value) => new Metric.fromJson(value))
+          .toList();
     }
   }
 
@@ -23363,29 +23403,32 @@
 
   GeoTargeting.fromJson(core.Map _json) {
     if (_json.containsKey("cities")) {
-      cities =
-          _json["cities"].map((value) => new City.fromJson(value)).toList();
+      cities = _json["cities"]
+          .map<City>((value) => new City.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("countries")) {
       countries = _json["countries"]
-          .map((value) => new Country.fromJson(value))
+          .map<Country>((value) => new Country.fromJson(value))
           .toList();
     }
     if (_json.containsKey("excludeCountries")) {
       excludeCountries = _json["excludeCountries"];
     }
     if (_json.containsKey("metros")) {
-      metros =
-          _json["metros"].map((value) => new Metro.fromJson(value)).toList();
+      metros = _json["metros"]
+          .map<Metro>((value) => new Metro.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("postalCodes")) {
       postalCodes = _json["postalCodes"]
-          .map((value) => new PostalCode.fromJson(value))
+          .map<PostalCode>((value) => new PostalCode.fromJson(value))
           .toList();
     }
     if (_json.containsKey("regions")) {
-      regions =
-          _json["regions"].map((value) => new Region.fromJson(value)).toList();
+      regions = _json["regions"]
+          .map<Region>((value) => new Region.fromJson(value))
+          .toList();
     }
   }
 
@@ -23493,8 +23536,9 @@
       accountId = _json["accountId"];
     }
     if (_json.containsKey("adSlots")) {
-      adSlots =
-          _json["adSlots"].map((value) => new AdSlot.fromJson(value)).toList();
+      adSlots = _json["adSlots"]
+          .map<AdSlot>((value) => new AdSlot.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("advertiserId")) {
       advertiserId = _json["advertiserId"];
@@ -23637,7 +23681,7 @@
   InventoryItemsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("inventoryItems")) {
       inventoryItems = _json["inventoryItems"]
-          .map((value) => new InventoryItem.fromJson(value))
+          .map<InventoryItem>((value) => new InventoryItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -23770,7 +23814,7 @@
     }
     if (_json.containsKey("landingPages")) {
       landingPages = _json["landingPages"]
-          .map((value) => new LandingPage.fromJson(value))
+          .map<LandingPage>((value) => new LandingPage.fromJson(value))
           .toList();
     }
   }
@@ -23855,7 +23899,7 @@
   LanguageTargeting.fromJson(core.Map _json) {
     if (_json.containsKey("languages")) {
       languages = _json["languages"]
-          .map((value) => new Language.fromJson(value))
+          .map<Language>((value) => new Language.fromJson(value))
           .toList();
     }
   }
@@ -23887,7 +23931,7 @@
     }
     if (_json.containsKey("languages")) {
       languages = _json["languages"]
-          .map((value) => new Language.fromJson(value))
+          .map<Language>((value) => new Language.fromJson(value))
           .toList();
     }
   }
@@ -23940,7 +23984,8 @@
   ListPopulationClause.fromJson(core.Map _json) {
     if (_json.containsKey("terms")) {
       terms = _json["terms"]
-          .map((value) => new ListPopulationTerm.fromJson(value))
+          .map<ListPopulationTerm>(
+              (value) => new ListPopulationTerm.fromJson(value))
           .toList();
     }
   }
@@ -23981,7 +24026,8 @@
     }
     if (_json.containsKey("listPopulationClauses")) {
       listPopulationClauses = _json["listPopulationClauses"]
-          .map((value) => new ListPopulationClause.fromJson(value))
+          .map<ListPopulationClause>(
+              (value) => new ListPopulationClause.fromJson(value))
           .toList();
     }
   }
@@ -24309,8 +24355,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("metros")) {
-      metros =
-          _json["metros"].map((value) => new Metro.fromJson(value)).toList();
+      metros = _json["metros"]
+          .map<Metro>((value) => new Metro.fromJson(value))
+          .toList();
     }
   }
 
@@ -24404,7 +24451,7 @@
     }
     if (_json.containsKey("mobileCarriers")) {
       mobileCarriers = _json["mobileCarriers"]
-          .map((value) => new MobileCarrier.fromJson(value))
+          .map<MobileCarrier>((value) => new MobileCarrier.fromJson(value))
           .toList();
     }
   }
@@ -24686,7 +24733,8 @@
     }
     if (_json.containsKey("operatingSystemVersions")) {
       operatingSystemVersions = _json["operatingSystemVersions"]
-          .map((value) => new OperatingSystemVersion.fromJson(value))
+          .map<OperatingSystemVersion>(
+              (value) => new OperatingSystemVersion.fromJson(value))
           .toList();
     }
   }
@@ -24722,7 +24770,7 @@
     }
     if (_json.containsKey("operatingSystems")) {
       operatingSystems = _json["operatingSystems"]
-          .map((value) => new OperatingSystem.fromJson(value))
+          .map<OperatingSystem>((value) => new OperatingSystem.fromJson(value))
           .toList();
     }
   }
@@ -24874,7 +24922,7 @@
     }
     if (_json.containsKey("contacts")) {
       contacts = _json["contacts"]
-          .map((value) => new OrderContact.fromJson(value))
+          .map<OrderContact>((value) => new OrderContact.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -25249,7 +25297,7 @@
     }
     if (_json.containsKey("orderDocuments")) {
       orderDocuments = _json["orderDocuments"]
-          .map((value) => new OrderDocument.fromJson(value))
+          .map<OrderDocument>((value) => new OrderDocument.fromJson(value))
           .toList();
     }
   }
@@ -25293,8 +25341,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("orders")) {
-      orders =
-          _json["orders"].map((value) => new Order.fromJson(value)).toList();
+      orders = _json["orders"]
+          .map<Order>((value) => new Order.fromJson(value))
+          .toList();
     }
   }
 
@@ -25342,24 +25391,25 @@
   PathToConversionReportCompatibleFields.fromJson(core.Map _json) {
     if (_json.containsKey("conversionDimensions")) {
       conversionDimensions = _json["conversionDimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("customFloodlightVariables")) {
       customFloodlightVariables = _json["customFloodlightVariables"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("metrics")) {
-      metrics =
-          _json["metrics"].map((value) => new Metric.fromJson(value)).toList();
+      metrics = _json["metrics"]
+          .map<Metric>((value) => new Metric.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("perInteractionDimensions")) {
       perInteractionDimensions = _json["perInteractionDimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
   }
@@ -26223,7 +26273,7 @@
     }
     if (_json.containsKey("placementGroups")) {
       placementGroups = _json["placementGroups"]
-          .map((value) => new PlacementGroup.fromJson(value))
+          .map<PlacementGroup>((value) => new PlacementGroup.fromJson(value))
           .toList();
     }
   }
@@ -26268,7 +26318,8 @@
     }
     if (_json.containsKey("placementStrategies")) {
       placementStrategies = _json["placementStrategies"]
-          .map((value) => new PlacementStrategy.fromJson(value))
+          .map<PlacementStrategy>(
+              (value) => new PlacementStrategy.fromJson(value))
           .toList();
     }
   }
@@ -26360,7 +26411,7 @@
     }
     if (_json.containsKey("tagDatas")) {
       tagDatas = _json["tagDatas"]
-          .map((value) => new TagData.fromJson(value))
+          .map<TagData>((value) => new TagData.fromJson(value))
           .toList();
     }
   }
@@ -26395,7 +26446,7 @@
     }
     if (_json.containsKey("placementTags")) {
       placementTags = _json["placementTags"]
-          .map((value) => new PlacementTag.fromJson(value))
+          .map<PlacementTag>((value) => new PlacementTag.fromJson(value))
           .toList();
     }
   }
@@ -26437,7 +26488,7 @@
     }
     if (_json.containsKey("placements")) {
       placements = _json["placements"]
-          .map((value) => new Placement.fromJson(value))
+          .map<Placement>((value) => new Placement.fromJson(value))
           .toList();
     }
   }
@@ -26518,7 +26569,7 @@
     }
     if (_json.containsKey("platformTypes")) {
       platformTypes = _json["platformTypes"]
-          .map((value) => new PlatformType.fromJson(value))
+          .map<PlatformType>((value) => new PlatformType.fromJson(value))
           .toList();
     }
   }
@@ -26714,7 +26765,7 @@
     }
     if (_json.containsKey("postalCodes")) {
       postalCodes = _json["postalCodes"]
-          .map((value) => new PostalCode.fromJson(value))
+          .map<PostalCode>((value) => new PostalCode.fromJson(value))
           .toList();
     }
   }
@@ -26788,8 +26839,9 @@
       endDate = core.DateTime.parse(_json["endDate"]);
     }
     if (_json.containsKey("flights")) {
-      flights =
-          _json["flights"].map((value) => new Flight.fromJson(value)).toList();
+      flights = _json["flights"]
+          .map<Flight>((value) => new Flight.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("groupType")) {
       groupType = _json["groupType"];
@@ -26900,7 +26952,8 @@
     }
     if (_json.containsKey("pricingPeriods")) {
       pricingPeriods = _json["pricingPeriods"]
-          .map((value) => new PricingSchedulePricingPeriod.fromJson(value))
+          .map<PricingSchedulePricingPeriod>(
+              (value) => new PricingSchedulePricingPeriod.fromJson(value))
           .toList();
     }
     if (_json.containsKey("pricingType")) {
@@ -27276,7 +27329,7 @@
     }
     if (_json.containsKey("projects")) {
       projects = _json["projects"]
-          .map((value) => new Project.fromJson(value))
+          .map<Project>((value) => new Project.fromJson(value))
           .toList();
     }
   }
@@ -27329,29 +27382,30 @@
   ReachReportCompatibleFields.fromJson(core.Map _json) {
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("metrics")) {
-      metrics =
-          _json["metrics"].map((value) => new Metric.fromJson(value)).toList();
+      metrics = _json["metrics"]
+          .map<Metric>((value) => new Metric.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("pivotedActivityMetrics")) {
       pivotedActivityMetrics = _json["pivotedActivityMetrics"]
-          .map((value) => new Metric.fromJson(value))
+          .map<Metric>((value) => new Metric.fromJson(value))
           .toList();
     }
     if (_json.containsKey("reachByFrequencyMetrics")) {
       reachByFrequencyMetrics = _json["reachByFrequencyMetrics"]
-          .map((value) => new Metric.fromJson(value))
+          .map<Metric>((value) => new Metric.fromJson(value))
           .toList();
     }
   }
@@ -27514,8 +27568,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("regions")) {
-      regions =
-          _json["regions"].map((value) => new Region.fromJson(value)).toList();
+      regions = _json["regions"]
+          .map<Region>((value) => new Region.fromJson(value))
+          .toList();
     }
   }
 
@@ -27767,7 +27822,7 @@
     }
     if (_json.containsKey("remarketingLists")) {
       remarketingLists = _json["remarketingLists"]
-          .map((value) => new RemarketingList.fromJson(value))
+          .map<RemarketingList>((value) => new RemarketingList.fromJson(value))
           .toList();
     }
   }
@@ -27826,12 +27881,12 @@
     }
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricNames")) {
@@ -27899,7 +27954,7 @@
   ReportCrossDimensionReachCriteria.fromJson(core.Map _json) {
     if (_json.containsKey("breakdown")) {
       breakdown = _json["breakdown"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dateRange")) {
@@ -27910,7 +27965,7 @@
     }
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricNames")) {
@@ -27984,7 +28039,7 @@
     }
     if (_json.containsKey("recipients")) {
       recipients = _json["recipients"]
-          .map((value) => new Recipient.fromJson(value))
+          .map<Recipient>((value) => new Recipient.fromJson(value))
           .toList();
     }
   }
@@ -28091,7 +28146,7 @@
   ReportFloodlightCriteria.fromJson(core.Map _json) {
     if (_json.containsKey("customRichMediaEvents")) {
       customRichMediaEvents = _json["customRichMediaEvents"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dateRange")) {
@@ -28099,12 +28154,12 @@
     }
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("floodlightConfigId")) {
@@ -28303,22 +28358,22 @@
   ReportPathToConversionCriteria.fromJson(core.Map _json) {
     if (_json.containsKey("activityFilters")) {
       activityFilters = _json["activityFilters"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("conversionDimensions")) {
       conversionDimensions = _json["conversionDimensions"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("customFloodlightVariables")) {
       customFloodlightVariables = _json["customFloodlightVariables"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("customRichMediaEvents")) {
       customRichMediaEvents = _json["customRichMediaEvents"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dateRange")) {
@@ -28333,7 +28388,7 @@
     }
     if (_json.containsKey("perInteractionDimensions")) {
       perInteractionDimensions = _json["perInteractionDimensions"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("reportProperties")) {
@@ -28428,12 +28483,12 @@
     }
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("enableAllDimensionCombinations")) {
@@ -28797,24 +28852,25 @@
   ReportCompatibleFields.fromJson(core.Map _json) {
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("metrics")) {
-      metrics =
-          _json["metrics"].map((value) => new Metric.fromJson(value)).toList();
+      metrics = _json["metrics"]
+          .map<Metric>((value) => new Metric.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("pivotedActivityMetrics")) {
       pivotedActivityMetrics = _json["pivotedActivityMetrics"]
-          .map((value) => new Metric.fromJson(value))
+          .map<Metric>((value) => new Metric.fromJson(value))
           .toList();
     }
   }
@@ -28868,8 +28924,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Report.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Report>((value) => new Report.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -29126,7 +29183,7 @@
     }
     if (_json.containsKey("siteContacts")) {
       siteContacts = _json["siteContacts"]
-          .map((value) => new SiteContact.fromJson(value))
+          .map<SiteContact>((value) => new SiteContact.fromJson(value))
           .toList();
     }
     if (_json.containsKey("siteSettings")) {
@@ -29401,7 +29458,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("sites")) {
-      sites = _json["sites"].map((value) => new Site.fromJson(value)).toList();
+      sites = _json["sites"]
+          .map<Site>((value) => new Site.fromJson(value))
+          .toList();
     }
   }
 
@@ -29497,7 +29556,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("sizes")) {
-      sizes = _json["sizes"].map((value) => new Size.fromJson(value)).toList();
+      sizes = _json["sizes"]
+          .map<Size>((value) => new Size.fromJson(value))
+          .toList();
     }
   }
 
@@ -29696,7 +29757,7 @@
     }
     if (_json.containsKey("subaccounts")) {
       subaccounts = _json["subaccounts"]
-          .map((value) => new Subaccount.fromJson(value))
+          .map<Subaccount>((value) => new Subaccount.fromJson(value))
           .toList();
     }
   }
@@ -30101,7 +30162,8 @@
     }
     if (_json.containsKey("targetableRemarketingLists")) {
       targetableRemarketingLists = _json["targetableRemarketingLists"]
-          .map((value) => new TargetableRemarketingList.fromJson(value))
+          .map<TargetableRemarketingList>(
+              (value) => new TargetableRemarketingList.fromJson(value))
           .toList();
     }
   }
@@ -30292,7 +30354,8 @@
     }
     if (_json.containsKey("targetingTemplates")) {
       targetingTemplates = _json["targetingTemplates"]
-          .map((value) => new TargetingTemplate.fromJson(value))
+          .map<TargetingTemplate>(
+              (value) => new TargetingTemplate.fromJson(value))
           .toList();
     }
   }
@@ -30357,32 +30420,33 @@
   TechnologyTargeting.fromJson(core.Map _json) {
     if (_json.containsKey("browsers")) {
       browsers = _json["browsers"]
-          .map((value) => new Browser.fromJson(value))
+          .map<Browser>((value) => new Browser.fromJson(value))
           .toList();
     }
     if (_json.containsKey("connectionTypes")) {
       connectionTypes = _json["connectionTypes"]
-          .map((value) => new ConnectionType.fromJson(value))
+          .map<ConnectionType>((value) => new ConnectionType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("mobileCarriers")) {
       mobileCarriers = _json["mobileCarriers"]
-          .map((value) => new MobileCarrier.fromJson(value))
+          .map<MobileCarrier>((value) => new MobileCarrier.fromJson(value))
           .toList();
     }
     if (_json.containsKey("operatingSystemVersions")) {
       operatingSystemVersions = _json["operatingSystemVersions"]
-          .map((value) => new OperatingSystemVersion.fromJson(value))
+          .map<OperatingSystemVersion>(
+              (value) => new OperatingSystemVersion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("operatingSystems")) {
       operatingSystems = _json["operatingSystems"]
-          .map((value) => new OperatingSystem.fromJson(value))
+          .map<OperatingSystem>((value) => new OperatingSystem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("platformTypes")) {
       platformTypes = _json["platformTypes"]
-          .map((value) => new PlatformType.fromJson(value))
+          .map<PlatformType>((value) => new PlatformType.fromJson(value))
           .toList();
     }
   }
@@ -30828,7 +30892,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new UserProfile.fromJson(value))
+          .map<UserProfile>((value) => new UserProfile.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -30911,7 +30975,8 @@
     }
     if (_json.containsKey("permissions")) {
       permissions = _json["permissions"]
-          .map((value) => new UserRolePermission.fromJson(value))
+          .map<UserRolePermission>(
+              (value) => new UserRolePermission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("subaccountId")) {
@@ -31076,7 +31141,8 @@
     }
     if (_json.containsKey("userRolePermissionGroups")) {
       userRolePermissionGroups = _json["userRolePermissionGroups"]
-          .map((value) => new UserRolePermissionGroup.fromJson(value))
+          .map<UserRolePermissionGroup>(
+              (value) => new UserRolePermissionGroup.fromJson(value))
           .toList();
     }
   }
@@ -31112,7 +31178,8 @@
     }
     if (_json.containsKey("userRolePermissions")) {
       userRolePermissions = _json["userRolePermissions"]
-          .map((value) => new UserRolePermission.fromJson(value))
+          .map<UserRolePermission>(
+              (value) => new UserRolePermission.fromJson(value))
           .toList();
     }
   }
@@ -31154,7 +31221,7 @@
     }
     if (_json.containsKey("userRoles")) {
       userRoles = _json["userRoles"]
-          .map((value) => new UserRole.fromJson(value))
+          .map<UserRole>((value) => new UserRole.fromJson(value))
           .toList();
     }
   }
@@ -31258,7 +31325,7 @@
     }
     if (_json.containsKey("videoFormats")) {
       videoFormats = _json["videoFormats"]
-          .map((value) => new VideoFormat.fromJson(value))
+          .map<VideoFormat>((value) => new VideoFormat.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/dfareporting/v3_0.dart b/generated/googleapis/lib/dfareporting/v3_0.dart
index 34e8191..143d872 100644
--- a/generated/googleapis/lib/dfareporting/v3_0.dart
+++ b/generated/googleapis/lib/dfareporting/v3_0.dart
@@ -175,7 +175,7 @@
       core.String profileId, core.String summaryAccountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -234,7 +234,7 @@
       core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -283,7 +283,7 @@
   async.Future<AccountPermissionGroupsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -338,7 +338,7 @@
   async.Future<AccountPermission> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -387,7 +387,7 @@
   async.Future<AccountPermissionsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -442,7 +442,7 @@
   async.Future<AccountUserProfile> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -494,7 +494,7 @@
       AccountUserProfile request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -584,7 +584,7 @@
       core.String userRoleId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -663,7 +663,7 @@
       AccountUserProfile request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -718,7 +718,7 @@
       AccountUserProfile request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -774,7 +774,7 @@
   async.Future<Account> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -858,7 +858,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -929,7 +929,7 @@
       Account request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -983,7 +983,7 @@
   async.Future<Account> update(Account request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1039,7 +1039,7 @@
   async.Future<Ad> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1090,7 +1090,7 @@
   async.Future<Ad> insert(Ad request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1234,7 +1234,7 @@
       core.List<core.String> type,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1352,7 +1352,7 @@
   async.Future<Ad> patch(Ad request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1405,7 +1405,7 @@
   async.Future<Ad> update(Ad request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1459,7 +1459,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1512,7 +1512,7 @@
   async.Future<AdvertiserGroup> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1564,7 +1564,7 @@
       AdvertiserGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1644,7 +1644,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1714,7 +1714,7 @@
       AdvertiserGroup request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1769,7 +1769,7 @@
       AdvertiserGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1826,7 +1826,7 @@
   async.Future<LandingPage> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1877,7 +1877,7 @@
   async.Future<LandingPage> insert(LandingPage request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1967,7 +1967,7 @@
       core.String subaccountId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2045,7 +2045,7 @@
       LandingPage request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2099,7 +2099,7 @@
   async.Future<LandingPage> update(LandingPage request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2155,7 +2155,7 @@
   async.Future<Advertiser> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2206,7 +2206,7 @@
   async.Future<Advertiser> insert(Advertiser request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2311,7 +2311,7 @@
       core.String subaccountId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2399,7 +2399,7 @@
       Advertiser request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2453,7 +2453,7 @@
   async.Future<Advertiser> update(Advertiser request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2507,7 +2507,7 @@
   async.Future<BrowsersListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2568,7 +2568,7 @@
       core.String campaignId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2639,7 +2639,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2707,7 +2707,7 @@
   async.Future<Campaign> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2758,7 +2758,7 @@
   async.Future<Campaign> insert(Campaign request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2863,7 +2863,7 @@
       core.String subaccountId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2954,7 +2954,7 @@
       Campaign request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3008,7 +3008,7 @@
   async.Future<Campaign> update(Campaign request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3064,7 +3064,7 @@
   async.Future<ChangeLog> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3213,7 +3213,7 @@
       core.List<core.String> userProfileIds,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3306,7 +3306,7 @@
       core.List<core.String> regionDartIds,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3371,7 +3371,7 @@
   async.Future<ConnectionType> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3420,7 +3420,7 @@
   async.Future<ConnectionTypesListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3473,7 +3473,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3526,7 +3526,7 @@
   async.Future<ContentCategory> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3578,7 +3578,7 @@
       ContentCategory request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3658,7 +3658,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3728,7 +3728,7 @@
       ContentCategory request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3783,7 +3783,7 @@
       ContentCategory request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3840,7 +3840,7 @@
       ConversionsBatchInsertRequest request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3892,7 +3892,7 @@
       ConversionsBatchUpdateRequest request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3949,7 +3949,7 @@
   async.Future<Country> get(core.String profileId, core.String dartId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3998,7 +3998,7 @@
   async.Future<CountriesListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4062,7 +4062,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4142,7 +4142,7 @@
       core.String profileId, core.String creativeFieldId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4203,7 +4203,7 @@
       core.String profileId, core.String creativeFieldId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4262,7 +4262,7 @@
       core.String profileId, core.String creativeFieldId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4345,7 +4345,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4422,7 +4422,7 @@
       core.String profileId, core.String creativeFieldId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4484,7 +4484,7 @@
       core.String profileId, core.String creativeFieldId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4543,7 +4543,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4596,7 +4596,7 @@
   async.Future<CreativeField> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4648,7 +4648,7 @@
       CreativeField request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4733,7 +4733,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4805,7 +4805,7 @@
       CreativeField request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4860,7 +4860,7 @@
       CreativeField request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4916,7 +4916,7 @@
   async.Future<CreativeGroup> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4968,7 +4968,7 @@
       CreativeGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5057,7 +5057,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5132,7 +5132,7 @@
       CreativeGroup request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5187,7 +5187,7 @@
       CreativeGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5243,7 +5243,7 @@
   async.Future<Creative> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5294,7 +5294,7 @@
   async.Future<Creative> insert(Creative request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5408,7 +5408,7 @@
       core.List<core.String> types,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5506,7 +5506,7 @@
       Creative request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5560,7 +5560,7 @@
   async.Future<Creative> update(Creative request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5622,7 +5622,7 @@
       DimensionValueRequest request, core.String profileId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5685,7 +5685,7 @@
   async.Future<DirectorySiteContact> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5771,7 +5771,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5846,7 +5846,7 @@
   async.Future<DirectorySite> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5898,7 +5898,7 @@
       DirectorySite request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6003,7 +6003,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6115,7 +6115,7 @@
       core.String name, core.String objectType,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6180,7 +6180,7 @@
       DynamicTargetingKey request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6246,7 +6246,7 @@
       core.String objectType,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6310,7 +6310,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6363,7 +6363,7 @@
   async.Future<EventTag> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6414,7 +6414,7 @@
   async.Future<EventTag> insert(EventTag request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6518,7 +6518,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6598,7 +6598,7 @@
       EventTag request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6652,7 +6652,7 @@
   async.Future<EventTag> update(EventTag request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6719,7 +6719,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6801,7 +6801,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6868,7 +6868,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6924,7 +6924,7 @@
       {core.String floodlightActivityId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6975,7 +6975,7 @@
   async.Future<FloodlightActivity> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7027,7 +7027,7 @@
       FloodlightActivity request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7143,7 +7143,7 @@
       core.String tagString,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7240,7 +7240,7 @@
       FloodlightActivity request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7295,7 +7295,7 @@
       FloodlightActivity request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7353,7 +7353,7 @@
       core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7405,7 +7405,7 @@
       FloodlightActivityGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7506,7 +7506,7 @@
       core.String type,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7585,7 +7585,7 @@
       FloodlightActivityGroup request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7640,7 +7640,7 @@
       FloodlightActivityGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7698,7 +7698,7 @@
       core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7750,7 +7750,7 @@
   async.Future<FloodlightConfigurationsListResponse> list(core.String profileId,
       {core.List<core.String> ids, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7805,7 +7805,7 @@
       FloodlightConfiguration request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7860,7 +7860,7 @@
       FloodlightConfiguration request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7919,7 +7919,7 @@
       core.String profileId, core.String projectId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8015,7 +8015,7 @@
       core.String type,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8099,7 +8099,7 @@
   async.Future<LanguagesListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8150,7 +8150,7 @@
   async.Future<MetrosListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8203,7 +8203,7 @@
   async.Future<MobileCarrier> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8252,7 +8252,7 @@
   async.Future<MobileCarriersListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8308,7 +8308,7 @@
       core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8357,7 +8357,7 @@
   async.Future<OperatingSystemVersionsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8412,7 +8412,7 @@
   async.Future<OperatingSystem> get(core.String profileId, core.String dartId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8461,7 +8461,7 @@
   async.Future<OperatingSystemsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8518,7 +8518,7 @@
       core.String profileId, core.String projectId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8619,7 +8619,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8708,7 +8708,7 @@
       core.String profileId, core.String projectId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8799,7 +8799,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8878,7 +8878,7 @@
   async.Future<PlacementGroup> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -8930,7 +8930,7 @@
       PlacementGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9074,7 +9074,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9182,7 +9182,7 @@
       PlacementGroup request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9237,7 +9237,7 @@
       PlacementGroup request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9292,7 +9292,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9345,7 +9345,7 @@
   async.Future<PlacementStrategy> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9397,7 +9397,7 @@
       PlacementStrategy request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9478,7 +9478,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9548,7 +9548,7 @@
       PlacementStrategy request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9603,7 +9603,7 @@
       PlacementStrategy request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9670,7 +9670,7 @@
       core.List<core.String> tagFormats,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9727,7 +9727,7 @@
   async.Future<Placement> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9778,7 +9778,7 @@
   async.Future<Placement> insert(Placement request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -9926,7 +9926,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10042,7 +10042,7 @@
       Placement request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10096,7 +10096,7 @@
   async.Future<Placement> update(Placement request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10152,7 +10152,7 @@
   async.Future<PlatformType> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10201,7 +10201,7 @@
   async.Future<PlatformTypesListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10255,7 +10255,7 @@
   async.Future<PostalCode> get(core.String profileId, core.String code,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10304,7 +10304,7 @@
   async.Future<PostalCodesListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10357,7 +10357,7 @@
   async.Future<Project> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10441,7 +10441,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10513,7 +10513,7 @@
   async.Future<RegionsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10568,7 +10568,7 @@
       core.String profileId, core.String remarketingListId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10623,7 +10623,7 @@
       core.String profileId, core.String remarketingListId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10678,7 +10678,7 @@
       RemarketingListShare request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10735,7 +10735,7 @@
   async.Future<RemarketingList> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10787,7 +10787,7 @@
       RemarketingList request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10874,7 +10874,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -10951,7 +10951,7 @@
       RemarketingList request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11006,7 +11006,7 @@
       RemarketingList request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11064,7 +11064,7 @@
   async.Future delete(core.String profileId, core.String reportId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11117,7 +11117,7 @@
   async.Future<Report> get(core.String profileId, core.String reportId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11168,7 +11168,7 @@
   async.Future<Report> insert(Report request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11242,7 +11242,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11307,7 +11307,7 @@
       Report request, core.String profileId, core.String reportId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11363,7 +11363,7 @@
   async.Future<File> run(core.String profileId, core.String reportId,
       {core.bool synchronous, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11421,7 +11421,7 @@
       Report request, core.String profileId, core.String reportId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11484,7 +11484,7 @@
   async.Future<CompatibleFields> query(Report request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11553,7 +11553,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11635,7 +11635,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11705,7 +11705,7 @@
   async.Future<Site> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11756,7 +11756,7 @@
   async.Future<Site> insert(Site request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11865,7 +11865,7 @@
       core.bool unmappedSite,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -11965,7 +11965,7 @@
   async.Future<Site> patch(Site request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12019,7 +12019,7 @@
   async.Future<Site> update(Site request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12075,7 +12075,7 @@
   async.Future<Size> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12126,7 +12126,7 @@
   async.Future<Size> insert(Size request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12188,7 +12188,7 @@
       core.int width,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12253,7 +12253,7 @@
   async.Future<Subaccount> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12304,7 +12304,7 @@
   async.Future<Subaccount> insert(Subaccount request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12384,7 +12384,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12452,7 +12452,7 @@
       Subaccount request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12506,7 +12506,7 @@
   async.Future<Subaccount> update(Subaccount request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12564,7 +12564,7 @@
       core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12651,7 +12651,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12728,7 +12728,7 @@
   async.Future<TargetingTemplate> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12780,7 +12780,7 @@
       TargetingTemplate request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12863,7 +12863,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12936,7 +12936,7 @@
       TargetingTemplate request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -12991,7 +12991,7 @@
       TargetingTemplate request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13044,7 +13044,7 @@
   /// this method will complete with the same error.
   async.Future<UserProfile> get(core.String profileId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13084,7 +13084,7 @@
   /// this method will complete with the same error.
   async.Future<UserProfileList> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13134,7 +13134,7 @@
       core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13183,7 +13183,7 @@
   async.Future<UserRolePermissionGroupsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13238,7 +13238,7 @@
   async.Future<UserRolePermission> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13289,7 +13289,7 @@
   async.Future<UserRolePermissionsListResponse> list(core.String profileId,
       {core.List<core.String> ids, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13344,7 +13344,7 @@
   async.Future delete(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13397,7 +13397,7 @@
   async.Future<UserRole> get(core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13448,7 +13448,7 @@
   async.Future<UserRole> insert(UserRole request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13535,7 +13535,7 @@
       core.String subaccountId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13609,7 +13609,7 @@
       UserRole request, core.String profileId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13663,7 +13663,7 @@
   async.Future<UserRole> update(UserRole request, core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13719,7 +13719,7 @@
   async.Future<VideoFormat> get(core.String profileId, core.int id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -13768,7 +13768,7 @@
   async.Future<VideoFormatsListResponse> list(core.String profileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -14272,7 +14272,8 @@
   AccountPermissionGroupsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("accountPermissionGroups")) {
       accountPermissionGroups = _json["accountPermissionGroups"]
-          .map((value) => new AccountPermissionGroup.fromJson(value))
+          .map<AccountPermissionGroup>(
+              (value) => new AccountPermissionGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -14308,7 +14309,8 @@
   AccountPermissionsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("accountPermissions")) {
       accountPermissions = _json["accountPermissions"]
-          .map((value) => new AccountPermission.fromJson(value))
+          .map<AccountPermission>(
+              (value) => new AccountPermission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -14542,7 +14544,8 @@
   AccountUserProfilesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("accountUserProfiles")) {
       accountUserProfiles = _json["accountUserProfiles"]
-          .map((value) => new AccountUserProfile.fromJson(value))
+          .map<AccountUserProfile>(
+              (value) => new AccountUserProfile.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -14587,7 +14590,7 @@
   AccountsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("accounts")) {
       accounts = _json["accounts"]
-          .map((value) => new Account.fromJson(value))
+          .map<Account>((value) => new Account.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -14631,7 +14634,7 @@
   Activities.fromJson(core.Map _json) {
     if (_json.containsKey("filters")) {
       filters = _json["filters"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -14885,7 +14888,8 @@
     }
     if (_json.containsKey("creativeGroupAssignments")) {
       creativeGroupAssignments = _json["creativeGroupAssignments"]
-          .map((value) => new CreativeGroupAssignment.fromJson(value))
+          .map<CreativeGroupAssignment>(
+              (value) => new CreativeGroupAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeRotation")) {
@@ -14913,7 +14917,8 @@
     }
     if (_json.containsKey("eventTagOverrides")) {
       eventTagOverrides = _json["eventTagOverrides"]
-          .map((value) => new EventTagOverride.fromJson(value))
+          .map<EventTagOverride>(
+              (value) => new EventTagOverride.fromJson(value))
           .toList();
     }
     if (_json.containsKey("geoTargeting")) {
@@ -14945,7 +14950,8 @@
     }
     if (_json.containsKey("placementAssignments")) {
       placementAssignments = _json["placementAssignments"]
-          .map((value) => new PlacementAssignment.fromJson(value))
+          .map<PlacementAssignment>(
+              (value) => new PlacementAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("remarketingListExpression")) {
@@ -15284,7 +15290,7 @@
 
   AdsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("ads")) {
-      ads = _json["ads"].map((value) => new Ad.fromJson(value)).toList();
+      ads = _json["ads"].map<Ad>((value) => new Ad.fromJson(value)).toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -15561,7 +15567,7 @@
   AdvertiserGroupsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("advertiserGroups")) {
       advertiserGroups = _json["advertiserGroups"]
-          .map((value) => new AdvertiserGroup.fromJson(value))
+          .map<AdvertiserGroup>((value) => new AdvertiserGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -15609,7 +15615,7 @@
     }
     if (_json.containsKey("landingPages")) {
       landingPages = _json["landingPages"]
-          .map((value) => new LandingPage.fromJson(value))
+          .map<LandingPage>((value) => new LandingPage.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -15651,7 +15657,7 @@
   AdvertisersListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("advertisers")) {
       advertisers = _json["advertisers"]
-          .map((value) => new Advertiser.fromJson(value))
+          .map<Advertiser>((value) => new Advertiser.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -15742,7 +15748,7 @@
   AudienceSegmentGroup.fromJson(core.Map _json) {
     if (_json.containsKey("audienceSegments")) {
       audienceSegments = _json["audienceSegments"]
-          .map((value) => new AudienceSegment.fromJson(value))
+          .map<AudienceSegment>((value) => new AudienceSegment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -15868,7 +15874,7 @@
   BrowsersListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("browsers")) {
       browsers = _json["browsers"]
-          .map((value) => new Browser.fromJson(value))
+          .map<Browser>((value) => new Browser.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -16009,10 +16015,11 @@
           _json["adBlockingConfiguration"]);
     }
     if (_json.containsKey("additionalCreativeOptimizationConfigurations")) {
-      additionalCreativeOptimizationConfigurations = _json[
-              "additionalCreativeOptimizationConfigurations"]
-          .map((value) => new CreativeOptimizationConfiguration.fromJson(value))
-          .toList();
+      additionalCreativeOptimizationConfigurations =
+          _json["additionalCreativeOptimizationConfigurations"]
+              .map<CreativeOptimizationConfiguration>((value) =>
+                  new CreativeOptimizationConfiguration.fromJson(value))
+              .toList();
     }
     if (_json.containsKey("advertiserGroupId")) {
       advertiserGroupId = _json["advertiserGroupId"];
@@ -16029,7 +16036,8 @@
     }
     if (_json.containsKey("audienceSegmentGroups")) {
       audienceSegmentGroups = _json["audienceSegmentGroups"]
-          .map((value) => new AudienceSegmentGroup.fromJson(value))
+          .map<AudienceSegmentGroup>(
+              (value) => new AudienceSegmentGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("billingInvoiceCode")) {
@@ -16067,7 +16075,8 @@
     }
     if (_json.containsKey("eventTagOverrides")) {
       eventTagOverrides = _json["eventTagOverrides"]
-          .map((value) => new EventTagOverride.fromJson(value))
+          .map<EventTagOverride>(
+              (value) => new EventTagOverride.fromJson(value))
           .toList();
     }
     if (_json.containsKey("externalId")) {
@@ -16262,7 +16271,8 @@
   CampaignCreativeAssociationsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("campaignCreativeAssociations")) {
       campaignCreativeAssociations = _json["campaignCreativeAssociations"]
-          .map((value) => new CampaignCreativeAssociation.fromJson(value))
+          .map<CampaignCreativeAssociation>(
+              (value) => new CampaignCreativeAssociation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -16308,7 +16318,7 @@
   CampaignsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("campaigns")) {
       campaigns = _json["campaigns"]
-          .map((value) => new Campaign.fromJson(value))
+          .map<Campaign>((value) => new Campaign.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -16496,7 +16506,7 @@
   ChangeLogsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("changeLogs")) {
       changeLogs = _json["changeLogs"]
-          .map((value) => new ChangeLog.fromJson(value))
+          .map<ChangeLog>((value) => new ChangeLog.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -16537,8 +16547,9 @@
 
   CitiesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("cities")) {
-      cities =
-          _json["cities"].map((value) => new City.fromJson(value)).toList();
+      cities = _json["cities"]
+          .map<City>((value) => new City.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -16851,7 +16862,7 @@
     }
     if (_json.containsKey("enabledSizes")) {
       enabledSizes = _json["enabledSizes"]
-          .map((value) => new Size.fromJson(value))
+          .map<Size>((value) => new Size.fromJson(value))
           .toList();
     }
     if (_json.containsKey("imageOnly")) {
@@ -17026,7 +17037,7 @@
   ConnectionTypesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("connectionTypes")) {
       connectionTypes = _json["connectionTypes"]
-          .map((value) => new ConnectionType.fromJson(value))
+          .map<ConnectionType>((value) => new ConnectionType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -17065,7 +17076,7 @@
   ContentCategoriesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("contentCategories")) {
       contentCategories = _json["contentCategories"]
-          .map((value) => new ContentCategory.fromJson(value))
+          .map<ContentCategory>((value) => new ContentCategory.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -17222,7 +17233,8 @@
     }
     if (_json.containsKey("customVariables")) {
       customVariables = _json["customVariables"]
-          .map((value) => new CustomFloodlightVariable.fromJson(value))
+          .map<CustomFloodlightVariable>(
+              (value) => new CustomFloodlightVariable.fromJson(value))
           .toList();
     }
     if (_json.containsKey("encryptedUserId")) {
@@ -17382,7 +17394,7 @@
     }
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new ConversionError.fromJson(value))
+          .map<ConversionError>((value) => new ConversionError.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -17425,7 +17437,7 @@
   ConversionsBatchInsertRequest.fromJson(core.Map _json) {
     if (_json.containsKey("conversions")) {
       conversions = _json["conversions"]
-          .map((value) => new Conversion.fromJson(value))
+          .map<Conversion>((value) => new Conversion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("encryptionInfo")) {
@@ -17477,7 +17489,8 @@
     }
     if (_json.containsKey("status")) {
       status = _json["status"]
-          .map((value) => new ConversionStatus.fromJson(value))
+          .map<ConversionStatus>(
+              (value) => new ConversionStatus.fromJson(value))
           .toList();
     }
   }
@@ -17516,7 +17529,7 @@
   ConversionsBatchUpdateRequest.fromJson(core.Map _json) {
     if (_json.containsKey("conversions")) {
       conversions = _json["conversions"]
-          .map((value) => new Conversion.fromJson(value))
+          .map<Conversion>((value) => new Conversion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("encryptionInfo")) {
@@ -17568,7 +17581,8 @@
     }
     if (_json.containsKey("status")) {
       status = _json["status"]
-          .map((value) => new ConversionStatus.fromJson(value))
+          .map<ConversionStatus>(
+              (value) => new ConversionStatus.fromJson(value))
           .toList();
     }
   }
@@ -17603,7 +17617,7 @@
   CountriesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("countries")) {
       countries = _json["countries"]
-          .map((value) => new Country.fromJson(value))
+          .map<Country>((value) => new Country.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -18127,7 +18141,7 @@
     }
     if (_json.containsKey("clickTags")) {
       clickTags = _json["clickTags"]
-          .map((value) => new ClickTag.fromJson(value))
+          .map<ClickTag>((value) => new ClickTag.fromJson(value))
           .toList();
     }
     if (_json.containsKey("commercialId")) {
@@ -18144,7 +18158,8 @@
     }
     if (_json.containsKey("counterCustomEvents")) {
       counterCustomEvents = _json["counterCustomEvents"]
-          .map((value) => new CreativeCustomEvent.fromJson(value))
+          .map<CreativeCustomEvent>(
+              (value) => new CreativeCustomEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeAssetSelection")) {
@@ -18153,12 +18168,13 @@
     }
     if (_json.containsKey("creativeAssets")) {
       creativeAssets = _json["creativeAssets"]
-          .map((value) => new CreativeAsset.fromJson(value))
+          .map<CreativeAsset>((value) => new CreativeAsset.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeFieldAssignments")) {
       creativeFieldAssignments = _json["creativeFieldAssignments"]
-          .map((value) => new CreativeFieldAssignment.fromJson(value))
+          .map<CreativeFieldAssignment>(
+              (value) => new CreativeFieldAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("customKeyValues")) {
@@ -18169,7 +18185,8 @@
     }
     if (_json.containsKey("exitCustomEvents")) {
       exitCustomEvents = _json["exitCustomEvents"]
-          .map((value) => new CreativeCustomEvent.fromJson(value))
+          .map<CreativeCustomEvent>(
+              (value) => new CreativeCustomEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("fsCommand")) {
@@ -18262,12 +18279,14 @@
     }
     if (_json.containsKey("thirdPartyUrls")) {
       thirdPartyUrls = _json["thirdPartyUrls"]
-          .map((value) => new ThirdPartyTrackingUrl.fromJson(value))
+          .map<ThirdPartyTrackingUrl>(
+              (value) => new ThirdPartyTrackingUrl.fromJson(value))
           .toList();
     }
     if (_json.containsKey("timerCustomEvents")) {
       timerCustomEvents = _json["timerCustomEvents"]
-          .map((value) => new CreativeCustomEvent.fromJson(value))
+          .map<CreativeCustomEvent>(
+              (value) => new CreativeCustomEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("totalFileSize")) {
@@ -19184,7 +19203,7 @@
     }
     if (_json.containsKey("clickTags")) {
       clickTags = _json["clickTags"]
-          .map((value) => new ClickTag.fromJson(value))
+          .map<ClickTag>((value) => new ClickTag.fromJson(value))
           .toList();
     }
     if (_json.containsKey("detectedFeatures")) {
@@ -19252,7 +19271,9 @@
       defaultAssetId = _json["defaultAssetId"];
     }
     if (_json.containsKey("rules")) {
-      rules = _json["rules"].map((value) => new Rule.fromJson(value)).toList();
+      rules = _json["rules"]
+          .map<Rule>((value) => new Rule.fromJson(value))
+          .toList();
     }
   }
 
@@ -19349,12 +19370,14 @@
     }
     if (_json.containsKey("companionCreativeOverrides")) {
       companionCreativeOverrides = _json["companionCreativeOverrides"]
-          .map((value) => new CompanionClickThroughOverride.fromJson(value))
+          .map<CompanionClickThroughOverride>(
+              (value) => new CompanionClickThroughOverride.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeGroupAssignments")) {
       creativeGroupAssignments = _json["creativeGroupAssignments"]
-          .map((value) => new CreativeGroupAssignment.fromJson(value))
+          .map<CreativeGroupAssignment>(
+              (value) => new CreativeGroupAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeId")) {
@@ -19369,7 +19392,8 @@
     }
     if (_json.containsKey("richMediaExitOverrides")) {
       richMediaExitOverrides = _json["richMediaExitOverrides"]
-          .map((value) => new RichMediaExitOverride.fromJson(value))
+          .map<RichMediaExitOverride>(
+              (value) => new RichMediaExitOverride.fromJson(value))
           .toList();
     }
     if (_json.containsKey("sequence")) {
@@ -19787,7 +19811,8 @@
   CreativeFieldValuesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("creativeFieldValues")) {
       creativeFieldValues = _json["creativeFieldValues"]
-          .map((value) => new CreativeFieldValue.fromJson(value))
+          .map<CreativeFieldValue>(
+              (value) => new CreativeFieldValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -19832,7 +19857,7 @@
   CreativeFieldsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("creativeFields")) {
       creativeFields = _json["creativeFields"]
-          .map((value) => new CreativeField.fromJson(value))
+          .map<CreativeField>((value) => new CreativeField.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -20010,7 +20035,7 @@
   CreativeGroupsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("creativeGroups")) {
       creativeGroups = _json["creativeGroups"]
-          .map((value) => new CreativeGroup.fromJson(value))
+          .map<CreativeGroup>((value) => new CreativeGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -20072,7 +20097,8 @@
     }
     if (_json.containsKey("optimizationActivitys")) {
       optimizationActivitys = _json["optimizationActivitys"]
-          .map((value) => new OptimizationActivity.fromJson(value))
+          .map<OptimizationActivity>(
+              (value) => new OptimizationActivity.fromJson(value))
           .toList();
     }
     if (_json.containsKey("optimizationModel")) {
@@ -20131,7 +20157,8 @@
   CreativeRotation.fromJson(core.Map _json) {
     if (_json.containsKey("creativeAssignments")) {
       creativeAssignments = _json["creativeAssignments"]
-          .map((value) => new CreativeAssignment.fromJson(value))
+          .map<CreativeAssignment>(
+              (value) => new CreativeAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeOptimizationConfigurationId")) {
@@ -20218,7 +20245,7 @@
   CreativesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("creatives")) {
       creatives = _json["creatives"]
-          .map((value) => new Creative.fromJson(value))
+          .map<Creative>((value) => new Creative.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -20273,24 +20300,25 @@
   CrossDimensionReachReportCompatibleFields.fromJson(core.Map _json) {
     if (_json.containsKey("breakdown")) {
       breakdown = _json["breakdown"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("metrics")) {
-      metrics =
-          _json["metrics"].map((value) => new Metric.fromJson(value)).toList();
+      metrics = _json["metrics"]
+          .map<Metric>((value) => new Metric.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("overlapMetrics")) {
       overlapMetrics = _json["overlapMetrics"]
-          .map((value) => new Metric.fromJson(value))
+          .map<Metric>((value) => new Metric.fromJson(value))
           .toList();
     }
   }
@@ -20479,7 +20507,7 @@
   CustomRichMediaEvents.fromJson(core.Map _json) {
     if (_json.containsKey("filteredEventIds")) {
       filteredEventIds = _json["filteredEventIds"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -20973,7 +21001,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -21034,7 +21062,7 @@
     }
     if (_json.containsKey("filters")) {
       filters = _json["filters"]
-          .map((value) => new DimensionFilter.fromJson(value))
+          .map<DimensionFilter>((value) => new DimensionFilter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -21186,7 +21214,8 @@
     }
     if (_json.containsKey("contactAssignments")) {
       contactAssignments = _json["contactAssignments"]
-          .map((value) => new DirectorySiteContactAssignment.fromJson(value))
+          .map<DirectorySiteContactAssignment>(
+              (value) => new DirectorySiteContactAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("countryId")) {
@@ -21447,7 +21476,8 @@
   DirectorySiteContactsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("directorySiteContacts")) {
       directorySiteContacts = _json["directorySiteContacts"]
-          .map((value) => new DirectorySiteContact.fromJson(value))
+          .map<DirectorySiteContact>(
+              (value) => new DirectorySiteContact.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -21571,7 +21601,7 @@
   DirectorySitesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("directorySites")) {
       directorySites = _json["directorySites"]
-          .map((value) => new DirectorySite.fromJson(value))
+          .map<DirectorySite>((value) => new DirectorySite.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -21677,7 +21707,8 @@
   DynamicTargetingKeysListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("dynamicTargetingKeys")) {
       dynamicTargetingKeys = _json["dynamicTargetingKeys"]
-          .map((value) => new DynamicTargetingKey.fromJson(value))
+          .map<DynamicTargetingKey>(
+              (value) => new DynamicTargetingKey.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -22020,7 +22051,7 @@
   EventTagsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("eventTags")) {
       eventTags = _json["eventTags"]
-          .map((value) => new EventTag.fromJson(value))
+          .map<EventTag>((value) => new EventTag.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -22214,7 +22245,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new File.fromJson(value)).toList();
+      items = _json["items"]
+          .map<File>((value) => new File.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -22357,7 +22390,8 @@
   FloodlightActivitiesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("floodlightActivities")) {
       floodlightActivities = _json["floodlightActivities"]
-          .map((value) => new FloodlightActivity.fromJson(value))
+          .map<FloodlightActivity>(
+              (value) => new FloodlightActivity.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -22545,7 +22579,8 @@
     }
     if (_json.containsKey("defaultTags")) {
       defaultTags = _json["defaultTags"]
-          .map((value) => new FloodlightActivityDynamicTag.fromJson(value))
+          .map<FloodlightActivityDynamicTag>(
+              (value) => new FloodlightActivityDynamicTag.fromJson(value))
           .toList();
     }
     if (_json.containsKey("expectedUrl")) {
@@ -22594,7 +22629,7 @@
     }
     if (_json.containsKey("publisherTags")) {
       publisherTags = _json["publisherTags"]
-          .map((value) =>
+          .map<FloodlightActivityPublisherDynamicTag>((value) =>
               new FloodlightActivityPublisherDynamicTag.fromJson(value))
           .toList();
     }
@@ -22923,7 +22958,8 @@
   FloodlightActivityGroupsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("floodlightActivityGroups")) {
       floodlightActivityGroups = _json["floodlightActivityGroups"]
-          .map((value) => new FloodlightActivityGroup.fromJson(value))
+          .map<FloodlightActivityGroup>(
+              (value) => new FloodlightActivityGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -23148,14 +23184,16 @@
     }
     if (_json.containsKey("thirdPartyAuthenticationTokens")) {
       thirdPartyAuthenticationTokens = _json["thirdPartyAuthenticationTokens"]
-          .map((value) => new ThirdPartyAuthenticationToken.fromJson(value))
+          .map<ThirdPartyAuthenticationToken>(
+              (value) => new ThirdPartyAuthenticationToken.fromJson(value))
           .toList();
     }
     if (_json.containsKey("userDefinedVariableConfigurations")) {
-      userDefinedVariableConfigurations = _json[
-              "userDefinedVariableConfigurations"]
-          .map((value) => new UserDefinedVariableConfiguration.fromJson(value))
-          .toList();
+      userDefinedVariableConfigurations =
+          _json["userDefinedVariableConfigurations"]
+              .map<UserDefinedVariableConfiguration>((value) =>
+                  new UserDefinedVariableConfiguration.fromJson(value))
+              .toList();
     }
   }
 
@@ -23239,7 +23277,8 @@
   FloodlightConfigurationsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("floodlightConfigurations")) {
       floodlightConfigurations = _json["floodlightConfigurations"]
-          .map((value) => new FloodlightConfiguration.fromJson(value))
+          .map<FloodlightConfiguration>(
+              (value) => new FloodlightConfiguration.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -23285,20 +23324,21 @@
   FloodlightReportCompatibleFields.fromJson(core.Map _json) {
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("metrics")) {
-      metrics =
-          _json["metrics"].map((value) => new Metric.fromJson(value)).toList();
+      metrics = _json["metrics"]
+          .map<Metric>((value) => new Metric.fromJson(value))
+          .toList();
     }
   }
 
@@ -23461,29 +23501,32 @@
 
   GeoTargeting.fromJson(core.Map _json) {
     if (_json.containsKey("cities")) {
-      cities =
-          _json["cities"].map((value) => new City.fromJson(value)).toList();
+      cities = _json["cities"]
+          .map<City>((value) => new City.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("countries")) {
       countries = _json["countries"]
-          .map((value) => new Country.fromJson(value))
+          .map<Country>((value) => new Country.fromJson(value))
           .toList();
     }
     if (_json.containsKey("excludeCountries")) {
       excludeCountries = _json["excludeCountries"];
     }
     if (_json.containsKey("metros")) {
-      metros =
-          _json["metros"].map((value) => new Metro.fromJson(value)).toList();
+      metros = _json["metros"]
+          .map<Metro>((value) => new Metro.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("postalCodes")) {
       postalCodes = _json["postalCodes"]
-          .map((value) => new PostalCode.fromJson(value))
+          .map<PostalCode>((value) => new PostalCode.fromJson(value))
           .toList();
     }
     if (_json.containsKey("regions")) {
-      regions =
-          _json["regions"].map((value) => new Region.fromJson(value)).toList();
+      regions = _json["regions"]
+          .map<Region>((value) => new Region.fromJson(value))
+          .toList();
     }
   }
 
@@ -23591,8 +23634,9 @@
       accountId = _json["accountId"];
     }
     if (_json.containsKey("adSlots")) {
-      adSlots =
-          _json["adSlots"].map((value) => new AdSlot.fromJson(value)).toList();
+      adSlots = _json["adSlots"]
+          .map<AdSlot>((value) => new AdSlot.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("advertiserId")) {
       advertiserId = _json["advertiserId"];
@@ -23735,7 +23779,7 @@
   InventoryItemsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("inventoryItems")) {
       inventoryItems = _json["inventoryItems"]
-          .map((value) => new InventoryItem.fromJson(value))
+          .map<InventoryItem>((value) => new InventoryItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -23923,7 +23967,7 @@
   LanguageTargeting.fromJson(core.Map _json) {
     if (_json.containsKey("languages")) {
       languages = _json["languages"]
-          .map((value) => new Language.fromJson(value))
+          .map<Language>((value) => new Language.fromJson(value))
           .toList();
     }
   }
@@ -23955,7 +23999,7 @@
     }
     if (_json.containsKey("languages")) {
       languages = _json["languages"]
-          .map((value) => new Language.fromJson(value))
+          .map<Language>((value) => new Language.fromJson(value))
           .toList();
     }
   }
@@ -24008,7 +24052,8 @@
   ListPopulationClause.fromJson(core.Map _json) {
     if (_json.containsKey("terms")) {
       terms = _json["terms"]
-          .map((value) => new ListPopulationTerm.fromJson(value))
+          .map<ListPopulationTerm>(
+              (value) => new ListPopulationTerm.fromJson(value))
           .toList();
     }
   }
@@ -24049,7 +24094,8 @@
     }
     if (_json.containsKey("listPopulationClauses")) {
       listPopulationClauses = _json["listPopulationClauses"]
-          .map((value) => new ListPopulationClause.fromJson(value))
+          .map<ListPopulationClause>(
+              (value) => new ListPopulationClause.fromJson(value))
           .toList();
     }
   }
@@ -24377,8 +24423,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("metros")) {
-      metros =
-          _json["metros"].map((value) => new Metro.fromJson(value)).toList();
+      metros = _json["metros"]
+          .map<Metro>((value) => new Metro.fromJson(value))
+          .toList();
     }
   }
 
@@ -24472,7 +24519,7 @@
     }
     if (_json.containsKey("mobileCarriers")) {
       mobileCarriers = _json["mobileCarriers"]
-          .map((value) => new MobileCarrier.fromJson(value))
+          .map<MobileCarrier>((value) => new MobileCarrier.fromJson(value))
           .toList();
     }
   }
@@ -24754,7 +24801,8 @@
     }
     if (_json.containsKey("operatingSystemVersions")) {
       operatingSystemVersions = _json["operatingSystemVersions"]
-          .map((value) => new OperatingSystemVersion.fromJson(value))
+          .map<OperatingSystemVersion>(
+              (value) => new OperatingSystemVersion.fromJson(value))
           .toList();
     }
   }
@@ -24790,7 +24838,7 @@
     }
     if (_json.containsKey("operatingSystems")) {
       operatingSystems = _json["operatingSystems"]
-          .map((value) => new OperatingSystem.fromJson(value))
+          .map<OperatingSystem>((value) => new OperatingSystem.fromJson(value))
           .toList();
     }
   }
@@ -24942,7 +24990,7 @@
     }
     if (_json.containsKey("contacts")) {
       contacts = _json["contacts"]
-          .map((value) => new OrderContact.fromJson(value))
+          .map<OrderContact>((value) => new OrderContact.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -25317,7 +25365,7 @@
     }
     if (_json.containsKey("orderDocuments")) {
       orderDocuments = _json["orderDocuments"]
-          .map((value) => new OrderDocument.fromJson(value))
+          .map<OrderDocument>((value) => new OrderDocument.fromJson(value))
           .toList();
     }
   }
@@ -25361,8 +25409,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("orders")) {
-      orders =
-          _json["orders"].map((value) => new Order.fromJson(value)).toList();
+      orders = _json["orders"]
+          .map<Order>((value) => new Order.fromJson(value))
+          .toList();
     }
   }
 
@@ -25410,24 +25459,25 @@
   PathToConversionReportCompatibleFields.fromJson(core.Map _json) {
     if (_json.containsKey("conversionDimensions")) {
       conversionDimensions = _json["conversionDimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("customFloodlightVariables")) {
       customFloodlightVariables = _json["customFloodlightVariables"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("metrics")) {
-      metrics =
-          _json["metrics"].map((value) => new Metric.fromJson(value)).toList();
+      metrics = _json["metrics"]
+          .map<Metric>((value) => new Metric.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("perInteractionDimensions")) {
       perInteractionDimensions = _json["perInteractionDimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
   }
@@ -26291,7 +26341,7 @@
     }
     if (_json.containsKey("placementGroups")) {
       placementGroups = _json["placementGroups"]
-          .map((value) => new PlacementGroup.fromJson(value))
+          .map<PlacementGroup>((value) => new PlacementGroup.fromJson(value))
           .toList();
     }
   }
@@ -26336,7 +26386,8 @@
     }
     if (_json.containsKey("placementStrategies")) {
       placementStrategies = _json["placementStrategies"]
-          .map((value) => new PlacementStrategy.fromJson(value))
+          .map<PlacementStrategy>(
+              (value) => new PlacementStrategy.fromJson(value))
           .toList();
     }
   }
@@ -26428,7 +26479,7 @@
     }
     if (_json.containsKey("tagDatas")) {
       tagDatas = _json["tagDatas"]
-          .map((value) => new TagData.fromJson(value))
+          .map<TagData>((value) => new TagData.fromJson(value))
           .toList();
     }
   }
@@ -26463,7 +26514,7 @@
     }
     if (_json.containsKey("placementTags")) {
       placementTags = _json["placementTags"]
-          .map((value) => new PlacementTag.fromJson(value))
+          .map<PlacementTag>((value) => new PlacementTag.fromJson(value))
           .toList();
     }
   }
@@ -26505,7 +26556,7 @@
     }
     if (_json.containsKey("placements")) {
       placements = _json["placements"]
-          .map((value) => new Placement.fromJson(value))
+          .map<Placement>((value) => new Placement.fromJson(value))
           .toList();
     }
   }
@@ -26586,7 +26637,7 @@
     }
     if (_json.containsKey("platformTypes")) {
       platformTypes = _json["platformTypes"]
-          .map((value) => new PlatformType.fromJson(value))
+          .map<PlatformType>((value) => new PlatformType.fromJson(value))
           .toList();
     }
   }
@@ -26782,7 +26833,7 @@
     }
     if (_json.containsKey("postalCodes")) {
       postalCodes = _json["postalCodes"]
-          .map((value) => new PostalCode.fromJson(value))
+          .map<PostalCode>((value) => new PostalCode.fromJson(value))
           .toList();
     }
   }
@@ -26856,8 +26907,9 @@
       endDate = core.DateTime.parse(_json["endDate"]);
     }
     if (_json.containsKey("flights")) {
-      flights =
-          _json["flights"].map((value) => new Flight.fromJson(value)).toList();
+      flights = _json["flights"]
+          .map<Flight>((value) => new Flight.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("groupType")) {
       groupType = _json["groupType"];
@@ -26968,7 +27020,8 @@
     }
     if (_json.containsKey("pricingPeriods")) {
       pricingPeriods = _json["pricingPeriods"]
-          .map((value) => new PricingSchedulePricingPeriod.fromJson(value))
+          .map<PricingSchedulePricingPeriod>(
+              (value) => new PricingSchedulePricingPeriod.fromJson(value))
           .toList();
     }
     if (_json.containsKey("pricingType")) {
@@ -27344,7 +27397,7 @@
     }
     if (_json.containsKey("projects")) {
       projects = _json["projects"]
-          .map((value) => new Project.fromJson(value))
+          .map<Project>((value) => new Project.fromJson(value))
           .toList();
     }
   }
@@ -27397,29 +27450,30 @@
   ReachReportCompatibleFields.fromJson(core.Map _json) {
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("metrics")) {
-      metrics =
-          _json["metrics"].map((value) => new Metric.fromJson(value)).toList();
+      metrics = _json["metrics"]
+          .map<Metric>((value) => new Metric.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("pivotedActivityMetrics")) {
       pivotedActivityMetrics = _json["pivotedActivityMetrics"]
-          .map((value) => new Metric.fromJson(value))
+          .map<Metric>((value) => new Metric.fromJson(value))
           .toList();
     }
     if (_json.containsKey("reachByFrequencyMetrics")) {
       reachByFrequencyMetrics = _json["reachByFrequencyMetrics"]
-          .map((value) => new Metric.fromJson(value))
+          .map<Metric>((value) => new Metric.fromJson(value))
           .toList();
     }
   }
@@ -27582,8 +27636,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("regions")) {
-      regions =
-          _json["regions"].map((value) => new Region.fromJson(value)).toList();
+      regions = _json["regions"]
+          .map<Region>((value) => new Region.fromJson(value))
+          .toList();
     }
   }
 
@@ -27835,7 +27890,7 @@
     }
     if (_json.containsKey("remarketingLists")) {
       remarketingLists = _json["remarketingLists"]
-          .map((value) => new RemarketingList.fromJson(value))
+          .map<RemarketingList>((value) => new RemarketingList.fromJson(value))
           .toList();
     }
   }
@@ -27894,12 +27949,12 @@
     }
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricNames")) {
@@ -27967,7 +28022,7 @@
   ReportCrossDimensionReachCriteria.fromJson(core.Map _json) {
     if (_json.containsKey("breakdown")) {
       breakdown = _json["breakdown"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dateRange")) {
@@ -27978,7 +28033,7 @@
     }
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricNames")) {
@@ -28052,7 +28107,7 @@
     }
     if (_json.containsKey("recipients")) {
       recipients = _json["recipients"]
-          .map((value) => new Recipient.fromJson(value))
+          .map<Recipient>((value) => new Recipient.fromJson(value))
           .toList();
     }
   }
@@ -28159,7 +28214,7 @@
   ReportFloodlightCriteria.fromJson(core.Map _json) {
     if (_json.containsKey("customRichMediaEvents")) {
       customRichMediaEvents = _json["customRichMediaEvents"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dateRange")) {
@@ -28167,12 +28222,12 @@
     }
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("floodlightConfigId")) {
@@ -28371,22 +28426,22 @@
   ReportPathToConversionCriteria.fromJson(core.Map _json) {
     if (_json.containsKey("activityFilters")) {
       activityFilters = _json["activityFilters"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("conversionDimensions")) {
       conversionDimensions = _json["conversionDimensions"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("customFloodlightVariables")) {
       customFloodlightVariables = _json["customFloodlightVariables"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("customRichMediaEvents")) {
       customRichMediaEvents = _json["customRichMediaEvents"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dateRange")) {
@@ -28401,7 +28456,7 @@
     }
     if (_json.containsKey("perInteractionDimensions")) {
       perInteractionDimensions = _json["perInteractionDimensions"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("reportProperties")) {
@@ -28496,12 +28551,12 @@
     }
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new DimensionValue.fromJson(value))
+          .map<DimensionValue>((value) => new DimensionValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new SortedDimension.fromJson(value))
+          .map<SortedDimension>((value) => new SortedDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("enableAllDimensionCombinations")) {
@@ -28865,24 +28920,25 @@
   ReportCompatibleFields.fromJson(core.Map _json) {
     if (_json.containsKey("dimensionFilters")) {
       dimensionFilters = _json["dimensionFilters"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
       dimensions = _json["dimensions"]
-          .map((value) => new Dimension.fromJson(value))
+          .map<Dimension>((value) => new Dimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
     }
     if (_json.containsKey("metrics")) {
-      metrics =
-          _json["metrics"].map((value) => new Metric.fromJson(value)).toList();
+      metrics = _json["metrics"]
+          .map<Metric>((value) => new Metric.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("pivotedActivityMetrics")) {
       pivotedActivityMetrics = _json["pivotedActivityMetrics"]
-          .map((value) => new Metric.fromJson(value))
+          .map<Metric>((value) => new Metric.fromJson(value))
           .toList();
     }
   }
@@ -28936,8 +28992,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Report.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Report>((value) => new Report.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -29194,7 +29251,7 @@
     }
     if (_json.containsKey("siteContacts")) {
       siteContacts = _json["siteContacts"]
-          .map((value) => new SiteContact.fromJson(value))
+          .map<SiteContact>((value) => new SiteContact.fromJson(value))
           .toList();
     }
     if (_json.containsKey("siteSettings")) {
@@ -29469,7 +29526,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("sites")) {
-      sites = _json["sites"].map((value) => new Site.fromJson(value)).toList();
+      sites = _json["sites"]
+          .map<Site>((value) => new Site.fromJson(value))
+          .toList();
     }
   }
 
@@ -29565,7 +29624,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("sizes")) {
-      sizes = _json["sizes"].map((value) => new Size.fromJson(value)).toList();
+      sizes = _json["sizes"]
+          .map<Size>((value) => new Size.fromJson(value))
+          .toList();
     }
   }
 
@@ -29764,7 +29825,7 @@
     }
     if (_json.containsKey("subaccounts")) {
       subaccounts = _json["subaccounts"]
-          .map((value) => new Subaccount.fromJson(value))
+          .map<Subaccount>((value) => new Subaccount.fromJson(value))
           .toList();
     }
   }
@@ -30169,7 +30230,8 @@
     }
     if (_json.containsKey("targetableRemarketingLists")) {
       targetableRemarketingLists = _json["targetableRemarketingLists"]
-          .map((value) => new TargetableRemarketingList.fromJson(value))
+          .map<TargetableRemarketingList>(
+              (value) => new TargetableRemarketingList.fromJson(value))
           .toList();
     }
   }
@@ -30360,7 +30422,8 @@
     }
     if (_json.containsKey("targetingTemplates")) {
       targetingTemplates = _json["targetingTemplates"]
-          .map((value) => new TargetingTemplate.fromJson(value))
+          .map<TargetingTemplate>(
+              (value) => new TargetingTemplate.fromJson(value))
           .toList();
     }
   }
@@ -30425,32 +30488,33 @@
   TechnologyTargeting.fromJson(core.Map _json) {
     if (_json.containsKey("browsers")) {
       browsers = _json["browsers"]
-          .map((value) => new Browser.fromJson(value))
+          .map<Browser>((value) => new Browser.fromJson(value))
           .toList();
     }
     if (_json.containsKey("connectionTypes")) {
       connectionTypes = _json["connectionTypes"]
-          .map((value) => new ConnectionType.fromJson(value))
+          .map<ConnectionType>((value) => new ConnectionType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("mobileCarriers")) {
       mobileCarriers = _json["mobileCarriers"]
-          .map((value) => new MobileCarrier.fromJson(value))
+          .map<MobileCarrier>((value) => new MobileCarrier.fromJson(value))
           .toList();
     }
     if (_json.containsKey("operatingSystemVersions")) {
       operatingSystemVersions = _json["operatingSystemVersions"]
-          .map((value) => new OperatingSystemVersion.fromJson(value))
+          .map<OperatingSystemVersion>(
+              (value) => new OperatingSystemVersion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("operatingSystems")) {
       operatingSystems = _json["operatingSystems"]
-          .map((value) => new OperatingSystem.fromJson(value))
+          .map<OperatingSystem>((value) => new OperatingSystem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("platformTypes")) {
       platformTypes = _json["platformTypes"]
-          .map((value) => new PlatformType.fromJson(value))
+          .map<PlatformType>((value) => new PlatformType.fromJson(value))
           .toList();
     }
   }
@@ -30896,7 +30960,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new UserProfile.fromJson(value))
+          .map<UserProfile>((value) => new UserProfile.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -30979,7 +31043,8 @@
     }
     if (_json.containsKey("permissions")) {
       permissions = _json["permissions"]
-          .map((value) => new UserRolePermission.fromJson(value))
+          .map<UserRolePermission>(
+              (value) => new UserRolePermission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("subaccountId")) {
@@ -31144,7 +31209,8 @@
     }
     if (_json.containsKey("userRolePermissionGroups")) {
       userRolePermissionGroups = _json["userRolePermissionGroups"]
-          .map((value) => new UserRolePermissionGroup.fromJson(value))
+          .map<UserRolePermissionGroup>(
+              (value) => new UserRolePermissionGroup.fromJson(value))
           .toList();
     }
   }
@@ -31180,7 +31246,8 @@
     }
     if (_json.containsKey("userRolePermissions")) {
       userRolePermissions = _json["userRolePermissions"]
-          .map((value) => new UserRolePermission.fromJson(value))
+          .map<UserRolePermission>(
+              (value) => new UserRolePermission.fromJson(value))
           .toList();
     }
   }
@@ -31222,7 +31289,7 @@
     }
     if (_json.containsKey("userRoles")) {
       userRoles = _json["userRoles"]
-          .map((value) => new UserRole.fromJson(value))
+          .map<UserRole>((value) => new UserRole.fromJson(value))
           .toList();
     }
   }
@@ -31326,7 +31393,7 @@
     }
     if (_json.containsKey("videoFormats")) {
       videoFormats = _json["videoFormats"]
-          .map((value) => new VideoFormat.fromJson(value))
+          .map<VideoFormat>((value) => new VideoFormat.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/digitalassetlinks/v1.dart b/generated/googleapis/lib/digitalassetlinks/v1.dart
index b58bdf9..64d3cc7 100644
--- a/generated/googleapis/lib/digitalassetlinks/v1.dart
+++ b/generated/googleapis/lib/digitalassetlinks/v1.dart
@@ -229,7 +229,7 @@
       core.String target_web_site,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -405,7 +405,7 @@
       core.String source_androidApp_certificate_sha256Fingerprint,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -676,7 +676,7 @@
     }
     if (_json.containsKey("statements")) {
       statements = _json["statements"]
-          .map((value) => new Statement.fromJson(value))
+          .map<Statement>((value) => new Statement.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/discovery/v1.dart b/generated/googleapis/lib/discovery/v1.dart
index 9c6edf9..e947424 100644
--- a/generated/googleapis/lib/discovery/v1.dart
+++ b/generated/googleapis/lib/discovery/v1.dart
@@ -53,7 +53,7 @@
   async.Future<RestDescription> getRest(core.String api, core.String version,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -105,7 +105,7 @@
   async.Future<DirectoryList> list(
       {core.String name, core.bool preferred, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -304,7 +304,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new DirectoryListItems.fromJson(value))
+          .map<DirectoryListItems>(
+              (value) => new DirectoryListItems.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -397,7 +398,8 @@
     }
     if (_json.containsKey("map")) {
       map = _json["map"]
-          .map((value) => new JsonSchemaVariantMap.fromJson(value))
+          .map<JsonSchemaVariantMap>(
+              (value) => new JsonSchemaVariantMap.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/dns/v1.dart b/generated/googleapis/lib/dns/v1.dart
index 6bc0bc8..b4e9aa2 100644
--- a/generated/googleapis/lib/dns/v1.dart
+++ b/generated/googleapis/lib/dns/v1.dart
@@ -78,7 +78,7 @@
       Change request, core.String project, core.String managedZone,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -137,7 +137,7 @@
       core.String project, core.String managedZone, core.String changeId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -210,7 +210,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -279,7 +279,7 @@
   async.Future<ManagedZone> create(ManagedZone request, core.String project,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -326,7 +326,7 @@
   async.Future delete(core.String project, core.String managedZone,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -379,7 +379,7 @@
   async.Future<ManagedZone> get(core.String project, core.String managedZone,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -438,7 +438,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -496,7 +496,7 @@
   /// this method will complete with the same error.
   async.Future<Project> get(core.String project, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -566,7 +566,7 @@
       core.String type,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -640,12 +640,14 @@
   Change.fromJson(core.Map _json) {
     if (_json.containsKey("additions")) {
       additions = _json["additions"]
-          .map((value) => new ResourceRecordSet.fromJson(value))
+          .map<ResourceRecordSet>(
+              (value) => new ResourceRecordSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("deletions")) {
       deletions = _json["deletions"]
-          .map((value) => new ResourceRecordSet.fromJson(value))
+          .map<ResourceRecordSet>(
+              (value) => new ResourceRecordSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -712,8 +714,9 @@
 
   ChangesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("changes")) {
-      changes =
-          _json["changes"].map((value) => new Change.fromJson(value)).toList();
+      changes = _json["changes"]
+          .map<Change>((value) => new Change.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -862,7 +865,7 @@
     }
     if (_json.containsKey("managedZones")) {
       managedZones = _json["managedZones"]
-          .map((value) => new ManagedZone.fromJson(value))
+          .map<ManagedZone>((value) => new ManagedZone.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -1113,7 +1116,8 @@
     }
     if (_json.containsKey("rrsets")) {
       rrsets = _json["rrsets"]
-          .map((value) => new ResourceRecordSet.fromJson(value))
+          .map<ResourceRecordSet>(
+              (value) => new ResourceRecordSet.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/doubleclickbidmanager/v1.dart b/generated/googleapis/lib/doubleclickbidmanager/v1.dart
index 4774b30..33d8804 100644
--- a/generated/googleapis/lib/doubleclickbidmanager/v1.dart
+++ b/generated/googleapis/lib/doubleclickbidmanager/v1.dart
@@ -59,7 +59,7 @@
       DownloadLineItemsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -104,7 +104,7 @@
       UploadLineItemsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -152,7 +152,7 @@
   /// this method will complete with the same error.
   async.Future<Query> createquery(Query request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -192,7 +192,7 @@
   /// this method will complete with the same error.
   async.Future deletequery(core.String queryId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -236,7 +236,7 @@
   /// this method will complete with the same error.
   async.Future<Query> getquery(core.String queryId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -276,7 +276,7 @@
   /// this method will complete with the same error.
   async.Future<ListQueriesResponse> listqueries({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -316,7 +316,7 @@
   async.Future runquery(RunQueryRequest request, core.String queryId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -370,7 +370,7 @@
   async.Future<ListReportsResponse> listreports(core.String queryId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -419,7 +419,7 @@
   async.Future<DownloadResponse> download(DownloadRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -814,8 +814,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("queries")) {
-      queries =
-          _json["queries"].map((value) => new Query.fromJson(value)).toList();
+      queries = _json["queries"]
+          .map<Query>((value) => new Query.fromJson(value))
+          .toList();
     }
   }
 
@@ -848,8 +849,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("reports")) {
-      reports =
-          _json["reports"].map((value) => new Report.fromJson(value)).toList();
+      reports = _json["reports"]
+          .map<Report>((value) => new Report.fromJson(value))
+          .toList();
     }
   }
 
@@ -921,7 +923,7 @@
   Parameters.fromJson(core.Map _json) {
     if (_json.containsKey("filters")) {
       filters = _json["filters"]
-          .map((value) => new FilterPair.fromJson(value))
+          .map<FilterPair>((value) => new FilterPair.fromJson(value))
           .toList();
     }
     if (_json.containsKey("groupBys")) {
@@ -1710,7 +1712,7 @@
     }
     if (_json.containsKey("rowStatus")) {
       rowStatus = _json["rowStatus"]
-          .map((value) => new RowStatus.fromJson(value))
+          .map<RowStatus>((value) => new RowStatus.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/doubleclicksearch/v2.dart b/generated/googleapis/lib/doubleclicksearch/v2.dart
index e2759fb..2e55c8a 100644
--- a/generated/googleapis/lib/doubleclicksearch/v2.dart
+++ b/generated/googleapis/lib/doubleclicksearch/v2.dart
@@ -105,7 +105,7 @@
       core.String criterionId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -188,7 +188,7 @@
   async.Future<ConversionList> insert(ConversionList request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -260,7 +260,7 @@
       core.int startRow,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -331,7 +331,7 @@
   async.Future<ConversionList> update(ConversionList request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -376,7 +376,7 @@
       UpdateAvailabilityRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -426,7 +426,7 @@
   async.Future<Report> generate(ReportRequest request_1,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -468,7 +468,7 @@
   /// this method will complete with the same error.
   async.Future<Report> get(core.String reportId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -517,7 +517,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -572,7 +572,7 @@
   /// this method will complete with the same error.
   async.Future<Report> request(ReportRequest request_1, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -624,7 +624,7 @@
       core.String agencyId, core.String advertiserId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -899,12 +899,12 @@
     }
     if (_json.containsKey("customDimension")) {
       customDimension = _json["customDimension"]
-          .map((value) => new CustomDimension.fromJson(value))
+          .map<CustomDimension>((value) => new CustomDimension.fromJson(value))
           .toList();
     }
     if (_json.containsKey("customMetric")) {
       customMetric = _json["customMetric"]
-          .map((value) => new CustomMetric.fromJson(value))
+          .map<CustomMetric>((value) => new CustomMetric.fromJson(value))
           .toList();
     }
     if (_json.containsKey("deviceType")) {
@@ -1082,7 +1082,7 @@
   ConversionList.fromJson(core.Map _json) {
     if (_json.containsKey("conversion")) {
       conversion = _json["conversion"]
-          .map((value) => new Conversion.fromJson(value))
+          .map<Conversion>((value) => new Conversion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1243,7 +1243,7 @@
   Report.fromJson(core.Map _json) {
     if (_json.containsKey("files")) {
       files = _json["files"]
-          .map((value) => new ReportFiles.fromJson(value))
+          .map<ReportFiles>((value) => new ReportFiles.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -1262,8 +1262,9 @@
       rowCount = _json["rowCount"];
     }
     if (_json.containsKey("rows")) {
-      rows =
-          _json["rows"].map((value) => new ReportRow.fromJson(value)).toList();
+      rows = _json["rows"]
+          .map<ReportRow>((value) => new ReportRow.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("statisticsCurrencyCode")) {
       statisticsCurrencyCode = _json["statisticsCurrencyCode"];
@@ -1720,7 +1721,8 @@
   ReportRequest.fromJson(core.Map _json) {
     if (_json.containsKey("columns")) {
       columns = _json["columns"]
-          .map((value) => new ReportApiColumnSpec.fromJson(value))
+          .map<ReportApiColumnSpec>(
+              (value) => new ReportApiColumnSpec.fromJson(value))
           .toList();
     }
     if (_json.containsKey("downloadFormat")) {
@@ -1728,7 +1730,8 @@
     }
     if (_json.containsKey("filters")) {
       filters = _json["filters"]
-          .map((value) => new ReportRequestFilters.fromJson(value))
+          .map<ReportRequestFilters>(
+              (value) => new ReportRequestFilters.fromJson(value))
           .toList();
     }
     if (_json.containsKey("includeDeletedEntities")) {
@@ -1742,7 +1745,8 @@
     }
     if (_json.containsKey("orderBy")) {
       orderBy = _json["orderBy"]
-          .map((value) => new ReportRequestOrderBy.fromJson(value))
+          .map<ReportRequestOrderBy>(
+              (value) => new ReportRequestOrderBy.fromJson(value))
           .toList();
     }
     if (_json.containsKey("reportScope")) {
@@ -1915,7 +1919,7 @@
   SavedColumnList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new SavedColumn.fromJson(value))
+          .map<SavedColumn>((value) => new SavedColumn.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1946,7 +1950,7 @@
   UpdateAvailabilityRequest.fromJson(core.Map _json) {
     if (_json.containsKey("availabilities")) {
       availabilities = _json["availabilities"]
-          .map((value) => new Availability.fromJson(value))
+          .map<Availability>((value) => new Availability.fromJson(value))
           .toList();
     }
   }
@@ -1972,7 +1976,7 @@
   UpdateAvailabilityResponse.fromJson(core.Map _json) {
     if (_json.containsKey("availabilities")) {
       availabilities = _json["availabilities"]
-          .map((value) => new Availability.fromJson(value))
+          .map<Availability>((value) => new Availability.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/drive/v2.dart b/generated/googleapis/lib/drive/v2.dart
index 7008d39..a9e1599 100644
--- a/generated/googleapis/lib/drive/v2.dart
+++ b/generated/googleapis/lib/drive/v2.dart
@@ -120,7 +120,7 @@
       core.String startChangeId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -174,7 +174,7 @@
   /// this method will complete with the same error.
   async.Future<App> get(core.String appId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -234,7 +234,7 @@
       core.String languageCode,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -297,7 +297,7 @@
       core.String teamDriveId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -352,7 +352,7 @@
       core.String teamDriveId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -441,7 +441,7 @@
       core.String teamDriveId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -556,7 +556,7 @@
       core.String teamDriveId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -632,7 +632,7 @@
   /// this method will complete with the same error.
   async.Future stop(Channel request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -683,7 +683,7 @@
   async.Future delete(core.String folderId, core.String childId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -736,7 +736,7 @@
   async.Future<ChildReference> get(core.String folderId, core.String childId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -791,7 +791,7 @@
       ChildReference request, core.String folderId,
       {core.bool supportsTeamDrives, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -859,7 +859,7 @@
       core.String q,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -920,7 +920,7 @@
   async.Future delete(core.String fileId, core.String commentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -976,7 +976,7 @@
   async.Future<Comment> get(core.String fileId, core.String commentId,
       {core.bool includeDeleted, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1030,7 +1030,7 @@
   async.Future<Comment> insert(Comment request, core.String fileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1094,7 +1094,7 @@
       core.String updatedMin,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1154,7 +1154,7 @@
       Comment request, core.String fileId, core.String commentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1211,7 +1211,7 @@
       Comment request, core.String fileId, core.String commentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1304,7 +1304,7 @@
       core.String visibility,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1377,7 +1377,7 @@
   async.Future delete(core.String fileId,
       {core.bool supportsTeamDrives, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1420,7 +1420,7 @@
   /// this method will complete with the same error.
   async.Future emptyTrash({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1469,7 +1469,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1527,7 +1527,7 @@
   async.Future<GeneratedIds> generateIds(
       {core.int maxResults, core.String space, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1606,7 +1606,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1716,7 +1716,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1851,7 +1851,7 @@
       core.String teamDriveId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1996,7 +1996,7 @@
       core.bool useContentAsIndexableText,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2089,7 +2089,7 @@
   async.Future<File> touch(core.String fileId,
       {core.bool supportsTeamDrives, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2139,7 +2139,7 @@
   async.Future<File> trash(core.String fileId,
       {core.bool supportsTeamDrives, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2188,7 +2188,7 @@
   async.Future<File> untrash(core.String fileId,
       {core.bool supportsTeamDrives, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2313,7 +2313,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2449,7 +2449,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2523,7 +2523,7 @@
   async.Future delete(core.String fileId, core.String parentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2576,7 +2576,7 @@
   async.Future<ParentReference> get(core.String fileId, core.String parentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2631,7 +2631,7 @@
       ParentReference request, core.String fileId,
       {core.bool supportsTeamDrives, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2679,7 +2679,7 @@
   /// this method will complete with the same error.
   async.Future<ParentList> list(core.String fileId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2738,7 +2738,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2807,7 +2807,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2862,7 +2862,7 @@
   async.Future<PermissionId> getIdForEmail(core.String email,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2926,7 +2926,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3006,7 +3006,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3084,7 +3084,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3171,7 +3171,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3243,7 +3243,7 @@
   async.Future delete(core.String fileId, core.String propertyKey,
       {core.String visibility, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3301,7 +3301,7 @@
   async.Future<Property> get(core.String fileId, core.String propertyKey,
       {core.String visibility, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3355,7 +3355,7 @@
   async.Future<Property> insert(Property request, core.String fileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3400,7 +3400,7 @@
   /// this method will complete with the same error.
   async.Future<PropertyList> list(core.String fileId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3451,7 +3451,7 @@
       Property request, core.String fileId, core.String propertyKey,
       {core.String visibility, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3513,7 +3513,7 @@
       Property request, core.String fileId, core.String propertyKey,
       {core.String visibility, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3586,7 +3586,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3654,7 +3654,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3723,7 +3723,7 @@
       core.String fileId, core.String commentId, core.String replyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3787,7 +3787,7 @@
       core.String fileId, core.String commentId, core.String replyId,
       {core.bool includeDeleted, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3849,7 +3849,7 @@
       CommentReply request, core.String fileId, core.String commentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3918,7 +3918,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3984,7 +3984,7 @@
       core.String commentId, core.String replyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4048,7 +4048,7 @@
       core.String commentId, core.String replyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4111,7 +4111,7 @@
   async.Future delete(core.String fileId, core.String revisionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4164,7 +4164,7 @@
   async.Future<Revision> get(core.String fileId, core.String revisionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4220,7 +4220,7 @@
   async.Future<RevisionList> list(core.String fileId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4274,7 +4274,7 @@
       Revision request, core.String fileId, core.String revisionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4331,7 +4331,7 @@
       Revision request, core.String fileId, core.String revisionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4387,7 +4387,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String teamDriveId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4437,7 +4437,7 @@
   async.Future<TeamDrive> get(core.String teamDriveId,
       {core.bool useDomainAdminAccess, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4489,7 +4489,7 @@
   async.Future<TeamDrive> insert(TeamDrive request, core.String requestId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4549,7 +4549,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4603,7 +4603,7 @@
   async.Future<TeamDrive> update(TeamDrive request, core.String teamDriveId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4674,7 +4674,8 @@
   AboutAdditionalRoleInfo.fromJson(core.Map _json) {
     if (_json.containsKey("roleSets")) {
       roleSets = _json["roleSets"]
-          .map((value) => new AboutAdditionalRoleInfoRoleSets.fromJson(value))
+          .map<AboutAdditionalRoleInfoRoleSets>(
+              (value) => new AboutAdditionalRoleInfoRoleSets.fromJson(value))
           .toList();
     }
     if (_json.containsKey("type")) {
@@ -4986,7 +4987,8 @@
   About.fromJson(core.Map _json) {
     if (_json.containsKey("additionalRoleInfo")) {
       additionalRoleInfo = _json["additionalRoleInfo"]
-          .map((value) => new AboutAdditionalRoleInfo.fromJson(value))
+          .map<AboutAdditionalRoleInfo>(
+              (value) => new AboutAdditionalRoleInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("canCreateTeamDrives")) {
@@ -5000,12 +5002,13 @@
     }
     if (_json.containsKey("exportFormats")) {
       exportFormats = _json["exportFormats"]
-          .map((value) => new AboutExportFormats.fromJson(value))
+          .map<AboutExportFormats>(
+              (value) => new AboutExportFormats.fromJson(value))
           .toList();
     }
     if (_json.containsKey("features")) {
       features = _json["features"]
-          .map((value) => new AboutFeatures.fromJson(value))
+          .map<AboutFeatures>((value) => new AboutFeatures.fromJson(value))
           .toList();
     }
     if (_json.containsKey("folderColorPalette")) {
@@ -5013,7 +5016,8 @@
     }
     if (_json.containsKey("importFormats")) {
       importFormats = _json["importFormats"]
-          .map((value) => new AboutImportFormats.fromJson(value))
+          .map<AboutImportFormats>(
+              (value) => new AboutImportFormats.fromJson(value))
           .toList();
     }
     if (_json.containsKey("isCurrentAppInstalled")) {
@@ -5030,7 +5034,8 @@
     }
     if (_json.containsKey("maxUploadSizes")) {
       maxUploadSizes = _json["maxUploadSizes"]
-          .map((value) => new AboutMaxUploadSizes.fromJson(value))
+          .map<AboutMaxUploadSizes>(
+              (value) => new AboutMaxUploadSizes.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -5041,7 +5046,8 @@
     }
     if (_json.containsKey("quotaBytesByService")) {
       quotaBytesByService = _json["quotaBytesByService"]
-          .map((value) => new AboutQuotaBytesByService.fromJson(value))
+          .map<AboutQuotaBytesByService>(
+              (value) => new AboutQuotaBytesByService.fromJson(value))
           .toList();
     }
     if (_json.containsKey("quotaBytesTotal")) {
@@ -5070,7 +5076,8 @@
     }
     if (_json.containsKey("teamDriveThemes")) {
       teamDriveThemes = _json["teamDriveThemes"]
-          .map((value) => new AboutTeamDriveThemes.fromJson(value))
+          .map<AboutTeamDriveThemes>(
+              (value) => new AboutTeamDriveThemes.fromJson(value))
           .toList();
     }
     if (_json.containsKey("user")) {
@@ -5311,8 +5318,9 @@
       hasDriveWideScope = _json["hasDriveWideScope"];
     }
     if (_json.containsKey("icons")) {
-      icons =
-          _json["icons"].map((value) => new AppIcons.fromJson(value)).toList();
+      icons = _json["icons"]
+          .map<AppIcons>((value) => new AppIcons.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("id")) {
       id = _json["id"];
@@ -5481,7 +5489,8 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new App.fromJson(value)).toList();
+      items =
+          _json["items"].map<App>((value) => new App.fromJson(value)).toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -5659,8 +5668,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Change.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Change>((value) => new Change.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -5853,7 +5863,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ChildReference.fromJson(value))
+          .map<ChildReference>((value) => new ChildReference.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -6076,7 +6086,7 @@
     }
     if (_json.containsKey("replies")) {
       replies = _json["replies"]
-          .map((value) => new CommentReply.fromJson(value))
+          .map<CommentReply>((value) => new CommentReply.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selfLink")) {
@@ -6164,8 +6174,9 @@
 
   CommentList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Comment.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Comment>((value) => new Comment.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -6333,7 +6344,7 @@
   CommentReplyList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new CommentReply.fromJson(value))
+          .map<CommentReply>((value) => new CommentReply.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -7358,12 +7369,13 @@
       ownerNames = _json["ownerNames"];
     }
     if (_json.containsKey("owners")) {
-      owners =
-          _json["owners"].map((value) => new User.fromJson(value)).toList();
+      owners = _json["owners"]
+          .map<User>((value) => new User.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("parents")) {
       parents = _json["parents"]
-          .map((value) => new ParentReference.fromJson(value))
+          .map<ParentReference>((value) => new ParentReference.fromJson(value))
           .toList();
     }
     if (_json.containsKey("permissionIds")) {
@@ -7371,12 +7383,12 @@
     }
     if (_json.containsKey("permissions")) {
       permissions = _json["permissions"]
-          .map((value) => new Permission.fromJson(value))
+          .map<Permission>((value) => new Permission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("properties")) {
       properties = _json["properties"]
-          .map((value) => new Property.fromJson(value))
+          .map<Property>((value) => new Property.fromJson(value))
           .toList();
     }
     if (_json.containsKey("quotaBytesUsed")) {
@@ -7691,7 +7703,9 @@
       incompleteSearch = _json["incompleteSearch"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new File.fromJson(value)).toList();
+      items = _json["items"]
+          .map<File>((value) => new File.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -7798,7 +7812,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ParentReference.fromJson(value))
+          .map<ParentReference>((value) => new ParentReference.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -8083,7 +8097,7 @@
     }
     if (_json.containsKey("teamDrivePermissionDetails")) {
       teamDrivePermissionDetails = _json["teamDrivePermissionDetails"]
-          .map((value) =>
+          .map<PermissionTeamDrivePermissionDetails>((value) =>
               new PermissionTeamDrivePermissionDetails.fromJson(value))
           .toList();
     }
@@ -8217,7 +8231,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Permission.fromJson(value))
+          .map<Permission>((value) => new Permission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -8350,8 +8364,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Property.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Property>((value) => new Property.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -8595,8 +8610,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Revision.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Revision>((value) => new Revision.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -8995,8 +9011,9 @@
 
   TeamDriveList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new TeamDrive.fromJson(value)).toList();
+      items = _json["items"]
+          .map<TeamDrive>((value) => new TeamDrive.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
diff --git a/generated/googleapis/lib/drive/v3.dart b/generated/googleapis/lib/drive/v3.dart
index 3d8645d..b51da30 100644
--- a/generated/googleapis/lib/drive/v3.dart
+++ b/generated/googleapis/lib/drive/v3.dart
@@ -98,7 +98,7 @@
   /// this method will complete with the same error.
   async.Future<About> get({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -150,7 +150,7 @@
       core.String teamDriveId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -236,7 +236,7 @@
       core.String teamDriveId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -346,7 +346,7 @@
       core.String teamDriveId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -420,7 +420,7 @@
   /// this method will complete with the same error.
   async.Future stop(Channel request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -473,7 +473,7 @@
   async.Future<Comment> create(Comment request, core.String fileId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -519,7 +519,7 @@
   async.Future delete(core.String fileId, core.String commentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -575,7 +575,7 @@
   async.Future<Comment> get(core.String fileId, core.String commentId,
       {core.bool includeDeleted, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -644,7 +644,7 @@
       core.String startModifiedTime,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -704,7 +704,7 @@
       Comment request, core.String fileId, core.String commentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -785,7 +785,7 @@
       core.bool supportsTeamDrives,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -875,7 +875,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -948,7 +948,7 @@
   async.Future delete(core.String fileId,
       {core.bool supportsTeamDrives, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -991,7 +991,7 @@
   /// this method will complete with the same error.
   async.Future emptyTrash({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1040,7 +1040,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1098,7 +1098,7 @@
   async.Future<GeneratedIds> generateIds(
       {core.int count, core.String space, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1163,7 +1163,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1270,7 +1270,7 @@
       core.String teamDriveId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1373,7 +1373,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1471,7 +1471,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1563,7 +1563,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1634,7 +1634,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1703,7 +1703,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1780,7 +1780,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1858,7 +1858,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1933,7 +1933,7 @@
       Reply request, core.String fileId, core.String commentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1989,7 +1989,7 @@
       core.String fileId, core.String commentId, core.String replyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2053,7 +2053,7 @@
       core.String fileId, core.String commentId, core.String replyId,
       {core.bool includeDeleted, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2125,7 +2125,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2191,7 +2191,7 @@
       core.String commentId, core.String replyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2255,7 +2255,7 @@
   async.Future delete(core.String fileId, core.String revisionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2323,7 +2323,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2389,7 +2389,7 @@
   async.Future<RevisionList> list(core.String fileId,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2443,7 +2443,7 @@
       Revision request, core.String fileId, core.String revisionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2507,7 +2507,7 @@
   async.Future<TeamDrive> create(TeamDrive request, core.String requestId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2552,7 +2552,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String teamDriveId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2602,7 +2602,7 @@
   async.Future<TeamDrive> get(core.String teamDriveId,
       {core.bool useDomainAdminAccess, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2661,7 +2661,7 @@
       core.bool useDomainAdminAccess,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2715,7 +2715,7 @@
   async.Future<TeamDrive> update(TeamDrive request, core.String teamDriveId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2903,7 +2903,8 @@
     }
     if (_json.containsKey("teamDriveThemes")) {
       teamDriveThemes = _json["teamDriveThemes"]
-          .map((value) => new AboutTeamDriveThemes.fromJson(value))
+          .map<AboutTeamDriveThemes>(
+              (value) => new AboutTeamDriveThemes.fromJson(value))
           .toList();
     }
     if (_json.containsKey("user")) {
@@ -3067,8 +3068,9 @@
 
   ChangeList.fromJson(core.Map _json) {
     if (_json.containsKey("changes")) {
-      changes =
-          _json["changes"].map((value) => new Change.fromJson(value)).toList();
+      changes = _json["changes"]
+          .map<Change>((value) => new Change.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3323,8 +3325,9 @@
           new CommentQuotedFileContent.fromJson(_json["quotedFileContent"]);
     }
     if (_json.containsKey("replies")) {
-      replies =
-          _json["replies"].map((value) => new Reply.fromJson(value)).toList();
+      replies = _json["replies"]
+          .map<Reply>((value) => new Reply.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("resolved")) {
       resolved = _json["resolved"];
@@ -3395,7 +3398,7 @@
   CommentList.fromJson(core.Map _json) {
     if (_json.containsKey("comments")) {
       comments = _json["comments"]
-          .map((value) => new Comment.fromJson(value))
+          .map<Comment>((value) => new Comment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4263,8 +4266,9 @@
       ownedByMe = _json["ownedByMe"];
     }
     if (_json.containsKey("owners")) {
-      owners =
-          _json["owners"].map((value) => new User.fromJson(value)).toList();
+      owners = _json["owners"]
+          .map<User>((value) => new User.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("parents")) {
       parents = _json["parents"];
@@ -4274,7 +4278,7 @@
     }
     if (_json.containsKey("permissions")) {
       permissions = _json["permissions"]
-          .map((value) => new Permission.fromJson(value))
+          .map<Permission>((value) => new Permission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("properties")) {
@@ -4538,7 +4542,9 @@
 
   FileList.fromJson(core.Map _json) {
     if (_json.containsKey("files")) {
-      files = _json["files"].map((value) => new File.fromJson(value)).toList();
+      files = _json["files"]
+          .map<File>((value) => new File.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("incompleteSearch")) {
       incompleteSearch = _json["incompleteSearch"];
@@ -4765,7 +4771,7 @@
     }
     if (_json.containsKey("teamDrivePermissionDetails")) {
       teamDrivePermissionDetails = _json["teamDrivePermissionDetails"]
-          .map((value) =>
+          .map<PermissionTeamDrivePermissionDetails>((value) =>
               new PermissionTeamDrivePermissionDetails.fromJson(value))
           .toList();
     }
@@ -4845,7 +4851,7 @@
     }
     if (_json.containsKey("permissions")) {
       permissions = _json["permissions"]
-          .map((value) => new Permission.fromJson(value))
+          .map<Permission>((value) => new Permission.fromJson(value))
           .toList();
     }
   }
@@ -4993,8 +4999,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("replies")) {
-      replies =
-          _json["replies"].map((value) => new Reply.fromJson(value)).toList();
+      replies = _json["replies"]
+          .map<Reply>((value) => new Reply.fromJson(value))
+          .toList();
     }
   }
 
@@ -5174,7 +5181,7 @@
     }
     if (_json.containsKey("revisions")) {
       revisions = _json["revisions"]
-          .map((value) => new Revision.fromJson(value))
+          .map<Revision>((value) => new Revision.fromJson(value))
           .toList();
     }
   }
@@ -5572,7 +5579,7 @@
     }
     if (_json.containsKey("teamDrives")) {
       teamDrives = _json["teamDrives"]
-          .map((value) => new TeamDrive.fromJson(value))
+          .map<TeamDrive>((value) => new TeamDrive.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/firebasedynamiclinks/v1.dart b/generated/googleapis/lib/firebasedynamiclinks/v1.dart
index 7cbdea5..4b1b831 100644
--- a/generated/googleapis/lib/firebasedynamiclinks/v1.dart
+++ b/generated/googleapis/lib/firebasedynamiclinks/v1.dart
@@ -64,7 +64,7 @@
       CreateShortDynamicLinkRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -118,7 +118,7 @@
   async.Future<DynamicLinkStats> getLinkStats(core.String dynamicLink,
       {core.String durationDays, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -165,7 +165,7 @@
       GetIosPostInstallAttributionRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -345,7 +345,8 @@
     }
     if (_json.containsKey("warning")) {
       warning = _json["warning"]
-          .map((value) => new DynamicLinkWarning.fromJson(value))
+          .map<DynamicLinkWarning>(
+              (value) => new DynamicLinkWarning.fromJson(value))
           .toList();
     }
   }
@@ -645,7 +646,8 @@
   DynamicLinkStats.fromJson(core.Map _json) {
     if (_json.containsKey("linkEventStats")) {
       linkEventStats = _json["linkEventStats"]
-          .map((value) => new DynamicLinkEventStat.fromJson(value))
+          .map<DynamicLinkEventStat>(
+              (value) => new DynamicLinkEventStat.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/firebaseremoteconfig/v1.dart b/generated/googleapis/lib/firebaseremoteconfig/v1.dart
index 031982b..6298408 100644
--- a/generated/googleapis/lib/firebaseremoteconfig/v1.dart
+++ b/generated/googleapis/lib/firebaseremoteconfig/v1.dart
@@ -56,7 +56,7 @@
   async.Future<RemoteConfig> getRemoteConfig(core.String project,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -132,7 +132,7 @@
       RemoteConfig request, core.String project,
       {core.bool validateOnly, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -204,7 +204,8 @@
   RemoteConfig.fromJson(core.Map _json) {
     if (_json.containsKey("conditions")) {
       conditions = _json["conditions"]
-          .map((value) => new RemoteConfigCondition.fromJson(value))
+          .map<RemoteConfigCondition>(
+              (value) => new RemoteConfigCondition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("parameters")) {
diff --git a/generated/googleapis/lib/firebaserules/v1.dart b/generated/googleapis/lib/firebaserules/v1.dart
index fa3651c..921d4d1 100644
--- a/generated/googleapis/lib/firebaserules/v1.dart
+++ b/generated/googleapis/lib/firebaserules/v1.dart
@@ -100,7 +100,7 @@
       TestRulesetRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -179,7 +179,7 @@
   async.Future<Release> create(Release request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -227,7 +227,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -272,7 +272,7 @@
   /// this method will complete with the same error.
   async.Future<Release> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -326,7 +326,7 @@
   async.Future<GetReleaseExecutableResponse> getExecutable(core.String name,
       {core.String executableVersion, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -418,7 +418,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -479,7 +479,7 @@
   async.Future<Release> patch(UpdateReleaseRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -543,7 +543,7 @@
   async.Future<Ruleset> create(Ruleset request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -593,7 +593,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -638,7 +638,7 @@
   /// this method will complete with the same error.
   async.Future<Ruleset> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -709,7 +709,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -912,7 +912,8 @@
 
   FunctionMock.fromJson(core.Map _json) {
     if (_json.containsKey("args")) {
-      args = _json["args"].map((value) => new Arg.fromJson(value)).toList();
+      args =
+          _json["args"].map<Arg>((value) => new Arg.fromJson(value)).toList();
     }
     if (_json.containsKey("function")) {
       function = _json["function"];
@@ -1085,7 +1086,7 @@
     }
     if (_json.containsKey("releases")) {
       releases = _json["releases"]
-          .map((value) => new Release.fromJson(value))
+          .map<Release>((value) => new Release.fromJson(value))
           .toList();
     }
   }
@@ -1120,7 +1121,7 @@
     }
     if (_json.containsKey("rulesets")) {
       rulesets = _json["rulesets"]
-          .map((value) => new Ruleset.fromJson(value))
+          .map<Ruleset>((value) => new Ruleset.fromJson(value))
           .toList();
     }
   }
@@ -1306,7 +1307,9 @@
 
   Source.fromJson(core.Map _json) {
     if (_json.containsKey("files")) {
-      files = _json["files"].map((value) => new File.fromJson(value)).toList();
+      files = _json["files"]
+          .map<File>((value) => new File.fromJson(value))
+          .toList();
     }
   }
 
@@ -1425,7 +1428,7 @@
     }
     if (_json.containsKey("functionMocks")) {
       functionMocks = _json["functionMocks"]
-          .map((value) => new FunctionMock.fromJson(value))
+          .map<FunctionMock>((value) => new FunctionMock.fromJson(value))
           .toList();
     }
     if (_json.containsKey("request")) {
@@ -1503,7 +1506,7 @@
     }
     if (_json.containsKey("functionCalls")) {
       functionCalls = _json["functionCalls"]
-          .map((value) => new FunctionCall.fromJson(value))
+          .map<FunctionCall>((value) => new FunctionCall.fromJson(value))
           .toList();
     }
     if (_json.containsKey("state")) {
@@ -1580,12 +1583,13 @@
 
   TestRulesetResponse.fromJson(core.Map _json) {
     if (_json.containsKey("issues")) {
-      issues =
-          _json["issues"].map((value) => new Issue.fromJson(value)).toList();
+      issues = _json["issues"]
+          .map<Issue>((value) => new Issue.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("testResults")) {
       testResults = _json["testResults"]
-          .map((value) => new TestResult.fromJson(value))
+          .map<TestResult>((value) => new TestResult.fromJson(value))
           .toList();
     }
   }
@@ -1618,7 +1622,7 @@
   TestSuite.fromJson(core.Map _json) {
     if (_json.containsKey("testCases")) {
       testCases = _json["testCases"]
-          .map((value) => new TestCase.fromJson(value))
+          .map<TestCase>((value) => new TestCase.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/fitness/v1.dart b/generated/googleapis/lib/fitness/v1.dart
index 649231f..ac35783 100644
--- a/generated/googleapis/lib/fitness/v1.dart
+++ b/generated/googleapis/lib/fitness/v1.dart
@@ -153,7 +153,7 @@
   async.Future<DataSource> create(DataSource request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -203,7 +203,7 @@
   async.Future<DataSource> delete(core.String userId, core.String dataSourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -254,7 +254,7 @@
   async.Future<DataSource> get(core.String userId, core.String dataSourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -309,7 +309,7 @@
   async.Future<ListDataSourcesResponse> list(core.String userId,
       {core.List<core.String> dataTypeName, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -366,7 +366,7 @@
       DataSource request, core.String userId, core.String dataSourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -427,7 +427,7 @@
       DataSource request, core.String userId, core.String dataSourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -497,7 +497,7 @@
       core.String userId, core.String dataSourceId,
       {core.int limit, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -581,7 +581,7 @@
       core.String modifiedTimeMillis,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -666,7 +666,7 @@
       core.String userId, core.String dataSourceId, core.String datasetId,
       {core.int limit, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -744,7 +744,7 @@
       core.String dataSourceId, core.String datasetId,
       {core.String currentTimeMillis, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -816,7 +816,7 @@
       AggregateRequest request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -872,7 +872,7 @@
   async.Future delete(core.String userId, core.String sessionId,
       {core.String currentTimeMillis, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -944,7 +944,7 @@
       core.String startTime,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1008,7 +1008,7 @@
       Session request, core.String userId, core.String sessionId,
       {core.String currentTimeMillis, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1079,8 +1079,9 @@
       activity = _json["activity"];
     }
     if (_json.containsKey("dataset")) {
-      dataset =
-          _json["dataset"].map((value) => new Dataset.fromJson(value)).toList();
+      dataset = _json["dataset"]
+          .map<Dataset>((value) => new Dataset.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("endTimeMillis")) {
       endTimeMillis = _json["endTimeMillis"];
@@ -1208,7 +1209,7 @@
   AggregateRequest.fromJson(core.Map _json) {
     if (_json.containsKey("aggregateBy")) {
       aggregateBy = _json["aggregateBy"]
-          .map((value) => new AggregateBy.fromJson(value))
+          .map<AggregateBy>((value) => new AggregateBy.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bucketByActivitySegment")) {
@@ -1277,7 +1278,7 @@
   AggregateResponse.fromJson(core.Map _json) {
     if (_json.containsKey("bucket")) {
       bucket = _json["bucket"]
-          .map((value) => new AggregateBucket.fromJson(value))
+          .map<AggregateBucket>((value) => new AggregateBucket.fromJson(value))
           .toList();
     }
   }
@@ -1551,7 +1552,9 @@
       startTimeNanos = _json["startTimeNanos"];
     }
     if (_json.containsKey("value")) {
-      value = _json["value"].map((value) => new Value.fromJson(value)).toList();
+      value = _json["value"]
+          .map<Value>((value) => new Value.fromJson(value))
+          .toList();
     }
   }
 
@@ -1739,7 +1742,7 @@
   DataType.fromJson(core.Map _json) {
     if (_json.containsKey("field")) {
       field = _json["field"]
-          .map((value) => new DataTypeField.fromJson(value))
+          .map<DataTypeField>((value) => new DataTypeField.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -1860,8 +1863,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("point")) {
-      point =
-          _json["point"].map((value) => new DataPoint.fromJson(value)).toList();
+      point = _json["point"]
+          .map<DataPoint>((value) => new DataPoint.fromJson(value))
+          .toList();
     }
   }
 
@@ -1992,12 +1996,12 @@
     }
     if (_json.containsKey("deletedDataPoint")) {
       deletedDataPoint = _json["deletedDataPoint"]
-          .map((value) => new DataPoint.fromJson(value))
+          .map<DataPoint>((value) => new DataPoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("insertedDataPoint")) {
       insertedDataPoint = _json["insertedDataPoint"]
-          .map((value) => new DataPoint.fromJson(value))
+          .map<DataPoint>((value) => new DataPoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2035,7 +2039,7 @@
   ListDataSourcesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("dataSource")) {
       dataSource = _json["dataSource"]
-          .map((value) => new DataSource.fromJson(value))
+          .map<DataSource>((value) => new DataSource.fromJson(value))
           .toList();
     }
   }
@@ -2074,7 +2078,7 @@
   ListSessionsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deletedSession")) {
       deletedSession = _json["deletedSession"]
-          .map((value) => new Session.fromJson(value))
+          .map<Session>((value) => new Session.fromJson(value))
           .toList();
     }
     if (_json.containsKey("hasMoreData")) {
@@ -2084,8 +2088,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("session")) {
-      session =
-          _json["session"].map((value) => new Session.fromJson(value)).toList();
+      session = _json["session"]
+          .map<Session>((value) => new Session.fromJson(value))
+          .toList();
     }
   }
 
@@ -2269,7 +2274,8 @@
     }
     if (_json.containsKey("mapVal")) {
       mapVal = _json["mapVal"]
-          .map((value) => new ValueMapValEntry.fromJson(value))
+          .map<ValueMapValEntry>(
+              (value) => new ValueMapValEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("stringVal")) {
diff --git a/generated/googleapis/lib/fusiontables/v1.dart b/generated/googleapis/lib/fusiontables/v1.dart
index 12e83cf..367b7ca 100644
--- a/generated/googleapis/lib/fusiontables/v1.dart
+++ b/generated/googleapis/lib/fusiontables/v1.dart
@@ -72,7 +72,7 @@
   async.Future delete(core.String tableId, core.String columnId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -125,7 +125,7 @@
   async.Future<Column> get(core.String tableId, core.String columnId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -176,7 +176,7 @@
   async.Future<Column> insert(Column request, core.String tableId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -228,7 +228,7 @@
   async.Future<ColumnList> list(core.String tableId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -283,7 +283,7 @@
       Column request, core.String tableId, core.String columnId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -340,7 +340,7 @@
       Column request, core.String tableId, core.String columnId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -419,7 +419,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -495,7 +495,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -558,7 +558,7 @@
   async.Future delete(core.String tableId, core.int styleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -611,7 +611,7 @@
   async.Future<StyleSetting> get(core.String tableId, core.int styleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -662,7 +662,7 @@
   async.Future<StyleSetting> insert(StyleSetting request, core.String tableId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -713,7 +713,7 @@
   async.Future<StyleSettingList> list(core.String tableId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -767,7 +767,7 @@
       StyleSetting request, core.String tableId, core.int styleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -824,7 +824,7 @@
       StyleSetting request, core.String tableId, core.int styleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -885,7 +885,7 @@
   async.Future<Table> copy(core.String tableId,
       {core.bool copyPresentation, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -928,7 +928,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String tableId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -972,7 +972,7 @@
   /// this method will complete with the same error.
   async.Future<Table> get(core.String tableId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1050,7 +1050,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1137,7 +1137,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1195,7 +1195,7 @@
   /// this method will complete with the same error.
   async.Future<Table> insert(Table request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1241,7 +1241,7 @@
   async.Future<TableList> list(
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1295,7 +1295,7 @@
   async.Future<Table> patch(Table request, core.String tableId,
       {core.bool replaceViewDefinition, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1351,7 +1351,7 @@
   async.Future<Table> update(Table request, core.String tableId,
       {core.bool replaceViewDefinition, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1406,7 +1406,7 @@
   async.Future delete(core.String tableId, core.String taskId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1459,7 +1459,7 @@
   async.Future<Task> get(core.String tableId, core.String taskId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1518,7 +1518,7 @@
       core.int startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1576,7 +1576,7 @@
   async.Future delete(core.String tableId, core.int templateId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1629,7 +1629,7 @@
   async.Future<Template> get(core.String tableId, core.int templateId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1680,7 +1680,7 @@
   async.Future<Template> insert(Template request, core.String tableId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1732,7 +1732,7 @@
   async.Future<TemplateList> list(core.String tableId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1786,7 +1786,7 @@
       Template request, core.String tableId, core.int templateId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1843,7 +1843,7 @@
       Template request, core.String tableId, core.int templateId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2080,8 +2080,9 @@
 
   ColumnList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Column.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Column>((value) => new Column.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2570,7 +2571,8 @@
   StyleFunctionGradient.fromJson(core.Map _json) {
     if (_json.containsKey("colors")) {
       colors = _json["colors"]
-          .map((value) => new StyleFunctionGradientColors.fromJson(value))
+          .map<StyleFunctionGradientColors>(
+              (value) => new StyleFunctionGradientColors.fromJson(value))
           .toList();
     }
     if (_json.containsKey("max")) {
@@ -2623,8 +2625,9 @@
 
   StyleFunction.fromJson(core.Map _json) {
     if (_json.containsKey("buckets")) {
-      buckets =
-          _json["buckets"].map((value) => new Bucket.fromJson(value)).toList();
+      buckets = _json["buckets"]
+          .map<Bucket>((value) => new Bucket.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("columnName")) {
       columnName = _json["columnName"];
@@ -2757,7 +2760,7 @@
   StyleSettingList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new StyleSetting.fromJson(value))
+          .map<StyleSetting>((value) => new StyleSetting.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -2836,8 +2839,9 @@
       baseTableIds = _json["baseTableIds"];
     }
     if (_json.containsKey("columns")) {
-      columns =
-          _json["columns"].map((value) => new Column.fromJson(value)).toList();
+      columns = _json["columns"]
+          .map<Column>((value) => new Column.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("description")) {
       description = _json["description"];
@@ -2912,7 +2916,9 @@
 
   TableList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Table.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Table>((value) => new Table.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3021,7 +3027,9 @@
 
   TaskList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Task.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Task>((value) => new Task.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3146,8 +3154,9 @@
 
   TemplateList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Template.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Template>((value) => new Template.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
diff --git a/generated/googleapis/lib/fusiontables/v2.dart b/generated/googleapis/lib/fusiontables/v2.dart
index 8de057b..f1efe07 100644
--- a/generated/googleapis/lib/fusiontables/v2.dart
+++ b/generated/googleapis/lib/fusiontables/v2.dart
@@ -72,7 +72,7 @@
   async.Future delete(core.String tableId, core.String columnId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -125,7 +125,7 @@
   async.Future<Column> get(core.String tableId, core.String columnId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -176,7 +176,7 @@
   async.Future<Column> insert(Column request, core.String tableId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -226,7 +226,7 @@
   async.Future<ColumnList> list(core.String tableId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -281,7 +281,7 @@
       Column request, core.String tableId, core.String columnId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -338,7 +338,7 @@
       Column request, core.String tableId, core.String columnId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -429,7 +429,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -511,7 +511,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -574,7 +574,7 @@
   async.Future delete(core.String tableId, core.int styleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -627,7 +627,7 @@
   async.Future<StyleSetting> get(core.String tableId, core.int styleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -678,7 +678,7 @@
   async.Future<StyleSetting> insert(StyleSetting request, core.String tableId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -729,7 +729,7 @@
   async.Future<StyleSettingList> list(core.String tableId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -783,7 +783,7 @@
       StyleSetting request, core.String tableId, core.int styleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -840,7 +840,7 @@
       StyleSetting request, core.String tableId, core.int styleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -901,7 +901,7 @@
   async.Future<Table> copy(core.String tableId,
       {core.bool copyPresentation, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -944,7 +944,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String tableId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -988,7 +988,7 @@
   /// this method will complete with the same error.
   async.Future<Table> get(core.String tableId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1062,7 +1062,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1149,7 +1149,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1207,7 +1207,7 @@
   /// this method will complete with the same error.
   async.Future<Table> insert(Table request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1252,7 +1252,7 @@
   async.Future<TableList> list(
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1306,7 +1306,7 @@
   async.Future<Table> patch(Table request, core.String tableId,
       {core.bool replaceViewDefinition, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1356,7 +1356,7 @@
   /// this method will complete with the same error.
   async.Future<Task> refetchSheet(core.String tableId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1432,7 +1432,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1510,7 +1510,7 @@
   async.Future<Table> update(Table request, core.String tableId,
       {core.bool replaceViewDefinition, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1566,7 +1566,7 @@
   async.Future delete(core.String tableId, core.String taskId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1619,7 +1619,7 @@
   async.Future<Task> get(core.String tableId, core.String taskId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1677,7 +1677,7 @@
       core.int startIndex,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1735,7 +1735,7 @@
   async.Future delete(core.String tableId, core.int templateId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1788,7 +1788,7 @@
   async.Future<Template> get(core.String tableId, core.int templateId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1839,7 +1839,7 @@
   async.Future<Template> insert(Template request, core.String tableId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1891,7 +1891,7 @@
   async.Future<TemplateList> list(core.String tableId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1945,7 +1945,7 @@
       Template request, core.String tableId, core.int templateId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2002,7 +2002,7 @@
       Template request, core.String tableId, core.int templateId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2311,8 +2311,9 @@
 
   ColumnList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Column.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Column>((value) => new Column.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2803,7 +2804,8 @@
   StyleFunctionGradient.fromJson(core.Map _json) {
     if (_json.containsKey("colors")) {
       colors = _json["colors"]
-          .map((value) => new StyleFunctionGradientColors.fromJson(value))
+          .map<StyleFunctionGradientColors>(
+              (value) => new StyleFunctionGradientColors.fromJson(value))
           .toList();
     }
     if (_json.containsKey("max")) {
@@ -2855,8 +2857,9 @@
 
   StyleFunction.fromJson(core.Map _json) {
     if (_json.containsKey("buckets")) {
-      buckets =
-          _json["buckets"].map((value) => new Bucket.fromJson(value)).toList();
+      buckets = _json["buckets"]
+          .map<Bucket>((value) => new Bucket.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("columnName")) {
       columnName = _json["columnName"];
@@ -2990,7 +2993,7 @@
   StyleSettingList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new StyleSetting.fromJson(value))
+          .map<StyleSetting>((value) => new StyleSetting.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3080,8 +3083,9 @@
       columnPropertiesJsonSchema = _json["columnPropertiesJsonSchema"];
     }
     if (_json.containsKey("columns")) {
-      columns =
-          _json["columns"].map((value) => new Column.fromJson(value)).toList();
+      columns = _json["columns"]
+          .map<Column>((value) => new Column.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("description")) {
       description = _json["description"];
@@ -3172,7 +3176,9 @@
 
   TableList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Table.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Table>((value) => new Table.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3278,7 +3284,9 @@
 
   TaskList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Task.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Task>((value) => new Task.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3403,8 +3411,9 @@
 
   TemplateList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Template.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Template>((value) => new Template.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
diff --git a/generated/googleapis/lib/games/v1.dart b/generated/googleapis/lib/games/v1.dart
index ad39db4..bf89563 100644
--- a/generated/googleapis/lib/games/v1.dart
+++ b/generated/googleapis/lib/games/v1.dart
@@ -94,7 +94,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -158,7 +158,7 @@
       core.String achievementId, core.int stepsToIncrement,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -235,7 +235,7 @@
       core.String state,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -294,7 +294,7 @@
   async.Future<AchievementRevealResponse> reveal(core.String achievementId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -346,7 +346,7 @@
       core.String achievementId, core.int steps,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -396,7 +396,7 @@
   async.Future<AchievementUnlockResponse> unlock(core.String achievementId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -443,7 +443,7 @@
       AchievementUpdateMultipleRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -506,7 +506,7 @@
   async.Future<Application> get(core.String applicationId,
       {core.String language, core.String platformType, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -551,7 +551,7 @@
   /// this method will complete with the same error.
   async.Future played({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -596,7 +596,7 @@
   async.Future<ApplicationVerifyResponse> verify(core.String applicationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -660,7 +660,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -720,7 +720,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -774,7 +774,7 @@
   async.Future<EventUpdateResponse> record(EventRecordRequest request,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -829,7 +829,7 @@
   async.Future<Leaderboard> get(core.String leaderboardId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -886,7 +886,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -938,7 +938,7 @@
   /// this method will complete with the same error.
   async.Future<MetagameConfig> getMetagameConfig({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -999,7 +999,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1068,7 +1068,7 @@
   async.Future<Player> get(core.String playerId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1137,7 +1137,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1193,7 +1193,7 @@
   /// this method will complete with the same error.
   async.Future remove(PushTokenId request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1235,7 +1235,7 @@
   /// this method will complete with the same error.
   async.Future update(PushToken request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1292,7 +1292,7 @@
       core.String questId, core.String milestoneId, core.String requestId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1358,7 +1358,7 @@
   async.Future<Quest> accept(core.String questId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1420,7 +1420,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1484,7 +1484,7 @@
   async.Future<RevisionCheckResponse> check(core.String clientRevision,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1538,7 +1538,7 @@
   async.Future<Room> create(RoomCreateRequest request,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1588,7 +1588,7 @@
   async.Future<Room> decline(core.String roomId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1632,7 +1632,7 @@
   /// this method will complete with the same error.
   async.Future dismiss(core.String roomId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1680,7 +1680,7 @@
   async.Future<Room> get(core.String roomId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1732,7 +1732,7 @@
   async.Future<Room> join(RoomJoinRequest request, core.String roomId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1787,7 +1787,7 @@
   async.Future<Room> leave(RoomLeaveRequest request, core.String roomId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1847,7 +1847,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1904,7 +1904,7 @@
       RoomP2PStatuses request, core.String roomId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1999,7 +1999,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2092,7 +2092,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2190,7 +2190,7 @@
       core.bool returnTopIfAbsent,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2274,7 +2274,7 @@
       core.String leaderboardId, core.String score,
       {core.String language, core.String scoreTag, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2334,7 +2334,7 @@
       {core.String language,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2389,7 +2389,7 @@
   async.Future<Snapshot> get(core.String snapshotId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2450,7 +2450,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2507,7 +2507,7 @@
   /// this method will complete with the same error.
   async.Future cancel(core.String matchId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2557,7 +2557,7 @@
   async.Future<TurnBasedMatch> create(TurnBasedMatchCreateRequest request,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2606,7 +2606,7 @@
   async.Future<TurnBasedMatch> decline(core.String matchId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2652,7 +2652,7 @@
   /// this method will complete with the same error.
   async.Future dismiss(core.String matchId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2707,7 +2707,7 @@
       TurnBasedMatchResults request, core.String matchId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2763,7 +2763,7 @@
   async.Future<TurnBasedMatch> get(core.String matchId,
       {core.bool includeMatchData, core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2815,7 +2815,7 @@
   async.Future<TurnBasedMatch> join(core.String matchId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2867,7 +2867,7 @@
   async.Future<TurnBasedMatch> leave(core.String matchId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2929,7 +2929,7 @@
       core.String pendingParticipantId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3008,7 +3008,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3073,7 +3073,7 @@
   async.Future<TurnBasedMatchRematch> rematch(core.String matchId,
       {core.String language, core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3151,7 +3151,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3212,7 +3212,7 @@
       TurnBasedMatchTurn request, core.String matchId,
       {core.String language, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3403,7 +3403,8 @@
   AchievementDefinitionsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new AchievementDefinition.fromJson(value))
+          .map<AchievementDefinition>(
+              (value) => new AchievementDefinition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3604,7 +3605,8 @@
     }
     if (_json.containsKey("updates")) {
       updates = _json["updates"]
-          .map((value) => new AchievementUpdateRequest.fromJson(value))
+          .map<AchievementUpdateRequest>(
+              (value) => new AchievementUpdateRequest.fromJson(value))
           .toList();
     }
   }
@@ -3639,7 +3641,8 @@
     }
     if (_json.containsKey("updatedAchievements")) {
       updatedAchievements = _json["updatedAchievements"]
-          .map((value) => new AchievementUpdateResponse.fromJson(value))
+          .map<AchievementUpdateResponse>(
+              (value) => new AchievementUpdateResponse.fromJson(value))
           .toList();
     }
   }
@@ -3957,7 +3960,7 @@
     }
     if (_json.containsKey("assets")) {
       assets = _json["assets"]
-          .map((value) => new ImageAsset.fromJson(value))
+          .map<ImageAsset>((value) => new ImageAsset.fromJson(value))
           .toList();
     }
     if (_json.containsKey("author")) {
@@ -3977,7 +3980,7 @@
     }
     if (_json.containsKey("instances")) {
       instances = _json["instances"]
-          .map((value) => new Instance.fromJson(value))
+          .map<Instance>((value) => new Instance.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4187,8 +4190,9 @@
 
   CategoryListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Category.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Category>((value) => new Category.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -4339,7 +4343,7 @@
   EventDefinition.fromJson(core.Map _json) {
     if (_json.containsKey("childEvents")) {
       childEvents = _json["childEvents"]
-          .map((value) => new EventChild.fromJson(value))
+          .map<EventChild>((value) => new EventChild.fromJson(value))
           .toList();
     }
     if (_json.containsKey("description")) {
@@ -4414,7 +4418,7 @@
   EventDefinitionListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new EventDefinition.fromJson(value))
+          .map<EventDefinition>((value) => new EventDefinition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4508,7 +4512,8 @@
     }
     if (_json.containsKey("updates")) {
       updates = _json["updates"]
-          .map((value) => new EventUpdateRequest.fromJson(value))
+          .map<EventUpdateRequest>(
+              (value) => new EventUpdateRequest.fromJson(value))
           .toList();
     }
   }
@@ -4605,7 +4610,8 @@
     }
     if (_json.containsKey("timePeriods")) {
       timePeriods = _json["timePeriods"]
-          .map((value) => new EventPeriodUpdate.fromJson(value))
+          .map<EventPeriodUpdate>(
+              (value) => new EventPeriodUpdate.fromJson(value))
           .toList();
     }
   }
@@ -4692,12 +4698,14 @@
   EventUpdateResponse.fromJson(core.Map _json) {
     if (_json.containsKey("batchFailures")) {
       batchFailures = _json["batchFailures"]
-          .map((value) => new EventBatchRecordFailure.fromJson(value))
+          .map<EventBatchRecordFailure>(
+              (value) => new EventBatchRecordFailure.fromJson(value))
           .toList();
     }
     if (_json.containsKey("eventFailures")) {
       eventFailures = _json["eventFailures"]
-          .map((value) => new EventRecordFailure.fromJson(value))
+          .map<EventRecordFailure>(
+              (value) => new EventRecordFailure.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4705,7 +4713,7 @@
     }
     if (_json.containsKey("playerEvents")) {
       playerEvents = _json["playerEvents"]
-          .map((value) => new PlayerEvent.fromJson(value))
+          .map<PlayerEvent>((value) => new PlayerEvent.fromJson(value))
           .toList();
     }
   }
@@ -5337,7 +5345,7 @@
   LeaderboardListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Leaderboard.fromJson(value))
+          .map<Leaderboard>((value) => new Leaderboard.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -5454,7 +5462,8 @@
   LeaderboardScores.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new LeaderboardEntry.fromJson(value))
+          .map<LeaderboardEntry>(
+              (value) => new LeaderboardEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -5523,7 +5532,7 @@
     }
     if (_json.containsKey("playerLevels")) {
       playerLevels = _json["playerLevels"]
-          .map((value) => new PlayerLevel.fromJson(value))
+          .map<PlayerLevel>((value) => new PlayerLevel.fromJson(value))
           .toList();
     }
   }
@@ -6154,7 +6163,8 @@
   PlayerAchievementListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new PlayerAchievement.fromJson(value))
+          .map<PlayerAchievement>(
+              (value) => new PlayerAchievement.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -6260,7 +6270,7 @@
   PlayerEventListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new PlayerEvent.fromJson(value))
+          .map<PlayerEvent>((value) => new PlayerEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -6472,7 +6482,8 @@
   PlayerLeaderboardScoreListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new PlayerLeaderboardScore.fromJson(value))
+          .map<PlayerLeaderboardScore>(
+              (value) => new PlayerLeaderboardScore.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -6572,8 +6583,9 @@
 
   PlayerListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Player.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Player>((value) => new Player.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -6681,7 +6693,8 @@
     }
     if (_json.containsKey("submittedScores")) {
       submittedScores = _json["submittedScores"]
-          .map((value) => new PlayerScoreResponse.fromJson(value))
+          .map<PlayerScoreResponse>(
+              (value) => new PlayerScoreResponse.fromJson(value))
           .toList();
     }
   }
@@ -6749,7 +6762,7 @@
     }
     if (_json.containsKey("unbeatenScores")) {
       unbeatenScores = _json["unbeatenScores"]
-          .map((value) => new PlayerScore.fromJson(value))
+          .map<PlayerScore>((value) => new PlayerScore.fromJson(value))
           .toList();
     }
   }
@@ -6797,7 +6810,7 @@
     }
     if (_json.containsKey("scores")) {
       scores = _json["scores"]
-          .map((value) => new ScoreSubmission.fromJson(value))
+          .map<ScoreSubmission>((value) => new ScoreSubmission.fromJson(value))
           .toList();
     }
   }
@@ -7086,7 +7099,7 @@
     }
     if (_json.containsKey("milestones")) {
       milestones = _json["milestones"]
-          .map((value) => new QuestMilestone.fromJson(value))
+          .map<QuestMilestone>((value) => new QuestMilestone.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -7291,7 +7304,9 @@
 
   QuestListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Quest.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Quest>((value) => new Quest.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -7360,7 +7375,7 @@
     }
     if (_json.containsKey("criteria")) {
       criteria = _json["criteria"]
-          .map((value) => new QuestCriterion.fromJson(value))
+          .map<QuestCriterion>((value) => new QuestCriterion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -7537,7 +7552,7 @@
     }
     if (_json.containsKey("participants")) {
       participants = _json["participants"]
-          .map((value) => new RoomParticipant.fromJson(value))
+          .map<RoomParticipant>((value) => new RoomParticipant.fromJson(value))
           .toList();
     }
     if (_json.containsKey("roomId")) {
@@ -7925,7 +7940,8 @@
     }
     if (_json.containsKey("peerSession")) {
       peerSession = _json["peerSession"]
-          .map((value) => new PeerSessionDiagnostics.fromJson(value))
+          .map<PeerSessionDiagnostics>(
+              (value) => new PeerSessionDiagnostics.fromJson(value))
           .toList();
     }
     if (_json.containsKey("socketsUsed")) {
@@ -8045,7 +8061,9 @@
 
   RoomList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Room.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Room>((value) => new Room.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -8225,7 +8243,7 @@
     }
     if (_json.containsKey("updates")) {
       updates = _json["updates"]
-          .map((value) => new RoomP2PStatus.fromJson(value))
+          .map<RoomP2PStatus>((value) => new RoomP2PStatus.fromJson(value))
           .toList();
     }
   }
@@ -8421,7 +8439,7 @@
     }
     if (_json.containsKey("participants")) {
       participants = _json["participants"]
-          .map((value) => new RoomParticipant.fromJson(value))
+          .map<RoomParticipant>((value) => new RoomParticipant.fromJson(value))
           .toList();
     }
     if (_json.containsKey("roomId")) {
@@ -8721,8 +8739,9 @@
 
   SnapshotListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Snapshot.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Snapshot>((value) => new Snapshot.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -8935,7 +8954,8 @@
     }
     if (_json.containsKey("participants")) {
       participants = _json["participants"]
-          .map((value) => new TurnBasedMatchParticipant.fromJson(value))
+          .map<TurnBasedMatchParticipant>(
+              (value) => new TurnBasedMatchParticipant.fromJson(value))
           .toList();
     }
     if (_json.containsKey("pendingParticipantId")) {
@@ -8950,7 +8970,8 @@
     }
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) => new ParticipantResult.fromJson(value))
+          .map<ParticipantResult>(
+              (value) => new ParticipantResult.fromJson(value))
           .toList();
     }
     if (_json.containsKey("status")) {
@@ -9210,7 +9231,7 @@
   TurnBasedMatchList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new TurnBasedMatch.fromJson(value))
+          .map<TurnBasedMatch>((value) => new TurnBasedMatch.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -9441,7 +9462,8 @@
     }
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) => new ParticipantResult.fromJson(value))
+          .map<ParticipantResult>(
+              (value) => new ParticipantResult.fromJson(value))
           .toList();
     }
   }
@@ -9487,7 +9509,7 @@
   TurnBasedMatchSync.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new TurnBasedMatch.fromJson(value))
+          .map<TurnBasedMatch>((value) => new TurnBasedMatch.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -9560,7 +9582,8 @@
     }
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) => new ParticipantResult.fromJson(value))
+          .map<ParticipantResult>(
+              (value) => new ParticipantResult.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/gamesconfiguration/v1configuration.dart b/generated/googleapis/lib/gamesconfiguration/v1configuration.dart
index 6e28727..19d7fa0 100644
--- a/generated/googleapis/lib/gamesconfiguration/v1configuration.dart
+++ b/generated/googleapis/lib/gamesconfiguration/v1configuration.dart
@@ -67,7 +67,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String achievementId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -112,7 +112,7 @@
   async.Future<AchievementConfiguration> get(core.String achievementId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -160,7 +160,7 @@
       AchievementConfiguration request, core.String applicationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -220,7 +220,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -276,7 +276,7 @@
       AchievementConfiguration request, core.String achievementId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -326,7 +326,7 @@
       AchievementConfiguration request, core.String achievementId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -394,7 +394,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -462,7 +462,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String leaderboardId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -507,7 +507,7 @@
   async.Future<LeaderboardConfiguration> get(core.String leaderboardId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -555,7 +555,7 @@
       LeaderboardConfiguration request, core.String applicationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -615,7 +615,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -671,7 +671,7 @@
       LeaderboardConfiguration request, core.String leaderboardId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -721,7 +721,7 @@
       LeaderboardConfiguration request, core.String leaderboardId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -931,7 +931,8 @@
   AchievementConfigurationListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new AchievementConfiguration.fromJson(value))
+          .map<AchievementConfiguration>(
+              (value) => new AchievementConfiguration.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1312,7 +1313,8 @@
   LeaderboardConfigurationListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new LeaderboardConfiguration.fromJson(value))
+          .map<LeaderboardConfiguration>(
+              (value) => new LeaderboardConfiguration.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1398,7 +1400,7 @@
     }
     if (_json.containsKey("translations")) {
       translations = _json["translations"]
-          .map((value) => new LocalizedString.fromJson(value))
+          .map<LocalizedString>((value) => new LocalizedString.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/gamesmanagement/v1management.dart b/generated/googleapis/lib/gamesmanagement/v1management.dart
index 7464201..eab27ff 100644
--- a/generated/googleapis/lib/gamesmanagement/v1management.dart
+++ b/generated/googleapis/lib/gamesmanagement/v1management.dart
@@ -70,7 +70,7 @@
   async.Future<AchievementResetResponse> reset(core.String achievementId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -115,7 +115,7 @@
   /// this method will complete with the same error.
   async.Future<AchievementResetAllResponse> resetAll({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -152,7 +152,7 @@
   /// this method will complete with the same error.
   async.Future resetAllForAllPlayers({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -194,7 +194,7 @@
   async.Future resetForAllPlayers(core.String achievementId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -242,7 +242,7 @@
       AchievementResetMultipleForAllRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -302,7 +302,7 @@
   async.Future<HiddenPlayerList> listHidden(core.String applicationId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -359,7 +359,7 @@
   /// this method will complete with the same error.
   async.Future reset(core.String eventId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -401,7 +401,7 @@
   /// this method will complete with the same error.
   async.Future resetAll({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -440,7 +440,7 @@
   /// this method will complete with the same error.
   async.Future resetAllForAllPlayers({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -481,7 +481,7 @@
   /// this method will complete with the same error.
   async.Future resetForAllPlayers(core.String eventId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -529,7 +529,7 @@
       EventsResetMultipleForAllRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -583,7 +583,7 @@
   async.Future hide(core.String applicationId, core.String playerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -637,7 +637,7 @@
   async.Future unhide(core.String applicationId, core.String playerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -693,7 +693,7 @@
   /// this method will complete with the same error.
   async.Future reset(core.String questId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -735,7 +735,7 @@
   /// this method will complete with the same error.
   async.Future resetAll({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -773,7 +773,7 @@
   /// this method will complete with the same error.
   async.Future resetAllForAllPlayers({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -814,7 +814,7 @@
   /// this method will complete with the same error.
   async.Future resetForAllPlayers(core.String questId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -862,7 +862,7 @@
       QuestsResetMultipleForAllRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -910,7 +910,7 @@
   /// this method will complete with the same error.
   async.Future reset({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -949,7 +949,7 @@
   /// this method will complete with the same error.
   async.Future resetForAllPlayers({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -999,7 +999,7 @@
   async.Future<PlayerScoreResetResponse> reset(core.String leaderboardId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1044,7 +1044,7 @@
   /// this method will complete with the same error.
   async.Future<PlayerScoreResetAllResponse> resetAll({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1081,7 +1081,7 @@
   /// this method will complete with the same error.
   async.Future resetAllForAllPlayers({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1123,7 +1123,7 @@
   async.Future resetForAllPlayers(core.String leaderboardId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1171,7 +1171,7 @@
       ScoresResetMultipleForAllRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1219,7 +1219,7 @@
   /// this method will complete with the same error.
   async.Future reset({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1258,7 +1258,7 @@
   /// this method will complete with the same error.
   async.Future resetForAllPlayers({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1299,7 +1299,8 @@
     }
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) => new AchievementResetResponse.fromJson(value))
+          .map<AchievementResetResponse>(
+              (value) => new AchievementResetResponse.fromJson(value))
           .toList();
     }
   }
@@ -1626,7 +1627,7 @@
   HiddenPlayerList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new HiddenPlayer.fromJson(value))
+          .map<HiddenPlayer>((value) => new HiddenPlayer.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1837,7 +1838,8 @@
     }
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) => new PlayerScoreResetResponse.fromJson(value))
+          .map<PlayerScoreResetResponse>(
+              (value) => new PlayerScoreResetResponse.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/genomics/v1.dart b/generated/googleapis/lib/genomics/v1.dart
index 647ce69..0f52835 100644
--- a/generated/googleapis/lib/genomics/v1.dart
+++ b/generated/googleapis/lib/genomics/v1.dart
@@ -98,7 +98,7 @@
       BatchCreateAnnotationsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -162,7 +162,7 @@
   /// this method will complete with the same error.
   async.Future<Annotation> create(Annotation request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -205,7 +205,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String annotationId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -249,7 +249,7 @@
   async.Future<Annotation> get(core.String annotationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -299,7 +299,7 @@
       SearchAnnotationsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -354,7 +354,7 @@
   async.Future<Annotation> update(Annotation request, core.String annotationId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -418,7 +418,7 @@
   async.Future<AnnotationSet> create(AnnotationSet request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -462,7 +462,7 @@
   async.Future<Empty> delete(core.String annotationSetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -507,7 +507,7 @@
   async.Future<AnnotationSet> get(core.String annotationSetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -558,7 +558,7 @@
       SearchAnnotationSetsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -615,7 +615,7 @@
       AnnotationSet request, core.String annotationSetId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -674,7 +674,7 @@
   /// this method will complete with the same error.
   async.Future<CallSet> create(CallSet request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -720,7 +720,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String callSetId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -766,7 +766,7 @@
   /// this method will complete with the same error.
   async.Future<CallSet> get(core.String callSetId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -823,7 +823,7 @@
   async.Future<CallSet> patch(CallSet request, core.String callSetId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -879,7 +879,7 @@
   async.Future<SearchCallSetsResponse> search(SearchCallSetsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -931,7 +931,7 @@
   /// this method will complete with the same error.
   async.Future<Dataset> create(Dataset request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -982,7 +982,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String datasetId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1028,7 +1028,7 @@
   /// this method will complete with the same error.
   async.Future<Dataset> get(core.String datasetId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1085,7 +1085,7 @@
       GetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1149,7 +1149,7 @@
       core.String projectId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1212,7 +1212,7 @@
   async.Future<Dataset> patch(Dataset request, core.String datasetId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1275,7 +1275,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1335,7 +1335,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1393,7 +1393,7 @@
       UndeleteDatasetRequest request, core.String datasetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1454,7 +1454,7 @@
   async.Future<Empty> cancel(CancelOperationRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1502,7 +1502,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1575,7 +1575,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1642,7 +1642,7 @@
   async.Future<Empty> delete(core.String readGroupSetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1700,7 +1700,7 @@
       ExportReadGroupSetRequest request, core.String readGroupSetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1752,7 +1752,7 @@
   async.Future<ReadGroupSet> get(core.String readGroupSetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1814,7 +1814,7 @@
   async.Future<Operation> import(ImportReadGroupSetsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1877,7 +1877,7 @@
       ReadGroupSet request, core.String readGroupSetId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1935,7 +1935,7 @@
       SearchReadGroupSetsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2036,7 +2036,7 @@
       core.String targetBucketWidth,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2132,7 +2132,7 @@
   async.Future<SearchReadsResponse> search(SearchReadsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2190,7 +2190,7 @@
   /// this method will complete with the same error.
   async.Future<Reference> get(core.String referenceId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2240,7 +2240,7 @@
   async.Future<SearchReferencesResponse> search(SearchReferencesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2318,7 +2318,7 @@
       core.String end,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2388,7 +2388,7 @@
   async.Future<ReferenceSet> get(core.String referenceSetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2440,7 +2440,7 @@
       SearchReferenceSetsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2493,7 +2493,7 @@
   /// this method will complete with the same error.
   async.Future<Variant> create(Variant request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2539,7 +2539,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String variantId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2585,7 +2585,7 @@
   /// this method will complete with the same error.
   async.Future<Variant> get(core.String variantId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2647,7 +2647,7 @@
   async.Future<Operation> import(ImportVariantsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2780,7 +2780,7 @@
   async.Future<Empty> merge(MergeVariantsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2838,7 +2838,7 @@
   async.Future<Variant> patch(Variant request, core.String variantId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2894,7 +2894,7 @@
   async.Future<SearchVariantsResponse> search(SearchVariantsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2950,7 +2950,7 @@
   /// this method will complete with the same error.
   async.Future<VariantSet> create(VariantSet request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2997,7 +2997,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String variantSetId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3049,7 +3049,7 @@
       ExportVariantSetRequest request, core.String variantSetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3101,7 +3101,7 @@
   async.Future<VariantSet> get(core.String variantSetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3160,7 +3160,7 @@
   async.Future<VariantSet> patch(VariantSet request, core.String variantSetId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3217,7 +3217,7 @@
       SearchVariantSetsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3520,7 +3520,7 @@
   BatchCreateAnnotationsRequest.fromJson(core.Map _json) {
     if (_json.containsKey("annotations")) {
       annotations = _json["annotations"]
-          .map((value) => new Annotation.fromJson(value))
+          .map<Annotation>((value) => new Annotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("requestId")) {
@@ -3551,8 +3551,9 @@
 
   BatchCreateAnnotationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
-      entries =
-          _json["entries"].map((value) => new Entry.fromJson(value)).toList();
+      entries = _json["entries"]
+          .map<Entry>((value) => new Entry.fromJson(value))
+          .toList();
     }
   }
 
@@ -3827,7 +3828,7 @@
     }
     if (_json.containsKey("externalIds")) {
       externalIds = _json["externalIds"]
-          .map((value) => new ExternalId.fromJson(value))
+          .map<ExternalId>((value) => new ExternalId.fromJson(value))
           .toList();
     }
     if (_json.containsKey("names")) {
@@ -4583,8 +4584,9 @@
 
   LinearAlignment.fromJson(core.Map _json) {
     if (_json.containsKey("cigar")) {
-      cigar =
-          _json["cigar"].map((value) => new CigarUnit.fromJson(value)).toList();
+      cigar = _json["cigar"]
+          .map<CigarUnit>((value) => new CigarUnit.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("mappingQuality")) {
       mappingQuality = _json["mappingQuality"];
@@ -4680,7 +4682,7 @@
     }
     if (_json.containsKey("coverageBuckets")) {
       coverageBuckets = _json["coverageBuckets"]
-          .map((value) => new CoverageBucket.fromJson(value))
+          .map<CoverageBucket>((value) => new CoverageBucket.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4720,7 +4722,7 @@
   ListDatasetsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("datasets")) {
       datasets = _json["datasets"]
-          .map((value) => new Dataset.fromJson(value))
+          .map<Dataset>((value) => new Dataset.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4757,7 +4759,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -4798,7 +4800,7 @@
     }
     if (_json.containsKey("variants")) {
       variants = _json["variants"]
-          .map((value) => new Variant.fromJson(value))
+          .map<Variant>((value) => new Variant.fromJson(value))
           .toList();
     }
   }
@@ -4990,7 +4992,7 @@
     }
     if (_json.containsKey("events")) {
       events = _json["events"]
-          .map((value) => new OperationEvent.fromJson(value))
+          .map<OperationEvent>((value) => new OperationEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("labels")) {
@@ -5111,7 +5113,7 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -5650,7 +5652,7 @@
     }
     if (_json.containsKey("programs")) {
       programs = _json["programs"]
-          .map((value) => new Program.fromJson(value))
+          .map<Program>((value) => new Program.fromJson(value))
           .toList();
     }
     if (_json.containsKey("referenceSetId")) {
@@ -5757,7 +5759,7 @@
     }
     if (_json.containsKey("readGroups")) {
       readGroups = _json["readGroups"]
-          .map((value) => new ReadGroup.fromJson(value))
+          .map<ReadGroup>((value) => new ReadGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("referenceSetId")) {
@@ -6133,7 +6135,7 @@
   SearchAnnotationSetsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("annotationSets")) {
       annotationSets = _json["annotationSets"]
-          .map((value) => new AnnotationSet.fromJson(value))
+          .map<AnnotationSet>((value) => new AnnotationSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -6258,7 +6260,7 @@
   SearchAnnotationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("annotations")) {
       annotations = _json["annotations"]
-          .map((value) => new Annotation.fromJson(value))
+          .map<Annotation>((value) => new Annotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -6351,7 +6353,7 @@
   SearchCallSetsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("callSets")) {
       callSets = _json["callSets"]
-          .map((value) => new CallSet.fromJson(value))
+          .map<CallSet>((value) => new CallSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -6446,7 +6448,7 @@
     }
     if (_json.containsKey("readGroupSets")) {
       readGroupSets = _json["readGroupSets"]
-          .map((value) => new ReadGroupSet.fromJson(value))
+          .map<ReadGroupSet>((value) => new ReadGroupSet.fromJson(value))
           .toList();
     }
   }
@@ -6573,8 +6575,9 @@
 
   SearchReadsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("alignments")) {
-      alignments =
-          _json["alignments"].map((value) => new Read.fromJson(value)).toList();
+      alignments = _json["alignments"]
+          .map<Read>((value) => new Read.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -6678,7 +6681,7 @@
     }
     if (_json.containsKey("referenceSets")) {
       referenceSets = _json["referenceSets"]
-          .map((value) => new ReferenceSet.fromJson(value))
+          .map<ReferenceSet>((value) => new ReferenceSet.fromJson(value))
           .toList();
     }
   }
@@ -6779,7 +6782,7 @@
     }
     if (_json.containsKey("references")) {
       references = _json["references"]
-          .map((value) => new Reference.fromJson(value))
+          .map<Reference>((value) => new Reference.fromJson(value))
           .toList();
     }
   }
@@ -6861,7 +6864,7 @@
     }
     if (_json.containsKey("variantSets")) {
       variantSets = _json["variantSets"]
-          .map((value) => new VariantSet.fromJson(value))
+          .map<VariantSet>((value) => new VariantSet.fromJson(value))
           .toList();
     }
   }
@@ -7006,7 +7009,7 @@
     }
     if (_json.containsKey("variants")) {
       variants = _json["variants"]
-          .map((value) => new Variant.fromJson(value))
+          .map<Variant>((value) => new Variant.fromJson(value))
           .toList();
     }
   }
@@ -7255,7 +7258,9 @@
       codingSequence = new CodingSequence.fromJson(_json["codingSequence"]);
     }
     if (_json.containsKey("exons")) {
-      exons = _json["exons"].map((value) => new Exon.fromJson(value)).toList();
+      exons = _json["exons"]
+          .map<Exon>((value) => new Exon.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("geneId")) {
       geneId = _json["geneId"];
@@ -7364,7 +7369,7 @@
     }
     if (_json.containsKey("calls")) {
       calls = _json["calls"]
-          .map((value) => new VariantCall.fromJson(value))
+          .map<VariantCall>((value) => new VariantCall.fromJson(value))
           .toList();
     }
     if (_json.containsKey("created")) {
@@ -7549,7 +7554,8 @@
     }
     if (_json.containsKey("conditions")) {
       conditions = _json["conditions"]
-          .map((value) => new ClinicalCondition.fromJson(value))
+          .map<ClinicalCondition>(
+              (value) => new ClinicalCondition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("effect")) {
@@ -7742,7 +7748,8 @@
     }
     if (_json.containsKey("metadata")) {
       metadata = _json["metadata"]
-          .map((value) => new VariantSetMetadata.fromJson(value))
+          .map<VariantSetMetadata>(
+              (value) => new VariantSetMetadata.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -7750,7 +7757,7 @@
     }
     if (_json.containsKey("referenceBounds")) {
       referenceBounds = _json["referenceBounds"]
-          .map((value) => new ReferenceBound.fromJson(value))
+          .map<ReferenceBound>((value) => new ReferenceBound.fromJson(value))
           .toList();
     }
     if (_json.containsKey("referenceSetId")) {
diff --git a/generated/googleapis/lib/gmail/v1.dart b/generated/googleapis/lib/gmail/v1.dart
index 037e2e2..f860aba 100644
--- a/generated/googleapis/lib/gmail/v1.dart
+++ b/generated/googleapis/lib/gmail/v1.dart
@@ -109,7 +109,7 @@
   /// this method will complete with the same error.
   async.Future<Profile> getProfile(core.String userId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -150,7 +150,7 @@
   /// this method will complete with the same error.
   async.Future stop(core.String userId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -198,7 +198,7 @@
   async.Future<WatchResponse> watch(WatchRequest request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -261,7 +261,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -322,7 +322,7 @@
   async.Future delete(core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -382,7 +382,7 @@
   async.Future<Draft> get(core.String userId, core.String id,
       {core.String format, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -449,7 +449,7 @@
       core.String q,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -516,7 +516,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -588,7 +588,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -688,7 +688,7 @@
       core.String startHistoryId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -755,7 +755,7 @@
   async.Future<Label> create(Label request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -803,7 +803,7 @@
   async.Future delete(core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -856,7 +856,7 @@
   async.Future<Label> get(core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -905,7 +905,7 @@
   async.Future<ListLabelsResponse> list(core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -953,7 +953,7 @@
   async.Future<Label> patch(Label request, core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1009,7 +1009,7 @@
   async.Future<Label> update(Label request, core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1072,7 +1072,7 @@
       BatchDeleteMessagesRequest request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1122,7 +1122,7 @@
       BatchModifyMessagesRequest request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1172,7 +1172,7 @@
   async.Future delete(core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1237,7 +1237,7 @@
       core.List<core.String> metadataHeaders,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1323,7 +1323,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1418,7 +1418,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1505,7 +1505,7 @@
       core.String q,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1569,7 +1569,7 @@
       ModifyMessageRequest request, core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1633,7 +1633,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1695,7 +1695,7 @@
   async.Future<Message> trash(core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1747,7 +1747,7 @@
   async.Future<Message> untrash(core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1809,7 +1809,7 @@
       core.String userId, core.String messageId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1876,7 +1876,7 @@
   async.Future<AutoForwarding> getAutoForwarding(core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1921,7 +1921,7 @@
   async.Future<ImapSettings> getImap(core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1964,7 +1964,7 @@
   /// this method will complete with the same error.
   async.Future<PopSettings> getPop(core.String userId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2008,7 +2008,7 @@
   async.Future<VacationSettings> getVacation(core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2059,7 +2059,7 @@
       AutoForwarding request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2110,7 +2110,7 @@
       ImapSettings request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2159,7 +2159,7 @@
   async.Future<PopSettings> updatePop(PopSettings request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2209,7 +2209,7 @@
       VacationSettings request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2265,7 +2265,7 @@
   async.Future<Filter> create(Filter request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2312,7 +2312,7 @@
   async.Future delete(core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2365,7 +2365,7 @@
   async.Future<Filter> get(core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2414,7 +2414,7 @@
   async.Future<ListFiltersResponse> list(core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2474,7 +2474,7 @@
       ForwardingAddress request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2526,7 +2526,7 @@
   async.Future delete(core.String userId, core.String forwardingEmail,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2580,7 +2580,7 @@
       core.String userId, core.String forwardingEmail,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2629,7 +2629,7 @@
   async.Future<ListForwardingAddressesResponse> list(core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2696,7 +2696,7 @@
   async.Future<SendAs> create(SendAs request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2747,7 +2747,7 @@
   async.Future delete(core.String userId, core.String sendAsEmail,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2801,7 +2801,7 @@
   async.Future<SendAs> get(core.String userId, core.String sendAsEmail,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2852,7 +2852,7 @@
   async.Future<ListSendAsResponse> list(core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2906,7 +2906,7 @@
       SendAs request, core.String userId, core.String sendAsEmail,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2968,7 +2968,7 @@
       SendAs request, core.String userId, core.String sendAsEmail,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3024,7 +3024,7 @@
   async.Future verify(core.String userId, core.String sendAsEmail,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3087,7 +3087,7 @@
       core.String userId, core.String sendAsEmail, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3149,7 +3149,7 @@
       core.String userId, core.String sendAsEmail, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3210,7 +3210,7 @@
       SmimeInfo request, core.String userId, core.String sendAsEmail,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3267,7 +3267,7 @@
       core.String userId, core.String sendAsEmail,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3321,7 +3321,7 @@
       core.String userId, core.String sendAsEmail, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3385,7 +3385,7 @@
   async.Future delete(core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3449,7 +3449,7 @@
       core.List<core.String> metadataHeaders,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3524,7 +3524,7 @@
       core.String q,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3589,7 +3589,7 @@
       ModifyThreadRequest request, core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3644,7 +3644,7 @@
   async.Future<Thread> trash(core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3696,7 +3696,7 @@
   async.Future<Thread> untrash(core.String userId, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4129,27 +4129,31 @@
     }
     if (_json.containsKey("labelsAdded")) {
       labelsAdded = _json["labelsAdded"]
-          .map((value) => new HistoryLabelAdded.fromJson(value))
+          .map<HistoryLabelAdded>(
+              (value) => new HistoryLabelAdded.fromJson(value))
           .toList();
     }
     if (_json.containsKey("labelsRemoved")) {
       labelsRemoved = _json["labelsRemoved"]
-          .map((value) => new HistoryLabelRemoved.fromJson(value))
+          .map<HistoryLabelRemoved>(
+              (value) => new HistoryLabelRemoved.fromJson(value))
           .toList();
     }
     if (_json.containsKey("messages")) {
       messages = _json["messages"]
-          .map((value) => new Message.fromJson(value))
+          .map<Message>((value) => new Message.fromJson(value))
           .toList();
     }
     if (_json.containsKey("messagesAdded")) {
       messagesAdded = _json["messagesAdded"]
-          .map((value) => new HistoryMessageAdded.fromJson(value))
+          .map<HistoryMessageAdded>(
+              (value) => new HistoryMessageAdded.fromJson(value))
           .toList();
     }
     if (_json.containsKey("messagesDeleted")) {
       messagesDeleted = _json["messagesDeleted"]
-          .map((value) => new HistoryMessageDeleted.fromJson(value))
+          .map<HistoryMessageDeleted>(
+              (value) => new HistoryMessageDeleted.fromJson(value))
           .toList();
     }
   }
@@ -4532,8 +4536,9 @@
 
   ListDraftsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("drafts")) {
-      drafts =
-          _json["drafts"].map((value) => new Draft.fromJson(value)).toList();
+      drafts = _json["drafts"]
+          .map<Draft>((value) => new Draft.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -4568,8 +4573,9 @@
 
   ListFiltersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("filter")) {
-      filter =
-          _json["filter"].map((value) => new Filter.fromJson(value)).toList();
+      filter = _json["filter"]
+          .map<Filter>((value) => new Filter.fromJson(value))
+          .toList();
     }
   }
 
@@ -4593,7 +4599,8 @@
   ListForwardingAddressesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("forwardingAddresses")) {
       forwardingAddresses = _json["forwardingAddresses"]
-          .map((value) => new ForwardingAddress.fromJson(value))
+          .map<ForwardingAddress>(
+              (value) => new ForwardingAddress.fromJson(value))
           .toList();
     }
   }
@@ -4624,8 +4631,9 @@
 
   ListHistoryResponse.fromJson(core.Map _json) {
     if (_json.containsKey("history")) {
-      history =
-          _json["history"].map((value) => new History.fromJson(value)).toList();
+      history = _json["history"]
+          .map<History>((value) => new History.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("historyId")) {
       historyId = _json["historyId"];
@@ -4659,8 +4667,9 @@
 
   ListLabelsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("labels")) {
-      labels =
-          _json["labels"].map((value) => new Label.fromJson(value)).toList();
+      labels = _json["labels"]
+          .map<Label>((value) => new Label.fromJson(value))
+          .toList();
     }
   }
 
@@ -4689,7 +4698,7 @@
   ListMessagesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("messages")) {
       messages = _json["messages"]
-          .map((value) => new Message.fromJson(value))
+          .map<Message>((value) => new Message.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4725,8 +4734,9 @@
 
   ListSendAsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("sendAs")) {
-      sendAs =
-          _json["sendAs"].map((value) => new SendAs.fromJson(value)).toList();
+      sendAs = _json["sendAs"]
+          .map<SendAs>((value) => new SendAs.fromJson(value))
+          .toList();
     }
   }
 
@@ -4749,7 +4759,7 @@
   ListSmimeInfoResponse.fromJson(core.Map _json) {
     if (_json.containsKey("smimeInfo")) {
       smimeInfo = _json["smimeInfo"]
-          .map((value) => new SmimeInfo.fromJson(value))
+          .map<SmimeInfo>((value) => new SmimeInfo.fromJson(value))
           .toList();
     }
   }
@@ -4784,8 +4794,9 @@
       resultSizeEstimate = _json["resultSizeEstimate"];
     }
     if (_json.containsKey("threads")) {
-      threads =
-          _json["threads"].map((value) => new Thread.fromJson(value)).toList();
+      threads = _json["threads"]
+          .map<Thread>((value) => new Thread.fromJson(value))
+          .toList();
     }
   }
 
@@ -4958,7 +4969,8 @@
     }
     if (_json.containsKey("headers")) {
       headers = _json["headers"]
-          .map((value) => new MessagePartHeader.fromJson(value))
+          .map<MessagePartHeader>(
+              (value) => new MessagePartHeader.fromJson(value))
           .toList();
     }
     if (_json.containsKey("mimeType")) {
@@ -4969,7 +4981,7 @@
     }
     if (_json.containsKey("parts")) {
       parts = _json["parts"]
-          .map((value) => new MessagePart.fromJson(value))
+          .map<MessagePart>((value) => new MessagePart.fromJson(value))
           .toList();
     }
   }
@@ -5548,7 +5560,7 @@
     }
     if (_json.containsKey("messages")) {
       messages = _json["messages"]
-          .map((value) => new Message.fromJson(value))
+          .map<Message>((value) => new Message.fromJson(value))
           .toList();
     }
     if (_json.containsKey("snippet")) {
diff --git a/generated/googleapis/lib/groupsmigration/v1.dart b/generated/googleapis/lib/groupsmigration/v1.dart
index 13fe1b5..064966d 100644
--- a/generated/googleapis/lib/groupsmigration/v1.dart
+++ b/generated/googleapis/lib/groupsmigration/v1.dart
@@ -70,7 +70,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
diff --git a/generated/googleapis/lib/groupssettings/v1.dart b/generated/googleapis/lib/groupssettings/v1.dart
index fdd1913..e7aef58 100644
--- a/generated/googleapis/lib/groupssettings/v1.dart
+++ b/generated/googleapis/lib/groupssettings/v1.dart
@@ -54,7 +54,7 @@
   /// this method will complete with the same error.
   async.Future<Groups> get(core.String groupUniqueId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -99,7 +99,7 @@
   async.Future<Groups> patch(Groups request, core.String groupUniqueId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -147,7 +147,7 @@
   async.Future<Groups> update(Groups request, core.String groupUniqueId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
diff --git a/generated/googleapis/lib/iam/v1.dart b/generated/googleapis/lib/iam/v1.dart
index bbbc983..3bc5516 100644
--- a/generated/googleapis/lib/iam/v1.dart
+++ b/generated/googleapis/lib/iam/v1.dart
@@ -66,7 +66,7 @@
       QueryAuditableServicesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -132,7 +132,7 @@
   async.Future<Role> create(CreateRoleRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -192,7 +192,7 @@
   async.Future<Role> delete(core.String name,
       {core.String etag, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -241,7 +241,7 @@
   /// this method will complete with the same error.
   async.Future<Role> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -306,7 +306,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -369,7 +369,7 @@
   async.Future<Role> patch(Role request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -423,7 +423,7 @@
   async.Future<Role> undelete(UndeleteRoleRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -478,7 +478,7 @@
       QueryTestablePermissionsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -545,7 +545,7 @@
   async.Future<Role> create(CreateRoleRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -605,7 +605,7 @@
   async.Future<Role> delete(core.String name,
       {core.String etag, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -654,7 +654,7 @@
   /// this method will complete with the same error.
   async.Future<Role> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -719,7 +719,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -782,7 +782,7 @@
   async.Future<Role> patch(Role request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -836,7 +836,7 @@
   async.Future<Role> undelete(UndeleteRoleRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -899,7 +899,7 @@
       CreateServiceAccountRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -951,7 +951,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -998,7 +998,7 @@
   /// this method will complete with the same error.
   async.Future<ServiceAccount> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1045,7 +1045,7 @@
   async.Future<Policy> getIamPolicy(core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1102,7 +1102,7 @@
   async.Future<ListServiceAccountsResponse> list(core.String name,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1161,7 +1161,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1217,7 +1217,7 @@
       SignBlobRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1275,7 +1275,7 @@
       SignJwtRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1328,7 +1328,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1392,7 +1392,7 @@
   async.Future<ServiceAccount> update(ServiceAccount request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1454,7 +1454,7 @@
       CreateServiceAccountKeyRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1506,7 +1506,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1565,7 +1565,7 @@
   async.Future<ServiceAccountKey> get(core.String name,
       {core.String publicKeyType, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1622,7 +1622,7 @@
   async.Future<ListServiceAccountKeysResponse> list(core.String name,
       {core.List<core.String> keyTypes, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1678,7 +1678,7 @@
   /// this method will complete with the same error.
   async.Future<Role> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1743,7 +1743,7 @@
       core.String parent,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1802,7 +1802,7 @@
       QueryGrantableRolesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1894,7 +1894,7 @@
   AuditConfig.fromJson(core.Map _json) {
     if (_json.containsKey("auditLogConfigs")) {
       auditLogConfigs = _json["auditLogConfigs"]
-          .map((value) => new AuditLogConfig.fromJson(value))
+          .map<AuditLogConfig>((value) => new AuditLogConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("service")) {
@@ -2281,7 +2281,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("roles")) {
-      roles = _json["roles"].map((value) => new Role.fromJson(value)).toList();
+      roles = _json["roles"]
+          .map<Role>((value) => new Role.fromJson(value))
+          .toList();
     }
   }
 
@@ -2308,7 +2310,8 @@
   ListServiceAccountKeysResponse.fromJson(core.Map _json) {
     if (_json.containsKey("keys")) {
       keys = _json["keys"]
-          .map((value) => new ServiceAccountKey.fromJson(value))
+          .map<ServiceAccountKey>(
+              (value) => new ServiceAccountKey.fromJson(value))
           .toList();
     }
   }
@@ -2338,7 +2341,7 @@
   ListServiceAccountsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("accounts")) {
       accounts = _json["accounts"]
-          .map((value) => new ServiceAccount.fromJson(value))
+          .map<ServiceAccount>((value) => new ServiceAccount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2516,12 +2519,12 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("auditConfigs")) {
       auditConfigs = _json["auditConfigs"]
-          .map((value) => new AuditConfig.fromJson(value))
+          .map<AuditConfig>((value) => new AuditConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -2562,7 +2565,7 @@
   PolicyDelta.fromJson(core.Map _json) {
     if (_json.containsKey("bindingDeltas")) {
       bindingDeltas = _json["bindingDeltas"]
-          .map((value) => new BindingDelta.fromJson(value))
+          .map<BindingDelta>((value) => new BindingDelta.fromJson(value))
           .toList();
     }
   }
@@ -2616,7 +2619,8 @@
   QueryAuditableServicesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("services")) {
       services = _json["services"]
-          .map((value) => new AuditableService.fromJson(value))
+          .map<AuditableService>(
+              (value) => new AuditableService.fromJson(value))
           .toList();
     }
   }
@@ -2707,7 +2711,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("roles")) {
-      roles = _json["roles"].map((value) => new Role.fromJson(value)).toList();
+      roles = _json["roles"]
+          .map<Role>((value) => new Role.fromJson(value))
+          .toList();
     }
   }
 
@@ -2788,7 +2794,7 @@
     }
     if (_json.containsKey("permissions")) {
       permissions = _json["permissions"]
-          .map((value) => new Permission.fromJson(value))
+          .map<Permission>((value) => new Permission.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/identitytoolkit/v3.dart b/generated/googleapis/lib/identitytoolkit/v3.dart
index 48f5779..4c36fab 100644
--- a/generated/googleapis/lib/identitytoolkit/v3.dart
+++ b/generated/googleapis/lib/identitytoolkit/v3.dart
@@ -61,7 +61,7 @@
       IdentitytoolkitRelyingpartyCreateAuthUriRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -105,7 +105,7 @@
       IdentitytoolkitRelyingpartyDeleteAccountRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -149,7 +149,7 @@
       IdentitytoolkitRelyingpartyDownloadAccountRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -193,7 +193,7 @@
       IdentitytoolkitRelyingpartyEmailLinkSigninRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -237,7 +237,7 @@
       IdentitytoolkitRelyingpartyGetAccountInfoRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -281,7 +281,7 @@
       Relyingparty request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -330,7 +330,7 @@
           core.String projectNumber,
           core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -375,7 +375,7 @@
   async.Future<IdentitytoolkitRelyingpartyGetPublicKeysResponse> getPublicKeys(
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -414,7 +414,7 @@
   async.Future<GetRecaptchaParamResponse> getRecaptchaParam(
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -456,7 +456,7 @@
       IdentitytoolkitRelyingpartyResetPasswordRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -502,7 +502,7 @@
           IdentitytoolkitRelyingpartySendVerificationCodeRequest request,
           {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -548,7 +548,7 @@
       IdentitytoolkitRelyingpartySetAccountInfoRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -593,7 +593,7 @@
           IdentitytoolkitRelyingpartySetProjectConfigRequest request,
           {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -638,7 +638,7 @@
       IdentitytoolkitRelyingpartySignOutUserRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -683,7 +683,7 @@
       IdentitytoolkitRelyingpartySignupNewUserRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -727,7 +727,7 @@
       IdentitytoolkitRelyingpartyUploadAccountRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -771,7 +771,7 @@
       IdentitytoolkitRelyingpartyVerifyAssertionRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -815,7 +815,7 @@
       IdentitytoolkitRelyingpartyVerifyCustomTokenRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -860,7 +860,7 @@
       IdentitytoolkitRelyingpartyVerifyPasswordRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -906,7 +906,7 @@
           IdentitytoolkitRelyingpartyVerifyPhoneNumberRequest request,
           {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1074,8 +1074,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("users")) {
-      users =
-          _json["users"].map((value) => new UserInfo.fromJson(value)).toList();
+      users = _json["users"]
+          .map<UserInfo>((value) => new UserInfo.fromJson(value))
+          .toList();
     }
   }
 
@@ -1255,8 +1256,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("users")) {
-      users =
-          _json["users"].map((value) => new UserInfo.fromJson(value)).toList();
+      users = _json["users"]
+          .map<UserInfo>((value) => new UserInfo.fromJson(value))
+          .toList();
     }
   }
 
@@ -1765,7 +1767,7 @@
     }
     if (_json.containsKey("idpConfig")) {
       idpConfig = _json["idpConfig"]
-          .map((value) => new IdpConfig.fromJson(value))
+          .map<IdpConfig>((value) => new IdpConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("legacyResetPasswordTemplate")) {
@@ -2277,7 +2279,7 @@
     }
     if (_json.containsKey("idpConfig")) {
       idpConfig = _json["idpConfig"]
-          .map((value) => new IdpConfig.fromJson(value))
+          .map<IdpConfig>((value) => new IdpConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("legacyResetPasswordTemplate")) {
@@ -2638,8 +2640,9 @@
       targetProjectId = _json["targetProjectId"];
     }
     if (_json.containsKey("users")) {
-      users =
-          _json["users"].map((value) => new UserInfo.fromJson(value)).toList();
+      users = _json["users"]
+          .map<UserInfo>((value) => new UserInfo.fromJson(value))
+          .toList();
     }
   }
 
@@ -3517,7 +3520,7 @@
     }
     if (_json.containsKey("providerUserInfo")) {
       providerUserInfo = _json["providerUserInfo"]
-          .map((value) =>
+          .map<SetAccountInfoResponseProviderUserInfo>((value) =>
               new SetAccountInfoResponseProviderUserInfo.fromJson(value))
           .toList();
     }
@@ -3693,7 +3696,8 @@
   UploadAccountResponse.fromJson(core.Map _json) {
     if (_json.containsKey("error")) {
       error = _json["error"]
-          .map((value) => new UploadAccountResponseError.fromJson(value))
+          .map<UploadAccountResponseError>(
+              (value) => new UploadAccountResponseError.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3920,7 +3924,8 @@
     }
     if (_json.containsKey("providerUserInfo")) {
       providerUserInfo = _json["providerUserInfo"]
-          .map((value) => new UserInfoProviderUserInfo.fromJson(value))
+          .map<UserInfoProviderUserInfo>(
+              (value) => new UserInfoProviderUserInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("rawPassword")) {
diff --git a/generated/googleapis/lib/kgsearch/v1.dart b/generated/googleapis/lib/kgsearch/v1.dart
index 6ab490f..5567f50 100644
--- a/generated/googleapis/lib/kgsearch/v1.dart
+++ b/generated/googleapis/lib/kgsearch/v1.dart
@@ -78,7 +78,7 @@
       core.List<core.String> types,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
diff --git a/generated/googleapis/lib/language/v1.dart b/generated/googleapis/lib/language/v1.dart
index 2f3e72a..73f96bc 100644
--- a/generated/googleapis/lib/language/v1.dart
+++ b/generated/googleapis/lib/language/v1.dart
@@ -64,7 +64,7 @@
       AnalyzeEntitiesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -109,7 +109,7 @@
       AnalyzeEntitySentimentRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -154,7 +154,7 @@
       AnalyzeSentimentRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -201,7 +201,7 @@
       AnalyzeSyntaxRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -245,7 +245,7 @@
   async.Future<AnnotateTextResponse> annotateText(AnnotateTextRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -288,7 +288,7 @@
   async.Future<ClassifyTextResponse> classifyText(ClassifyTextRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -375,8 +375,9 @@
 
   AnalyzeEntitiesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entities")) {
-      entities =
-          _json["entities"].map((value) => new Entity.fromJson(value)).toList();
+      entities = _json["entities"]
+          .map<Entity>((value) => new Entity.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("language")) {
       language = _json["language"];
@@ -458,8 +459,9 @@
 
   AnalyzeEntitySentimentResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entities")) {
-      entities =
-          _json["entities"].map((value) => new Entity.fromJson(value)).toList();
+      entities = _json["entities"]
+          .map<Entity>((value) => new Entity.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("language")) {
       language = _json["language"];
@@ -551,7 +553,7 @@
     }
     if (_json.containsKey("sentences")) {
       sentences = _json["sentences"]
-          .map((value) => new Sentence.fromJson(value))
+          .map<Sentence>((value) => new Sentence.fromJson(value))
           .toList();
     }
   }
@@ -641,12 +643,13 @@
     }
     if (_json.containsKey("sentences")) {
       sentences = _json["sentences"]
-          .map((value) => new Sentence.fromJson(value))
+          .map<Sentence>((value) => new Sentence.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tokens")) {
-      tokens =
-          _json["tokens"].map((value) => new Token.fromJson(value)).toList();
+      tokens = _json["tokens"]
+          .map<Token>((value) => new Token.fromJson(value))
+          .toList();
     }
   }
 
@@ -757,27 +760,30 @@
   AnnotateTextResponse.fromJson(core.Map _json) {
     if (_json.containsKey("categories")) {
       categories = _json["categories"]
-          .map((value) => new ClassificationCategory.fromJson(value))
+          .map<ClassificationCategory>(
+              (value) => new ClassificationCategory.fromJson(value))
           .toList();
     }
     if (_json.containsKey("documentSentiment")) {
       documentSentiment = new Sentiment.fromJson(_json["documentSentiment"]);
     }
     if (_json.containsKey("entities")) {
-      entities =
-          _json["entities"].map((value) => new Entity.fromJson(value)).toList();
+      entities = _json["entities"]
+          .map<Entity>((value) => new Entity.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("language")) {
       language = _json["language"];
     }
     if (_json.containsKey("sentences")) {
       sentences = _json["sentences"]
-          .map((value) => new Sentence.fromJson(value))
+          .map<Sentence>((value) => new Sentence.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tokens")) {
-      tokens =
-          _json["tokens"].map((value) => new Token.fromJson(value)).toList();
+      tokens = _json["tokens"]
+          .map<Token>((value) => new Token.fromJson(value))
+          .toList();
     }
   }
 
@@ -873,7 +879,8 @@
   ClassifyTextResponse.fromJson(core.Map _json) {
     if (_json.containsKey("categories")) {
       categories = _json["categories"]
-          .map((value) => new ClassificationCategory.fromJson(value))
+          .map<ClassificationCategory>(
+              (value) => new ClassificationCategory.fromJson(value))
           .toList();
     }
   }
@@ -1128,7 +1135,7 @@
   Entity.fromJson(core.Map _json) {
     if (_json.containsKey("mentions")) {
       mentions = _json["mentions"]
-          .map((value) => new EntityMention.fromJson(value))
+          .map<EntityMention>((value) => new EntityMention.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metadata")) {
diff --git a/generated/googleapis/lib/licensing/v1.dart b/generated/googleapis/lib/licensing/v1.dart
index 4a84546..89e27ab 100644
--- a/generated/googleapis/lib/licensing/v1.dart
+++ b/generated/googleapis/lib/licensing/v1.dart
@@ -60,7 +60,7 @@
       core.String productId, core.String skuId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -120,7 +120,7 @@
       core.String productId, core.String skuId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -178,7 +178,7 @@
       LicenseAssignmentInsert request, core.String productId, core.String skuId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -241,7 +241,7 @@
       core.String productId, core.String customerId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -307,7 +307,7 @@
       core.String productId, core.String skuId, core.String customerId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -373,7 +373,7 @@
       core.String productId, core.String skuId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -436,7 +436,7 @@
       core.String productId, core.String skuId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -606,7 +606,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new LicenseAssignment.fromJson(value))
+          .map<LicenseAssignment>(
+              (value) => new LicenseAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
diff --git a/generated/googleapis/lib/logging/v2.dart b/generated/googleapis/lib/logging/v2.dart
index f63fffc..540ae56 100644
--- a/generated/googleapis/lib/logging/v2.dart
+++ b/generated/googleapis/lib/logging/v2.dart
@@ -106,7 +106,7 @@
   async.Future<LogExclusion> create(LogExclusion request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -159,7 +159,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -207,7 +207,7 @@
   /// this method will complete with the same error.
   async.Future<LogExclusion> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -266,7 +266,7 @@
   async.Future<ListExclusionsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -332,7 +332,7 @@
   async.Future<LogExclusion> patch(LogExclusion request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -398,7 +398,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String logName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -457,7 +457,7 @@
   async.Future<ListLogsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -535,7 +535,7 @@
   async.Future<LogSink> create(LogSink request, core.String parent,
       {core.bool uniqueWriterIdentity, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -591,7 +591,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String sinkName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -639,7 +639,7 @@
   /// this method will complete with the same error.
   async.Future<LogSink> get(core.String sinkName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -697,7 +697,7 @@
   async.Future<ListSinksResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -781,7 +781,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -868,7 +868,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -927,7 +927,7 @@
   async.Future<ListLogEntriesResponse> list(ListLogEntriesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -973,7 +973,7 @@
   async.Future<WriteLogEntriesResponse> write(WriteLogEntriesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1032,7 +1032,7 @@
   async.Future<LogExclusion> create(LogExclusion request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1085,7 +1085,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1133,7 +1133,7 @@
   /// this method will complete with the same error.
   async.Future<LogExclusion> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1192,7 +1192,7 @@
   async.Future<ListExclusionsResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1258,7 +1258,7 @@
   async.Future<LogExclusion> patch(LogExclusion request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1335,7 +1335,7 @@
   async.Future<LogExclusion> create(LogExclusion request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1388,7 +1388,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1436,7 +1436,7 @@
   /// this method will complete with the same error.
   async.Future<LogExclusion> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1495,7 +1495,7 @@
   async.Future<ListExclusionsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1561,7 +1561,7 @@
   async.Future<LogExclusion> patch(LogExclusion request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1626,7 +1626,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String logName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1685,7 +1685,7 @@
   async.Future<ListLogsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1762,7 +1762,7 @@
   async.Future<LogSink> create(LogSink request, core.String parent,
       {core.bool uniqueWriterIdentity, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1818,7 +1818,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String sinkName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1866,7 +1866,7 @@
   /// this method will complete with the same error.
   async.Future<LogSink> get(core.String sinkName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1924,7 +1924,7 @@
   async.Future<ListSinksResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2008,7 +2008,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2095,7 +2095,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2163,7 +2163,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String logName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2222,7 +2222,7 @@
   async.Future<ListLogsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2286,7 +2286,7 @@
   async.Future<ListMonitoredResourceDescriptorsResponse> list(
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2363,7 +2363,7 @@
   async.Future<LogExclusion> create(LogExclusion request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2416,7 +2416,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2464,7 +2464,7 @@
   /// this method will complete with the same error.
   async.Future<LogExclusion> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2523,7 +2523,7 @@
   async.Future<ListExclusionsResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2589,7 +2589,7 @@
   async.Future<LogExclusion> patch(LogExclusion request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2655,7 +2655,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String logName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2714,7 +2714,7 @@
   async.Future<ListLogsResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2792,7 +2792,7 @@
   async.Future<LogSink> create(LogSink request, core.String parent,
       {core.bool uniqueWriterIdentity, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2848,7 +2848,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String sinkName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2896,7 +2896,7 @@
   /// this method will complete with the same error.
   async.Future<LogSink> get(core.String sinkName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2954,7 +2954,7 @@
   async.Future<ListSinksResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3038,7 +3038,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3125,7 +3125,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3208,7 +3208,7 @@
   async.Future<LogExclusion> create(LogExclusion request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3261,7 +3261,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3309,7 +3309,7 @@
   /// this method will complete with the same error.
   async.Future<LogExclusion> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3368,7 +3368,7 @@
   async.Future<ListExclusionsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3434,7 +3434,7 @@
   async.Future<LogExclusion> patch(LogExclusion request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3499,7 +3499,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String logName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3558,7 +3558,7 @@
   async.Future<ListLogsResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3618,7 +3618,7 @@
   async.Future<LogMetric> create(LogMetric request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3667,7 +3667,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String metricName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3712,7 +3712,7 @@
   /// this method will complete with the same error.
   async.Future<LogMetric> get(core.String metricName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3767,7 +3767,7 @@
   async.Future<ListLogMetricsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3824,7 +3824,7 @@
   async.Future<LogMetric> update(LogMetric request, core.String metricName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3898,7 +3898,7 @@
   async.Future<LogSink> create(LogSink request, core.String parent,
       {core.bool uniqueWriterIdentity, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3954,7 +3954,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String sinkName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4002,7 +4002,7 @@
   /// this method will complete with the same error.
   async.Future<LogSink> get(core.String sinkName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4060,7 +4060,7 @@
   async.Future<ListSinksResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4144,7 +4144,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4231,7 +4231,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4311,7 +4311,7 @@
   async.Future<LogSink> create(LogSink request, core.String parent,
       {core.bool uniqueWriterIdentity, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4367,7 +4367,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String sinkName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4415,7 +4415,7 @@
   /// this method will complete with the same error.
   async.Future<LogSink> get(core.String sinkName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4473,7 +4473,7 @@
   async.Future<ListSinksResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4557,7 +4557,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5008,7 +5008,7 @@
   ListExclusionsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("exclusions")) {
       exclusions = _json["exclusions"]
-          .map((value) => new LogExclusion.fromJson(value))
+          .map<LogExclusion>((value) => new LogExclusion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5145,7 +5145,7 @@
   ListLogEntriesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new LogEntry.fromJson(value))
+          .map<LogEntry>((value) => new LogEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5181,7 +5181,7 @@
   ListLogMetricsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("metrics")) {
       metrics = _json["metrics"]
-          .map((value) => new LogMetric.fromJson(value))
+          .map<LogMetric>((value) => new LogMetric.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5255,7 +5255,8 @@
     }
     if (_json.containsKey("resourceDescriptors")) {
       resourceDescriptors = _json["resourceDescriptors"]
-          .map((value) => new MonitoredResourceDescriptor.fromJson(value))
+          .map<MonitoredResourceDescriptor>(
+              (value) => new MonitoredResourceDescriptor.fromJson(value))
           .toList();
     }
   }
@@ -5291,8 +5292,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("sinks")) {
-      sinks =
-          _json["sinks"].map((value) => new LogSink.fromJson(value)).toList();
+      sinks = _json["sinks"]
+          .map<LogSink>((value) => new LogSink.fromJson(value))
+          .toList();
     }
   }
 
@@ -6144,7 +6146,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricKind")) {
@@ -6289,7 +6291,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -6477,7 +6479,9 @@
       latency = _json["latency"];
     }
     if (_json.containsKey("line")) {
-      line = _json["line"].map((value) => new LogLine.fromJson(value)).toList();
+      line = _json["line"]
+          .map<LogLine>((value) => new LogLine.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("megaCycles")) {
       megaCycles = _json["megaCycles"];
@@ -6508,7 +6512,7 @@
     }
     if (_json.containsKey("sourceReference")) {
       sourceReference = _json["sourceReference"]
-          .map((value) => new SourceReference.fromJson(value))
+          .map<SourceReference>((value) => new SourceReference.fromJson(value))
           .toList();
     }
     if (_json.containsKey("startTime")) {
@@ -6791,7 +6795,7 @@
     }
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new LogEntry.fromJson(value))
+          .map<LogEntry>((value) => new LogEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("labels")) {
diff --git a/generated/googleapis/lib/manufacturers/v1.dart b/generated/googleapis/lib/manufacturers/v1.dart
index dad088c..3a053dc 100644
--- a/generated/googleapis/lib/manufacturers/v1.dart
+++ b/generated/googleapis/lib/manufacturers/v1.dart
@@ -81,7 +81,7 @@
   async.Future<Empty> delete(core.String parent, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -152,7 +152,7 @@
   async.Future<Product> get(core.String parent, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -210,7 +210,7 @@
   async.Future<ListProductsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -291,7 +291,7 @@
       Attributes request, core.String parent, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -466,7 +466,7 @@
   Attributes.fromJson(core.Map _json) {
     if (_json.containsKey("additionalImageLink")) {
       additionalImageLink = _json["additionalImageLink"]
-          .map((value) => new Image.fromJson(value))
+          .map<Image>((value) => new Image.fromJson(value))
           .toList();
     }
     if (_json.containsKey("ageGroup")) {
@@ -492,7 +492,8 @@
     }
     if (_json.containsKey("featureDescription")) {
       featureDescription = _json["featureDescription"]
-          .map((value) => new FeatureDescription.fromJson(value))
+          .map<FeatureDescription>(
+              (value) => new FeatureDescription.fromJson(value))
           .toList();
     }
     if (_json.containsKey("flavor")) {
@@ -524,7 +525,7 @@
     }
     if (_json.containsKey("productDetail")) {
       productDetail = _json["productDetail"]
-          .map((value) => new ProductDetail.fromJson(value))
+          .map<ProductDetail>((value) => new ProductDetail.fromJson(value))
           .toList();
     }
     if (_json.containsKey("productLine")) {
@@ -966,7 +967,7 @@
     }
     if (_json.containsKey("products")) {
       products = _json["products"]
-          .map((value) => new Product.fromJson(value))
+          .map<Product>((value) => new Product.fromJson(value))
           .toList();
     }
   }
@@ -1089,8 +1090,9 @@
       finalAttributes = new Attributes.fromJson(_json["finalAttributes"]);
     }
     if (_json.containsKey("issues")) {
-      issues =
-          _json["issues"].map((value) => new Issue.fromJson(value)).toList();
+      issues = _json["issues"]
+          .map<Issue>((value) => new Issue.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("manuallyDeletedAttributes")) {
       manuallyDeletedAttributes = _json["manuallyDeletedAttributes"];
diff --git a/generated/googleapis/lib/mirror/v1.dart b/generated/googleapis/lib/mirror/v1.dart
index 7ab6e15..8555a3e 100644
--- a/generated/googleapis/lib/mirror/v1.dart
+++ b/generated/googleapis/lib/mirror/v1.dart
@@ -81,7 +81,7 @@
       core.String accountType, core.String accountName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -141,7 +141,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -185,7 +185,7 @@
   /// this method will complete with the same error.
   async.Future<Contact> get(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -227,7 +227,7 @@
   /// this method will complete with the same error.
   async.Future<Contact> insert(Contact request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -267,7 +267,7 @@
   /// this method will complete with the same error.
   async.Future<ContactsListResponse> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -309,7 +309,7 @@
   async.Future<Contact> patch(Contact request, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -357,7 +357,7 @@
   async.Future<Contact> update(Contact request, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -408,7 +408,7 @@
   /// this method will complete with the same error.
   async.Future<Location> get(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -448,7 +448,7 @@
   /// this method will complete with the same error.
   async.Future<LocationsListResponse> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -497,7 +497,7 @@
   /// this method will complete with the same error.
   async.Future<Setting> get(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -543,7 +543,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -588,7 +588,7 @@
   async.Future<Subscription> insert(Subscription request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -628,7 +628,7 @@
   /// this method will complete with the same error.
   async.Future<SubscriptionsListResponse> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -671,7 +671,7 @@
   async.Future<Subscription> update(Subscription request, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -723,7 +723,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -767,7 +767,7 @@
   /// this method will complete with the same error.
   async.Future<TimelineItem> get(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -818,7 +818,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -898,7 +898,7 @@
       core.String sourceItemId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -961,7 +961,7 @@
   async.Future<TimelineItem> patch(TimelineItem request, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1017,7 +1017,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1081,7 +1081,7 @@
   async.Future delete(core.String itemId, core.String attachmentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1144,7 +1144,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1208,7 +1208,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1266,7 +1266,7 @@
   async.Future<AttachmentsListResponse> list(core.String itemId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1304,7 +1304,7 @@
   Account.fromJson(core.Map _json) {
     if (_json.containsKey("authTokens")) {
       authTokens = _json["authTokens"]
-          .map((value) => new AuthToken.fromJson(value))
+          .map<AuthToken>((value) => new AuthToken.fromJson(value))
           .toList();
     }
     if (_json.containsKey("features")) {
@@ -1315,7 +1315,7 @@
     }
     if (_json.containsKey("userData")) {
       userData = _json["userData"]
-          .map((value) => new UserData.fromJson(value))
+          .map<UserData>((value) => new UserData.fromJson(value))
           .toList();
     }
   }
@@ -1407,7 +1407,7 @@
   AttachmentsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Attachment.fromJson(value))
+          .map<Attachment>((value) => new Attachment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1547,7 +1547,7 @@
   Contact.fromJson(core.Map _json) {
     if (_json.containsKey("acceptCommands")) {
       acceptCommands = _json["acceptCommands"]
-          .map((value) => new Command.fromJson(value))
+          .map<Command>((value) => new Command.fromJson(value))
           .toList();
     }
     if (_json.containsKey("acceptTypes")) {
@@ -1642,8 +1642,9 @@
 
   ContactsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Contact.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Contact>((value) => new Contact.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1764,8 +1765,9 @@
 
   LocationsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Location.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Location>((value) => new Location.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1875,7 +1877,7 @@
     }
     if (_json.containsKey("values")) {
       values = _json["values"]
-          .map((value) => new MenuValue.fromJson(value))
+          .map<MenuValue>((value) => new MenuValue.fromJson(value))
           .toList();
     }
   }
@@ -1989,7 +1991,7 @@
     }
     if (_json.containsKey("userActions")) {
       userActions = _json["userActions"]
-          .map((value) => new UserAction.fromJson(value))
+          .map<UserAction>((value) => new UserAction.fromJson(value))
           .toList();
     }
     if (_json.containsKey("userToken")) {
@@ -2229,7 +2231,7 @@
   SubscriptionsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Subscription.fromJson(value))
+          .map<Subscription>((value) => new Subscription.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -2410,7 +2412,7 @@
   TimelineItem.fromJson(core.Map _json) {
     if (_json.containsKey("attachments")) {
       attachments = _json["attachments"]
-          .map((value) => new Attachment.fromJson(value))
+          .map<Attachment>((value) => new Attachment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bundleId")) {
@@ -2457,7 +2459,7 @@
     }
     if (_json.containsKey("menuItems")) {
       menuItems = _json["menuItems"]
-          .map((value) => new MenuItem.fromJson(value))
+          .map<MenuItem>((value) => new MenuItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("notification")) {
@@ -2468,7 +2470,7 @@
     }
     if (_json.containsKey("recipients")) {
       recipients = _json["recipients"]
-          .map((value) => new Contact.fromJson(value))
+          .map<Contact>((value) => new Contact.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selfLink")) {
@@ -2599,7 +2601,7 @@
   TimelineListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new TimelineItem.fromJson(value))
+          .map<TimelineItem>((value) => new TimelineItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
diff --git a/generated/googleapis/lib/ml/v1.dart b/generated/googleapis/lib/ml/v1.dart
index 10fafaa..9991453 100644
--- a/generated/googleapis/lib/ml/v1.dart
+++ b/generated/googleapis/lib/ml/v1.dart
@@ -67,7 +67,7 @@
   async.Future<GoogleCloudMlV1GetConfigResponse> getConfig(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -122,7 +122,7 @@
       GoogleCloudMlV1PredictRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -178,7 +178,7 @@
       GoogleCloudMlV1CancelJobRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -228,7 +228,7 @@
       GoogleCloudMlV1Job request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -275,7 +275,7 @@
   async.Future<GoogleCloudMlV1Job> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -323,7 +323,7 @@
   async.Future<GoogleIamV1Policy> getIamPolicy(core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -398,7 +398,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -458,7 +458,7 @@
       GoogleIamV1SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -518,7 +518,7 @@
       GoogleIamV1TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -576,7 +576,7 @@
   async.Future<GoogleCloudMlV1Location> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -634,7 +634,7 @@
   async.Future<GoogleCloudMlV1ListLocationsResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -702,7 +702,7 @@
       GoogleCloudMlV1Model request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -753,7 +753,7 @@
   async.Future<GoogleLongrunningOperation> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -800,7 +800,7 @@
   async.Future<GoogleCloudMlV1Model> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -848,7 +848,7 @@
   async.Future<GoogleIamV1Policy> getIamPolicy(core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -918,7 +918,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -995,7 +995,7 @@
       GoogleCloudMlV1Model request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1052,7 +1052,7 @@
       GoogleIamV1SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1112,7 +1112,7 @@
       GoogleIamV1TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1179,7 +1179,7 @@
       GoogleCloudMlV1Version request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1237,7 +1237,7 @@
   async.Future<GoogleLongrunningOperation> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1287,7 +1287,7 @@
   async.Future<GoogleCloudMlV1Version> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1355,7 +1355,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1428,7 +1428,7 @@
       GoogleCloudMlV1Version request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1492,7 +1492,7 @@
       GoogleCloudMlV1SetDefaultVersionRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1556,7 +1556,7 @@
   async.Future<GoogleProtobufEmpty> cancel(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1603,7 +1603,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1649,7 +1649,7 @@
   async.Future<GoogleLongrunningOperation> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1713,7 +1713,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2019,9 +2019,10 @@
   GoogleCloudMlV1HyperparameterOutput.fromJson(core.Map _json) {
     if (_json.containsKey("allMetrics")) {
       allMetrics = _json["allMetrics"]
-          .map((value) =>
-              new GoogleCloudMlV1HyperparameterOutputHyperparameterMetric
-                  .fromJson(value))
+          .map<GoogleCloudMlV1HyperparameterOutputHyperparameterMetric>(
+              (value) =>
+                  new GoogleCloudMlV1HyperparameterOutputHyperparameterMetric
+                      .fromJson(value))
           .toList();
     }
     if (_json.containsKey("finalMetric")) {
@@ -2134,7 +2135,8 @@
     }
     if (_json.containsKey("params")) {
       params = _json["params"]
-          .map((value) => new GoogleCloudMlV1ParameterSpec.fromJson(value))
+          .map<GoogleCloudMlV1ParameterSpec>(
+              (value) => new GoogleCloudMlV1ParameterSpec.fromJson(value))
           .toList();
     }
     if (_json.containsKey("resumePreviousJobId")) {
@@ -2305,7 +2307,8 @@
   GoogleCloudMlV1ListJobsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("jobs")) {
       jobs = _json["jobs"]
-          .map((value) => new GoogleCloudMlV1Job.fromJson(value))
+          .map<GoogleCloudMlV1Job>(
+              (value) => new GoogleCloudMlV1Job.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2339,7 +2342,8 @@
   GoogleCloudMlV1ListLocationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new GoogleCloudMlV1Location.fromJson(value))
+          .map<GoogleCloudMlV1Location>(
+              (value) => new GoogleCloudMlV1Location.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2374,7 +2378,8 @@
   GoogleCloudMlV1ListModelsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("models")) {
       models = _json["models"]
-          .map((value) => new GoogleCloudMlV1Model.fromJson(value))
+          .map<GoogleCloudMlV1Model>(
+              (value) => new GoogleCloudMlV1Model.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2412,7 +2417,8 @@
     }
     if (_json.containsKey("versions")) {
       versions = _json["versions"]
-          .map((value) => new GoogleCloudMlV1Version.fromJson(value))
+          .map<GoogleCloudMlV1Version>(
+              (value) => new GoogleCloudMlV1Version.fromJson(value))
           .toList();
     }
   }
@@ -2440,7 +2446,8 @@
   GoogleCloudMlV1Location.fromJson(core.Map _json) {
     if (_json.containsKey("capabilities")) {
       capabilities = _json["capabilities"]
-          .map((value) => new GoogleCloudMlV1Capability.fromJson(value))
+          .map<GoogleCloudMlV1Capability>(
+              (value) => new GoogleCloudMlV1Capability.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -3326,7 +3333,7 @@
     }
     if (_json.containsKey("trials")) {
       trials = _json["trials"]
-          .map((value) =>
+          .map<GoogleCloudMlV1HyperparameterOutput>((value) =>
               new GoogleCloudMlV1HyperparameterOutput.fromJson(value))
           .toList();
     }
@@ -3635,7 +3642,8 @@
   GoogleIamV1Policy.fromJson(core.Map _json) {
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new GoogleIamV1Binding.fromJson(value))
+          .map<GoogleIamV1Binding>(
+              (value) => new GoogleIamV1Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -3754,7 +3762,8 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new GoogleLongrunningOperation.fromJson(value))
+          .map<GoogleLongrunningOperation>(
+              (value) => new GoogleLongrunningOperation.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/monitoring/v3.dart b/generated/googleapis/lib/monitoring/v3.dart
index 6ac2f38..8097b47 100644
--- a/generated/googleapis/lib/monitoring/v3.dart
+++ b/generated/googleapis/lib/monitoring/v3.dart
@@ -99,7 +99,7 @@
       CreateCollectdTimeSeriesRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -164,7 +164,7 @@
   async.Future<Group> create(Group request, core.String name,
       {core.bool validateOnly, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -214,7 +214,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -258,7 +258,7 @@
   /// this method will complete with the same error.
   async.Future<Group> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -334,7 +334,7 @@
       core.String descendantsOfGroup,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -403,7 +403,7 @@
   async.Future<Group> update(Group request, core.String name,
       {core.bool validateOnly, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -486,7 +486,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -558,7 +558,7 @@
       MetricDescriptor request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -609,7 +609,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -656,7 +656,7 @@
   /// this method will complete with the same error.
   async.Future<MetricDescriptor> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -719,7 +719,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -786,7 +786,7 @@
   async.Future<MonitoredResourceDescriptor> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -850,7 +850,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -919,7 +919,7 @@
   async.Future<Empty> create(CreateTimeSeriesRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1084,7 +1084,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1179,7 +1179,7 @@
       UptimeCheckConfig request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1230,7 +1230,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1274,7 +1274,7 @@
   /// this method will complete with the same error.
   async.Future<UptimeCheckConfig> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1330,7 +1330,7 @@
   async.Future<ListUptimeCheckConfigsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1397,7 +1397,7 @@
       UptimeCheckConfig request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1460,7 +1460,7 @@
   async.Future<ListUptimeCheckIpsResponse> list(
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1634,7 +1634,7 @@
     }
     if (_json.containsKey("values")) {
       values = _json["values"]
-          .map((value) => new CollectdValue.fromJson(value))
+          .map<CollectdValue>((value) => new CollectdValue.fromJson(value))
           .toList();
     }
   }
@@ -1697,7 +1697,8 @@
     }
     if (_json.containsKey("valueErrors")) {
       valueErrors = _json["valueErrors"]
-          .map((value) => new CollectdValueError.fromJson(value))
+          .map<CollectdValueError>(
+              (value) => new CollectdValueError.fromJson(value))
           .toList();
     }
   }
@@ -1849,7 +1850,7 @@
   CreateCollectdTimeSeriesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("collectdPayloads")) {
       collectdPayloads = _json["collectdPayloads"]
-          .map((value) => new CollectdPayload.fromJson(value))
+          .map<CollectdPayload>((value) => new CollectdPayload.fromJson(value))
           .toList();
     }
     if (_json.containsKey("collectdVersion")) {
@@ -1889,7 +1890,8 @@
   CreateCollectdTimeSeriesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("payloadErrors")) {
       payloadErrors = _json["payloadErrors"]
-          .map((value) => new CollectdPayloadError.fromJson(value))
+          .map<CollectdPayloadError>(
+              (value) => new CollectdPayloadError.fromJson(value))
           .toList();
     }
   }
@@ -1919,7 +1921,7 @@
   CreateTimeSeriesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("timeSeries")) {
       timeSeries = _json["timeSeries"]
-          .map((value) => new TimeSeries.fromJson(value))
+          .map<TimeSeries>((value) => new TimeSeries.fromJson(value))
           .toList();
     }
   }
@@ -2208,8 +2210,9 @@
       oneofIndex = _json["oneofIndex"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("packed")) {
       packed = _json["packed"];
@@ -2597,7 +2600,8 @@
   ListGroupMembersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("members")) {
       members = _json["members"]
-          .map((value) => new MonitoredResource.fromJson(value))
+          .map<MonitoredResource>(
+              (value) => new MonitoredResource.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2638,7 +2642,9 @@
 
   ListGroupsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("group")) {
-      group = _json["group"].map((value) => new Group.fromJson(value)).toList();
+      group = _json["group"]
+          .map<Group>((value) => new Group.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -2674,7 +2680,8 @@
   ListMetricDescriptorsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("metricDescriptors")) {
       metricDescriptors = _json["metricDescriptors"]
-          .map((value) => new MetricDescriptor.fromJson(value))
+          .map<MetricDescriptor>(
+              (value) => new MetricDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2715,7 +2722,8 @@
     }
     if (_json.containsKey("resourceDescriptors")) {
       resourceDescriptors = _json["resourceDescriptors"]
-          .map((value) => new MonitoredResourceDescriptor.fromJson(value))
+          .map<MonitoredResourceDescriptor>(
+              (value) => new MonitoredResourceDescriptor.fromJson(value))
           .toList();
     }
   }
@@ -2752,7 +2760,7 @@
     }
     if (_json.containsKey("timeSeries")) {
       timeSeries = _json["timeSeries"]
-          .map((value) => new TimeSeries.fromJson(value))
+          .map<TimeSeries>((value) => new TimeSeries.fromJson(value))
           .toList();
     }
   }
@@ -2798,7 +2806,8 @@
     }
     if (_json.containsKey("uptimeCheckConfigs")) {
       uptimeCheckConfigs = _json["uptimeCheckConfigs"]
-          .map((value) => new UptimeCheckConfig.fromJson(value))
+          .map<UptimeCheckConfig>(
+              (value) => new UptimeCheckConfig.fromJson(value))
           .toList();
     }
   }
@@ -2842,7 +2851,7 @@
     }
     if (_json.containsKey("uptimeCheckIps")) {
       uptimeCheckIps = _json["uptimeCheckIps"]
-          .map((value) => new UptimeCheckIp.fromJson(value))
+          .map<UptimeCheckIp>((value) => new UptimeCheckIp.fromJson(value))
           .toList();
     }
   }
@@ -2971,7 +2980,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricKind")) {
@@ -3116,7 +3125,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -3591,8 +3600,9 @@
       metricKind = _json["metricKind"];
     }
     if (_json.containsKey("points")) {
-      points =
-          _json["points"].map((value) => new Point.fromJson(value)).toList();
+      points = _json["points"]
+          .map<Point>((value) => new Point.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("resource")) {
       resource = new MonitoredResource.fromJson(_json["resource"]);
@@ -3654,8 +3664,9 @@
 
   Type.fromJson(core.Map _json) {
     if (_json.containsKey("fields")) {
-      fields =
-          _json["fields"].map((value) => new Field.fromJson(value)).toList();
+      fields = _json["fields"]
+          .map<Field>((value) => new Field.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
@@ -3664,8 +3675,9 @@
       oneofs = _json["oneofs"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -3825,7 +3837,7 @@
   UptimeCheckConfig.fromJson(core.Map _json) {
     if (_json.containsKey("contentMatchers")) {
       contentMatchers = _json["contentMatchers"]
-          .map((value) => new ContentMatcher.fromJson(value))
+          .map<ContentMatcher>((value) => new ContentMatcher.fromJson(value))
           .toList();
     }
     if (_json.containsKey("displayName")) {
@@ -3836,7 +3848,7 @@
     }
     if (_json.containsKey("internalCheckers")) {
       internalCheckers = _json["internalCheckers"]
-          .map((value) => new InternalChecker.fromJson(value))
+          .map<InternalChecker>((value) => new InternalChecker.fromJson(value))
           .toList();
     }
     if (_json.containsKey("isInternal")) {
diff --git a/generated/googleapis/lib/oauth2/v2.dart b/generated/googleapis/lib/oauth2/v2.dart
index 92eab9e..503777c 100644
--- a/generated/googleapis/lib/oauth2/v2.dart
+++ b/generated/googleapis/lib/oauth2/v2.dart
@@ -53,7 +53,7 @@
   /// this method will complete with the same error.
   async.Future<Jwk> getCertForOpenIdConnect({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -98,7 +98,7 @@
       core.String tokenHandle,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -150,7 +150,7 @@
   /// this method will complete with the same error.
   async.Future<Userinfoplus> get({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -199,7 +199,7 @@
   /// this method will complete with the same error.
   async.Future<Userinfoplus> get({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -284,7 +284,9 @@
 
   Jwk.fromJson(core.Map _json) {
     if (_json.containsKey("keys")) {
-      keys = _json["keys"].map((value) => new JwkKeys.fromJson(value)).toList();
+      keys = _json["keys"]
+          .map<JwkKeys>((value) => new JwkKeys.fromJson(value))
+          .toList();
     }
   }
 
diff --git a/generated/googleapis/lib/oslogin/v1.dart b/generated/googleapis/lib/oslogin/v1.dart
index 2bceb0a..ffcd689 100644
--- a/generated/googleapis/lib/oslogin/v1.dart
+++ b/generated/googleapis/lib/oslogin/v1.dart
@@ -65,7 +65,7 @@
   async.Future<LoginProfile> getLoginProfile(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -118,7 +118,7 @@
       SshPublicKey request, core.String parent,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -179,7 +179,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -232,7 +232,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -278,7 +278,7 @@
   /// this method will complete with the same error.
   async.Future<SshPublicKey> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -331,7 +331,7 @@
   async.Future<SshPublicKey> patch(SshPublicKey request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -426,7 +426,7 @@
     }
     if (_json.containsKey("posixAccounts")) {
       posixAccounts = _json["posixAccounts"]
-          .map((value) => new PosixAccount.fromJson(value))
+          .map<PosixAccount>((value) => new PosixAccount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("sshPublicKeys")) {
diff --git a/generated/googleapis/lib/pagespeedonline/v1.dart b/generated/googleapis/lib/pagespeedonline/v1.dart
index 49256f7..a2f64cc 100644
--- a/generated/googleapis/lib/pagespeedonline/v1.dart
+++ b/generated/googleapis/lib/pagespeedonline/v1.dart
@@ -78,7 +78,7 @@
       core.String strategy,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -170,9 +170,10 @@
       core.Map _json) {
     if (_json.containsKey("args")) {
       args = _json["args"]
-          .map((value) =>
-              new ResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs
-                  .fromJson(value))
+          .map<ResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs>(
+              (value) =>
+                  new ResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs
+                      .fromJson(value))
           .toList();
     }
     if (_json.containsKey("format")) {
@@ -242,9 +243,10 @@
       core.Map _json) {
     if (_json.containsKey("args")) {
       args = _json["args"]
-          .map((value) =>
-              new ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs
-                  .fromJson(value))
+          .map<ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs>(
+              (value) =>
+                  new ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs
+                      .fromJson(value))
           .toList();
     }
     if (_json.containsKey("format")) {
@@ -315,9 +317,10 @@
       core.Map _json) {
     if (_json.containsKey("args")) {
       args = _json["args"]
-          .map((value) =>
-              new ResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs
-                  .fromJson(value))
+          .map<ResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs>(
+              (value) =>
+                  new ResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs
+                      .fromJson(value))
           .toList();
     }
     if (_json.containsKey("format")) {
@@ -352,9 +355,10 @@
   ResultFormattedResultsRuleResultsValueUrlBlocksUrls.fromJson(core.Map _json) {
     if (_json.containsKey("details")) {
       details = _json["details"]
-          .map((value) =>
-              new ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails
-                  .fromJson(value))
+          .map<ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails>(
+              (value) =>
+                  new ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails
+                      .fromJson(value))
           .toList();
     }
     if (_json.containsKey("result")) {
@@ -394,7 +398,7 @@
     }
     if (_json.containsKey("urls")) {
       urls = _json["urls"]
-          .map((value) =>
+          .map<ResultFormattedResultsRuleResultsValueUrlBlocksUrls>((value) =>
               new ResultFormattedResultsRuleResultsValueUrlBlocksUrls.fromJson(
                   value))
           .toList();
@@ -444,7 +448,7 @@
     }
     if (_json.containsKey("urlBlocks")) {
       urlBlocks = _json["urlBlocks"]
-          .map((value) =>
+          .map<ResultFormattedResultsRuleResultsValueUrlBlocks>((value) =>
               new ResultFormattedResultsRuleResultsValueUrlBlocks.fromJson(
                   value))
           .toList();
diff --git a/generated/googleapis/lib/pagespeedonline/v2.dart b/generated/googleapis/lib/pagespeedonline/v2.dart
index 07964cc..8c93ce1 100644
--- a/generated/googleapis/lib/pagespeedonline/v2.dart
+++ b/generated/googleapis/lib/pagespeedonline/v2.dart
@@ -78,7 +78,7 @@
       core.String strategy,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -248,13 +248,13 @@
     }
     if (_json.containsKey("rects")) {
       rects = _json["rects"]
-          .map((value) =>
+          .map<PagespeedApiFormatStringV2ArgsRects>((value) =>
               new PagespeedApiFormatStringV2ArgsRects.fromJson(value))
           .toList();
     }
     if (_json.containsKey("secondary_rects")) {
       secondaryRects = _json["secondary_rects"]
-          .map((value) =>
+          .map<PagespeedApiFormatStringV2ArgsSecondaryRects>((value) =>
               new PagespeedApiFormatStringV2ArgsSecondaryRects.fromJson(value))
           .toList();
     }
@@ -304,7 +304,8 @@
   PagespeedApiFormatStringV2.fromJson(core.Map _json) {
     if (_json.containsKey("args")) {
       args = _json["args"]
-          .map((value) => new PagespeedApiFormatStringV2Args.fromJson(value))
+          .map<PagespeedApiFormatStringV2Args>(
+              (value) => new PagespeedApiFormatStringV2Args.fromJson(value))
           .toList();
     }
     if (_json.containsKey("format")) {
@@ -466,7 +467,8 @@
   ResultFormattedResultsRuleResultsValueUrlBlocksUrls.fromJson(core.Map _json) {
     if (_json.containsKey("details")) {
       details = _json["details"]
-          .map((value) => new PagespeedApiFormatStringV2.fromJson(value))
+          .map<PagespeedApiFormatStringV2>(
+              (value) => new PagespeedApiFormatStringV2.fromJson(value))
           .toList();
     }
     if (_json.containsKey("result")) {
@@ -503,7 +505,7 @@
     }
     if (_json.containsKey("urls")) {
       urls = _json["urls"]
-          .map((value) =>
+          .map<ResultFormattedResultsRuleResultsValueUrlBlocksUrls>((value) =>
               new ResultFormattedResultsRuleResultsValueUrlBlocksUrls.fromJson(
                   value))
           .toList();
@@ -568,7 +570,7 @@
     }
     if (_json.containsKey("urlBlocks")) {
       urlBlocks = _json["urlBlocks"]
-          .map((value) =>
+          .map<ResultFormattedResultsRuleResultsValueUrlBlocks>((value) =>
               new ResultFormattedResultsRuleResultsValueUrlBlocks.fromJson(
                   value))
           .toList();
diff --git a/generated/googleapis/lib/partners/v2.dart b/generated/googleapis/lib/partners/v2.dart
index cc974e6..3744928 100644
--- a/generated/googleapis/lib/partners/v2.dart
+++ b/generated/googleapis/lib/partners/v2.dart
@@ -110,7 +110,7 @@
       core.String requestMetadata_trafficSource_trafficSubId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -196,7 +196,7 @@
   async.Future<LogMessageResponse> log(LogMessageRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -303,7 +303,7 @@
       core.String address,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -515,7 +515,7 @@
       core.String requestMetadata_trafficSource_trafficSubId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -654,7 +654,7 @@
       CreateLeadRequest request, core.String companyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -753,7 +753,7 @@
       core.String orderBy,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -871,7 +871,7 @@
       core.String requestMetadata_trafficSource_trafficSubId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -996,7 +996,7 @@
       core.String requestMetadata_trafficSource_trafficSubId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1087,7 +1087,7 @@
   async.Future<LogUserEventResponse> log(LogUserEventRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1164,7 +1164,7 @@
       core.String requestMetadata_trafficSource_trafficSourceId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1276,7 +1276,7 @@
       core.String requestMetadata_userOverrides_ipAddress,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1387,7 +1387,7 @@
       core.String requestMetadata_trafficSource_trafficSourceId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1503,7 +1503,7 @@
       core.List<core.String> requestMetadata_experimentIds,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1612,7 +1612,7 @@
       core.String requestMetadata_trafficSource_trafficSubId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1722,7 +1722,7 @@
       core.String requestMetadata_userOverrides_ipAddress,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1830,7 +1830,7 @@
       core.String requestMetadata_trafficSource_trafficSubId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1943,7 +1943,7 @@
       core.String requestMetadata_trafficSource_trafficSubId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2106,7 +2106,7 @@
     }
     if (_json.containsKey("eventLocations")) {
       eventLocations = _json["eventLocations"]
-          .map((value) => new LatLng.fromJson(value))
+          .map<LatLng>((value) => new LatLng.fromJson(value))
           .toList();
     }
   }
@@ -2233,7 +2233,8 @@
     }
     if (_json.containsKey("countryOfferInfos")) {
       countryOfferInfos = _json["countryOfferInfos"]
-          .map((value) => new CountryOfferInfo.fromJson(value))
+          .map<CountryOfferInfo>(
+              (value) => new CountryOfferInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("description")) {
@@ -2256,7 +2257,7 @@
     }
     if (_json.containsKey("qualifiedCustomer")) {
       qualifiedCustomer = _json["qualifiedCustomer"]
-          .map((value) => new OfferCustomer.fromJson(value))
+          .map<OfferCustomer>((value) => new OfferCustomer.fromJson(value))
           .toList();
     }
     if (_json.containsKey("qualifiedCustomersComplete")) {
@@ -2463,7 +2464,8 @@
   CertificationStatus.fromJson(core.Map _json) {
     if (_json.containsKey("examStatuses")) {
       examStatuses = _json["examStatuses"]
-          .map((value) => new CertificationExamStatus.fromJson(value))
+          .map<CertificationExamStatus>(
+              (value) => new CertificationExamStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("isCertified")) {
@@ -2602,7 +2604,8 @@
     }
     if (_json.containsKey("certificationStatuses")) {
       certificationStatuses = _json["certificationStatuses"]
-          .map((value) => new CertificationStatus.fromJson(value))
+          .map<CertificationStatus>(
+              (value) => new CertificationStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("companyTypes")) {
@@ -2620,12 +2623,13 @@
     }
     if (_json.containsKey("localizedInfos")) {
       localizedInfos = _json["localizedInfos"]
-          .map((value) => new LocalizedCompanyInfo.fromJson(value))
+          .map<LocalizedCompanyInfo>(
+              (value) => new LocalizedCompanyInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new Location.fromJson(value))
+          .map<Location>((value) => new Location.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -2651,14 +2655,17 @@
       publicProfile = new PublicProfile.fromJson(_json["publicProfile"]);
     }
     if (_json.containsKey("ranks")) {
-      ranks = _json["ranks"].map((value) => new Rank.fromJson(value)).toList();
+      ranks = _json["ranks"]
+          .map<Rank>((value) => new Rank.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("services")) {
       services = _json["services"];
     }
     if (_json.containsKey("specializationStatus")) {
       specializationStatus = _json["specializationStatus"]
-          .map((value) => new SpecializationStatus.fromJson(value))
+          .map<SpecializationStatus>(
+              (value) => new SpecializationStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("websiteUrl")) {
@@ -2869,7 +2876,8 @@
     }
     if (_json.containsKey("specializationStatus")) {
       specializationStatus = _json["specializationStatus"]
-          .map((value) => new SpecializationStatus.fromJson(value))
+          .map<SpecializationStatus>(
+              (value) => new SpecializationStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("state")) {
@@ -3772,7 +3780,7 @@
   ListAnalyticsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("analytics")) {
       analytics = _json["analytics"]
-          .map((value) => new Analytics.fromJson(value))
+          .map<Analytics>((value) => new Analytics.fromJson(value))
           .toList();
     }
     if (_json.containsKey("analyticsSummary")) {
@@ -3828,7 +3836,7 @@
   ListCompaniesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("companies")) {
       companies = _json["companies"]
-          .map((value) => new Company.fromJson(value))
+          .map<Company>((value) => new Company.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -3878,7 +3886,9 @@
 
   ListLeadsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("leads")) {
-      leads = _json["leads"].map((value) => new Lead.fromJson(value)).toList();
+      leads = _json["leads"]
+          .map<Lead>((value) => new Lead.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -3942,7 +3952,7 @@
     }
     if (_json.containsKey("offers")) {
       offers = _json["offers"]
-          .map((value) => new HistoricalOffer.fromJson(value))
+          .map<HistoricalOffer>((value) => new HistoricalOffer.fromJson(value))
           .toList();
     }
     if (_json.containsKey("responseMetadata")) {
@@ -4003,7 +4013,7 @@
   ListOffersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("availableOffers")) {
       availableOffers = _json["availableOffers"]
-          .map((value) => new AvailableOffer.fromJson(value))
+          .map<AvailableOffer>((value) => new AvailableOffer.fromJson(value))
           .toList();
     }
     if (_json.containsKey("noOfferReason")) {
@@ -4671,7 +4681,7 @@
     }
     if (_json.containsKey("eventDatas")) {
       eventDatas = _json["eventDatas"]
-          .map((value) => new EventData.fromJson(value))
+          .map<EventData>((value) => new EventData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("eventScope")) {
@@ -5296,12 +5306,13 @@
   User.fromJson(core.Map _json) {
     if (_json.containsKey("availableAdwordsManagerAccounts")) {
       availableAdwordsManagerAccounts = _json["availableAdwordsManagerAccounts"]
-          .map((value) => new AdWordsManagerAccountInfo.fromJson(value))
+          .map<AdWordsManagerAccountInfo>(
+              (value) => new AdWordsManagerAccountInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("certificationStatus")) {
       certificationStatus = _json["certificationStatus"]
-          .map((value) => new Certification.fromJson(value))
+          .map<Certification>((value) => new Certification.fromJson(value))
           .toList();
     }
     if (_json.containsKey("company")) {
@@ -5312,7 +5323,7 @@
     }
     if (_json.containsKey("examStatus")) {
       examStatus = _json["examStatus"]
-          .map((value) => new ExamStatus.fromJson(value))
+          .map<ExamStatus>((value) => new ExamStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
diff --git a/generated/googleapis/lib/people/v1.dart b/generated/googleapis/lib/people/v1.dart
index 73d3a89..c0a655d 100644
--- a/generated/googleapis/lib/people/v1.dart
+++ b/generated/googleapis/lib/people/v1.dart
@@ -96,7 +96,7 @@
       core.int maxMembers,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -143,7 +143,7 @@
   async.Future<ContactGroup> create(CreateContactGroupRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -191,7 +191,7 @@
   async.Future<Empty> delete(core.String resourceName,
       {core.bool deleteContacts, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -241,7 +241,7 @@
   async.Future<ContactGroup> get(core.String resourceName,
       {core.int maxMembers, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -299,7 +299,7 @@
       core.String syncToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -356,7 +356,7 @@
       UpdateContactGroupRequest request, core.String resourceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -413,7 +413,7 @@
       ModifyContactGroupMembersRequest request, core.String resourceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -473,7 +473,7 @@
   async.Future<Person> createContact(Person request,
       {core.String parent, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -520,7 +520,7 @@
   async.Future<Empty> deleteContact(core.String resourceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -616,7 +616,7 @@
       core.String requestMask_includeField,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -719,7 +719,7 @@
       core.List<core.String> resourceNames,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -809,7 +809,7 @@
   async.Future<Person> updateContact(Person request, core.String resourceName,
       {core.String updatePersonFields, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -941,7 +941,7 @@
       core.String personFields,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1167,7 +1167,8 @@
   BatchGetContactGroupsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("responses")) {
       responses = _json["responses"]
-          .map((value) => new ContactGroupResponse.fromJson(value))
+          .map<ContactGroupResponse>(
+              (value) => new ContactGroupResponse.fromJson(value))
           .toList();
     }
   }
@@ -1888,7 +1889,7 @@
   GetPeopleResponse.fromJson(core.Map _json) {
     if (_json.containsKey("responses")) {
       responses = _json["responses"]
-          .map((value) => new PersonResponse.fromJson(value))
+          .map<PersonResponse>((value) => new PersonResponse.fromJson(value))
           .toList();
     }
   }
@@ -2043,7 +2044,7 @@
   ListConnectionsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("connections")) {
       connections = _json["connections"]
-          .map((value) => new Person.fromJson(value))
+          .map<Person>((value) => new Person.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2103,7 +2104,7 @@
   ListContactGroupsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("contactGroups")) {
       contactGroups = _json["contactGroups"]
-          .map((value) => new ContactGroup.fromJson(value))
+          .map<ContactGroup>((value) => new ContactGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2759,7 +2760,7 @@
   Person.fromJson(core.Map _json) {
     if (_json.containsKey("addresses")) {
       addresses = _json["addresses"]
-          .map((value) => new Address.fromJson(value))
+          .map<Address>((value) => new Address.fromJson(value))
           .toList();
     }
     if (_json.containsKey("ageRange")) {
@@ -2767,132 +2768,142 @@
     }
     if (_json.containsKey("ageRanges")) {
       ageRanges = _json["ageRanges"]
-          .map((value) => new AgeRangeType.fromJson(value))
+          .map<AgeRangeType>((value) => new AgeRangeType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("biographies")) {
       biographies = _json["biographies"]
-          .map((value) => new Biography.fromJson(value))
+          .map<Biography>((value) => new Biography.fromJson(value))
           .toList();
     }
     if (_json.containsKey("birthdays")) {
       birthdays = _json["birthdays"]
-          .map((value) => new Birthday.fromJson(value))
+          .map<Birthday>((value) => new Birthday.fromJson(value))
           .toList();
     }
     if (_json.containsKey("braggingRights")) {
       braggingRights = _json["braggingRights"]
-          .map((value) => new BraggingRights.fromJson(value))
+          .map<BraggingRights>((value) => new BraggingRights.fromJson(value))
           .toList();
     }
     if (_json.containsKey("coverPhotos")) {
       coverPhotos = _json["coverPhotos"]
-          .map((value) => new CoverPhoto.fromJson(value))
+          .map<CoverPhoto>((value) => new CoverPhoto.fromJson(value))
           .toList();
     }
     if (_json.containsKey("emailAddresses")) {
       emailAddresses = _json["emailAddresses"]
-          .map((value) => new EmailAddress.fromJson(value))
+          .map<EmailAddress>((value) => new EmailAddress.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
       etag = _json["etag"];
     }
     if (_json.containsKey("events")) {
-      events =
-          _json["events"].map((value) => new Event.fromJson(value)).toList();
+      events = _json["events"]
+          .map<Event>((value) => new Event.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("genders")) {
-      genders =
-          _json["genders"].map((value) => new Gender.fromJson(value)).toList();
+      genders = _json["genders"]
+          .map<Gender>((value) => new Gender.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("imClients")) {
       imClients = _json["imClients"]
-          .map((value) => new ImClient.fromJson(value))
+          .map<ImClient>((value) => new ImClient.fromJson(value))
           .toList();
     }
     if (_json.containsKey("interests")) {
       interests = _json["interests"]
-          .map((value) => new Interest.fromJson(value))
+          .map<Interest>((value) => new Interest.fromJson(value))
           .toList();
     }
     if (_json.containsKey("locales")) {
-      locales =
-          _json["locales"].map((value) => new Locale.fromJson(value)).toList();
+      locales = _json["locales"]
+          .map<Locale>((value) => new Locale.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("memberships")) {
       memberships = _json["memberships"]
-          .map((value) => new Membership.fromJson(value))
+          .map<Membership>((value) => new Membership.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metadata")) {
       metadata = new PersonMetadata.fromJson(_json["metadata"]);
     }
     if (_json.containsKey("names")) {
-      names = _json["names"].map((value) => new Name.fromJson(value)).toList();
+      names = _json["names"]
+          .map<Name>((value) => new Name.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nicknames")) {
       nicknames = _json["nicknames"]
-          .map((value) => new Nickname.fromJson(value))
+          .map<Nickname>((value) => new Nickname.fromJson(value))
           .toList();
     }
     if (_json.containsKey("occupations")) {
       occupations = _json["occupations"]
-          .map((value) => new Occupation.fromJson(value))
+          .map<Occupation>((value) => new Occupation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("organizations")) {
       organizations = _json["organizations"]
-          .map((value) => new Organization.fromJson(value))
+          .map<Organization>((value) => new Organization.fromJson(value))
           .toList();
     }
     if (_json.containsKey("phoneNumbers")) {
       phoneNumbers = _json["phoneNumbers"]
-          .map((value) => new PhoneNumber.fromJson(value))
+          .map<PhoneNumber>((value) => new PhoneNumber.fromJson(value))
           .toList();
     }
     if (_json.containsKey("photos")) {
-      photos =
-          _json["photos"].map((value) => new Photo.fromJson(value)).toList();
+      photos = _json["photos"]
+          .map<Photo>((value) => new Photo.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("relations")) {
       relations = _json["relations"]
-          .map((value) => new Relation.fromJson(value))
+          .map<Relation>((value) => new Relation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("relationshipInterests")) {
       relationshipInterests = _json["relationshipInterests"]
-          .map((value) => new RelationshipInterest.fromJson(value))
+          .map<RelationshipInterest>(
+              (value) => new RelationshipInterest.fromJson(value))
           .toList();
     }
     if (_json.containsKey("relationshipStatuses")) {
       relationshipStatuses = _json["relationshipStatuses"]
-          .map((value) => new RelationshipStatus.fromJson(value))
+          .map<RelationshipStatus>(
+              (value) => new RelationshipStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("residences")) {
       residences = _json["residences"]
-          .map((value) => new Residence.fromJson(value))
+          .map<Residence>((value) => new Residence.fromJson(value))
           .toList();
     }
     if (_json.containsKey("resourceName")) {
       resourceName = _json["resourceName"];
     }
     if (_json.containsKey("skills")) {
-      skills =
-          _json["skills"].map((value) => new Skill.fromJson(value)).toList();
+      skills = _json["skills"]
+          .map<Skill>((value) => new Skill.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("taglines")) {
       taglines = _json["taglines"]
-          .map((value) => new Tagline.fromJson(value))
+          .map<Tagline>((value) => new Tagline.fromJson(value))
           .toList();
     }
     if (_json.containsKey("urls")) {
-      urls = _json["urls"].map((value) => new Url.fromJson(value)).toList();
+      urls =
+          _json["urls"].map<Url>((value) => new Url.fromJson(value)).toList();
     }
     if (_json.containsKey("userDefined")) {
       userDefined = _json["userDefined"]
-          .map((value) => new UserDefined.fromJson(value))
+          .map<UserDefined>((value) => new UserDefined.fromJson(value))
           .toList();
     }
   }
@@ -3057,8 +3068,9 @@
       previousResourceNames = _json["previousResourceNames"];
     }
     if (_json.containsKey("sources")) {
-      sources =
-          _json["sources"].map((value) => new Source.fromJson(value)).toList();
+      sources = _json["sources"]
+          .map<Source>((value) => new Source.fromJson(value))
+          .toList();
     }
   }
 
diff --git a/generated/googleapis/lib/playcustomapp/v1.dart b/generated/googleapis/lib/playcustomapp/v1.dart
index 6f1fea9..7dfcef1 100644
--- a/generated/googleapis/lib/playcustomapp/v1.dart
+++ b/generated/googleapis/lib/playcustomapp/v1.dart
@@ -83,7 +83,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
diff --git a/generated/googleapis/lib/plus/v1.dart b/generated/googleapis/lib/plus/v1.dart
index 49f7120..71c6a13 100644
--- a/generated/googleapis/lib/plus/v1.dart
+++ b/generated/googleapis/lib/plus/v1.dart
@@ -65,7 +65,7 @@
   /// this method will complete with the same error.
   async.Future<Activity> get(core.String activityId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -123,7 +123,7 @@
   async.Future<ActivityFeed> list(core.String userId, core.String collection,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -200,7 +200,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -261,7 +261,7 @@
   /// this method will complete with the same error.
   async.Future<Comment> get(core.String commentId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -321,7 +321,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -383,7 +383,7 @@
   /// this method will complete with the same error.
   async.Future<Person> get(core.String userId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -452,7 +452,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -526,7 +526,7 @@
       core.String activityId, core.String collection,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -598,7 +598,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -652,7 +652,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new PlusAclentryResource.fromJson(value))
+          .map<PlusAclentryResource>(
+              (value) => new PlusAclentryResource.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1337,7 +1338,7 @@
     }
     if (_json.containsKey("thumbnails")) {
       thumbnails = _json["thumbnails"]
-          .map((value) =>
+          .map<ActivityObjectAttachmentsThumbnails>((value) =>
               new ActivityObjectAttachmentsThumbnails.fromJson(value))
           .toList();
     }
@@ -1525,7 +1526,8 @@
     }
     if (_json.containsKey("attachments")) {
       attachments = _json["attachments"]
-          .map((value) => new ActivityObjectAttachments.fromJson(value))
+          .map<ActivityObjectAttachments>(
+              (value) => new ActivityObjectAttachments.fromJson(value))
           .toList();
     }
     if (_json.containsKey("content")) {
@@ -1860,8 +1862,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Activity.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Activity>((value) => new Activity.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2234,7 +2237,8 @@
     }
     if (_json.containsKey("inReplyTo")) {
       inReplyTo = _json["inReplyTo"]
-          .map((value) => new CommentInReplyTo.fromJson(value))
+          .map<CommentInReplyTo>(
+              (value) => new CommentInReplyTo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -2339,8 +2343,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Comment.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Comment>((value) => new Comment.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2426,8 +2431,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Person.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Person>((value) => new Person.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3095,7 +3101,7 @@
     }
     if (_json.containsKey("emails")) {
       emails = _json["emails"]
-          .map((value) => new PersonEmails.fromJson(value))
+          .map<PersonEmails>((value) => new PersonEmails.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -3133,12 +3139,14 @@
     }
     if (_json.containsKey("organizations")) {
       organizations = _json["organizations"]
-          .map((value) => new PersonOrganizations.fromJson(value))
+          .map<PersonOrganizations>(
+              (value) => new PersonOrganizations.fromJson(value))
           .toList();
     }
     if (_json.containsKey("placesLived")) {
       placesLived = _json["placesLived"]
-          .map((value) => new PersonPlacesLived.fromJson(value))
+          .map<PersonPlacesLived>(
+              (value) => new PersonPlacesLived.fromJson(value))
           .toList();
     }
     if (_json.containsKey("plusOneCount")) {
@@ -3157,8 +3165,9 @@
       url = _json["url"];
     }
     if (_json.containsKey("urls")) {
-      urls =
-          _json["urls"].map((value) => new PersonUrls.fromJson(value)).toList();
+      urls = _json["urls"]
+          .map<PersonUrls>((value) => new PersonUrls.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("verified")) {
       verified = _json["verified"];
diff --git a/generated/googleapis/lib/plusdomains/v1.dart b/generated/googleapis/lib/plusdomains/v1.dart
index dcc228e..f5be8bb 100644
--- a/generated/googleapis/lib/plusdomains/v1.dart
+++ b/generated/googleapis/lib/plusdomains/v1.dart
@@ -103,7 +103,7 @@
   /// this method will complete with the same error.
   async.Future<Activity> get(core.String activityId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -153,7 +153,7 @@
   async.Future<Activity> insert(Activity request, core.String userId,
       {core.bool preview, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -218,7 +218,7 @@
   async.Future<ActivityFeed> list(core.String userId, core.String collection,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -289,7 +289,7 @@
   async.Future<AudiencesFeed> list(core.String userId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -353,7 +353,7 @@
       core.List<core.String> userId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -401,7 +401,7 @@
   /// this method will complete with the same error.
   async.Future<Circle> get(core.String circleId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -447,7 +447,7 @@
   async.Future<Circle> insert(Circle request, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -503,7 +503,7 @@
   async.Future<CircleFeed> list(core.String userId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -554,7 +554,7 @@
   async.Future<Circle> patch(Circle request, core.String circleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -597,7 +597,7 @@
   /// this method will complete with the same error.
   async.Future remove(core.String circleId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -648,7 +648,7 @@
       core.List<core.String> userId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -701,7 +701,7 @@
   async.Future<Circle> update(Circle request, core.String circleId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -752,7 +752,7 @@
   /// this method will complete with the same error.
   async.Future<Comment> get(core.String commentId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -797,7 +797,7 @@
   async.Future<Comment> insert(Comment request, core.String activityId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -862,7 +862,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -940,7 +940,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1013,7 +1013,7 @@
   /// this method will complete with the same error.
   async.Future<Person> get(core.String userId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1079,7 +1079,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1154,7 +1154,7 @@
       core.String activityId, core.String collection,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1218,7 +1218,7 @@
   async.Future<PeopleFeed> listByCircle(core.String circleId,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1274,7 +1274,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new PlusDomainsAclentryResource.fromJson(value))
+          .map<PlusDomainsAclentryResource>(
+              (value) => new PlusDomainsAclentryResource.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1989,13 +1990,13 @@
     }
     if (_json.containsKey("previewThumbnails")) {
       previewThumbnails = _json["previewThumbnails"]
-          .map((value) =>
+          .map<ActivityObjectAttachmentsPreviewThumbnails>((value) =>
               new ActivityObjectAttachmentsPreviewThumbnails.fromJson(value))
           .toList();
     }
     if (_json.containsKey("thumbnails")) {
       thumbnails = _json["thumbnails"]
-          .map((value) =>
+          .map<ActivityObjectAttachmentsThumbnails>((value) =>
               new ActivityObjectAttachmentsThumbnails.fromJson(value))
           .toList();
     }
@@ -2249,7 +2250,8 @@
     }
     if (_json.containsKey("attachments")) {
       attachments = _json["attachments"]
-          .map((value) => new ActivityObjectAttachments.fromJson(value))
+          .map<ActivityObjectAttachments>(
+              (value) => new ActivityObjectAttachments.fromJson(value))
           .toList();
     }
     if (_json.containsKey("content")) {
@@ -2591,8 +2593,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Activity.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Activity>((value) => new Activity.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2739,8 +2742,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Audience.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Audience>((value) => new Audience.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2910,8 +2914,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Circle.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Circle>((value) => new Circle.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3281,7 +3286,8 @@
     }
     if (_json.containsKey("inReplyTo")) {
       inReplyTo = _json["inReplyTo"]
-          .map((value) => new CommentInReplyTo.fromJson(value))
+          .map<CommentInReplyTo>(
+              (value) => new CommentInReplyTo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3386,8 +3392,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Comment.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Comment>((value) => new Comment.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3638,7 +3645,7 @@
     }
     if (_json.containsKey("streams")) {
       streams = _json["streams"]
-          .map((value) => new Videostream.fromJson(value))
+          .map<Videostream>((value) => new Videostream.fromJson(value))
           .toList();
     }
     if (_json.containsKey("summary")) {
@@ -3758,8 +3765,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Person.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Person>((value) => new Person.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -4376,7 +4384,7 @@
     }
     if (_json.containsKey("emails")) {
       emails = _json["emails"]
-          .map((value) => new PersonEmails.fromJson(value))
+          .map<PersonEmails>((value) => new PersonEmails.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -4411,12 +4419,14 @@
     }
     if (_json.containsKey("organizations")) {
       organizations = _json["organizations"]
-          .map((value) => new PersonOrganizations.fromJson(value))
+          .map<PersonOrganizations>(
+              (value) => new PersonOrganizations.fromJson(value))
           .toList();
     }
     if (_json.containsKey("placesLived")) {
       placesLived = _json["placesLived"]
-          .map((value) => new PersonPlacesLived.fromJson(value))
+          .map<PersonPlacesLived>(
+              (value) => new PersonPlacesLived.fromJson(value))
           .toList();
     }
     if (_json.containsKey("plusOneCount")) {
@@ -4435,8 +4445,9 @@
       url = _json["url"];
     }
     if (_json.containsKey("urls")) {
-      urls =
-          _json["urls"].map((value) => new PersonUrls.fromJson(value)).toList();
+      urls = _json["urls"]
+          .map<PersonUrls>((value) => new PersonUrls.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("verified")) {
       verified = _json["verified"];
diff --git a/generated/googleapis/lib/poly/v1.dart b/generated/googleapis/lib/poly/v1.dart
index db78c58..9e26809 100644
--- a/generated/googleapis/lib/poly/v1.dart
+++ b/generated/googleapis/lib/poly/v1.dart
@@ -55,7 +55,7 @@
   /// this method will complete with the same error.
   async.Future<Asset> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -149,7 +149,7 @@
       core.bool curated,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -268,7 +268,7 @@
       core.String visibility,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -361,7 +361,7 @@
       core.String format,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -493,8 +493,9 @@
       displayName = _json["displayName"];
     }
     if (_json.containsKey("formats")) {
-      formats =
-          _json["formats"].map((value) => new Format.fromJson(value)).toList();
+      formats = _json["formats"]
+          .map<Format>((value) => new Format.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("isCurated")) {
       isCurated = _json["isCurated"];
@@ -653,8 +654,9 @@
       formatType = _json["formatType"];
     }
     if (_json.containsKey("resources")) {
-      resources =
-          _json["resources"].map((value) => new File.fromJson(value)).toList();
+      resources = _json["resources"]
+          .map<File>((value) => new File.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("root")) {
       root = new File.fromJson(_json["root"]);
@@ -734,8 +736,9 @@
 
   ListAssetsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("assets")) {
-      assets =
-          _json["assets"].map((value) => new Asset.fromJson(value)).toList();
+      assets = _json["assets"]
+          .map<Asset>((value) => new Asset.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -779,8 +782,9 @@
 
   ListLikedAssetsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("assets")) {
-      assets =
-          _json["assets"].map((value) => new Asset.fromJson(value)).toList();
+      assets = _json["assets"]
+          .map<Asset>((value) => new Asset.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -831,7 +835,7 @@
     }
     if (_json.containsKey("userAssets")) {
       userAssets = _json["userAssets"]
-          .map((value) => new UserAsset.fromJson(value))
+          .map<UserAsset>((value) => new UserAsset.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/prediction/v1_6.dart b/generated/googleapis/lib/prediction/v1_6.dart
index 29c8316..87fba5d 100644
--- a/generated/googleapis/lib/prediction/v1_6.dart
+++ b/generated/googleapis/lib/prediction/v1_6.dart
@@ -79,7 +79,7 @@
       Input request, core.String project, core.String hostedModelName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -139,7 +139,7 @@
   async.Future<Analyze> analyze(core.String project, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -188,7 +188,7 @@
   async.Future delete(core.String project, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -240,7 +240,7 @@
   async.Future<Insert2> get(core.String project, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -290,7 +290,7 @@
   async.Future<Insert2> insert(Insert request, core.String project,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -340,7 +340,7 @@
   async.Future<List> list(core.String project,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -394,7 +394,7 @@
       Input request, core.String project, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -451,7 +451,7 @@
       Update request, core.String project, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -531,7 +531,7 @@
     }
     if (_json.containsKey("values")) {
       values = _json["values"]
-          .map((value) =>
+          .map<AnalyzeDataDescriptionFeaturesCategoricalValues>((value) =>
               new AnalyzeDataDescriptionFeaturesCategoricalValues.fromJson(
                   value))
           .toList();
@@ -755,7 +755,7 @@
     }
     if (_json.containsKey("text")) {
       text = _json["text"]
-          .map((value) =>
+          .map<AnalyzeDataDescriptionOutputFeatureText>((value) =>
               new AnalyzeDataDescriptionOutputFeatureText.fromJson(value))
           .toList();
     }
@@ -787,7 +787,8 @@
   AnalyzeDataDescription.fromJson(core.Map _json) {
     if (_json.containsKey("features")) {
       features = _json["features"]
-          .map((value) => new AnalyzeDataDescriptionFeatures.fromJson(value))
+          .map<AnalyzeDataDescriptionFeatures>(
+              (value) => new AnalyzeDataDescriptionFeatures.fromJson(value))
           .toList();
     }
     if (_json.containsKey("outputFeature")) {
@@ -1055,7 +1056,8 @@
     }
     if (_json.containsKey("trainingInstances")) {
       trainingInstances = _json["trainingInstances"]
-          .map((value) => new InsertTrainingInstances.fromJson(value))
+          .map<InsertTrainingInstances>(
+              (value) => new InsertTrainingInstances.fromJson(value))
           .toList();
     }
     if (_json.containsKey("utility")) {
@@ -1300,8 +1302,9 @@
 
   List.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Insert2.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Insert2>((value) => new Insert2.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1398,7 +1401,8 @@
     }
     if (_json.containsKey("outputMulti")) {
       outputMulti = _json["outputMulti"]
-          .map((value) => new OutputOutputMulti.fromJson(value))
+          .map<OutputOutputMulti>(
+              (value) => new OutputOutputMulti.fromJson(value))
           .toList();
     }
     if (_json.containsKey("outputValue")) {
diff --git a/generated/googleapis/lib/pubsub/v1.dart b/generated/googleapis/lib/pubsub/v1.dart
index 3d4783b..856116a 100644
--- a/generated/googleapis/lib/pubsub/v1.dart
+++ b/generated/googleapis/lib/pubsub/v1.dart
@@ -98,7 +98,7 @@
   async.Future<Snapshot> create(CreateSnapshotRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -149,7 +149,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String snapshot, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -193,7 +193,7 @@
   /// this method will complete with the same error.
   async.Future<Snapshot> get(core.String snapshot, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -241,7 +241,7 @@
   async.Future<Policy> getIamPolicy(core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -295,7 +295,7 @@
   async.Future<ListSnapshotsResponse> list(core.String project,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -350,7 +350,7 @@
   async.Future<Snapshot> patch(UpdateSnapshotRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -403,7 +403,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -463,7 +463,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -530,7 +530,7 @@
       AcknowledgeRequest request, core.String subscription,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -597,7 +597,7 @@
   async.Future<Subscription> create(Subscription request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -650,7 +650,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String subscription, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -695,7 +695,7 @@
   async.Future<Subscription> get(core.String subscription,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -743,7 +743,7 @@
   async.Future<Policy> getIamPolicy(core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -797,7 +797,7 @@
   async.Future<ListSubscriptionsResponse> list(core.String project,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -858,7 +858,7 @@
       ModifyAckDeadlineRequest request, core.String subscription,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -916,7 +916,7 @@
       ModifyPushConfigRequest request, core.String subscription,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -974,7 +974,7 @@
       UpdateSubscriptionRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1027,7 +1027,7 @@
   async.Future<PullResponse> pull(PullRequest request, core.String subscription,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1079,7 +1079,7 @@
   async.Future<SeekResponse> seek(SeekRequest request, core.String subscription,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1134,7 +1134,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1194,7 +1194,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1262,7 +1262,7 @@
   async.Future<Topic> create(Topic request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1313,7 +1313,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String topic, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1357,7 +1357,7 @@
   /// this method will complete with the same error.
   async.Future<Topic> get(core.String topic, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1405,7 +1405,7 @@
   async.Future<Policy> getIamPolicy(core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1459,7 +1459,7 @@
   async.Future<ListTopicsResponse> list(core.String project,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1516,7 +1516,7 @@
       PublishRequest request, core.String topic,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1569,7 +1569,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1629,7 +1629,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1694,7 +1694,7 @@
   async.Future<ListTopicSnapshotsResponse> list(core.String topic,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1761,7 +1761,7 @@
   async.Future<ListTopicSubscriptionsResponse> list(core.String topic,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1944,7 +1944,7 @@
     }
     if (_json.containsKey("snapshots")) {
       snapshots = _json["snapshots"]
-          .map((value) => new Snapshot.fromJson(value))
+          .map<Snapshot>((value) => new Snapshot.fromJson(value))
           .toList();
     }
   }
@@ -1980,7 +1980,7 @@
     }
     if (_json.containsKey("subscriptions")) {
       subscriptions = _json["subscriptions"]
-          .map((value) => new Subscription.fromJson(value))
+          .map<Subscription>((value) => new Subscription.fromJson(value))
           .toList();
     }
   }
@@ -2083,8 +2083,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("topics")) {
-      topics =
-          _json["topics"].map((value) => new Topic.fromJson(value)).toList();
+      topics = _json["topics"]
+          .map<Topic>((value) => new Topic.fromJson(value))
+          .toList();
     }
   }
 
@@ -2234,7 +2235,7 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -2271,7 +2272,7 @@
   PublishRequest.fromJson(core.Map _json) {
     if (_json.containsKey("messages")) {
       messages = _json["messages"]
-          .map((value) => new PubsubMessage.fromJson(value))
+          .map<PubsubMessage>((value) => new PubsubMessage.fromJson(value))
           .toList();
     }
   }
@@ -2426,7 +2427,7 @@
   PullResponse.fromJson(core.Map _json) {
     if (_json.containsKey("receivedMessages")) {
       receivedMessages = _json["receivedMessages"]
-          .map((value) => new ReceivedMessage.fromJson(value))
+          .map<ReceivedMessage>((value) => new ReceivedMessage.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/reseller/v1.dart b/generated/googleapis/lib/reseller/v1.dart
index bfc1e81..8cadce1 100644
--- a/generated/googleapis/lib/reseller/v1.dart
+++ b/generated/googleapis/lib/reseller/v1.dart
@@ -64,7 +64,7 @@
   /// this method will complete with the same error.
   async.Future<Customer> get(core.String customerId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -114,7 +114,7 @@
   async.Future<Customer> insert(Customer request,
       {core.String customerAuthToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -166,7 +166,7 @@
   async.Future<Customer> patch(Customer request, core.String customerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -217,7 +217,7 @@
   async.Future<Customer> update(Customer request, core.String customerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -267,7 +267,7 @@
   async.Future<ResellernotifyGetwatchdetailsResponse> getwatchdetails(
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -309,7 +309,7 @@
   async.Future<ResellernotifyResource> register(
       {core.String serviceAccountEmailAddress, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -353,7 +353,7 @@
   async.Future<ResellernotifyResource> unregister(
       {core.String serviceAccountEmailAddress, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -412,7 +412,7 @@
       core.String customerId, core.String subscriptionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -476,7 +476,7 @@
       core.String customerId, core.String subscriptionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -542,7 +542,7 @@
       core.String customerId, core.String subscriptionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -607,7 +607,7 @@
       Seats request, core.String customerId, core.String subscriptionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -701,7 +701,7 @@
       core.String deletionType,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -766,7 +766,7 @@
       core.String customerId, core.String subscriptionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -828,7 +828,7 @@
       Subscription request, core.String customerId,
       {core.String customerAuthToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -912,7 +912,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -978,7 +978,7 @@
       core.String customerId, core.String subscriptionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1038,7 +1038,7 @@
       core.String customerId, core.String subscriptionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1938,7 +1938,7 @@
     }
     if (_json.containsKey("subscriptions")) {
       subscriptions = _json["subscriptions"]
-          .map((value) => new Subscription.fromJson(value))
+          .map<Subscription>((value) => new Subscription.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/runtimeconfig/v1.dart b/generated/googleapis/lib/runtimeconfig/v1.dart
index ab24087..c8975aa 100644
--- a/generated/googleapis/lib/runtimeconfig/v1.dart
+++ b/generated/googleapis/lib/runtimeconfig/v1.dart
@@ -74,7 +74,7 @@
   async.Future<Empty> cancel(CancelOperationRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -123,7 +123,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -186,7 +186,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -270,7 +270,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/safebrowsing/v4.dart b/generated/googleapis/lib/safebrowsing/v4.dart
index daca101..815c84c 100644
--- a/generated/googleapis/lib/safebrowsing/v4.dart
+++ b/generated/googleapis/lib/safebrowsing/v4.dart
@@ -68,7 +68,7 @@
   async.Future<FindFullHashesResponse> get(core.String encodedRequest,
       {core.String clientId, core.String clientVersion, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -128,7 +128,7 @@
   async.Future<FetchThreatListUpdatesResponse> get(core.String encodedRequest,
       {core.String clientId, core.String clientVersion, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -185,7 +185,7 @@
   async.Future<FindFullHashesResponse> find(FindFullHashesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -234,7 +234,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> create(ThreatHit request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -286,7 +286,7 @@
       FetchThreatListUpdatesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -333,7 +333,7 @@
   /// this method will complete with the same error.
   async.Future<ListThreatListsResponse> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -379,7 +379,7 @@
   async.Future<FindThreatMatchesResponse> find(FindThreatMatchesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -587,7 +587,8 @@
     }
     if (_json.containsKey("listUpdateRequests")) {
       listUpdateRequests = _json["listUpdateRequests"]
-          .map((value) => new ListUpdateRequest.fromJson(value))
+          .map<ListUpdateRequest>(
+              (value) => new ListUpdateRequest.fromJson(value))
           .toList();
     }
   }
@@ -619,7 +620,8 @@
   FetchThreatListUpdatesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("listUpdateResponses")) {
       listUpdateResponses = _json["listUpdateResponses"]
-          .map((value) => new ListUpdateResponse.fromJson(value))
+          .map<ListUpdateResponse>(
+              (value) => new ListUpdateResponse.fromJson(value))
           .toList();
     }
     if (_json.containsKey("minimumWaitDuration")) {
@@ -710,7 +712,7 @@
   FindFullHashesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("matches")) {
       matches = _json["matches"]
-          .map((value) => new ThreatMatch.fromJson(value))
+          .map<ThreatMatch>((value) => new ThreatMatch.fromJson(value))
           .toList();
     }
     if (_json.containsKey("minimumWaitDuration")) {
@@ -778,7 +780,7 @@
   FindThreatMatchesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("matches")) {
       matches = _json["matches"]
-          .map((value) => new ThreatMatch.fromJson(value))
+          .map<ThreatMatch>((value) => new ThreatMatch.fromJson(value))
           .toList();
     }
   }
@@ -802,7 +804,8 @@
   ListThreatListsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("threatLists")) {
       threatLists = _json["threatLists"]
-          .map((value) => new ThreatListDescriptor.fromJson(value))
+          .map<ThreatListDescriptor>(
+              (value) => new ThreatListDescriptor.fromJson(value))
           .toList();
     }
   }
@@ -1020,7 +1023,7 @@
   ListUpdateResponse.fromJson(core.Map _json) {
     if (_json.containsKey("additions")) {
       additions = _json["additions"]
-          .map((value) => new ThreatEntrySet.fromJson(value))
+          .map<ThreatEntrySet>((value) => new ThreatEntrySet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("checksum")) {
@@ -1034,7 +1037,7 @@
     }
     if (_json.containsKey("removals")) {
       removals = _json["removals"]
-          .map((value) => new ThreatEntrySet.fromJson(value))
+          .map<ThreatEntrySet>((value) => new ThreatEntrySet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("responseType")) {
@@ -1338,7 +1341,7 @@
   ThreatEntryMetadata.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new MetadataEntry.fromJson(value))
+          .map<MetadataEntry>((value) => new MetadataEntry.fromJson(value))
           .toList();
     }
   }
@@ -1488,7 +1491,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new ThreatSource.fromJson(value))
+          .map<ThreatSource>((value) => new ThreatSource.fromJson(value))
           .toList();
     }
     if (_json.containsKey("threatType")) {
@@ -1547,7 +1550,7 @@
     }
     if (_json.containsKey("threatEntries")) {
       threatEntries = _json["threatEntries"]
-          .map((value) => new ThreatEntry.fromJson(value))
+          .map<ThreatEntry>((value) => new ThreatEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("threatEntryTypes")) {
diff --git a/generated/googleapis/lib/script/v1.dart b/generated/googleapis/lib/script/v1.dart
index 86f0eff..bb857da 100644
--- a/generated/googleapis/lib/script/v1.dart
+++ b/generated/googleapis/lib/script/v1.dart
@@ -146,7 +146,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -276,7 +276,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -369,7 +369,7 @@
   async.Future<Project> create(CreateProjectRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -411,7 +411,7 @@
   /// this method will complete with the same error.
   async.Future<Project> get(core.String scriptId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -459,7 +459,7 @@
   async.Future<Content> getContent(core.String scriptId,
       {core.int versionNumber, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -520,7 +520,7 @@
       core.String metricsFilter_deploymentId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -577,7 +577,7 @@
   async.Future<Content> updateContent(Content request, core.String scriptId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -635,7 +635,7 @@
       DeploymentConfig request, core.String scriptId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -685,7 +685,7 @@
   async.Future<Empty> delete(core.String scriptId, core.String deploymentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -736,7 +736,7 @@
   async.Future<Deployment> get(core.String scriptId, core.String deploymentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -792,7 +792,7 @@
   async.Future<ListDeploymentsResponse> list(core.String scriptId,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -848,7 +848,7 @@
       core.String scriptId, core.String deploymentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -910,7 +910,7 @@
   async.Future<Version> create(Version request, core.String scriptId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -960,7 +960,7 @@
   async.Future<Version> get(core.String scriptId, core.int versionNumber,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1016,7 +1016,7 @@
   async.Future<ListVersionsResponse> list(core.String scriptId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1086,7 +1086,7 @@
   async.Future<Operation> run(ExecutionRequest request, core.String scriptId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1129,7 +1129,9 @@
 
   Content.fromJson(core.Map _json) {
     if (_json.containsKey("files")) {
-      files = _json["files"].map((value) => new File.fromJson(value)).toList();
+      files = _json["files"]
+          .map<File>((value) => new File.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("scriptId")) {
       scriptId = _json["scriptId"];
@@ -1215,7 +1217,7 @@
     }
     if (_json.containsKey("entryPoints")) {
       entryPoints = _json["entryPoints"]
-          .map((value) => new EntryPoint.fromJson(value))
+          .map<EntryPoint>((value) => new EntryPoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("functionSet")) {
@@ -1417,7 +1419,8 @@
     }
     if (_json.containsKey("scriptStackTraceElements")) {
       scriptStackTraceElements = _json["scriptStackTraceElements"]
-          .map((value) => new ScriptStackTraceElement.fromJson(value))
+          .map<ScriptStackTraceElement>(
+              (value) => new ScriptStackTraceElement.fromJson(value))
           .toList();
     }
   }
@@ -1808,7 +1811,8 @@
   GoogleAppsScriptTypeFunctionSet.fromJson(core.Map _json) {
     if (_json.containsKey("values")) {
       values = _json["values"]
-          .map((value) => new GoogleAppsScriptTypeFunction.fromJson(value))
+          .map<GoogleAppsScriptTypeFunction>(
+              (value) => new GoogleAppsScriptTypeFunction.fromJson(value))
           .toList();
     }
   }
@@ -1981,7 +1985,8 @@
   GoogleAppsScriptTypeScopeSet.fromJson(core.Map _json) {
     if (_json.containsKey("values")) {
       values = _json["values"]
-          .map((value) => new GoogleAppsScriptTypeScope.fromJson(value))
+          .map<GoogleAppsScriptTypeScope>(
+              (value) => new GoogleAppsScriptTypeScope.fromJson(value))
           .toList();
     }
   }
@@ -2142,7 +2147,7 @@
   ListDeploymentsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deployments")) {
       deployments = _json["deployments"]
-          .map((value) => new Deployment.fromJson(value))
+          .map<Deployment>((value) => new Deployment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2182,7 +2187,8 @@
     }
     if (_json.containsKey("processes")) {
       processes = _json["processes"]
-          .map((value) => new GoogleAppsScriptTypeProcess.fromJson(value))
+          .map<GoogleAppsScriptTypeProcess>(
+              (value) => new GoogleAppsScriptTypeProcess.fromJson(value))
           .toList();
     }
   }
@@ -2218,7 +2224,8 @@
     }
     if (_json.containsKey("processes")) {
       processes = _json["processes"]
-          .map((value) => new GoogleAppsScriptTypeProcess.fromJson(value))
+          .map<GoogleAppsScriptTypeProcess>(
+              (value) => new GoogleAppsScriptTypeProcess.fromJson(value))
           .toList();
     }
   }
@@ -2253,7 +2260,7 @@
     }
     if (_json.containsKey("versions")) {
       versions = _json["versions"]
-          .map((value) => new Version.fromJson(value))
+          .map<Version>((value) => new Version.fromJson(value))
           .toList();
     }
   }
@@ -2288,17 +2295,17 @@
   Metrics.fromJson(core.Map _json) {
     if (_json.containsKey("activeUsers")) {
       activeUsers = _json["activeUsers"]
-          .map((value) => new MetricsValue.fromJson(value))
+          .map<MetricsValue>((value) => new MetricsValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("failedExecutions")) {
       failedExecutions = _json["failedExecutions"]
-          .map((value) => new MetricsValue.fromJson(value))
+          .map<MetricsValue>((value) => new MetricsValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("totalExecutions")) {
       totalExecutions = _json["totalExecutions"]
-          .map((value) => new MetricsValue.fromJson(value))
+          .map<MetricsValue>((value) => new MetricsValue.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/searchconsole/v1.dart b/generated/googleapis/lib/searchconsole/v1.dart
index f8df051..3168a3d 100644
--- a/generated/googleapis/lib/searchconsole/v1.dart
+++ b/generated/googleapis/lib/searchconsole/v1.dart
@@ -63,7 +63,7 @@
       RunMobileFriendlyTestRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -282,12 +282,13 @@
     }
     if (_json.containsKey("mobileFriendlyIssues")) {
       mobileFriendlyIssues = _json["mobileFriendlyIssues"]
-          .map((value) => new MobileFriendlyIssue.fromJson(value))
+          .map<MobileFriendlyIssue>(
+              (value) => new MobileFriendlyIssue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("resourceIssues")) {
       resourceIssues = _json["resourceIssues"]
-          .map((value) => new ResourceIssue.fromJson(value))
+          .map<ResourceIssue>((value) => new ResourceIssue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("screenshot")) {
diff --git a/generated/googleapis/lib/serviceconsumermanagement/v1.dart b/generated/googleapis/lib/serviceconsumermanagement/v1.dart
index f15fb80..0bf20fe 100644
--- a/generated/googleapis/lib/serviceconsumermanagement/v1.dart
+++ b/generated/googleapis/lib/serviceconsumermanagement/v1.dart
@@ -73,7 +73,7 @@
   async.Future<Empty> cancel(CancelOperationRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -122,7 +122,7 @@
   /// call, this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -167,7 +167,7 @@
   /// call, this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -230,7 +230,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -330,7 +330,7 @@
       core.String query,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -399,7 +399,7 @@
       AddTenantProjectRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -457,7 +457,7 @@
       CreateTenancyUnitRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -507,7 +507,7 @@
   /// call, this method will complete with the same error.
   async.Future<Operation> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -572,7 +572,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -637,7 +637,7 @@
       RemoveTenantProjectRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -761,19 +761,22 @@
 
   Api.fromJson(core.Map _json) {
     if (_json.containsKey("methods")) {
-      methods =
-          _json["methods"].map((value) => new Method.fromJson(value)).toList();
+      methods = _json["methods"]
+          .map<Method>((value) => new Method.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("mixins")) {
-      mixins =
-          _json["mixins"].map((value) => new Mixin.fromJson(value)).toList();
+      mixins = _json["mixins"]
+          .map<Mixin>((value) => new Mixin.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -988,12 +991,13 @@
   Authentication.fromJson(core.Map _json) {
     if (_json.containsKey("providers")) {
       providers = _json["providers"]
-          .map((value) => new AuthProvider.fromJson(value))
+          .map<AuthProvider>((value) => new AuthProvider.fromJson(value))
           .toList();
     }
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new AuthenticationRule.fromJson(value))
+          .map<AuthenticationRule>(
+              (value) => new AuthenticationRule.fromJson(value))
           .toList();
     }
   }
@@ -1059,7 +1063,7 @@
     }
     if (_json.containsKey("requirements")) {
       requirements = _json["requirements"]
-          .map((value) => new AuthRequirement.fromJson(value))
+          .map<AuthRequirement>((value) => new AuthRequirement.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selector")) {
@@ -1191,7 +1195,7 @@
   Backend.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new BackendRule.fromJson(value))
+          .map<BackendRule>((value) => new BackendRule.fromJson(value))
           .toList();
     }
   }
@@ -1295,7 +1299,8 @@
   Billing.fromJson(core.Map _json) {
     if (_json.containsKey("consumerDestinations")) {
       consumerDestinations = _json["consumerDestinations"]
-          .map((value) => new BillingDestination.fromJson(value))
+          .map<BillingDestination>(
+              (value) => new BillingDestination.fromJson(value))
           .toList();
     }
   }
@@ -1431,7 +1436,7 @@
   Context.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new ContextRule.fromJson(value))
+          .map<ContextRule>((value) => new ContextRule.fromJson(value))
           .toList();
     }
   }
@@ -1614,7 +1619,7 @@
   CustomError.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new CustomErrorRule.fromJson(value))
+          .map<CustomErrorRule>((value) => new CustomErrorRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("types")) {
@@ -1800,11 +1805,14 @@
       overview = _json["overview"];
     }
     if (_json.containsKey("pages")) {
-      pages = _json["pages"].map((value) => new Page.fromJson(value)).toList();
+      pages = _json["pages"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new DocumentationRule.fromJson(value))
+          .map<DocumentationRule>(
+              (value) => new DocumentationRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("summary")) {
@@ -2017,15 +2025,16 @@
   Enum.fromJson(core.Map _json) {
     if (_json.containsKey("enumvalue")) {
       enumvalue = _json["enumvalue"]
-          .map((value) => new EnumValue.fromJson(value))
+          .map<EnumValue>((value) => new EnumValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -2078,8 +2087,9 @@
       number = _json["number"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
   }
 
@@ -2207,8 +2217,9 @@
       oneofIndex = _json["oneofIndex"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("packed")) {
       packed = _json["packed"];
@@ -2280,8 +2291,9 @@
       fullyDecodeReservedExpansion = _json["fullyDecodeReservedExpansion"];
     }
     if (_json.containsKey("rules")) {
-      rules =
-          _json["rules"].map((value) => new HttpRule.fromJson(value)).toList();
+      rules = _json["rules"]
+          .map<HttpRule>((value) => new HttpRule.fromJson(value))
+          .toList();
     }
   }
 
@@ -2624,12 +2636,13 @@
   HttpRule.fromJson(core.Map _json) {
     if (_json.containsKey("additionalBindings")) {
       additionalBindings = _json["additionalBindings"]
-          .map((value) => new HttpRule.fromJson(value))
+          .map<HttpRule>((value) => new HttpRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("authorizations")) {
       authorizations = _json["authorizations"]
-          .map((value) => new AuthorizationRule.fromJson(value))
+          .map<AuthorizationRule>(
+              (value) => new AuthorizationRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("body")) {
@@ -2782,7 +2795,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -2817,7 +2830,7 @@
     }
     if (_json.containsKey("tenancyUnits")) {
       tenancyUnits = _json["tenancyUnits"]
-          .map((value) => new TenancyUnit.fromJson(value))
+          .map<TenancyUnit>((value) => new TenancyUnit.fromJson(value))
           .toList();
     }
   }
@@ -2875,7 +2888,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -2949,12 +2962,14 @@
   Logging.fromJson(core.Map _json) {
     if (_json.containsKey("consumerDestinations")) {
       consumerDestinations = _json["consumerDestinations"]
-          .map((value) => new LoggingDestination.fromJson(value))
+          .map<LoggingDestination>(
+              (value) => new LoggingDestination.fromJson(value))
           .toList();
     }
     if (_json.containsKey("producerDestinations")) {
       producerDestinations = _json["producerDestinations"]
-          .map((value) => new LoggingDestination.fromJson(value))
+          .map<LoggingDestination>(
+              (value) => new LoggingDestination.fromJson(value))
           .toList();
     }
   }
@@ -3215,8 +3230,9 @@
       name = _json["name"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("requestStreaming")) {
       requestStreaming = _json["requestStreaming"];
@@ -3403,7 +3419,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricKind")) {
@@ -3654,7 +3670,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -3742,12 +3758,14 @@
   Monitoring.fromJson(core.Map _json) {
     if (_json.containsKey("consumerDestinations")) {
       consumerDestinations = _json["consumerDestinations"]
-          .map((value) => new MonitoringDestination.fromJson(value))
+          .map<MonitoringDestination>(
+              (value) => new MonitoringDestination.fromJson(value))
           .toList();
     }
     if (_json.containsKey("producerDestinations")) {
       producerDestinations = _json["producerDestinations"]
-          .map((value) => new MonitoringDestination.fromJson(value))
+          .map<MonitoringDestination>(
+              (value) => new MonitoringDestination.fromJson(value))
           .toList();
     }
   }
@@ -4009,8 +4027,9 @@
       name = _json["name"];
     }
     if (_json.containsKey("subpages")) {
-      subpages =
-          _json["subpages"].map((value) => new Page.fromJson(value)).toList();
+      subpages = _json["subpages"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
   }
 
@@ -4127,12 +4146,12 @@
   Quota.fromJson(core.Map _json) {
     if (_json.containsKey("limits")) {
       limits = _json["limits"]
-          .map((value) => new QuotaLimit.fromJson(value))
+          .map<QuotaLimit>((value) => new QuotaLimit.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricRules")) {
       metricRules = _json["metricRules"]
-          .map((value) => new MetricRule.fromJson(value))
+          .map<MetricRule>((value) => new MetricRule.fromJson(value))
           .toList();
     }
   }
@@ -4348,7 +4367,7 @@
     }
     if (_json.containsKey("tenancyUnits")) {
       tenancyUnits = _json["tenancyUnits"]
-          .map((value) => new TenancyUnit.fromJson(value))
+          .map<TenancyUnit>((value) => new TenancyUnit.fromJson(value))
           .toList();
     }
   }
@@ -4514,7 +4533,8 @@
 
   Service.fromJson(core.Map _json) {
     if (_json.containsKey("apis")) {
-      apis = _json["apis"].map((value) => new Api.fromJson(value)).toList();
+      apis =
+          _json["apis"].map<Api>((value) => new Api.fromJson(value)).toList();
     }
     if (_json.containsKey("authentication")) {
       authentication = new Authentication.fromJson(_json["authentication"]);
@@ -4542,11 +4562,13 @@
     }
     if (_json.containsKey("endpoints")) {
       endpoints = _json["endpoints"]
-          .map((value) => new Endpoint.fromJson(value))
+          .map<Endpoint>((value) => new Endpoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("enums")) {
-      enums = _json["enums"].map((value) => new Enum.fromJson(value)).toList();
+      enums = _json["enums"]
+          .map<Enum>((value) => new Enum.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("experimental")) {
       experimental = new Experimental.fromJson(_json["experimental"]);
@@ -4562,17 +4584,19 @@
     }
     if (_json.containsKey("logs")) {
       logs = _json["logs"]
-          .map((value) => new LogDescriptor.fromJson(value))
+          .map<LogDescriptor>((value) => new LogDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metrics")) {
       metrics = _json["metrics"]
-          .map((value) => new MetricDescriptor.fromJson(value))
+          .map<MetricDescriptor>(
+              (value) => new MetricDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("monitoredResources")) {
       monitoredResources = _json["monitoredResources"]
-          .map((value) => new MonitoredResourceDescriptor.fromJson(value))
+          .map<MonitoredResourceDescriptor>(
+              (value) => new MonitoredResourceDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("monitoring")) {
@@ -4596,14 +4620,16 @@
     }
     if (_json.containsKey("systemTypes")) {
       systemTypes = _json["systemTypes"]
-          .map((value) => new Type.fromJson(value))
+          .map<Type>((value) => new Type.fromJson(value))
           .toList();
     }
     if (_json.containsKey("title")) {
       title = _json["title"];
     }
     if (_json.containsKey("types")) {
-      types = _json["types"].map((value) => new Type.fromJson(value)).toList();
+      types = _json["types"]
+          .map<Type>((value) => new Type.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("usage")) {
       usage = new Usage.fromJson(_json["usage"]);
@@ -4966,7 +4992,7 @@
   SystemParameterRule.fromJson(core.Map _json) {
     if (_json.containsKey("parameters")) {
       parameters = _json["parameters"]
-          .map((value) => new SystemParameter.fromJson(value))
+          .map<SystemParameter>((value) => new SystemParameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selector")) {
@@ -5031,7 +5057,8 @@
   SystemParameters.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new SystemParameterRule.fromJson(value))
+          .map<SystemParameterRule>(
+              (value) => new SystemParameterRule.fromJson(value))
           .toList();
     }
   }
@@ -5084,7 +5111,7 @@
     }
     if (_json.containsKey("tenantResources")) {
       tenantResources = _json["tenantResources"]
-          .map((value) => new TenantResource.fromJson(value))
+          .map<TenantResource>((value) => new TenantResource.fromJson(value))
           .toList();
     }
   }
@@ -5211,7 +5238,7 @@
   TenantProjectPolicy.fromJson(core.Map _json) {
     if (_json.containsKey("policyBindings")) {
       policyBindings = _json["policyBindings"]
-          .map((value) => new PolicyBinding.fromJson(value))
+          .map<PolicyBinding>((value) => new PolicyBinding.fromJson(value))
           .toList();
     }
   }
@@ -5303,8 +5330,9 @@
 
   Type.fromJson(core.Map _json) {
     if (_json.containsKey("fields")) {
-      fields =
-          _json["fields"].map((value) => new Field.fromJson(value)).toList();
+      fields = _json["fields"]
+          .map<Field>((value) => new Field.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
@@ -5313,8 +5341,9 @@
       oneofs = _json["oneofs"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -5381,8 +5410,9 @@
       requirements = _json["requirements"];
     }
     if (_json.containsKey("rules")) {
-      rules =
-          _json["rules"].map((value) => new UsageRule.fromJson(value)).toList();
+      rules = _json["rules"]
+          .map<UsageRule>((value) => new UsageRule.fromJson(value))
+          .toList();
     }
   }
 
@@ -5508,7 +5538,7 @@
   Visibility.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new VisibilityRule.fromJson(value))
+          .map<VisibilityRule>((value) => new VisibilityRule.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/servicecontrol/v1.dart b/generated/googleapis/lib/servicecontrol/v1.dart
index d76c9c9..8aa8d29 100644
--- a/generated/googleapis/lib/servicecontrol/v1.dart
+++ b/generated/googleapis/lib/servicecontrol/v1.dart
@@ -77,7 +77,7 @@
       AllocateQuotaRequest request, core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -146,7 +146,7 @@
       CheckRequest request, core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -206,7 +206,7 @@
       EndReconciliationRequest request, core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -272,7 +272,7 @@
       ReleaseQuotaRequest request, core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -342,7 +342,7 @@
       ReportRequest request, core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -422,7 +422,7 @@
       StartReconciliationRequest request, core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -546,7 +546,7 @@
   AllocateQuotaResponse.fromJson(core.Map _json) {
     if (_json.containsKey("allocateErrors")) {
       allocateErrors = _json["allocateErrors"]
-          .map((value) => new QuotaError.fromJson(value))
+          .map<QuotaError>((value) => new QuotaError.fromJson(value))
           .toList();
     }
     if (_json.containsKey("allocateInfo")) {
@@ -557,7 +557,7 @@
     }
     if (_json.containsKey("quotaMetrics")) {
       quotaMetrics = _json["quotaMetrics"]
-          .map((value) => new MetricValueSet.fromJson(value))
+          .map<MetricValueSet>((value) => new MetricValueSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("serviceConfigId")) {
@@ -675,7 +675,8 @@
     }
     if (_json.containsKey("authorizationInfo")) {
       authorizationInfo = _json["authorizationInfo"]
-          .map((value) => new AuthorizationInfo.fromJson(value))
+          .map<AuthorizationInfo>(
+              (value) => new AuthorizationInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metadata")) {
@@ -1075,7 +1076,7 @@
   CheckResponse.fromJson(core.Map _json) {
     if (_json.containsKey("checkErrors")) {
       checkErrors = _json["checkErrors"]
-          .map((value) => new CheckError.fromJson(value))
+          .map<CheckError>((value) => new CheckError.fromJson(value))
           .toList();
     }
     if (_json.containsKey("checkInfo")) {
@@ -1336,12 +1337,12 @@
     }
     if (_json.containsKey("quotaMetrics")) {
       quotaMetrics = _json["quotaMetrics"]
-          .map((value) => new MetricValueSet.fromJson(value))
+          .map<MetricValueSet>((value) => new MetricValueSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("reconciliationErrors")) {
       reconciliationErrors = _json["reconciliationErrors"]
-          .map((value) => new QuotaError.fromJson(value))
+          .map<QuotaError>((value) => new QuotaError.fromJson(value))
           .toList();
     }
     if (_json.containsKey("serviceConfigId")) {
@@ -1737,7 +1738,7 @@
     }
     if (_json.containsKey("metricValues")) {
       metricValues = _json["metricValues"]
-          .map((value) => new MetricValue.fromJson(value))
+          .map<MetricValue>((value) => new MetricValue.fromJson(value))
           .toList();
     }
   }
@@ -1924,12 +1925,12 @@
     }
     if (_json.containsKey("logEntries")) {
       logEntries = _json["logEntries"]
-          .map((value) => new LogEntry.fromJson(value))
+          .map<LogEntry>((value) => new LogEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricValueSets")) {
       metricValueSets = _json["metricValueSets"]
-          .map((value) => new MetricValueSet.fromJson(value))
+          .map<MetricValueSet>((value) => new MetricValueSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("operationId")) {
@@ -1946,7 +1947,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new ResourceInfo.fromJson(value))
+          .map<ResourceInfo>((value) => new ResourceInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("startTime")) {
@@ -2126,7 +2127,7 @@
     }
     if (_json.containsKey("quotaMetrics")) {
       quotaMetrics = _json["quotaMetrics"]
-          .map((value) => new MetricValueSet.fromJson(value))
+          .map<MetricValueSet>((value) => new MetricValueSet.fromJson(value))
           .toList();
     }
   }
@@ -2233,7 +2234,7 @@
     }
     if (_json.containsKey("quotaMetrics")) {
       quotaMetrics = _json["quotaMetrics"]
-          .map((value) => new MetricValueSet.fromJson(value))
+          .map<MetricValueSet>((value) => new MetricValueSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("quotaMode")) {
@@ -2377,12 +2378,12 @@
     }
     if (_json.containsKey("quotaMetrics")) {
       quotaMetrics = _json["quotaMetrics"]
-          .map((value) => new MetricValueSet.fromJson(value))
+          .map<MetricValueSet>((value) => new MetricValueSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("releaseErrors")) {
       releaseErrors = _json["releaseErrors"]
-          .map((value) => new QuotaError.fromJson(value))
+          .map<QuotaError>((value) => new QuotaError.fromJson(value))
           .toList();
     }
     if (_json.containsKey("serviceConfigId")) {
@@ -2501,7 +2502,7 @@
   ReportRequest.fromJson(core.Map _json) {
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("serviceConfigId")) {
@@ -2559,12 +2560,12 @@
   ReportResponse.fromJson(core.Map _json) {
     if (_json.containsKey("reportErrors")) {
       reportErrors = _json["reportErrors"]
-          .map((value) => new ReportError.fromJson(value))
+          .map<ReportError>((value) => new ReportError.fromJson(value))
           .toList();
     }
     if (_json.containsKey("reportInfos")) {
       reportInfos = _json["reportInfos"]
-          .map((value) => new ReportInfo.fromJson(value))
+          .map<ReportInfo>((value) => new ReportInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("serviceConfigId")) {
@@ -2762,12 +2763,12 @@
     }
     if (_json.containsKey("quotaMetrics")) {
       quotaMetrics = _json["quotaMetrics"]
-          .map((value) => new MetricValueSet.fromJson(value))
+          .map<MetricValueSet>((value) => new MetricValueSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("reconciliationErrors")) {
       reconciliationErrors = _json["reconciliationErrors"]
-          .map((value) => new QuotaError.fromJson(value))
+          .map<QuotaError>((value) => new QuotaError.fromJson(value))
           .toList();
     }
     if (_json.containsKey("serviceConfigId")) {
diff --git a/generated/googleapis/lib/servicemanagement/v1.dart b/generated/googleapis/lib/servicemanagement/v1.dart
index 365b9fc..f7a3f6b 100644
--- a/generated/googleapis/lib/servicemanagement/v1.dart
+++ b/generated/googleapis/lib/servicemanagement/v1.dart
@@ -72,7 +72,7 @@
   /// call, this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -147,7 +147,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -215,7 +215,7 @@
   async.Future<Operation> create(ManagedService request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -265,7 +265,7 @@
   async.Future<Operation> delete(core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -317,7 +317,7 @@
       DisableServiceRequest request, core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -375,7 +375,7 @@
       EnableServiceRequest request, core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -435,7 +435,7 @@
       GenerateConfigReportRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -482,7 +482,7 @@
   async.Future<ManagedService> get(core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -536,7 +536,7 @@
   async.Future<Service> getConfig(core.String serviceName,
       {core.String configId, core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -595,7 +595,7 @@
       GetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -667,7 +667,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -726,7 +726,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -786,7 +786,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -842,7 +842,7 @@
   async.Future<Operation> undelete(core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -900,7 +900,7 @@
   async.Future<Service> create(Service request, core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -959,7 +959,7 @@
   async.Future<Service> get(core.String serviceName, core.String configId,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1018,7 +1018,7 @@
   async.Future<ListServiceConfigsResponse> list(core.String serviceName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1084,7 +1084,7 @@
       SubmitConfigSourceRequest request, core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1147,7 +1147,7 @@
       GetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1202,7 +1202,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1262,7 +1262,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1331,7 +1331,7 @@
   async.Future<Operation> create(Rollout request, core.String serviceName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1383,7 +1383,7 @@
   async.Future<Rollout> get(core.String serviceName, core.String rolloutId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1451,7 +1451,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1573,19 +1573,22 @@
 
   Api.fromJson(core.Map _json) {
     if (_json.containsKey("methods")) {
-      methods =
-          _json["methods"].map((value) => new Method.fromJson(value)).toList();
+      methods = _json["methods"]
+          .map<Method>((value) => new Method.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("mixins")) {
-      mixins =
-          _json["mixins"].map((value) => new Mixin.fromJson(value)).toList();
+      mixins = _json["mixins"]
+          .map<Mixin>((value) => new Mixin.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -1692,7 +1695,7 @@
   AuditConfig.fromJson(core.Map _json) {
     if (_json.containsKey("auditLogConfigs")) {
       auditLogConfigs = _json["auditLogConfigs"]
-          .map((value) => new AuditLogConfig.fromJson(value))
+          .map<AuditLogConfig>((value) => new AuditLogConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("service")) {
@@ -1945,12 +1948,13 @@
   Authentication.fromJson(core.Map _json) {
     if (_json.containsKey("providers")) {
       providers = _json["providers"]
-          .map((value) => new AuthProvider.fromJson(value))
+          .map<AuthProvider>((value) => new AuthProvider.fromJson(value))
           .toList();
     }
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new AuthenticationRule.fromJson(value))
+          .map<AuthenticationRule>(
+              (value) => new AuthenticationRule.fromJson(value))
           .toList();
     }
   }
@@ -2016,7 +2020,7 @@
     }
     if (_json.containsKey("requirements")) {
       requirements = _json["requirements"]
-          .map((value) => new AuthRequirement.fromJson(value))
+          .map<AuthRequirement>((value) => new AuthRequirement.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selector")) {
@@ -2092,7 +2096,7 @@
   Backend.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new BackendRule.fromJson(value))
+          .map<BackendRule>((value) => new BackendRule.fromJson(value))
           .toList();
     }
   }
@@ -2196,7 +2200,8 @@
   Billing.fromJson(core.Map _json) {
     if (_json.containsKey("consumerDestinations")) {
       consumerDestinations = _json["consumerDestinations"]
-          .map((value) => new BillingDestination.fromJson(value))
+          .map<BillingDestination>(
+              (value) => new BillingDestination.fromJson(value))
           .toList();
     }
   }
@@ -2333,7 +2338,7 @@
   ChangeReport.fromJson(core.Map _json) {
     if (_json.containsKey("configChanges")) {
       configChanges = _json["configChanges"]
-          .map((value) => new ConfigChange.fromJson(value))
+          .map<ConfigChange>((value) => new ConfigChange.fromJson(value))
           .toList();
     }
   }
@@ -2398,8 +2403,9 @@
 
   ConfigChange.fromJson(core.Map _json) {
     if (_json.containsKey("advices")) {
-      advices =
-          _json["advices"].map((value) => new Advice.fromJson(value)).toList();
+      advices = _json["advices"]
+          .map<Advice>((value) => new Advice.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("changeType")) {
       changeType = _json["changeType"];
@@ -2545,7 +2551,7 @@
   ConfigSource.fromJson(core.Map _json) {
     if (_json.containsKey("files")) {
       files = _json["files"]
-          .map((value) => new ConfigFile.fromJson(value))
+          .map<ConfigFile>((value) => new ConfigFile.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -2594,7 +2600,7 @@
   Context.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new ContextRule.fromJson(value))
+          .map<ContextRule>((value) => new ContextRule.fromJson(value))
           .toList();
     }
   }
@@ -2728,7 +2734,7 @@
   CustomError.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new CustomErrorRule.fromJson(value))
+          .map<CustomErrorRule>((value) => new CustomErrorRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("types")) {
@@ -3003,11 +3009,14 @@
       overview = _json["overview"];
     }
     if (_json.containsKey("pages")) {
-      pages = _json["pages"].map((value) => new Page.fromJson(value)).toList();
+      pages = _json["pages"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new DocumentationRule.fromJson(value))
+          .map<DocumentationRule>(
+              (value) => new DocumentationRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("summary")) {
@@ -3230,15 +3239,16 @@
   Enum.fromJson(core.Map _json) {
     if (_json.containsKey("enumvalue")) {
       enumvalue = _json["enumvalue"]
-          .map((value) => new EnumValue.fromJson(value))
+          .map<EnumValue>((value) => new EnumValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -3291,8 +3301,9 @@
       number = _json["number"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
   }
 
@@ -3482,8 +3493,9 @@
       oneofIndex = _json["oneofIndex"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("packed")) {
       packed = _json["packed"];
@@ -3598,12 +3610,12 @@
   GenerateConfigReportResponse.fromJson(core.Map _json) {
     if (_json.containsKey("changeReports")) {
       changeReports = _json["changeReports"]
-          .map((value) => new ChangeReport.fromJson(value))
+          .map<ChangeReport>((value) => new ChangeReport.fromJson(value))
           .toList();
     }
     if (_json.containsKey("diagnostics")) {
       diagnostics = _json["diagnostics"]
-          .map((value) => new Diagnostic.fromJson(value))
+          .map<Diagnostic>((value) => new Diagnostic.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -3673,8 +3685,9 @@
       fullyDecodeReservedExpansion = _json["fullyDecodeReservedExpansion"];
     }
     if (_json.containsKey("rules")) {
-      rules =
-          _json["rules"].map((value) => new HttpRule.fromJson(value)).toList();
+      rules = _json["rules"]
+          .map<HttpRule>((value) => new HttpRule.fromJson(value))
+          .toList();
     }
   }
 
@@ -3970,7 +3983,7 @@
   HttpRule.fromJson(core.Map _json) {
     if (_json.containsKey("additionalBindings")) {
       additionalBindings = _json["additionalBindings"]
-          .map((value) => new HttpRule.fromJson(value))
+          .map<HttpRule>((value) => new HttpRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("body")) {
@@ -4107,7 +4120,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -4142,7 +4155,7 @@
     }
     if (_json.containsKey("serviceConfigs")) {
       serviceConfigs = _json["serviceConfigs"]
-          .map((value) => new Service.fromJson(value))
+          .map<Service>((value) => new Service.fromJson(value))
           .toList();
     }
   }
@@ -4177,7 +4190,7 @@
     }
     if (_json.containsKey("rollouts")) {
       rollouts = _json["rollouts"]
-          .map((value) => new Rollout.fromJson(value))
+          .map<Rollout>((value) => new Rollout.fromJson(value))
           .toList();
     }
   }
@@ -4211,7 +4224,7 @@
     }
     if (_json.containsKey("services")) {
       services = _json["services"]
-          .map((value) => new ManagedService.fromJson(value))
+          .map<ManagedService>((value) => new ManagedService.fromJson(value))
           .toList();
     }
   }
@@ -4268,7 +4281,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -4342,12 +4355,14 @@
   Logging.fromJson(core.Map _json) {
     if (_json.containsKey("consumerDestinations")) {
       consumerDestinations = _json["consumerDestinations"]
-          .map((value) => new LoggingDestination.fromJson(value))
+          .map<LoggingDestination>(
+              (value) => new LoggingDestination.fromJson(value))
           .toList();
     }
     if (_json.containsKey("producerDestinations")) {
       producerDestinations = _json["producerDestinations"]
-          .map((value) => new LoggingDestination.fromJson(value))
+          .map<LoggingDestination>(
+              (value) => new LoggingDestination.fromJson(value))
           .toList();
     }
   }
@@ -4642,8 +4657,9 @@
       name = _json["name"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("requestStreaming")) {
       requestStreaming = _json["requestStreaming"];
@@ -4830,7 +4846,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricKind")) {
@@ -5081,7 +5097,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -5169,12 +5185,14 @@
   Monitoring.fromJson(core.Map _json) {
     if (_json.containsKey("consumerDestinations")) {
       consumerDestinations = _json["consumerDestinations"]
-          .map((value) => new MonitoringDestination.fromJson(value))
+          .map<MonitoringDestination>(
+              (value) => new MonitoringDestination.fromJson(value))
           .toList();
     }
     if (_json.containsKey("producerDestinations")) {
       producerDestinations = _json["producerDestinations"]
-          .map((value) => new MonitoringDestination.fromJson(value))
+          .map<MonitoringDestination>(
+              (value) => new MonitoringDestination.fromJson(value))
           .toList();
     }
   }
@@ -5384,7 +5402,9 @@
       startTime = _json["startTime"];
     }
     if (_json.containsKey("steps")) {
-      steps = _json["steps"].map((value) => new Step.fromJson(value)).toList();
+      steps = _json["steps"]
+          .map<Step>((value) => new Step.fromJson(value))
+          .toList();
     }
   }
 
@@ -5487,8 +5507,9 @@
       name = _json["name"];
     }
     if (_json.containsKey("subpages")) {
-      subpages =
-          _json["subpages"].map((value) => new Page.fromJson(value)).toList();
+      subpages = _json["subpages"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
   }
 
@@ -5578,12 +5599,12 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("auditConfigs")) {
       auditConfigs = _json["auditConfigs"]
-          .map((value) => new AuditConfig.fromJson(value))
+          .map<AuditConfig>((value) => new AuditConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -5676,12 +5697,12 @@
   Quota.fromJson(core.Map _json) {
     if (_json.containsKey("limits")) {
       limits = _json["limits"]
-          .map((value) => new QuotaLimit.fromJson(value))
+          .map<QuotaLimit>((value) => new QuotaLimit.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricRules")) {
       metricRules = _json["metricRules"]
-          .map((value) => new MetricRule.fromJson(value))
+          .map<MetricRule>((value) => new MetricRule.fromJson(value))
           .toList();
     }
   }
@@ -6113,7 +6134,8 @@
 
   Service.fromJson(core.Map _json) {
     if (_json.containsKey("apis")) {
-      apis = _json["apis"].map((value) => new Api.fromJson(value)).toList();
+      apis =
+          _json["apis"].map<Api>((value) => new Api.fromJson(value)).toList();
     }
     if (_json.containsKey("authentication")) {
       authentication = new Authentication.fromJson(_json["authentication"]);
@@ -6141,11 +6163,13 @@
     }
     if (_json.containsKey("endpoints")) {
       endpoints = _json["endpoints"]
-          .map((value) => new Endpoint.fromJson(value))
+          .map<Endpoint>((value) => new Endpoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("enums")) {
-      enums = _json["enums"].map((value) => new Enum.fromJson(value)).toList();
+      enums = _json["enums"]
+          .map<Enum>((value) => new Enum.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("experimental")) {
       experimental = new Experimental.fromJson(_json["experimental"]);
@@ -6161,17 +6185,19 @@
     }
     if (_json.containsKey("logs")) {
       logs = _json["logs"]
-          .map((value) => new LogDescriptor.fromJson(value))
+          .map<LogDescriptor>((value) => new LogDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metrics")) {
       metrics = _json["metrics"]
-          .map((value) => new MetricDescriptor.fromJson(value))
+          .map<MetricDescriptor>(
+              (value) => new MetricDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("monitoredResources")) {
       monitoredResources = _json["monitoredResources"]
-          .map((value) => new MonitoredResourceDescriptor.fromJson(value))
+          .map<MonitoredResourceDescriptor>(
+              (value) => new MonitoredResourceDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("monitoring")) {
@@ -6195,14 +6221,16 @@
     }
     if (_json.containsKey("systemTypes")) {
       systemTypes = _json["systemTypes"]
-          .map((value) => new Type.fromJson(value))
+          .map<Type>((value) => new Type.fromJson(value))
           .toList();
     }
     if (_json.containsKey("title")) {
       title = _json["title"];
     }
     if (_json.containsKey("types")) {
-      types = _json["types"].map((value) => new Type.fromJson(value)).toList();
+      types = _json["types"]
+          .map<Type>((value) => new Type.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("usage")) {
       usage = new Usage.fromJson(_json["usage"]);
@@ -6667,7 +6695,7 @@
   SystemParameterRule.fromJson(core.Map _json) {
     if (_json.containsKey("parameters")) {
       parameters = _json["parameters"]
-          .map((value) => new SystemParameter.fromJson(value))
+          .map<SystemParameter>((value) => new SystemParameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selector")) {
@@ -6732,7 +6760,8 @@
   SystemParameters.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new SystemParameterRule.fromJson(value))
+          .map<SystemParameterRule>(
+              (value) => new SystemParameterRule.fromJson(value))
           .toList();
     }
   }
@@ -6878,8 +6907,9 @@
 
   Type.fromJson(core.Map _json) {
     if (_json.containsKey("fields")) {
-      fields =
-          _json["fields"].map((value) => new Field.fromJson(value)).toList();
+      fields = _json["fields"]
+          .map<Field>((value) => new Field.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
@@ -6888,8 +6918,9 @@
       oneofs = _json["oneofs"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -6979,8 +7010,9 @@
       requirements = _json["requirements"];
     }
     if (_json.containsKey("rules")) {
-      rules =
-          _json["rules"].map((value) => new UsageRule.fromJson(value)).toList();
+      rules = _json["rules"]
+          .map<UsageRule>((value) => new UsageRule.fromJson(value))
+          .toList();
     }
   }
 
@@ -7106,7 +7138,7 @@
   Visibility.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new VisibilityRule.fromJson(value))
+          .map<VisibilityRule>((value) => new VisibilityRule.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/serviceusage/v1.dart b/generated/googleapis/lib/serviceusage/v1.dart
index 0c0ffc2..98ec82c 100644
--- a/generated/googleapis/lib/serviceusage/v1.dart
+++ b/generated/googleapis/lib/serviceusage/v1.dart
@@ -78,7 +78,7 @@
   async.Future<Empty> cancel(CancelOperationRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -127,7 +127,7 @@
   /// call, this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -172,7 +172,7 @@
   /// call, this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -235,7 +235,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -310,7 +310,7 @@
       DisableServiceRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -371,7 +371,7 @@
   async.Future<Operation> enable(EnableServiceRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -420,7 +420,7 @@
   /// call, this method will complete with the same error.
   async.Future<ServiceState> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -473,7 +473,7 @@
   async.Future<ListEnabledServicesResponse> listEnabled(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -534,7 +534,7 @@
   async.Future<SearchServicesResponse> search(
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -622,19 +622,22 @@
 
   Api.fromJson(core.Map _json) {
     if (_json.containsKey("methods")) {
-      methods =
-          _json["methods"].map((value) => new Method.fromJson(value)).toList();
+      methods = _json["methods"]
+          .map<Method>((value) => new Method.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("mixins")) {
-      mixins =
-          _json["mixins"].map((value) => new Mixin.fromJson(value)).toList();
+      mixins = _json["mixins"]
+          .map<Mixin>((value) => new Mixin.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -849,12 +852,13 @@
   Authentication.fromJson(core.Map _json) {
     if (_json.containsKey("providers")) {
       providers = _json["providers"]
-          .map((value) => new AuthProvider.fromJson(value))
+          .map<AuthProvider>((value) => new AuthProvider.fromJson(value))
           .toList();
     }
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new AuthenticationRule.fromJson(value))
+          .map<AuthenticationRule>(
+              (value) => new AuthenticationRule.fromJson(value))
           .toList();
     }
   }
@@ -920,7 +924,7 @@
     }
     if (_json.containsKey("requirements")) {
       requirements = _json["requirements"]
-          .map((value) => new AuthRequirement.fromJson(value))
+          .map<AuthRequirement>((value) => new AuthRequirement.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selector")) {
@@ -1052,7 +1056,7 @@
   Backend.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new BackendRule.fromJson(value))
+          .map<BackendRule>((value) => new BackendRule.fromJson(value))
           .toList();
     }
   }
@@ -1156,7 +1160,8 @@
   Billing.fromJson(core.Map _json) {
     if (_json.containsKey("consumerDestinations")) {
       consumerDestinations = _json["consumerDestinations"]
-          .map((value) => new BillingDestination.fromJson(value))
+          .map<BillingDestination>(
+              (value) => new BillingDestination.fromJson(value))
           .toList();
     }
   }
@@ -1268,7 +1273,7 @@
   Context.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new ContextRule.fromJson(value))
+          .map<ContextRule>((value) => new ContextRule.fromJson(value))
           .toList();
     }
   }
@@ -1422,7 +1427,7 @@
   CustomError.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new CustomErrorRule.fromJson(value))
+          .map<CustomErrorRule>((value) => new CustomErrorRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("types")) {
@@ -1621,11 +1626,14 @@
       overview = _json["overview"];
     }
     if (_json.containsKey("pages")) {
-      pages = _json["pages"].map((value) => new Page.fromJson(value)).toList();
+      pages = _json["pages"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new DocumentationRule.fromJson(value))
+          .map<DocumentationRule>(
+              (value) => new DocumentationRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("summary")) {
@@ -1882,15 +1890,16 @@
   Enum.fromJson(core.Map _json) {
     if (_json.containsKey("enumvalue")) {
       enumvalue = _json["enumvalue"]
-          .map((value) => new EnumValue.fromJson(value))
+          .map<EnumValue>((value) => new EnumValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -1943,8 +1952,9 @@
       number = _json["number"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
   }
 
@@ -2072,8 +2082,9 @@
       oneofIndex = _json["oneofIndex"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("packed")) {
       packed = _json["packed"];
@@ -2267,7 +2278,8 @@
 
   GoogleApiService.fromJson(core.Map _json) {
     if (_json.containsKey("apis")) {
-      apis = _json["apis"].map((value) => new Api.fromJson(value)).toList();
+      apis =
+          _json["apis"].map<Api>((value) => new Api.fromJson(value)).toList();
     }
     if (_json.containsKey("authentication")) {
       authentication = new Authentication.fromJson(_json["authentication"]);
@@ -2295,11 +2307,13 @@
     }
     if (_json.containsKey("endpoints")) {
       endpoints = _json["endpoints"]
-          .map((value) => new Endpoint.fromJson(value))
+          .map<Endpoint>((value) => new Endpoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("enums")) {
-      enums = _json["enums"].map((value) => new Enum.fromJson(value)).toList();
+      enums = _json["enums"]
+          .map<Enum>((value) => new Enum.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("experimental")) {
       experimental = new Experimental.fromJson(_json["experimental"]);
@@ -2315,17 +2329,19 @@
     }
     if (_json.containsKey("logs")) {
       logs = _json["logs"]
-          .map((value) => new LogDescriptor.fromJson(value))
+          .map<LogDescriptor>((value) => new LogDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metrics")) {
       metrics = _json["metrics"]
-          .map((value) => new MetricDescriptor.fromJson(value))
+          .map<MetricDescriptor>(
+              (value) => new MetricDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("monitoredResources")) {
       monitoredResources = _json["monitoredResources"]
-          .map((value) => new MonitoredResourceDescriptor.fromJson(value))
+          .map<MonitoredResourceDescriptor>(
+              (value) => new MonitoredResourceDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("monitoring")) {
@@ -2349,14 +2365,16 @@
     }
     if (_json.containsKey("systemTypes")) {
       systemTypes = _json["systemTypes"]
-          .map((value) => new Type.fromJson(value))
+          .map<Type>((value) => new Type.fromJson(value))
           .toList();
     }
     if (_json.containsKey("title")) {
       title = _json["title"];
     }
     if (_json.containsKey("types")) {
-      types = _json["types"].map((value) => new Type.fromJson(value)).toList();
+      types = _json["types"]
+          .map<Type>((value) => new Type.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("usage")) {
       usage = new Usage.fromJson(_json["usage"]);
@@ -2487,8 +2505,9 @@
       fullyDecodeReservedExpansion = _json["fullyDecodeReservedExpansion"];
     }
     if (_json.containsKey("rules")) {
-      rules =
-          _json["rules"].map((value) => new HttpRule.fromJson(value)).toList();
+      rules = _json["rules"]
+          .map<HttpRule>((value) => new HttpRule.fromJson(value))
+          .toList();
     }
   }
 
@@ -2831,12 +2850,13 @@
   HttpRule.fromJson(core.Map _json) {
     if (_json.containsKey("additionalBindings")) {
       additionalBindings = _json["additionalBindings"]
-          .map((value) => new HttpRule.fromJson(value))
+          .map<HttpRule>((value) => new HttpRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("authorizations")) {
       authorizations = _json["authorizations"]
-          .map((value) => new AuthorizationRule.fromJson(value))
+          .map<AuthorizationRule>(
+              (value) => new AuthorizationRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("body")) {
@@ -2990,7 +3010,7 @@
     }
     if (_json.containsKey("services")) {
       services = _json["services"]
-          .map((value) => new ServiceState.fromJson(value))
+          .map<ServiceState>((value) => new ServiceState.fromJson(value))
           .toList();
     }
   }
@@ -3024,7 +3044,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -3082,7 +3102,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -3156,12 +3176,14 @@
   Logging.fromJson(core.Map _json) {
     if (_json.containsKey("consumerDestinations")) {
       consumerDestinations = _json["consumerDestinations"]
-          .map((value) => new LoggingDestination.fromJson(value))
+          .map<LoggingDestination>(
+              (value) => new LoggingDestination.fromJson(value))
           .toList();
     }
     if (_json.containsKey("producerDestinations")) {
       producerDestinations = _json["producerDestinations"]
-          .map((value) => new LoggingDestination.fromJson(value))
+          .map<LoggingDestination>(
+              (value) => new LoggingDestination.fromJson(value))
           .toList();
     }
   }
@@ -3422,8 +3444,9 @@
       name = _json["name"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("requestStreaming")) {
       requestStreaming = _json["requestStreaming"];
@@ -3610,7 +3633,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricKind")) {
@@ -3861,7 +3884,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -3949,12 +3972,14 @@
   Monitoring.fromJson(core.Map _json) {
     if (_json.containsKey("consumerDestinations")) {
       consumerDestinations = _json["consumerDestinations"]
-          .map((value) => new MonitoringDestination.fromJson(value))
+          .map<MonitoringDestination>(
+              (value) => new MonitoringDestination.fromJson(value))
           .toList();
     }
     if (_json.containsKey("producerDestinations")) {
       producerDestinations = _json["producerDestinations"]
-          .map((value) => new MonitoringDestination.fromJson(value))
+          .map<MonitoringDestination>(
+              (value) => new MonitoringDestination.fromJson(value))
           .toList();
     }
   }
@@ -4164,7 +4189,9 @@
       startTime = _json["startTime"];
     }
     if (_json.containsKey("steps")) {
-      steps = _json["steps"].map((value) => new Step.fromJson(value)).toList();
+      steps = _json["steps"]
+          .map<Step>((value) => new Step.fromJson(value))
+          .toList();
     }
   }
 
@@ -4267,8 +4294,9 @@
       name = _json["name"];
     }
     if (_json.containsKey("subpages")) {
-      subpages =
-          _json["subpages"].map((value) => new Page.fromJson(value)).toList();
+      subpages = _json["subpages"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
   }
 
@@ -4386,12 +4414,12 @@
   Quota.fromJson(core.Map _json) {
     if (_json.containsKey("limits")) {
       limits = _json["limits"]
-          .map((value) => new QuotaLimit.fromJson(value))
+          .map<QuotaLimit>((value) => new QuotaLimit.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricRules")) {
       metricRules = _json["metricRules"]
-          .map((value) => new MetricRule.fromJson(value))
+          .map<MetricRule>((value) => new MetricRule.fromJson(value))
           .toList();
     }
   }
@@ -4585,7 +4613,8 @@
     }
     if (_json.containsKey("services")) {
       services = _json["services"]
-          .map((value) => new PublishedService.fromJson(value))
+          .map<PublishedService>(
+              (value) => new PublishedService.fromJson(value))
           .toList();
     }
   }
@@ -4909,7 +4938,7 @@
   SystemParameterRule.fromJson(core.Map _json) {
     if (_json.containsKey("parameters")) {
       parameters = _json["parameters"]
-          .map((value) => new SystemParameter.fromJson(value))
+          .map<SystemParameter>((value) => new SystemParameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selector")) {
@@ -4974,7 +5003,8 @@
   SystemParameters.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new SystemParameterRule.fromJson(value))
+          .map<SystemParameterRule>(
+              (value) => new SystemParameterRule.fromJson(value))
           .toList();
     }
   }
@@ -5016,8 +5046,9 @@
 
   Type.fromJson(core.Map _json) {
     if (_json.containsKey("fields")) {
-      fields =
-          _json["fields"].map((value) => new Field.fromJson(value)).toList();
+      fields = _json["fields"]
+          .map<Field>((value) => new Field.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
@@ -5026,8 +5057,9 @@
       oneofs = _json["oneofs"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -5094,8 +5126,9 @@
       requirements = _json["requirements"];
     }
     if (_json.containsKey("rules")) {
-      rules =
-          _json["rules"].map((value) => new UsageRule.fromJson(value)).toList();
+      rules = _json["rules"]
+          .map<UsageRule>((value) => new UsageRule.fromJson(value))
+          .toList();
     }
   }
 
@@ -5221,7 +5254,7 @@
   Visibility.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new VisibilityRule.fromJson(value))
+          .map<VisibilityRule>((value) => new VisibilityRule.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/serviceuser/v1.dart b/generated/googleapis/lib/serviceuser/v1.dart
index 141fe4c..1deb4b2 100644
--- a/generated/googleapis/lib/serviceuser/v1.dart
+++ b/generated/googleapis/lib/serviceuser/v1.dart
@@ -92,7 +92,7 @@
       DisableServiceRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -148,7 +148,7 @@
   async.Future<Operation> enable(EnableServiceRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -204,7 +204,7 @@
   async.Future<ListEnabledServicesResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -269,7 +269,7 @@
   async.Future<SearchServicesResponse> search(
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -357,19 +357,22 @@
 
   Api.fromJson(core.Map _json) {
     if (_json.containsKey("methods")) {
-      methods =
-          _json["methods"].map((value) => new Method.fromJson(value)).toList();
+      methods = _json["methods"]
+          .map<Method>((value) => new Method.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("mixins")) {
-      mixins =
-          _json["mixins"].map((value) => new Mixin.fromJson(value)).toList();
+      mixins = _json["mixins"]
+          .map<Mixin>((value) => new Mixin.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -584,12 +587,13 @@
   Authentication.fromJson(core.Map _json) {
     if (_json.containsKey("providers")) {
       providers = _json["providers"]
-          .map((value) => new AuthProvider.fromJson(value))
+          .map<AuthProvider>((value) => new AuthProvider.fromJson(value))
           .toList();
     }
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new AuthenticationRule.fromJson(value))
+          .map<AuthenticationRule>(
+              (value) => new AuthenticationRule.fromJson(value))
           .toList();
     }
   }
@@ -655,7 +659,7 @@
     }
     if (_json.containsKey("requirements")) {
       requirements = _json["requirements"]
-          .map((value) => new AuthRequirement.fromJson(value))
+          .map<AuthRequirement>((value) => new AuthRequirement.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selector")) {
@@ -731,7 +735,7 @@
   Backend.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new BackendRule.fromJson(value))
+          .map<BackendRule>((value) => new BackendRule.fromJson(value))
           .toList();
     }
   }
@@ -835,7 +839,8 @@
   Billing.fromJson(core.Map _json) {
     if (_json.containsKey("consumerDestinations")) {
       consumerDestinations = _json["consumerDestinations"]
-          .map((value) => new BillingDestination.fromJson(value))
+          .map<BillingDestination>(
+              (value) => new BillingDestination.fromJson(value))
           .toList();
     }
   }
@@ -914,7 +919,7 @@
   Context.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new ContextRule.fromJson(value))
+          .map<ContextRule>((value) => new ContextRule.fromJson(value))
           .toList();
     }
   }
@@ -1048,7 +1053,7 @@
   CustomError.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new CustomErrorRule.fromJson(value))
+          .map<CustomErrorRule>((value) => new CustomErrorRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("types")) {
@@ -1247,11 +1252,14 @@
       overview = _json["overview"];
     }
     if (_json.containsKey("pages")) {
-      pages = _json["pages"].map((value) => new Page.fromJson(value)).toList();
+      pages = _json["pages"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new DocumentationRule.fromJson(value))
+          .map<DocumentationRule>(
+              (value) => new DocumentationRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("summary")) {
@@ -1456,15 +1464,16 @@
   Enum.fromJson(core.Map _json) {
     if (_json.containsKey("enumvalue")) {
       enumvalue = _json["enumvalue"]
-          .map((value) => new EnumValue.fromJson(value))
+          .map<EnumValue>((value) => new EnumValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -1517,8 +1526,9 @@
       number = _json["number"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
   }
 
@@ -1646,8 +1656,9 @@
       oneofIndex = _json["oneofIndex"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("packed")) {
       packed = _json["packed"];
@@ -1719,8 +1730,9 @@
       fullyDecodeReservedExpansion = _json["fullyDecodeReservedExpansion"];
     }
     if (_json.containsKey("rules")) {
-      rules =
-          _json["rules"].map((value) => new HttpRule.fromJson(value)).toList();
+      rules = _json["rules"]
+          .map<HttpRule>((value) => new HttpRule.fromJson(value))
+          .toList();
     }
   }
 
@@ -2016,7 +2028,7 @@
   HttpRule.fromJson(core.Map _json) {
     if (_json.containsKey("additionalBindings")) {
       additionalBindings = _json["additionalBindings"]
-          .map((value) => new HttpRule.fromJson(value))
+          .map<HttpRule>((value) => new HttpRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("body")) {
@@ -2154,7 +2166,8 @@
     }
     if (_json.containsKey("services")) {
       services = _json["services"]
-          .map((value) => new PublishedService.fromJson(value))
+          .map<PublishedService>(
+              (value) => new PublishedService.fromJson(value))
           .toList();
     }
   }
@@ -2211,7 +2224,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -2285,12 +2298,14 @@
   Logging.fromJson(core.Map _json) {
     if (_json.containsKey("consumerDestinations")) {
       consumerDestinations = _json["consumerDestinations"]
-          .map((value) => new LoggingDestination.fromJson(value))
+          .map<LoggingDestination>(
+              (value) => new LoggingDestination.fromJson(value))
           .toList();
     }
     if (_json.containsKey("producerDestinations")) {
       producerDestinations = _json["producerDestinations"]
-          .map((value) => new LoggingDestination.fromJson(value))
+          .map<LoggingDestination>(
+              (value) => new LoggingDestination.fromJson(value))
           .toList();
     }
   }
@@ -2551,8 +2566,9 @@
       name = _json["name"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("requestStreaming")) {
       requestStreaming = _json["requestStreaming"];
@@ -2739,7 +2755,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricKind")) {
@@ -2990,7 +3006,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -3078,12 +3094,14 @@
   Monitoring.fromJson(core.Map _json) {
     if (_json.containsKey("consumerDestinations")) {
       consumerDestinations = _json["consumerDestinations"]
-          .map((value) => new MonitoringDestination.fromJson(value))
+          .map<MonitoringDestination>(
+              (value) => new MonitoringDestination.fromJson(value))
           .toList();
     }
     if (_json.containsKey("producerDestinations")) {
       producerDestinations = _json["producerDestinations"]
-          .map((value) => new MonitoringDestination.fromJson(value))
+          .map<MonitoringDestination>(
+              (value) => new MonitoringDestination.fromJson(value))
           .toList();
     }
   }
@@ -3293,7 +3311,9 @@
       startTime = _json["startTime"];
     }
     if (_json.containsKey("steps")) {
-      steps = _json["steps"].map((value) => new Step.fromJson(value)).toList();
+      steps = _json["steps"]
+          .map<Step>((value) => new Step.fromJson(value))
+          .toList();
     }
   }
 
@@ -3396,8 +3416,9 @@
       name = _json["name"];
     }
     if (_json.containsKey("subpages")) {
-      subpages =
-          _json["subpages"].map((value) => new Page.fromJson(value)).toList();
+      subpages = _json["subpages"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
   }
 
@@ -3515,12 +3536,12 @@
   Quota.fromJson(core.Map _json) {
     if (_json.containsKey("limits")) {
       limits = _json["limits"]
-          .map((value) => new QuotaLimit.fromJson(value))
+          .map<QuotaLimit>((value) => new QuotaLimit.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricRules")) {
       metricRules = _json["metricRules"]
-          .map((value) => new MetricRule.fromJson(value))
+          .map<MetricRule>((value) => new MetricRule.fromJson(value))
           .toList();
     }
   }
@@ -3714,7 +3735,8 @@
     }
     if (_json.containsKey("services")) {
       services = _json["services"]
-          .map((value) => new PublishedService.fromJson(value))
+          .map<PublishedService>(
+              (value) => new PublishedService.fromJson(value))
           .toList();
     }
   }
@@ -3879,7 +3901,8 @@
 
   Service.fromJson(core.Map _json) {
     if (_json.containsKey("apis")) {
-      apis = _json["apis"].map((value) => new Api.fromJson(value)).toList();
+      apis =
+          _json["apis"].map<Api>((value) => new Api.fromJson(value)).toList();
     }
     if (_json.containsKey("authentication")) {
       authentication = new Authentication.fromJson(_json["authentication"]);
@@ -3907,11 +3930,13 @@
     }
     if (_json.containsKey("endpoints")) {
       endpoints = _json["endpoints"]
-          .map((value) => new Endpoint.fromJson(value))
+          .map<Endpoint>((value) => new Endpoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("enums")) {
-      enums = _json["enums"].map((value) => new Enum.fromJson(value)).toList();
+      enums = _json["enums"]
+          .map<Enum>((value) => new Enum.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("experimental")) {
       experimental = new Experimental.fromJson(_json["experimental"]);
@@ -3927,17 +3952,19 @@
     }
     if (_json.containsKey("logs")) {
       logs = _json["logs"]
-          .map((value) => new LogDescriptor.fromJson(value))
+          .map<LogDescriptor>((value) => new LogDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metrics")) {
       metrics = _json["metrics"]
-          .map((value) => new MetricDescriptor.fromJson(value))
+          .map<MetricDescriptor>(
+              (value) => new MetricDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("monitoredResources")) {
       monitoredResources = _json["monitoredResources"]
-          .map((value) => new MonitoredResourceDescriptor.fromJson(value))
+          .map<MonitoredResourceDescriptor>(
+              (value) => new MonitoredResourceDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("monitoring")) {
@@ -3961,14 +3988,16 @@
     }
     if (_json.containsKey("systemTypes")) {
       systemTypes = _json["systemTypes"]
-          .map((value) => new Type.fromJson(value))
+          .map<Type>((value) => new Type.fromJson(value))
           .toList();
     }
     if (_json.containsKey("title")) {
       title = _json["title"];
     }
     if (_json.containsKey("types")) {
-      types = _json["types"].map((value) => new Type.fromJson(value)).toList();
+      types = _json["types"]
+          .map<Type>((value) => new Type.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("usage")) {
       usage = new Usage.fromJson(_json["usage"]);
@@ -4336,7 +4365,7 @@
   SystemParameterRule.fromJson(core.Map _json) {
     if (_json.containsKey("parameters")) {
       parameters = _json["parameters"]
-          .map((value) => new SystemParameter.fromJson(value))
+          .map<SystemParameter>((value) => new SystemParameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selector")) {
@@ -4401,7 +4430,8 @@
   SystemParameters.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new SystemParameterRule.fromJson(value))
+          .map<SystemParameterRule>(
+              (value) => new SystemParameterRule.fromJson(value))
           .toList();
     }
   }
@@ -4443,8 +4473,9 @@
 
   Type.fromJson(core.Map _json) {
     if (_json.containsKey("fields")) {
-      fields =
-          _json["fields"].map((value) => new Field.fromJson(value)).toList();
+      fields = _json["fields"]
+          .map<Field>((value) => new Field.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
@@ -4453,8 +4484,9 @@
       oneofs = _json["oneofs"];
     }
     if (_json.containsKey("options")) {
-      options =
-          _json["options"].map((value) => new Option.fromJson(value)).toList();
+      options = _json["options"]
+          .map<Option>((value) => new Option.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sourceContext")) {
       sourceContext = new SourceContext.fromJson(_json["sourceContext"]);
@@ -4521,8 +4553,9 @@
       requirements = _json["requirements"];
     }
     if (_json.containsKey("rules")) {
-      rules =
-          _json["rules"].map((value) => new UsageRule.fromJson(value)).toList();
+      rules = _json["rules"]
+          .map<UsageRule>((value) => new UsageRule.fromJson(value))
+          .toList();
     }
   }
 
@@ -4648,7 +4681,7 @@
   Visibility.fromJson(core.Map _json) {
     if (_json.containsKey("rules")) {
       rules = _json["rules"]
-          .map((value) => new VisibilityRule.fromJson(value))
+          .map<VisibilityRule>((value) => new VisibilityRule.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/sheets/v4.dart b/generated/googleapis/lib/sheets/v4.dart
index 6c6b37a..9f912dd 100644
--- a/generated/googleapis/lib/sheets/v4.dart
+++ b/generated/googleapis/lib/sheets/v4.dart
@@ -99,7 +99,7 @@
       BatchUpdateSpreadsheetRequest request, core.String spreadsheetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -147,7 +147,7 @@
   /// this method will complete with the same error.
   async.Future<Spreadsheet> create(Spreadsheet request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -217,7 +217,7 @@
       core.bool includeGridData,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -290,7 +290,7 @@
       GetSpreadsheetByDataFilterRequest request, core.String spreadsheetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -350,7 +350,7 @@
       core.String spreadsheetId, core.int metadataId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -406,7 +406,7 @@
       SearchDeveloperMetadataRequest request, core.String spreadsheetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -470,7 +470,7 @@
       core.int sheetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -589,7 +589,7 @@
       core.bool includeValuesInResponse,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -665,7 +665,7 @@
       BatchClearValuesRequest request, core.String spreadsheetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -721,7 +721,7 @@
       BatchClearValuesByDataFilterRequest request, core.String spreadsheetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -806,7 +806,7 @@
       core.String majorDimension,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -870,7 +870,7 @@
       BatchGetValuesByDataFilterRequest request, core.String spreadsheetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -925,7 +925,7 @@
       BatchUpdateValuesRequest request, core.String spreadsheetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -980,7 +980,7 @@
       BatchUpdateValuesByDataFilterRequest request, core.String spreadsheetId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1037,7 +1037,7 @@
       ClearValuesRequest request, core.String spreadsheetId, core.String range,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1125,7 +1125,7 @@
       core.String dateTimeRenderOption,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1226,7 +1226,7 @@
       core.String responseDateTimeRenderOption,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1630,7 +1630,9 @@
       fields = _json["fields"];
     }
     if (_json.containsKey("rows")) {
-      rows = _json["rows"].map((value) => new RowData.fromJson(value)).toList();
+      rows = _json["rows"]
+          .map<RowData>((value) => new RowData.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("sheetId")) {
       sheetId = _json["sheetId"];
@@ -2226,7 +2228,7 @@
   BasicChartSpec.fromJson(core.Map _json) {
     if (_json.containsKey("axis")) {
       axis = _json["axis"]
-          .map((value) => new BasicChartAxis.fromJson(value))
+          .map<BasicChartAxis>((value) => new BasicChartAxis.fromJson(value))
           .toList();
     }
     if (_json.containsKey("chartType")) {
@@ -2237,7 +2239,8 @@
     }
     if (_json.containsKey("domains")) {
       domains = _json["domains"]
-          .map((value) => new BasicChartDomain.fromJson(value))
+          .map<BasicChartDomain>(
+              (value) => new BasicChartDomain.fromJson(value))
           .toList();
     }
     if (_json.containsKey("headerCount")) {
@@ -2254,7 +2257,8 @@
     }
     if (_json.containsKey("series")) {
       series = _json["series"]
-          .map((value) => new BasicChartSeries.fromJson(value))
+          .map<BasicChartSeries>(
+              (value) => new BasicChartSeries.fromJson(value))
           .toList();
     }
     if (_json.containsKey("stackedType")) {
@@ -2334,7 +2338,7 @@
     }
     if (_json.containsKey("sortSpecs")) {
       sortSpecs = _json["sortSpecs"]
-          .map((value) => new SortSpec.fromJson(value))
+          .map<SortSpec>((value) => new SortSpec.fromJson(value))
           .toList();
     }
   }
@@ -2368,7 +2372,7 @@
   BatchClearValuesByDataFilterRequest.fromJson(core.Map _json) {
     if (_json.containsKey("dataFilters")) {
       dataFilters = _json["dataFilters"]
-          .map((value) => new DataFilter.fromJson(value))
+          .map<DataFilter>((value) => new DataFilter.fromJson(value))
           .toList();
     }
   }
@@ -2548,7 +2552,7 @@
   BatchGetValuesByDataFilterRequest.fromJson(core.Map _json) {
     if (_json.containsKey("dataFilters")) {
       dataFilters = _json["dataFilters"]
-          .map((value) => new DataFilter.fromJson(value))
+          .map<DataFilter>((value) => new DataFilter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dateTimeRenderOption")) {
@@ -2599,7 +2603,8 @@
     }
     if (_json.containsKey("valueRanges")) {
       valueRanges = _json["valueRanges"]
-          .map((value) => new MatchedValueRange.fromJson(value))
+          .map<MatchedValueRange>(
+              (value) => new MatchedValueRange.fromJson(value))
           .toList();
     }
   }
@@ -2635,7 +2640,7 @@
     }
     if (_json.containsKey("valueRanges")) {
       valueRanges = _json["valueRanges"]
-          .map((value) => new ValueRange.fromJson(value))
+          .map<ValueRange>((value) => new ValueRange.fromJson(value))
           .toList();
     }
   }
@@ -2682,7 +2687,7 @@
     }
     if (_json.containsKey("requests")) {
       requests = _json["requests"]
-          .map((value) => new Request.fromJson(value))
+          .map<Request>((value) => new Request.fromJson(value))
           .toList();
     }
     if (_json.containsKey("responseIncludeGridData")) {
@@ -2730,7 +2735,7 @@
   BatchUpdateSpreadsheetResponse.fromJson(core.Map _json) {
     if (_json.containsKey("replies")) {
       replies = _json["replies"]
-          .map((value) => new Response.fromJson(value))
+          .map<Response>((value) => new Response.fromJson(value))
           .toList();
     }
     if (_json.containsKey("spreadsheetId")) {
@@ -2837,7 +2842,8 @@
   BatchUpdateValuesByDataFilterRequest.fromJson(core.Map _json) {
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new DataFilterValueRange.fromJson(value))
+          .map<DataFilterValueRange>(
+              (value) => new DataFilterValueRange.fromJson(value))
           .toList();
     }
     if (_json.containsKey("includeValuesInResponse")) {
@@ -2903,7 +2909,8 @@
   BatchUpdateValuesByDataFilterResponse.fromJson(core.Map _json) {
     if (_json.containsKey("responses")) {
       responses = _json["responses"]
-          .map((value) => new UpdateValuesByDataFilterResponse.fromJson(value))
+          .map<UpdateValuesByDataFilterResponse>(
+              (value) => new UpdateValuesByDataFilterResponse.fromJson(value))
           .toList();
     }
     if (_json.containsKey("spreadsheetId")) {
@@ -3024,8 +3031,9 @@
 
   BatchUpdateValuesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("data")) {
-      data =
-          _json["data"].map((value) => new ValueRange.fromJson(value)).toList();
+      data = _json["data"]
+          .map<ValueRange>((value) => new ValueRange.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("includeValuesInResponse")) {
       includeValuesInResponse = _json["includeValuesInResponse"];
@@ -3091,7 +3099,8 @@
   BatchUpdateValuesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("responses")) {
       responses = _json["responses"]
-          .map((value) => new UpdateValuesResponse.fromJson(value))
+          .map<UpdateValuesResponse>(
+              (value) => new UpdateValuesResponse.fromJson(value))
           .toList();
     }
     if (_json.containsKey("spreadsheetId")) {
@@ -3267,7 +3276,7 @@
     }
     if (_json.containsKey("values")) {
       values = _json["values"]
-          .map((value) => new ConditionValue.fromJson(value))
+          .map<ConditionValue>((value) => new ConditionValue.fromJson(value))
           .toList();
     }
   }
@@ -3575,7 +3584,7 @@
   CandlestickChartSpec.fromJson(core.Map _json) {
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new CandlestickData.fromJson(value))
+          .map<CandlestickData>((value) => new CandlestickData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("domain")) {
@@ -3798,7 +3807,7 @@
     }
     if (_json.containsKey("textFormatRuns")) {
       textFormatRuns = _json["textFormatRuns"]
-          .map((value) => new TextFormatRun.fromJson(value))
+          .map<TextFormatRun>((value) => new TextFormatRun.fromJson(value))
           .toList();
     }
     if (_json.containsKey("userEnteredFormat")) {
@@ -4070,7 +4079,7 @@
   ChartSourceRange.fromJson(core.Map _json) {
     if (_json.containsKey("sources")) {
       sources = _json["sources"]
-          .map((value) => new GridRange.fromJson(value))
+          .map<GridRange>((value) => new GridRange.fromJson(value))
           .toList();
     }
   }
@@ -4601,7 +4610,7 @@
     }
     if (_json.containsKey("ranges")) {
       ranges = _json["ranges"]
-          .map((value) => new GridRange.fromJson(value))
+          .map<GridRange>((value) => new GridRange.fromJson(value))
           .toList();
     }
   }
@@ -5073,7 +5082,8 @@
   DeleteDeveloperMetadataResponse.fromJson(core.Map _json) {
     if (_json.containsKey("deletedDeveloperMetadata")) {
       deletedDeveloperMetadata = _json["deletedDeveloperMetadata"]
-          .map((value) => new DeveloperMetadata.fromJson(value))
+          .map<DeveloperMetadata>(
+              (value) => new DeveloperMetadata.fromJson(value))
           .toList();
     }
   }
@@ -5569,7 +5579,8 @@
   DimensionProperties.fromJson(core.Map _json) {
     if (_json.containsKey("developerMetadata")) {
       developerMetadata = _json["developerMetadata"]
-          .map((value) => new DeveloperMetadata.fromJson(value))
+          .map<DeveloperMetadata>(
+              (value) => new DeveloperMetadata.fromJson(value))
           .toList();
     }
     if (_json.containsKey("hiddenByFilter")) {
@@ -6102,7 +6113,7 @@
     }
     if (_json.containsKey("sortSpecs")) {
       sortSpecs = _json["sortSpecs"]
-          .map((value) => new SortSpec.fromJson(value))
+          .map<SortSpec>((value) => new SortSpec.fromJson(value))
           .toList();
     }
     if (_json.containsKey("title")) {
@@ -6317,7 +6328,7 @@
   GetSpreadsheetByDataFilterRequest.fromJson(core.Map _json) {
     if (_json.containsKey("dataFilters")) {
       dataFilters = _json["dataFilters"]
-          .map((value) => new DataFilter.fromJson(value))
+          .map<DataFilter>((value) => new DataFilter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("includeGridData")) {
@@ -6452,16 +6463,19 @@
   GridData.fromJson(core.Map _json) {
     if (_json.containsKey("columnMetadata")) {
       columnMetadata = _json["columnMetadata"]
-          .map((value) => new DimensionProperties.fromJson(value))
+          .map<DimensionProperties>(
+              (value) => new DimensionProperties.fromJson(value))
           .toList();
     }
     if (_json.containsKey("rowData")) {
-      rowData =
-          _json["rowData"].map((value) => new RowData.fromJson(value)).toList();
+      rowData = _json["rowData"]
+          .map<RowData>((value) => new RowData.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("rowMetadata")) {
       rowMetadata = _json["rowMetadata"]
-          .map((value) => new DimensionProperties.fromJson(value))
+          .map<DimensionProperties>(
+              (value) => new DimensionProperties.fromJson(value))
           .toList();
     }
     if (_json.containsKey("startColumn")) {
@@ -6701,7 +6715,7 @@
     }
     if (_json.containsKey("series")) {
       series = _json["series"]
-          .map((value) => new HistogramSeries.fromJson(value))
+          .map<HistogramSeries>((value) => new HistogramSeries.fromJson(value))
           .toList();
     }
     if (_json.containsKey("showItemDividers")) {
@@ -7102,7 +7116,7 @@
   ManualRule.fromJson(core.Map _json) {
     if (_json.containsKey("groups")) {
       groups = _json["groups"]
-          .map((value) => new ManualRuleGroup.fromJson(value))
+          .map<ManualRuleGroup>((value) => new ManualRuleGroup.fromJson(value))
           .toList();
     }
   }
@@ -7138,7 +7152,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ExtendedValue.fromJson(value))
+          .map<ExtendedValue>((value) => new ExtendedValue.fromJson(value))
           .toList();
     }
   }
@@ -7170,7 +7184,7 @@
   MatchedDeveloperMetadata.fromJson(core.Map _json) {
     if (_json.containsKey("dataFilters")) {
       dataFilters = _json["dataFilters"]
-          .map((value) => new DataFilter.fromJson(value))
+          .map<DataFilter>((value) => new DataFilter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("developerMetadata")) {
@@ -7207,7 +7221,7 @@
   MatchedValueRange.fromJson(core.Map _json) {
     if (_json.containsKey("dataFilters")) {
       dataFilters = _json["dataFilters"]
-          .map((value) => new DataFilter.fromJson(value))
+          .map<DataFilter>((value) => new DataFilter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("valueRange")) {
@@ -7853,7 +7867,8 @@
     }
     if (_json.containsKey("valueMetadata")) {
       valueMetadata = _json["valueMetadata"]
-          .map((value) => new PivotGroupValueMetadata.fromJson(value))
+          .map<PivotGroupValueMetadata>(
+              (value) => new PivotGroupValueMetadata.fromJson(value))
           .toList();
     }
   }
@@ -7948,7 +7963,7 @@
   PivotGroupSortValueBucket.fromJson(core.Map _json) {
     if (_json.containsKey("buckets")) {
       buckets = _json["buckets"]
-          .map((value) => new ExtendedValue.fromJson(value))
+          .map<ExtendedValue>((value) => new ExtendedValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("valuesIndex")) {
@@ -8040,7 +8055,7 @@
   PivotTable.fromJson(core.Map _json) {
     if (_json.containsKey("columns")) {
       columns = _json["columns"]
-          .map((value) => new PivotGroup.fromJson(value))
+          .map<PivotGroup>((value) => new PivotGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("criteria")) {
@@ -8051,8 +8066,9 @@
                   new PivotFilterCriteria.fromJson(item));
     }
     if (_json.containsKey("rows")) {
-      rows =
-          _json["rows"].map((value) => new PivotGroup.fromJson(value)).toList();
+      rows = _json["rows"]
+          .map<PivotGroup>((value) => new PivotGroup.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("source")) {
       source = new GridRange.fromJson(_json["source"]);
@@ -8062,7 +8078,7 @@
     }
     if (_json.containsKey("values")) {
       values = _json["values"]
-          .map((value) => new PivotValue.fromJson(value))
+          .map<PivotValue>((value) => new PivotValue.fromJson(value))
           .toList();
     }
   }
@@ -8266,7 +8282,7 @@
     }
     if (_json.containsKey("unprotectedRanges")) {
       unprotectedRanges = _json["unprotectedRanges"]
-          .map((value) => new GridRange.fromJson(value))
+          .map<GridRange>((value) => new GridRange.fromJson(value))
           .toList();
     }
     if (_json.containsKey("warningOnly")) {
@@ -9088,8 +9104,9 @@
 
   RowData.fromJson(core.Map _json) {
     if (_json.containsKey("values")) {
-      values =
-          _json["values"].map((value) => new CellData.fromJson(value)).toList();
+      values = _json["values"]
+          .map<CellData>((value) => new CellData.fromJson(value))
+          .toList();
     }
   }
 
@@ -9117,7 +9134,7 @@
   SearchDeveloperMetadataRequest.fromJson(core.Map _json) {
     if (_json.containsKey("dataFilters")) {
       dataFilters = _json["dataFilters"]
-          .map((value) => new DataFilter.fromJson(value))
+          .map<DataFilter>((value) => new DataFilter.fromJson(value))
           .toList();
     }
   }
@@ -9143,7 +9160,8 @@
   SearchDeveloperMetadataResponse.fromJson(core.Map _json) {
     if (_json.containsKey("matchedDeveloperMetadata")) {
       matchedDeveloperMetadata = _json["matchedDeveloperMetadata"]
-          .map((value) => new MatchedDeveloperMetadata.fromJson(value))
+          .map<MatchedDeveloperMetadata>(
+              (value) => new MatchedDeveloperMetadata.fromJson(value))
           .toList();
     }
   }
@@ -9260,7 +9278,7 @@
   Sheet.fromJson(core.Map _json) {
     if (_json.containsKey("bandedRanges")) {
       bandedRanges = _json["bandedRanges"]
-          .map((value) => new BandedRange.fromJson(value))
+          .map<BandedRange>((value) => new BandedRange.fromJson(value))
           .toList();
     }
     if (_json.containsKey("basicFilter")) {
@@ -9268,31 +9286,34 @@
     }
     if (_json.containsKey("charts")) {
       charts = _json["charts"]
-          .map((value) => new EmbeddedChart.fromJson(value))
+          .map<EmbeddedChart>((value) => new EmbeddedChart.fromJson(value))
           .toList();
     }
     if (_json.containsKey("conditionalFormats")) {
       conditionalFormats = _json["conditionalFormats"]
-          .map((value) => new ConditionalFormatRule.fromJson(value))
+          .map<ConditionalFormatRule>(
+              (value) => new ConditionalFormatRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("data")) {
-      data =
-          _json["data"].map((value) => new GridData.fromJson(value)).toList();
+      data = _json["data"]
+          .map<GridData>((value) => new GridData.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("developerMetadata")) {
       developerMetadata = _json["developerMetadata"]
-          .map((value) => new DeveloperMetadata.fromJson(value))
+          .map<DeveloperMetadata>(
+              (value) => new DeveloperMetadata.fromJson(value))
           .toList();
     }
     if (_json.containsKey("filterViews")) {
       filterViews = _json["filterViews"]
-          .map((value) => new FilterView.fromJson(value))
+          .map<FilterView>((value) => new FilterView.fromJson(value))
           .toList();
     }
     if (_json.containsKey("merges")) {
       merges = _json["merges"]
-          .map((value) => new GridRange.fromJson(value))
+          .map<GridRange>((value) => new GridRange.fromJson(value))
           .toList();
     }
     if (_json.containsKey("properties")) {
@@ -9300,7 +9321,7 @@
     }
     if (_json.containsKey("protectedRanges")) {
       protectedRanges = _json["protectedRanges"]
-          .map((value) => new ProtectedRange.fromJson(value))
+          .map<ProtectedRange>((value) => new ProtectedRange.fromJson(value))
           .toList();
     }
   }
@@ -9469,7 +9490,7 @@
     }
     if (_json.containsKey("sortSpecs")) {
       sortSpecs = _json["sortSpecs"]
-          .map((value) => new SortSpec.fromJson(value))
+          .map<SortSpec>((value) => new SortSpec.fromJson(value))
           .toList();
     }
   }
@@ -9598,20 +9619,22 @@
   Spreadsheet.fromJson(core.Map _json) {
     if (_json.containsKey("developerMetadata")) {
       developerMetadata = _json["developerMetadata"]
-          .map((value) => new DeveloperMetadata.fromJson(value))
+          .map<DeveloperMetadata>(
+              (value) => new DeveloperMetadata.fromJson(value))
           .toList();
     }
     if (_json.containsKey("namedRanges")) {
       namedRanges = _json["namedRanges"]
-          .map((value) => new NamedRange.fromJson(value))
+          .map<NamedRange>((value) => new NamedRange.fromJson(value))
           .toList();
     }
     if (_json.containsKey("properties")) {
       properties = new SpreadsheetProperties.fromJson(_json["properties"]);
     }
     if (_json.containsKey("sheets")) {
-      sheets =
-          _json["sheets"].map((value) => new Sheet.fromJson(value)).toList();
+      sheets = _json["sheets"]
+          .map<Sheet>((value) => new Sheet.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("spreadsheetId")) {
       spreadsheetId = _json["spreadsheetId"];
@@ -10159,7 +10182,9 @@
       range = new GridRange.fromJson(_json["range"]);
     }
     if (_json.containsKey("rows")) {
-      rows = _json["rows"].map((value) => new RowData.fromJson(value)).toList();
+      rows = _json["rows"]
+          .map<RowData>((value) => new RowData.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("start")) {
       start = new GridCoordinate.fromJson(_json["start"]);
@@ -10348,7 +10373,7 @@
   UpdateDeveloperMetadataRequest.fromJson(core.Map _json) {
     if (_json.containsKey("dataFilters")) {
       dataFilters = _json["dataFilters"]
-          .map((value) => new DataFilter.fromJson(value))
+          .map<DataFilter>((value) => new DataFilter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("developerMetadata")) {
@@ -10387,7 +10412,8 @@
   UpdateDeveloperMetadataResponse.fromJson(core.Map _json) {
     if (_json.containsKey("developerMetadata")) {
       developerMetadata = _json["developerMetadata"]
-          .map((value) => new DeveloperMetadata.fromJson(value))
+          .map<DeveloperMetadata>(
+              (value) => new DeveloperMetadata.fromJson(value))
           .toList();
     }
   }
@@ -11050,7 +11076,8 @@
   WaterfallChartSeries.fromJson(core.Map _json) {
     if (_json.containsKey("customSubtotals")) {
       customSubtotals = _json["customSubtotals"]
-          .map((value) => new WaterfallChartCustomSubtotal.fromJson(value))
+          .map<WaterfallChartCustomSubtotal>(
+              (value) => new WaterfallChartCustomSubtotal.fromJson(value))
           .toList();
     }
     if (_json.containsKey("data")) {
@@ -11142,7 +11169,8 @@
     }
     if (_json.containsKey("series")) {
       series = _json["series"]
-          .map((value) => new WaterfallChartSeries.fromJson(value))
+          .map<WaterfallChartSeries>(
+              (value) => new WaterfallChartSeries.fromJson(value))
           .toList();
     }
     if (_json.containsKey("stackedType")) {
diff --git a/generated/googleapis/lib/siteverification/v1.dart b/generated/googleapis/lib/siteverification/v1.dart
index 3483ed6..6dd02d6 100644
--- a/generated/googleapis/lib/siteverification/v1.dart
+++ b/generated/googleapis/lib/siteverification/v1.dart
@@ -57,7 +57,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -102,7 +102,7 @@
   async.Future<SiteVerificationWebResourceResource> get(core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -147,7 +147,7 @@
       SiteVerificationWebResourceGettokenRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -195,7 +195,7 @@
       core.String verificationMethod,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -241,7 +241,7 @@
   async.Future<SiteVerificationWebResourceListResponse> list(
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -286,7 +286,7 @@
       SiteVerificationWebResourceResource request, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -336,7 +336,7 @@
       SiteVerificationWebResourceResource request, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -477,7 +477,7 @@
   SiteVerificationWebResourceListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) =>
+          .map<SiteVerificationWebResourceResource>((value) =>
               new SiteVerificationWebResourceResource.fromJson(value))
           .toList();
     }
diff --git a/generated/googleapis/lib/slides/v1.dart b/generated/googleapis/lib/slides/v1.dart
index 8f33e4c..ee51e27 100644
--- a/generated/googleapis/lib/slides/v1.dart
+++ b/generated/googleapis/lib/slides/v1.dart
@@ -105,7 +105,7 @@
       BatchUpdatePresentationRequest request, core.String presentationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -156,7 +156,7 @@
   async.Future<Presentation> create(Presentation request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -200,7 +200,7 @@
   async.Future<Presentation> get(core.String presentationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -253,7 +253,7 @@
   async.Future<Page> get(core.String presentationId, core.String pageObjectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -326,7 +326,7 @@
       core.String thumbnailProperties_thumbnailSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -521,7 +521,7 @@
   BatchUpdatePresentationRequest.fromJson(core.Map _json) {
     if (_json.containsKey("requests")) {
       requests = _json["requests"]
-          .map((value) => new Request.fromJson(value))
+          .map<Request>((value) => new Request.fromJson(value))
           .toList();
     }
     if (_json.containsKey("writeControl")) {
@@ -562,7 +562,7 @@
     }
     if (_json.containsKey("replies")) {
       replies = _json["replies"]
-          .map((value) => new Response.fromJson(value))
+          .map<Response>((value) => new Response.fromJson(value))
           .toList();
     }
     if (_json.containsKey("writeControl")) {
@@ -646,7 +646,7 @@
   ColorScheme.fromJson(core.Map _json) {
     if (_json.containsKey("colors")) {
       colors = _json["colors"]
-          .map((value) => new ThemeColorPair.fromJson(value))
+          .map<ThemeColorPair>((value) => new ThemeColorPair.fromJson(value))
           .toList();
     }
   }
@@ -1543,7 +1543,8 @@
     }
     if (_json.containsKey("placeholderIdMappings")) {
       placeholderIdMappings = _json["placeholderIdMappings"]
-          .map((value) => new LayoutPlaceholderIdMapping.fromJson(value))
+          .map<LayoutPlaceholderIdMapping>(
+              (value) => new LayoutPlaceholderIdMapping.fromJson(value))
           .toList();
     }
     if (_json.containsKey("slideLayoutReference")) {
@@ -2207,7 +2208,7 @@
   Group.fromJson(core.Map _json) {
     if (_json.containsKey("children")) {
       children = _json["children"]
-          .map((value) => new PageElement.fromJson(value))
+          .map<PageElement>((value) => new PageElement.fromJson(value))
           .toList();
     }
   }
@@ -3459,7 +3460,7 @@
     }
     if (_json.containsKey("pageElements")) {
       pageElements = _json["pageElements"]
-          .map((value) => new PageElement.fromJson(value))
+          .map<PageElement>((value) => new PageElement.fromJson(value))
           .toList();
     }
     if (_json.containsKey("pageProperties")) {
@@ -4116,15 +4117,17 @@
 
   Presentation.fromJson(core.Map _json) {
     if (_json.containsKey("layouts")) {
-      layouts =
-          _json["layouts"].map((value) => new Page.fromJson(value)).toList();
+      layouts = _json["layouts"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("locale")) {
       locale = _json["locale"];
     }
     if (_json.containsKey("masters")) {
-      masters =
-          _json["masters"].map((value) => new Page.fromJson(value)).toList();
+      masters = _json["masters"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("notesMaster")) {
       notesMaster = new Page.fromJson(_json["notesMaster"]);
@@ -4139,8 +4142,9 @@
       revisionId = _json["revisionId"];
     }
     if (_json.containsKey("slides")) {
-      slides =
-          _json["slides"].map((value) => new Page.fromJson(value)).toList();
+      slides = _json["slides"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("title")) {
       title = _json["title"];
@@ -4332,7 +4336,7 @@
     }
     if (_json.containsKey("recolorStops")) {
       recolorStops = _json["recolorStops"]
-          .map((value) => new ColorStop.fromJson(value))
+          .map<ColorStop>((value) => new ColorStop.fromJson(value))
           .toList();
     }
   }
@@ -6243,7 +6247,7 @@
     }
     if (_json.containsKey("horizontalBorderRows")) {
       horizontalBorderRows = _json["horizontalBorderRows"]
-          .map((value) => new TableBorderRow.fromJson(value))
+          .map<TableBorderRow>((value) => new TableBorderRow.fromJson(value))
           .toList();
     }
     if (_json.containsKey("rows")) {
@@ -6251,17 +6255,18 @@
     }
     if (_json.containsKey("tableColumns")) {
       tableColumns = _json["tableColumns"]
-          .map((value) => new TableColumnProperties.fromJson(value))
+          .map<TableColumnProperties>(
+              (value) => new TableColumnProperties.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tableRows")) {
       tableRows = _json["tableRows"]
-          .map((value) => new TableRow.fromJson(value))
+          .map<TableRow>((value) => new TableRow.fromJson(value))
           .toList();
     }
     if (_json.containsKey("verticalBorderRows")) {
       verticalBorderRows = _json["verticalBorderRows"]
-          .map((value) => new TableBorderRow.fromJson(value))
+          .map<TableBorderRow>((value) => new TableBorderRow.fromJson(value))
           .toList();
     }
   }
@@ -6421,7 +6426,7 @@
   TableBorderRow.fromJson(core.Map _json) {
     if (_json.containsKey("tableBorderCells")) {
       tableBorderCells = _json["tableBorderCells"]
-          .map((value) => new TableBorderCell.fromJson(value))
+          .map<TableBorderCell>((value) => new TableBorderCell.fromJson(value))
           .toList();
     }
   }
@@ -6735,7 +6740,7 @@
     }
     if (_json.containsKey("tableCells")) {
       tableCells = _json["tableCells"]
-          .map((value) => new TableCell.fromJson(value))
+          .map<TableCell>((value) => new TableCell.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tableRowProperties")) {
@@ -6807,7 +6812,7 @@
     }
     if (_json.containsKey("textElements")) {
       textElements = _json["textElements"]
-          .map((value) => new TextElement.fromJson(value))
+          .map<TextElement>((value) => new TextElement.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/sourcerepo/v1.dart b/generated/googleapis/lib/sourcerepo/v1.dart
index f143d5a..7bc3674 100644
--- a/generated/googleapis/lib/sourcerepo/v1.dart
+++ b/generated/googleapis/lib/sourcerepo/v1.dart
@@ -83,7 +83,7 @@
   async.Future<Repo> create(Repo request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -130,7 +130,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -174,7 +174,7 @@
   /// this method will complete with the same error.
   async.Future<Repo> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -222,7 +222,7 @@
   async.Future<Policy> getIamPolicy(core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -278,7 +278,7 @@
   async.Future<ListReposResponse> list(core.String name,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -334,7 +334,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -390,7 +390,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -488,7 +488,7 @@
   AuditConfig.fromJson(core.Map _json) {
     if (_json.containsKey("auditLogConfigs")) {
       auditLogConfigs = _json["auditLogConfigs"]
-          .map((value) => new AuditLogConfig.fromJson(value))
+          .map<AuditLogConfig>((value) => new AuditLogConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("exemptedMembers")) {
@@ -741,7 +741,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("repos")) {
-      repos = _json["repos"].map((value) => new Repo.fromJson(value)).toList();
+      repos = _json["repos"]
+          .map<Repo>((value) => new Repo.fromJson(value))
+          .toList();
     }
   }
 
@@ -877,12 +879,12 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("auditConfigs")) {
       auditConfigs = _json["auditConfigs"]
-          .map((value) => new AuditConfig.fromJson(value))
+          .map<AuditConfig>((value) => new AuditConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
diff --git a/generated/googleapis/lib/spanner/v1.dart b/generated/googleapis/lib/spanner/v1.dart
index 8f6355d..102bc9f 100644
--- a/generated/googleapis/lib/spanner/v1.dart
+++ b/generated/googleapis/lib/spanner/v1.dart
@@ -78,7 +78,7 @@
   /// this method will complete with the same error.
   async.Future<InstanceConfig> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -133,7 +133,7 @@
   async.Future<ListInstanceConfigsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -236,7 +236,7 @@
       CreateInstanceRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -295,7 +295,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -340,7 +340,7 @@
   /// this method will complete with the same error.
   async.Future<Instance> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -394,7 +394,7 @@
       GetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -477,7 +477,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -576,7 +576,7 @@
   async.Future<Operation> patch(UpdateInstanceRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -633,7 +633,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -694,7 +694,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -768,7 +768,7 @@
       CreateDatabaseRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -817,7 +817,7 @@
   async.Future<Empty> dropDatabase(core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -863,7 +863,7 @@
   /// this method will complete with the same error.
   async.Future<Database> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -911,7 +911,7 @@
   async.Future<GetDatabaseDdlResponse> getDdl(core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -966,7 +966,7 @@
       GetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1024,7 +1024,7 @@
   async.Future<ListDatabasesResponse> list(core.String parent,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1086,7 +1086,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1149,7 +1149,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1209,7 +1209,7 @@
       UpdateDatabaseDdlRequest request, core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1272,7 +1272,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> cancel(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1319,7 +1319,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1365,7 +1365,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1429,7 +1429,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1496,7 +1496,7 @@
       BeginTransactionRequest request, core.String session,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1557,7 +1557,7 @@
       CommitRequest request, core.String session,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1628,7 +1628,7 @@
       CreateSessionRequest request, core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1677,7 +1677,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1736,7 +1736,7 @@
       ExecuteSqlRequest request, core.String session,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1794,7 +1794,7 @@
       ExecuteSqlRequest request, core.String session,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1845,7 +1845,7 @@
   /// this method will complete with the same error.
   async.Future<Session> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1913,7 +1913,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1979,7 +1979,7 @@
       PartitionQueryRequest request, core.String session,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2040,7 +2040,7 @@
       PartitionReadRequest request, core.String session,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2104,7 +2104,7 @@
   async.Future<ResultSet> read(ReadRequest request, core.String session,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2162,7 +2162,7 @@
   async.Future<Empty> rollback(RollbackRequest request, core.String session,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2218,7 +2218,7 @@
       ReadRequest request, core.String session,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2283,7 +2283,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> cancel(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2330,7 +2330,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2376,7 +2376,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2439,7 +2439,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2637,7 +2637,7 @@
   CommitRequest.fromJson(core.Map _json) {
     if (_json.containsKey("mutations")) {
       mutations = _json["mutations"]
-          .map((value) => new Mutation.fromJson(value))
+          .map<Mutation>((value) => new Mutation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("singleUseTransaction")) {
@@ -3510,8 +3510,9 @@
       keys = _json["keys"];
     }
     if (_json.containsKey("ranges")) {
-      ranges =
-          _json["ranges"].map((value) => new KeyRange.fromJson(value)).toList();
+      ranges = _json["ranges"]
+          .map<KeyRange>((value) => new KeyRange.fromJson(value))
+          .toList();
     }
   }
 
@@ -3546,7 +3547,7 @@
   ListDatabasesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("databases")) {
       databases = _json["databases"]
-          .map((value) => new Database.fromJson(value))
+          .map<Database>((value) => new Database.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -3582,7 +3583,7 @@
   ListInstanceConfigsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("instanceConfigs")) {
       instanceConfigs = _json["instanceConfigs"]
-          .map((value) => new InstanceConfig.fromJson(value))
+          .map<InstanceConfig>((value) => new InstanceConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -3619,7 +3620,7 @@
   ListInstancesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("instances")) {
       instances = _json["instances"]
-          .map((value) => new Instance.fromJson(value))
+          .map<Instance>((value) => new Instance.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -3656,7 +3657,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -3693,7 +3694,7 @@
     }
     if (_json.containsKey("sessions")) {
       sessions = _json["sessions"]
-          .map((value) => new Session.fromJson(value))
+          .map<Session>((value) => new Session.fromJson(value))
           .toList();
     }
   }
@@ -4275,7 +4276,7 @@
   PartitionResponse.fromJson(core.Map _json) {
     if (_json.containsKey("partitions")) {
       partitions = _json["partitions"]
-          .map((value) => new Partition.fromJson(value))
+          .map<Partition>((value) => new Partition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("transaction")) {
@@ -4356,7 +4357,7 @@
   PlanNode.fromJson(core.Map _json) {
     if (_json.containsKey("childLinks")) {
       childLinks = _json["childLinks"]
-          .map((value) => new ChildLink.fromJson(value))
+          .map<ChildLink>((value) => new ChildLink.fromJson(value))
           .toList();
     }
     if (_json.containsKey("displayName")) {
@@ -4476,7 +4477,7 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -4515,7 +4516,7 @@
   QueryPlan.fromJson(core.Map _json) {
     if (_json.containsKey("planNodes")) {
       planNodes = _json["planNodes"]
-          .map((value) => new PlanNode.fromJson(value))
+          .map<PlanNode>((value) => new PlanNode.fromJson(value))
           .toList();
     }
   }
@@ -5190,8 +5191,9 @@
 
   StructType.fromJson(core.Map _json) {
     if (_json.containsKey("fields")) {
-      fields =
-          _json["fields"].map((value) => new Field.fromJson(value)).toList();
+      fields = _json["fields"]
+          .map<Field>((value) => new Field.fromJson(value))
+          .toList();
     }
   }
 
diff --git a/generated/googleapis/lib/speech/v1.dart b/generated/googleapis/lib/speech/v1.dart
index dfe8c44..59e52c5 100644
--- a/generated/googleapis/lib/speech/v1.dart
+++ b/generated/googleapis/lib/speech/v1.dart
@@ -58,7 +58,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -111,7 +111,7 @@
       LongRunningRecognizeRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -155,7 +155,7 @@
   async.Future<RecognizeResponse> recognize(RecognizeRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -454,7 +454,7 @@
     }
     if (_json.containsKey("speechContexts")) {
       speechContexts = _json["speechContexts"]
-          .map((value) => new SpeechContext.fromJson(value))
+          .map<SpeechContext>((value) => new SpeechContext.fromJson(value))
           .toList();
     }
   }
@@ -537,7 +537,8 @@
   RecognizeResponse.fromJson(core.Map _json) {
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) => new SpeechRecognitionResult.fromJson(value))
+          .map<SpeechRecognitionResult>(
+              (value) => new SpeechRecognitionResult.fromJson(value))
           .toList();
     }
   }
@@ -612,8 +613,9 @@
       transcript = _json["transcript"];
     }
     if (_json.containsKey("words")) {
-      words =
-          _json["words"].map((value) => new WordInfo.fromJson(value)).toList();
+      words = _json["words"]
+          .map<WordInfo>((value) => new WordInfo.fromJson(value))
+          .toList();
     }
   }
 
@@ -646,7 +648,8 @@
   SpeechRecognitionResult.fromJson(core.Map _json) {
     if (_json.containsKey("alternatives")) {
       alternatives = _json["alternatives"]
-          .map((value) => new SpeechRecognitionAlternative.fromJson(value))
+          .map<SpeechRecognitionAlternative>(
+              (value) => new SpeechRecognitionAlternative.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/storage/v1.dart b/generated/googleapis/lib/storage/v1.dart
index daad0f6..8a247cf 100644
--- a/generated/googleapis/lib/storage/v1.dart
+++ b/generated/googleapis/lib/storage/v1.dart
@@ -97,7 +97,7 @@
   async.Future delete(core.String bucket, core.String entity,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -158,7 +158,7 @@
   async.Future<BucketAccessControl> get(core.String bucket, core.String entity,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -216,7 +216,7 @@
       BucketAccessControl request, core.String bucket,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -268,7 +268,7 @@
   async.Future<BucketAccessControls> list(core.String bucket,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -325,7 +325,7 @@
       BucketAccessControl request, core.String bucket, core.String entity,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -390,7 +390,7 @@
       BucketAccessControl request, core.String bucket, core.String entity,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -461,7 +461,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -535,7 +535,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -593,7 +593,7 @@
   async.Future<Policy> getIamPolicy(core.String bucket,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -682,7 +682,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -761,7 +761,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -827,7 +827,7 @@
       core.String bucket, core.String ifMetagenerationMatch,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -934,7 +934,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1003,7 +1003,7 @@
   async.Future<Policy> setIamPolicy(Policy request, core.String bucket,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1059,7 +1059,7 @@
       core.String bucket, core.List<core.String> permissions,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1165,7 +1165,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1232,7 +1232,7 @@
   /// this method will complete with the same error.
   async.Future stop(Channel request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1290,7 +1290,7 @@
   async.Future delete(core.String bucket, core.String entity,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1352,7 +1352,7 @@
   async.Future<ObjectAccessControl> get(core.String bucket, core.String entity,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1410,7 +1410,7 @@
       ObjectAccessControl request, core.String bucket,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1472,7 +1472,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1536,7 +1536,7 @@
       ObjectAccessControl request, core.String bucket, core.String entity,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1601,7 +1601,7 @@
       ObjectAccessControl request, core.String bucket, core.String entity,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1665,7 +1665,7 @@
   async.Future delete(core.String bucket, core.String notification,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1724,7 +1724,7 @@
   async.Future<Notification> get(core.String bucket, core.String notification,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1781,7 +1781,7 @@
   async.Future<Notification> insert(Notification request, core.String bucket,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1835,7 +1835,7 @@
   async.Future<Notifications> list(core.String bucket,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1903,7 +1903,7 @@
       core.String bucket, core.String object, core.String entity,
       {core.String generation, core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1979,7 +1979,7 @@
       core.String bucket, core.String object, core.String entity,
       {core.String generation, core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2051,7 +2051,7 @@
       ObjectAccessControl request, core.String bucket, core.String object,
       {core.String generation, core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2120,7 +2120,7 @@
       core.String bucket, core.String object,
       {core.String generation, core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2193,7 +2193,7 @@
       core.String bucket, core.String object, core.String entity,
       {core.String generation, core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2272,7 +2272,7 @@
       core.String bucket, core.String object, core.String entity,
       {core.String generation, core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2383,7 +2383,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2540,7 +2540,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2671,7 +2671,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2786,7 +2786,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2872,7 +2872,7 @@
   async.Future<Policy> getIamPolicy(core.String bucket, core.String object,
       {core.String generation, core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3005,7 +3005,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3128,7 +3128,7 @@
       core.bool versions,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3247,7 +3247,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3432,7 +3432,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3555,7 +3555,7 @@
       Policy request, core.String bucket, core.String object,
       {core.String generation, core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3631,7 +3631,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3747,7 +3747,7 @@
       core.String userProject,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3859,7 +3859,7 @@
       core.bool versions,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3945,7 +3945,7 @@
   async.Future<ServiceAccount> get(core.String projectId,
       {core.String userProject, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4223,7 +4223,8 @@
   BucketLifecycle.fromJson(core.Map _json) {
     if (_json.containsKey("rule")) {
       rule = _json["rule"]
-          .map((value) => new BucketLifecycleRule.fromJson(value))
+          .map<BucketLifecycleRule>(
+              (value) => new BucketLifecycleRule.fromJson(value))
           .toList();
     }
   }
@@ -4528,22 +4529,25 @@
   Bucket.fromJson(core.Map _json) {
     if (_json.containsKey("acl")) {
       acl = _json["acl"]
-          .map((value) => new BucketAccessControl.fromJson(value))
+          .map<BucketAccessControl>(
+              (value) => new BucketAccessControl.fromJson(value))
           .toList();
     }
     if (_json.containsKey("billing")) {
       billing = new BucketBilling.fromJson(_json["billing"]);
     }
     if (_json.containsKey("cors")) {
-      cors =
-          _json["cors"].map((value) => new BucketCors.fromJson(value)).toList();
+      cors = _json["cors"]
+          .map<BucketCors>((value) => new BucketCors.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("defaultEventBasedHold")) {
       defaultEventBasedHold = _json["defaultEventBasedHold"];
     }
     if (_json.containsKey("defaultObjectAcl")) {
       defaultObjectAcl = _json["defaultObjectAcl"]
-          .map((value) => new ObjectAccessControl.fromJson(value))
+          .map<ObjectAccessControl>(
+              (value) => new ObjectAccessControl.fromJson(value))
           .toList();
     }
     if (_json.containsKey("encryption")) {
@@ -4860,7 +4864,8 @@
   BucketAccessControls.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new BucketAccessControl.fromJson(value))
+          .map<BucketAccessControl>(
+              (value) => new BucketAccessControl.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4898,8 +4903,9 @@
 
   Buckets.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Bucket.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Bucket>((value) => new Bucket.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -5123,7 +5129,8 @@
     }
     if (_json.containsKey("sourceObjects")) {
       sourceObjects = _json["sourceObjects"]
-          .map((value) => new ComposeRequestSourceObjects.fromJson(value))
+          .map<ComposeRequestSourceObjects>(
+              (value) => new ComposeRequestSourceObjects.fromJson(value))
           .toList();
     }
   }
@@ -5259,7 +5266,7 @@
   Notifications.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Notification.fromJson(value))
+          .map<Notification>((value) => new Notification.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -5477,7 +5484,8 @@
   Object.fromJson(core.Map _json) {
     if (_json.containsKey("acl")) {
       acl = _json["acl"]
-          .map((value) => new ObjectAccessControl.fromJson(value))
+          .map<ObjectAccessControl>(
+              (value) => new ObjectAccessControl.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bucket")) {
@@ -5869,7 +5877,8 @@
   ObjectAccessControls.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ObjectAccessControl.fromJson(value))
+          .map<ObjectAccessControl>(
+              (value) => new ObjectAccessControl.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -5911,8 +5920,9 @@
 
   Objects.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Object.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Object>((value) => new Object.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -6066,7 +6076,7 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new PolicyBindings.fromJson(value))
+          .map<PolicyBindings>((value) => new PolicyBindings.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
diff --git a/generated/googleapis/lib/storagetransfer/v1.dart b/generated/googleapis/lib/storagetransfer/v1.dart
index 649c103..4daa700 100644
--- a/generated/googleapis/lib/storagetransfer/v1.dart
+++ b/generated/googleapis/lib/storagetransfer/v1.dart
@@ -72,7 +72,7 @@
   async.Future<GoogleServiceAccount> get(core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -121,7 +121,7 @@
   /// this method will complete with the same error.
   async.Future<TransferJob> create(TransferJob request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -170,7 +170,7 @@
   async.Future<TransferJob> get(core.String jobName,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -232,7 +232,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -289,7 +289,7 @@
       UpdateTransferJobRequest request, core.String jobName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -343,7 +343,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> cancel(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -386,7 +386,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -431,7 +431,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -500,7 +500,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -557,7 +557,7 @@
       PauseTransferOperationRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -608,7 +608,7 @@
       ResumeTransferOperationRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -973,7 +973,7 @@
     }
     if (_json.containsKey("errorLogEntries")) {
       errorLogEntries = _json["errorLogEntries"]
-          .map((value) => new ErrorLogEntry.fromJson(value))
+          .map<ErrorLogEntry>((value) => new ErrorLogEntry.fromJson(value))
           .toList();
     }
   }
@@ -1132,7 +1132,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -1167,7 +1167,7 @@
     }
     if (_json.containsKey("transferJobs")) {
       transferJobs = _json["transferJobs"]
-          .map((value) => new TransferJob.fromJson(value))
+          .map<TransferJob>((value) => new TransferJob.fromJson(value))
           .toList();
     }
   }
@@ -1926,7 +1926,7 @@
     }
     if (_json.containsKey("errorBreakdowns")) {
       errorBreakdowns = _json["errorBreakdowns"]
-          .map((value) => new ErrorSummary.fromJson(value))
+          .map<ErrorSummary>((value) => new ErrorSummary.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
diff --git a/generated/googleapis/lib/streetviewpublish/v1.dart b/generated/googleapis/lib/streetviewpublish/v1.dart
index 0bd8548..71971c8 100644
--- a/generated/googleapis/lib/streetviewpublish/v1.dart
+++ b/generated/googleapis/lib/streetviewpublish/v1.dart
@@ -76,7 +76,7 @@
   /// this method will complete with the same error.
   async.Future<Photo> create(Photo request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -124,7 +124,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String photoId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -184,7 +184,7 @@
   async.Future<Photo> get(core.String photoId,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -249,7 +249,7 @@
   /// this method will complete with the same error.
   async.Future<UploadRef> startUpload(Empty request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -344,7 +344,7 @@
   async.Future<Photo> update(Photo request, core.String id,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -415,7 +415,7 @@
       BatchDeletePhotosRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -485,7 +485,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -559,7 +559,7 @@
       BatchUpdatePhotosRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -633,7 +633,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -703,8 +703,9 @@
 
   BatchDeletePhotosResponse.fromJson(core.Map _json) {
     if (_json.containsKey("status")) {
-      status =
-          _json["status"].map((value) => new Status.fromJson(value)).toList();
+      status = _json["status"]
+          .map<Status>((value) => new Status.fromJson(value))
+          .toList();
     }
   }
 
@@ -731,7 +732,7 @@
   BatchGetPhotosResponse.fromJson(core.Map _json) {
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) => new PhotoResponse.fromJson(value))
+          .map<PhotoResponse>((value) => new PhotoResponse.fromJson(value))
           .toList();
     }
   }
@@ -758,7 +759,8 @@
   BatchUpdatePhotosRequest.fromJson(core.Map _json) {
     if (_json.containsKey("updatePhotoRequests")) {
       updatePhotoRequests = _json["updatePhotoRequests"]
-          .map((value) => new UpdatePhotoRequest.fromJson(value))
+          .map<UpdatePhotoRequest>(
+              (value) => new UpdatePhotoRequest.fromJson(value))
           .toList();
     }
   }
@@ -787,7 +789,7 @@
   BatchUpdatePhotosResponse.fromJson(core.Map _json) {
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) => new PhotoResponse.fromJson(value))
+          .map<PhotoResponse>((value) => new PhotoResponse.fromJson(value))
           .toList();
     }
   }
@@ -938,8 +940,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("photos")) {
-      photos =
-          _json["photos"].map((value) => new Photo.fromJson(value)).toList();
+      photos = _json["photos"]
+          .map<Photo>((value) => new Photo.fromJson(value))
+          .toList();
     }
   }
 
@@ -1087,7 +1090,7 @@
     }
     if (_json.containsKey("connections")) {
       connections = _json["connections"]
-          .map((value) => new Connection.fromJson(value))
+          .map<Connection>((value) => new Connection.fromJson(value))
           .toList();
     }
     if (_json.containsKey("downloadUrl")) {
@@ -1097,8 +1100,9 @@
       photoId = new PhotoId.fromJson(_json["photoId"]);
     }
     if (_json.containsKey("places")) {
-      places =
-          _json["places"].map((value) => new Place.fromJson(value)).toList();
+      places = _json["places"]
+          .map<Place>((value) => new Place.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("pose")) {
       pose = new Pose.fromJson(_json["pose"]);
diff --git a/generated/googleapis/lib/surveys/v2.dart b/generated/googleapis/lib/surveys/v2.dart
index dec1ff7..6b54773 100644
--- a/generated/googleapis/lib/surveys/v2.dart
+++ b/generated/googleapis/lib/surveys/v2.dart
@@ -73,7 +73,7 @@
   /// this method will complete with the same error.
   async.Future<MobileAppPanel> get(core.String panelId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -123,7 +123,7 @@
       core.String token,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -177,7 +177,7 @@
       MobileAppPanel request, core.String panelId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -243,7 +243,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -303,7 +303,7 @@
   async.Future<SurveysDeleteResponse> delete(core.String surveyUrlId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -345,7 +345,7 @@
   /// this method will complete with the same error.
   async.Future<Survey> get(core.String surveyUrlId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -387,7 +387,7 @@
   /// this method will complete with the same error.
   async.Future<Survey> insert(Survey request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -437,7 +437,7 @@
       core.String token,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -489,7 +489,7 @@
       SurveysStartRequest request, core.String resourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -535,7 +535,7 @@
   async.Future<SurveysStopResponse> stop(core.String resourceId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -581,7 +581,7 @@
   async.Future<Survey> update(Survey request, core.String surveyUrlId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -618,7 +618,7 @@
   FieldMask.fromJson(core.Map _json) {
     if (_json.containsKey("fields")) {
       fields = _json["fields"]
-          .map((value) => new FieldMask.fromJson(value))
+          .map<FieldMask>((value) => new FieldMask.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -738,7 +738,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new MobileAppPanel.fromJson(value))
+          .map<MobileAppPanel>((value) => new MobileAppPanel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tokenPagination")) {
@@ -830,7 +830,7 @@
   ResultsMask.fromJson(core.Map _json) {
     if (_json.containsKey("fields")) {
       fields = _json["fields"]
-          .map((value) => new FieldMask.fromJson(value))
+          .map<FieldMask>((value) => new FieldMask.fromJson(value))
           .toList();
     }
     if (_json.containsKey("projection")) {
@@ -918,7 +918,7 @@
     }
     if (_json.containsKey("questions")) {
       questions = _json["questions"]
-          .map((value) => new SurveyQuestion.fromJson(value))
+          .map<SurveyQuestion>((value) => new SurveyQuestion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("rejectionReason")) {
@@ -1224,7 +1224,8 @@
     }
     if (_json.containsKey("images")) {
       images = _json["images"]
-          .map((value) => new SurveyQuestionImage.fromJson(value))
+          .map<SurveyQuestionImage>(
+              (value) => new SurveyQuestionImage.fromJson(value))
           .toList();
     }
     if (_json.containsKey("lastAnswerPositionPinned")) {
@@ -1489,7 +1490,7 @@
     }
     if (_json.containsKey("resources")) {
       resources = _json["resources"]
-          .map((value) => new Survey.fromJson(value))
+          .map<Survey>((value) => new Survey.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tokenPagination")) {
diff --git a/generated/googleapis/lib/tagmanager/v1.dart b/generated/googleapis/lib/tagmanager/v1.dart
index 39cf25b..0bc2723 100644
--- a/generated/googleapis/lib/tagmanager/v1.dart
+++ b/generated/googleapis/lib/tagmanager/v1.dart
@@ -84,7 +84,7 @@
   /// this method will complete with the same error.
   async.Future<Account> get(core.String accountId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -124,7 +124,7 @@
   /// this method will complete with the same error.
   async.Future<ListAccountsResponse> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -169,7 +169,7 @@
   async.Future<Account> update(Account request, core.String accountId,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -245,7 +245,7 @@
   async.Future<Container> create(Container request, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -293,7 +293,7 @@
   async.Future delete(core.String accountId, core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -346,7 +346,7 @@
   async.Future<Container> get(core.String accountId, core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -395,7 +395,7 @@
   async.Future<ListContainersResponse> list(core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -448,7 +448,7 @@
       Container request, core.String accountId, core.String containerId,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -515,7 +515,7 @@
       Environment request, core.String accountId, core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -571,7 +571,7 @@
       core.String accountId, core.String containerId, core.String environmentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -632,7 +632,7 @@
       core.String accountId, core.String containerId, core.String environmentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -689,7 +689,7 @@
       core.String accountId, core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -750,7 +750,7 @@
       core.String containerId, core.String environmentId,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -820,7 +820,7 @@
       core.String containerId, core.String environmentId,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -895,7 +895,7 @@
       Folder request, core.String accountId, core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -951,7 +951,7 @@
       core.String accountId, core.String containerId, core.String folderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1012,7 +1012,7 @@
       core.String accountId, core.String containerId, core.String folderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1069,7 +1069,7 @@
       core.String accountId, core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1129,7 +1129,7 @@
       core.String containerId, core.String folderId,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1201,7 +1201,7 @@
       core.String accountId, core.String containerId, core.String folderId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1277,7 +1277,7 @@
       core.List<core.String> variableId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1360,7 +1360,7 @@
       core.String containerId, core.String environmentId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1429,7 +1429,7 @@
       Tag request, core.String accountId, core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1485,7 +1485,7 @@
       core.String accountId, core.String containerId, core.String tagId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1546,7 +1546,7 @@
       core.String accountId, core.String containerId, core.String tagId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1603,7 +1603,7 @@
       core.String accountId, core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1663,7 +1663,7 @@
       core.String containerId, core.String tagId,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1735,7 +1735,7 @@
       Trigger request, core.String accountId, core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1791,7 +1791,7 @@
       core.String accountId, core.String containerId, core.String triggerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1852,7 +1852,7 @@
       core.String accountId, core.String containerId, core.String triggerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1909,7 +1909,7 @@
       core.String accountId, core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1969,7 +1969,7 @@
       core.String containerId, core.String triggerId,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2041,7 +2041,7 @@
       Variable request, core.String accountId, core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2097,7 +2097,7 @@
       core.String accountId, core.String containerId, core.String variableId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2158,7 +2158,7 @@
       core.String accountId, core.String containerId, core.String variableId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2215,7 +2215,7 @@
       core.String accountId, core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2275,7 +2275,7 @@
       core.String containerId, core.String variableId,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2349,7 +2349,7 @@
       core.String containerId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2406,7 +2406,7 @@
       core.String containerVersionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2468,7 +2468,7 @@
       core.String containerId, core.String containerVersionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2529,7 +2529,7 @@
       core.String accountId, core.String containerId,
       {core.bool headers, core.bool includeDeleted, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2594,7 +2594,7 @@
       core.String containerId, core.String containerVersionId,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2661,7 +2661,7 @@
       core.String containerId, core.String containerVersionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2721,7 +2721,7 @@
       core.String containerId, core.String containerVersionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2790,7 +2790,7 @@
       {core.String fingerprint,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2859,7 +2859,7 @@
   async.Future<UserAccess> create(UserAccess request, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2908,7 +2908,7 @@
   async.Future delete(core.String accountId, core.String permissionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2961,7 +2961,7 @@
   async.Future<UserAccess> get(core.String accountId, core.String permissionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3012,7 +3012,7 @@
   async.Future<ListAccountUsersResponse> list(core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3063,7 +3063,7 @@
       UserAccess request, core.String accountId, core.String permissionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3206,7 +3206,7 @@
   Condition.fromJson(core.Map _json) {
     if (_json.containsKey("parameter")) {
       parameter = _json["parameter"]
-          .map((value) => new Parameter.fromJson(value))
+          .map<Parameter>((value) => new Parameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("type")) {
@@ -3447,11 +3447,14 @@
       fingerprint = _json["fingerprint"];
     }
     if (_json.containsKey("folder")) {
-      folder =
-          _json["folder"].map((value) => new Folder.fromJson(value)).toList();
+      folder = _json["folder"]
+          .map<Folder>((value) => new Folder.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("macro")) {
-      macro = _json["macro"].map((value) => new Macro.fromJson(value)).toList();
+      macro = _json["macro"]
+          .map<Macro>((value) => new Macro.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
@@ -3460,18 +3463,20 @@
       notes = _json["notes"];
     }
     if (_json.containsKey("rule")) {
-      rule = _json["rule"].map((value) => new Rule.fromJson(value)).toList();
+      rule =
+          _json["rule"].map<Rule>((value) => new Rule.fromJson(value)).toList();
     }
     if (_json.containsKey("tag")) {
-      tag = _json["tag"].map((value) => new Tag.fromJson(value)).toList();
+      tag = _json["tag"].map<Tag>((value) => new Tag.fromJson(value)).toList();
     }
     if (_json.containsKey("trigger")) {
-      trigger =
-          _json["trigger"].map((value) => new Trigger.fromJson(value)).toList();
+      trigger = _json["trigger"]
+          .map<Trigger>((value) => new Trigger.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("variable")) {
       variable = _json["variable"]
-          .map((value) => new Variable.fromJson(value))
+          .map<Variable>((value) => new Variable.fromJson(value))
           .toList();
     }
   }
@@ -3909,15 +3914,16 @@
 
   FolderEntities.fromJson(core.Map _json) {
     if (_json.containsKey("tag")) {
-      tag = _json["tag"].map((value) => new Tag.fromJson(value)).toList();
+      tag = _json["tag"].map<Tag>((value) => new Tag.fromJson(value)).toList();
     }
     if (_json.containsKey("trigger")) {
-      trigger =
-          _json["trigger"].map((value) => new Trigger.fromJson(value)).toList();
+      trigger = _json["trigger"]
+          .map<Trigger>((value) => new Trigger.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("variable")) {
       variable = _json["variable"]
-          .map((value) => new Variable.fromJson(value))
+          .map<Variable>((value) => new Variable.fromJson(value))
           .toList();
     }
   }
@@ -3948,7 +3954,7 @@
   ListAccountUsersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("userAccess")) {
       userAccess = _json["userAccess"]
-          .map((value) => new UserAccess.fromJson(value))
+          .map<UserAccess>((value) => new UserAccess.fromJson(value))
           .toList();
     }
   }
@@ -3974,7 +3980,7 @@
   ListAccountsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("accounts")) {
       accounts = _json["accounts"]
-          .map((value) => new Account.fromJson(value))
+          .map<Account>((value) => new Account.fromJson(value))
           .toList();
     }
   }
@@ -4002,12 +4008,14 @@
   ListContainerVersionsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("containerVersion")) {
       containerVersion = _json["containerVersion"]
-          .map((value) => new ContainerVersion.fromJson(value))
+          .map<ContainerVersion>(
+              (value) => new ContainerVersion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("containerVersionHeader")) {
       containerVersionHeader = _json["containerVersionHeader"]
-          .map((value) => new ContainerVersionHeader.fromJson(value))
+          .map<ContainerVersionHeader>(
+              (value) => new ContainerVersionHeader.fromJson(value))
           .toList();
     }
   }
@@ -4037,7 +4045,7 @@
   ListContainersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("containers")) {
       containers = _json["containers"]
-          .map((value) => new Container.fromJson(value))
+          .map<Container>((value) => new Container.fromJson(value))
           .toList();
     }
   }
@@ -4063,7 +4071,7 @@
   ListEnvironmentsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("environments")) {
       environments = _json["environments"]
-          .map((value) => new Environment.fromJson(value))
+          .map<Environment>((value) => new Environment.fromJson(value))
           .toList();
     }
   }
@@ -4088,8 +4096,9 @@
 
   ListFoldersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("folders")) {
-      folders =
-          _json["folders"].map((value) => new Folder.fromJson(value)).toList();
+      folders = _json["folders"]
+          .map<Folder>((value) => new Folder.fromJson(value))
+          .toList();
     }
   }
 
@@ -4112,7 +4121,8 @@
 
   ListTagsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("tags")) {
-      tags = _json["tags"].map((value) => new Tag.fromJson(value)).toList();
+      tags =
+          _json["tags"].map<Tag>((value) => new Tag.fromJson(value)).toList();
     }
   }
 
@@ -4136,7 +4146,7 @@
   ListTriggersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("triggers")) {
       triggers = _json["triggers"]
-          .map((value) => new Trigger.fromJson(value))
+          .map<Trigger>((value) => new Trigger.fromJson(value))
           .toList();
     }
   }
@@ -4161,7 +4171,7 @@
   ListVariablesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("variables")) {
       variables = _json["variables"]
-          .map((value) => new Variable.fromJson(value))
+          .map<Variable>((value) => new Variable.fromJson(value))
           .toList();
     }
   }
@@ -4251,7 +4261,7 @@
     }
     if (_json.containsKey("parameter")) {
       parameter = _json["parameter"]
-          .map((value) => new Parameter.fromJson(value))
+          .map<Parameter>((value) => new Parameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("parentFolderId")) {
@@ -4353,11 +4363,14 @@
       key = _json["key"];
     }
     if (_json.containsKey("list")) {
-      list =
-          _json["list"].map((value) => new Parameter.fromJson(value)).toList();
+      list = _json["list"]
+          .map<Parameter>((value) => new Parameter.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("map")) {
-      map = _json["map"].map((value) => new Parameter.fromJson(value)).toList();
+      map = _json["map"]
+          .map<Parameter>((value) => new Parameter.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("type")) {
       type = _json["type"];
@@ -4454,7 +4467,7 @@
     }
     if (_json.containsKey("condition")) {
       condition = _json["condition"]
-          .map((value) => new Condition.fromJson(value))
+          .map<Condition>((value) => new Condition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("containerId")) {
@@ -4647,7 +4660,7 @@
     }
     if (_json.containsKey("parameter")) {
       parameter = _json["parameter"]
-          .map((value) => new Parameter.fromJson(value))
+          .map<Parameter>((value) => new Parameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("parentFolderId")) {
@@ -4667,7 +4680,7 @@
     }
     if (_json.containsKey("setupTag")) {
       setupTag = _json["setupTag"]
-          .map((value) => new SetupTag.fromJson(value))
+          .map<SetupTag>((value) => new SetupTag.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tagFiringOption")) {
@@ -4678,7 +4691,7 @@
     }
     if (_json.containsKey("teardownTag")) {
       teardownTag = _json["teardownTag"]
-          .map((value) => new TeardownTag.fromJson(value))
+          .map<TeardownTag>((value) => new TeardownTag.fromJson(value))
           .toList();
     }
     if (_json.containsKey("type")) {
@@ -4932,7 +4945,7 @@
     }
     if (_json.containsKey("autoEventFilter")) {
       autoEventFilter = _json["autoEventFilter"]
-          .map((value) => new Condition.fromJson(value))
+          .map<Condition>((value) => new Condition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("checkValidation")) {
@@ -4947,7 +4960,7 @@
     }
     if (_json.containsKey("customEventFilter")) {
       customEventFilter = _json["customEventFilter"]
-          .map((value) => new Condition.fromJson(value))
+          .map<Condition>((value) => new Condition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("eventName")) {
@@ -4955,7 +4968,7 @@
     }
     if (_json.containsKey("filter")) {
       filter = _json["filter"]
-          .map((value) => new Condition.fromJson(value))
+          .map<Condition>((value) => new Condition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("fingerprint")) {
@@ -4983,7 +4996,7 @@
     }
     if (_json.containsKey("parameter")) {
       parameter = _json["parameter"]
-          .map((value) => new Parameter.fromJson(value))
+          .map<Parameter>((value) => new Parameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("parentFolderId")) {
@@ -5152,7 +5165,7 @@
     }
     if (_json.containsKey("containerAccess")) {
       containerAccess = _json["containerAccess"]
-          .map((value) => new ContainerAccess.fromJson(value))
+          .map<ContainerAccess>((value) => new ContainerAccess.fromJson(value))
           .toList();
     }
     if (_json.containsKey("emailAddress")) {
@@ -5259,7 +5272,7 @@
     }
     if (_json.containsKey("parameter")) {
       parameter = _json["parameter"]
-          .map((value) => new Parameter.fromJson(value))
+          .map<Parameter>((value) => new Parameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("parentFolderId")) {
diff --git a/generated/googleapis/lib/tagmanager/v2.dart b/generated/googleapis/lib/tagmanager/v2.dart
index 3753e94..d83176d 100644
--- a/generated/googleapis/lib/tagmanager/v2.dart
+++ b/generated/googleapis/lib/tagmanager/v2.dart
@@ -84,7 +84,7 @@
   /// this method will complete with the same error.
   async.Future<Account> get(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -127,7 +127,7 @@
   async.Future<ListAccountsResponse> list(
       {core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -175,7 +175,7 @@
   async.Future<Account> update(Account request, core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -243,7 +243,7 @@
   async.Future<Container> create(Container request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -287,7 +287,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -332,7 +332,7 @@
   /// this method will complete with the same error.
   async.Future<Container> get(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -378,7 +378,7 @@
   async.Future<ListContainersResponse> list(core.String parent,
       {core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -430,7 +430,7 @@
   async.Future<Container> update(Container request, core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -489,7 +489,7 @@
   async.Future<Environment> create(Environment request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -533,7 +533,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -578,7 +578,7 @@
   /// this method will complete with the same error.
   async.Future<Environment> get(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -624,7 +624,7 @@
   async.Future<ListEnvironmentsResponse> list(core.String parent,
       {core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -677,7 +677,7 @@
   async.Future<Environment> patch(Environment request, core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -729,7 +729,7 @@
   async.Future<Environment> reauthorize(Environment request, core.String path,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -781,7 +781,7 @@
   async.Future<Environment> update(Environment request, core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -838,7 +838,7 @@
   async.Future<ContainerVersionHeader> latest(core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -887,7 +887,7 @@
   async.Future<ListContainerVersionsResponse> list(core.String parent,
       {core.bool includeDeleted, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -943,7 +943,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -992,7 +992,7 @@
   async.Future<ContainerVersion> get(core.String path,
       {core.String containerVersionId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1039,7 +1039,7 @@
   async.Future<ContainerVersion> live(core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1086,7 +1086,7 @@
   async.Future<PublishContainerVersionResponse> publish(core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1135,7 +1135,7 @@
   async.Future<ContainerVersion> setLatest(core.String path,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1179,7 +1179,7 @@
   async.Future<ContainerVersion> undelete(core.String path,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1229,7 +1229,7 @@
       ContainerVersion request, core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1303,7 +1303,7 @@
   async.Future<Workspace> create(Workspace request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1355,7 +1355,7 @@
       CreateContainerVersionRequestVersionOptions request, core.String path,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1400,7 +1400,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1445,7 +1445,7 @@
   /// this method will complete with the same error.
   async.Future<Workspace> get(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1489,7 +1489,7 @@
   async.Future<WorkspaceProposal> getProposal(core.String path,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1533,7 +1533,7 @@
   async.Future<GetWorkspaceStatusResponse> getStatus(core.String path,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1580,7 +1580,7 @@
   async.Future<ListWorkspacesResponse> list(core.String parent,
       {core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1628,7 +1628,7 @@
   async.Future<QuickPreviewResponse> quickPreview(core.String path,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1676,7 +1676,7 @@
   async.Future resolveConflict(Entity request, core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1730,7 +1730,7 @@
   async.Future<SyncWorkspaceResponse> sync(core.String path,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1779,7 +1779,7 @@
   async.Future<Workspace> update(Workspace request, core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1832,7 +1832,7 @@
       UpdateWorkspaceProposalRequest request, core.String path,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1889,7 +1889,7 @@
   async.Future<CreateBuiltInVariableResponse> create(core.String parent,
       {core.List<core.String> type, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1938,7 +1938,7 @@
   async.Future delete(core.String path,
       {core.List<core.String> type, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1989,7 +1989,7 @@
   async.Future<ListEnabledBuiltInVariablesResponse> list(core.String parent,
       {core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2144,7 +2144,7 @@
   async.Future<RevertBuiltInVariableResponse> revert(core.String path,
       {core.String type, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2202,7 +2202,7 @@
   async.Future<Folder> create(Folder request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2246,7 +2246,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2294,7 +2294,7 @@
   async.Future<FolderEntities> entities(core.String path,
       {core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2340,7 +2340,7 @@
   /// this method will complete with the same error.
   async.Future<Folder> get(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2386,7 +2386,7 @@
   async.Future<ListFoldersResponse> list(core.String parent,
       {core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2442,7 +2442,7 @@
       core.List<core.String> variableId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2504,7 +2504,7 @@
   async.Future<RevertFolderResponse> revert(core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2556,7 +2556,7 @@
   async.Future<Folder> update(Folder request, core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2616,7 +2616,7 @@
       CreateWorkspaceProposalRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2660,7 +2660,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2715,7 +2715,7 @@
   async.Future<Tag> create(Tag request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2759,7 +2759,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2804,7 +2804,7 @@
   /// this method will complete with the same error.
   async.Future<Tag> get(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2850,7 +2850,7 @@
   async.Future<ListTagsResponse> list(core.String parent,
       {core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2900,7 +2900,7 @@
   async.Future<RevertTagResponse> revert(core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2952,7 +2952,7 @@
   async.Future<Tag> update(Tag request, core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3011,7 +3011,7 @@
   async.Future<Trigger> create(Trigger request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3055,7 +3055,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3100,7 +3100,7 @@
   /// this method will complete with the same error.
   async.Future<Trigger> get(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3146,7 +3146,7 @@
   async.Future<ListTriggersResponse> list(core.String parent,
       {core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3196,7 +3196,7 @@
   async.Future<RevertTriggerResponse> revert(core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3248,7 +3248,7 @@
   async.Future<Trigger> update(Trigger request, core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3307,7 +3307,7 @@
   async.Future<Variable> create(Variable request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3351,7 +3351,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3396,7 +3396,7 @@
   /// this method will complete with the same error.
   async.Future<Variable> get(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3442,7 +3442,7 @@
   async.Future<ListVariablesResponse> list(core.String parent,
       {core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3492,7 +3492,7 @@
   async.Future<RevertVariableResponse> revert(core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3544,7 +3544,7 @@
   async.Future<Variable> update(Variable request, core.String path,
       {core.String fingerprint, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3603,7 +3603,7 @@
       UserPermission request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3649,7 +3649,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3694,7 +3694,7 @@
   /// this method will complete with the same error.
   async.Future<UserPermission> get(core.String path, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3741,7 +3741,7 @@
   async.Future<ListUserPermissionsResponse> list(core.String parent,
       {core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3792,7 +3792,7 @@
   async.Future<UserPermission> update(UserPermission request, core.String path,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4133,7 +4133,7 @@
   Condition.fromJson(core.Map _json) {
     if (_json.containsKey("parameter")) {
       parameter = _json["parameter"]
-          .map((value) => new Parameter.fromJson(value))
+          .map<Parameter>((value) => new Parameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("type")) {
@@ -4359,7 +4359,7 @@
     }
     if (_json.containsKey("builtInVariable")) {
       builtInVariable = _json["builtInVariable"]
-          .map((value) => new BuiltInVariable.fromJson(value))
+          .map<BuiltInVariable>((value) => new BuiltInVariable.fromJson(value))
           .toList();
     }
     if (_json.containsKey("container")) {
@@ -4381,8 +4381,9 @@
       fingerprint = _json["fingerprint"];
     }
     if (_json.containsKey("folder")) {
-      folder =
-          _json["folder"].map((value) => new Folder.fromJson(value)).toList();
+      folder = _json["folder"]
+          .map<Folder>((value) => new Folder.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
@@ -4391,22 +4392,24 @@
       path = _json["path"];
     }
     if (_json.containsKey("tag")) {
-      tag = _json["tag"].map((value) => new Tag.fromJson(value)).toList();
+      tag = _json["tag"].map<Tag>((value) => new Tag.fromJson(value)).toList();
     }
     if (_json.containsKey("tagManagerUrl")) {
       tagManagerUrl = _json["tagManagerUrl"];
     }
     if (_json.containsKey("trigger")) {
-      trigger =
-          _json["trigger"].map((value) => new Trigger.fromJson(value)).toList();
+      trigger = _json["trigger"]
+          .map<Trigger>((value) => new Trigger.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("variable")) {
       variable = _json["variable"]
-          .map((value) => new Variable.fromJson(value))
+          .map<Variable>((value) => new Variable.fromJson(value))
           .toList();
     }
     if (_json.containsKey("zone")) {
-      zone = _json["zone"].map((value) => new Zone.fromJson(value)).toList();
+      zone =
+          _json["zone"].map<Zone>((value) => new Zone.fromJson(value)).toList();
     }
   }
 
@@ -4597,7 +4600,7 @@
   CreateBuiltInVariableResponse.fromJson(core.Map _json) {
     if (_json.containsKey("builtInVariable")) {
       builtInVariable = _json["builtInVariable"]
-          .map((value) => new BuiltInVariable.fromJson(value))
+          .map<BuiltInVariable>((value) => new BuiltInVariable.fromJson(value))
           .toList();
     }
   }
@@ -4716,7 +4719,8 @@
     }
     if (_json.containsKey("reviewers")) {
       reviewers = _json["reviewers"]
-          .map((value) => new WorkspaceProposalUser.fromJson(value))
+          .map<WorkspaceProposalUser>(
+              (value) => new WorkspaceProposalUser.fromJson(value))
           .toList();
     }
   }
@@ -5077,15 +5081,16 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("tag")) {
-      tag = _json["tag"].map((value) => new Tag.fromJson(value)).toList();
+      tag = _json["tag"].map<Tag>((value) => new Tag.fromJson(value)).toList();
     }
     if (_json.containsKey("trigger")) {
-      trigger =
-          _json["trigger"].map((value) => new Trigger.fromJson(value)).toList();
+      trigger = _json["trigger"]
+          .map<Trigger>((value) => new Trigger.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("variable")) {
       variable = _json["variable"]
-          .map((value) => new Variable.fromJson(value))
+          .map<Variable>((value) => new Variable.fromJson(value))
           .toList();
     }
   }
@@ -5123,12 +5128,12 @@
   GetWorkspaceStatusResponse.fromJson(core.Map _json) {
     if (_json.containsKey("mergeConflict")) {
       mergeConflict = _json["mergeConflict"]
-          .map((value) => new MergeConflict.fromJson(value))
+          .map<MergeConflict>((value) => new MergeConflict.fromJson(value))
           .toList();
     }
     if (_json.containsKey("workspaceChange")) {
       workspaceChange = _json["workspaceChange"]
-          .map((value) => new Entity.fromJson(value))
+          .map<Entity>((value) => new Entity.fromJson(value))
           .toList();
     }
   }
@@ -5160,8 +5165,9 @@
 
   ListAccountsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("account")) {
-      account =
-          _json["account"].map((value) => new Account.fromJson(value)).toList();
+      account = _json["account"]
+          .map<Account>((value) => new Account.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -5194,7 +5200,8 @@
   ListContainerVersionsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("containerVersionHeader")) {
       containerVersionHeader = _json["containerVersionHeader"]
-          .map((value) => new ContainerVersionHeader.fromJson(value))
+          .map<ContainerVersionHeader>(
+              (value) => new ContainerVersionHeader.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5229,7 +5236,7 @@
   ListContainersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("container")) {
       container = _json["container"]
-          .map((value) => new Container.fromJson(value))
+          .map<Container>((value) => new Container.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5263,7 +5270,7 @@
   ListEnabledBuiltInVariablesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("builtInVariable")) {
       builtInVariable = _json["builtInVariable"]
-          .map((value) => new BuiltInVariable.fromJson(value))
+          .map<BuiltInVariable>((value) => new BuiltInVariable.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5298,7 +5305,7 @@
   ListEnvironmentsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("environment")) {
       environment = _json["environment"]
-          .map((value) => new Environment.fromJson(value))
+          .map<Environment>((value) => new Environment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5332,8 +5339,9 @@
 
   ListFoldersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("folder")) {
-      folder =
-          _json["folder"].map((value) => new Folder.fromJson(value)).toList();
+      folder = _json["folder"]
+          .map<Folder>((value) => new Folder.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -5368,7 +5376,7 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("tag")) {
-      tag = _json["tag"].map((value) => new Tag.fromJson(value)).toList();
+      tag = _json["tag"].map<Tag>((value) => new Tag.fromJson(value)).toList();
     }
   }
 
@@ -5400,8 +5408,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("trigger")) {
-      trigger =
-          _json["trigger"].map((value) => new Trigger.fromJson(value)).toList();
+      trigger = _json["trigger"]
+          .map<Trigger>((value) => new Trigger.fromJson(value))
+          .toList();
     }
   }
 
@@ -5434,7 +5443,7 @@
     }
     if (_json.containsKey("userPermission")) {
       userPermission = _json["userPermission"]
-          .map((value) => new UserPermission.fromJson(value))
+          .map<UserPermission>((value) => new UserPermission.fromJson(value))
           .toList();
     }
   }
@@ -5469,7 +5478,7 @@
     }
     if (_json.containsKey("variable")) {
       variable = _json["variable"]
-          .map((value) => new Variable.fromJson(value))
+          .map<Variable>((value) => new Variable.fromJson(value))
           .toList();
     }
   }
@@ -5503,7 +5512,7 @@
     }
     if (_json.containsKey("workspace")) {
       workspace = _json["workspace"]
-          .map((value) => new Workspace.fromJson(value))
+          .map<Workspace>((value) => new Workspace.fromJson(value))
           .toList();
     }
   }
@@ -5597,11 +5606,14 @@
       key = _json["key"];
     }
     if (_json.containsKey("list")) {
-      list =
-          _json["list"].map((value) => new Parameter.fromJson(value)).toList();
+      list = _json["list"]
+          .map<Parameter>((value) => new Parameter.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("map")) {
-      map = _json["map"].map((value) => new Parameter.fromJson(value)).toList();
+      map = _json["map"]
+          .map<Parameter>((value) => new Parameter.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("type")) {
       type = _json["type"];
@@ -5915,7 +5927,7 @@
   SyncWorkspaceResponse.fromJson(core.Map _json) {
     if (_json.containsKey("mergeConflict")) {
       mergeConflict = _json["mergeConflict"]
-          .map((value) => new MergeConflict.fromJson(value))
+          .map<MergeConflict>((value) => new MergeConflict.fromJson(value))
           .toList();
     }
     if (_json.containsKey("syncStatus")) {
@@ -6059,7 +6071,7 @@
     }
     if (_json.containsKey("parameter")) {
       parameter = _json["parameter"]
-          .map((value) => new Parameter.fromJson(value))
+          .map<Parameter>((value) => new Parameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("parentFolderId")) {
@@ -6082,7 +6094,7 @@
     }
     if (_json.containsKey("setupTag")) {
       setupTag = _json["setupTag"]
-          .map((value) => new SetupTag.fromJson(value))
+          .map<SetupTag>((value) => new SetupTag.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tagFiringOption")) {
@@ -6096,7 +6108,7 @@
     }
     if (_json.containsKey("teardownTag")) {
       teardownTag = _json["teardownTag"]
-          .map((value) => new TeardownTag.fromJson(value))
+          .map<TeardownTag>((value) => new TeardownTag.fromJson(value))
           .toList();
     }
     if (_json.containsKey("type")) {
@@ -6495,7 +6507,7 @@
     }
     if (_json.containsKey("autoEventFilter")) {
       autoEventFilter = _json["autoEventFilter"]
-          .map((value) => new Condition.fromJson(value))
+          .map<Condition>((value) => new Condition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("checkValidation")) {
@@ -6510,7 +6522,7 @@
     }
     if (_json.containsKey("customEventFilter")) {
       customEventFilter = _json["customEventFilter"]
-          .map((value) => new Condition.fromJson(value))
+          .map<Condition>((value) => new Condition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("eventName")) {
@@ -6518,7 +6530,7 @@
     }
     if (_json.containsKey("filter")) {
       filter = _json["filter"]
-          .map((value) => new Condition.fromJson(value))
+          .map<Condition>((value) => new Condition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("fingerprint")) {
@@ -6549,7 +6561,7 @@
     }
     if (_json.containsKey("parameter")) {
       parameter = _json["parameter"]
-          .map((value) => new Parameter.fromJson(value))
+          .map<Parameter>((value) => new Parameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("parentFolderId")) {
@@ -6745,7 +6757,8 @@
     }
     if (_json.containsKey("reviewers")) {
       reviewers = _json["reviewers"]
-          .map((value) => new WorkspaceProposalUser.fromJson(value))
+          .map<WorkspaceProposalUser>(
+              (value) => new WorkspaceProposalUser.fromJson(value))
           .toList();
     }
     if (_json.containsKey("status")) {
@@ -6800,7 +6813,7 @@
     }
     if (_json.containsKey("containerAccess")) {
       containerAccess = _json["containerAccess"]
-          .map((value) => new ContainerAccess.fromJson(value))
+          .map<ContainerAccess>((value) => new ContainerAccess.fromJson(value))
           .toList();
     }
     if (_json.containsKey("emailAddress")) {
@@ -6916,7 +6929,7 @@
     }
     if (_json.containsKey("parameter")) {
       parameter = _json["parameter"]
-          .map((value) => new Parameter.fromJson(value))
+          .map<Parameter>((value) => new Parameter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("parentFolderId")) {
@@ -7121,7 +7134,8 @@
   WorkspaceProposal.fromJson(core.Map _json) {
     if (_json.containsKey("authors")) {
       authors = _json["authors"]
-          .map((value) => new WorkspaceProposalUser.fromJson(value))
+          .map<WorkspaceProposalUser>(
+              (value) => new WorkspaceProposalUser.fromJson(value))
           .toList();
     }
     if (_json.containsKey("fingerprint")) {
@@ -7129,7 +7143,8 @@
     }
     if (_json.containsKey("history")) {
       history = _json["history"]
-          .map((value) => new WorkspaceProposalHistory.fromJson(value))
+          .map<WorkspaceProposalHistory>(
+              (value) => new WorkspaceProposalHistory.fromJson(value))
           .toList();
     }
     if (_json.containsKey("path")) {
@@ -7137,7 +7152,8 @@
     }
     if (_json.containsKey("reviewers")) {
       reviewers = _json["reviewers"]
-          .map((value) => new WorkspaceProposalUser.fromJson(value))
+          .map<WorkspaceProposalUser>(
+              (value) => new WorkspaceProposalUser.fromJson(value))
           .toList();
     }
     if (_json.containsKey("status")) {
@@ -7388,7 +7404,8 @@
     }
     if (_json.containsKey("childContainer")) {
       childContainer = _json["childContainer"]
-          .map((value) => new ZoneChildContainer.fromJson(value))
+          .map<ZoneChildContainer>(
+              (value) => new ZoneChildContainer.fromJson(value))
           .toList();
     }
     if (_json.containsKey("containerId")) {
@@ -7479,7 +7496,7 @@
   ZoneBoundary.fromJson(core.Map _json) {
     if (_json.containsKey("condition")) {
       condition = _json["condition"]
-          .map((value) => new Condition.fromJson(value))
+          .map<Condition>((value) => new Condition.fromJson(value))
           .toList();
     }
     if (_json.containsKey("customEvaluationTriggerId")) {
diff --git a/generated/googleapis/lib/tasks/v1.dart b/generated/googleapis/lib/tasks/v1.dart
index 4d29d65..eb505cb 100644
--- a/generated/googleapis/lib/tasks/v1.dart
+++ b/generated/googleapis/lib/tasks/v1.dart
@@ -56,7 +56,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String tasklist, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -100,7 +100,7 @@
   /// this method will complete with the same error.
   async.Future<TaskList> get(core.String tasklist, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -143,7 +143,7 @@
   /// this method will complete with the same error.
   async.Future<TaskList> insert(TaskList request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -189,7 +189,7 @@
   async.Future<TaskLists> list(
       {core.String maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -238,7 +238,7 @@
   async.Future<TaskList> patch(TaskList request, core.String tasklist,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -286,7 +286,7 @@
   async.Future<TaskList> update(TaskList request, core.String tasklist,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -337,7 +337,7 @@
   /// this method will complete with the same error.
   async.Future clear(core.String tasklist, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -382,7 +382,7 @@
   async.Future delete(core.String tasklist, core.String task,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -435,7 +435,7 @@
   async.Future<Task> get(core.String tasklist, core.String task,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -493,7 +493,7 @@
   async.Future<Task> insert(Task request, core.String tasklist,
       {core.String parent, core.String previous, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -587,7 +587,7 @@
       core.String updatedMin,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -671,7 +671,7 @@
   async.Future<Task> move(core.String tasklist, core.String task,
       {core.String parent, core.String previous, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -731,7 +731,7 @@
   async.Future<Task> patch(Task request, core.String tasklist, core.String task,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -788,7 +788,7 @@
       Task request, core.String tasklist, core.String task,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -943,8 +943,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("links")) {
-      links =
-          _json["links"].map((value) => new TaskLinks.fromJson(value)).toList();
+      links = _json["links"]
+          .map<TaskLinks>((value) => new TaskLinks.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("notes")) {
       notes = _json["notes"];
@@ -1109,8 +1110,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new TaskList.fromJson(value)).toList();
+      items = _json["items"]
+          .map<TaskList>((value) => new TaskList.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1159,7 +1161,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Task.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Task>((value) => new Task.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
diff --git a/generated/googleapis/lib/testing/v1.dart b/generated/googleapis/lib/testing/v1.dart
index 1c40ca6..64278dc 100644
--- a/generated/googleapis/lib/testing/v1.dart
+++ b/generated/googleapis/lib/testing/v1.dart
@@ -65,7 +65,7 @@
   async.Future<GetApkDetailsResponse> getApkDetails(FileReference request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -135,7 +135,7 @@
       core.String projectId, core.String testMatrixId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -203,7 +203,7 @@
   async.Future<TestMatrix> create(TestMatrix request, core.String projectId,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -262,7 +262,7 @@
   async.Future<TestMatrix> get(core.String projectId, core.String testMatrixId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -333,7 +333,7 @@
   async.Future<TestEnvironmentCatalog> get(core.String environmentType,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -462,7 +462,7 @@
   AndroidDeviceCatalog.fromJson(core.Map _json) {
     if (_json.containsKey("models")) {
       models = _json["models"]
-          .map((value) => new AndroidModel.fromJson(value))
+          .map<AndroidModel>((value) => new AndroidModel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("runtimeConfiguration")) {
@@ -471,7 +471,7 @@
     }
     if (_json.containsKey("versions")) {
       versions = _json["versions"]
-          .map((value) => new AndroidVersion.fromJson(value))
+          .map<AndroidVersion>((value) => new AndroidVersion.fromJson(value))
           .toList();
     }
   }
@@ -503,7 +503,7 @@
   AndroidDeviceList.fromJson(core.Map _json) {
     if (_json.containsKey("androidDevices")) {
       androidDevices = _json["androidDevices"]
-          .map((value) => new AndroidDevice.fromJson(value))
+          .map<AndroidDevice>((value) => new AndroidDevice.fromJson(value))
           .toList();
     }
   }
@@ -911,12 +911,13 @@
     }
     if (_json.containsKey("roboDirectives")) {
       roboDirectives = _json["roboDirectives"]
-          .map((value) => new RoboDirective.fromJson(value))
+          .map<RoboDirective>((value) => new RoboDirective.fromJson(value))
           .toList();
     }
     if (_json.containsKey("startingIntents")) {
       startingIntents = _json["startingIntents"]
-          .map((value) => new RoboStartingIntent.fromJson(value))
+          .map<RoboStartingIntent>(
+              (value) => new RoboStartingIntent.fromJson(value))
           .toList();
     }
   }
@@ -965,12 +966,13 @@
 
   AndroidRuntimeConfiguration.fromJson(core.Map _json) {
     if (_json.containsKey("locales")) {
-      locales =
-          _json["locales"].map((value) => new Locale.fromJson(value)).toList();
+      locales = _json["locales"]
+          .map<Locale>((value) => new Locale.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("orientations")) {
       orientations = _json["orientations"]
-          .map((value) => new Orientation.fromJson(value))
+          .map<Orientation>((value) => new Orientation.fromJson(value))
           .toList();
     }
   }
@@ -1188,7 +1190,7 @@
     }
     if (_json.containsKey("intentFilters")) {
       intentFilters = _json["intentFilters"]
-          .map((value) => new IntentFilter.fromJson(value))
+          .map<IntentFilter>((value) => new IntentFilter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("maxSdkVersion")) {
@@ -1308,7 +1310,8 @@
   ClientInfo.fromJson(core.Map _json) {
     if (_json.containsKey("clientInfoDetails")) {
       clientInfoDetails = _json["clientInfoDetails"]
-          .map((value) => new ClientInfoDetail.fromJson(value))
+          .map<ClientInfoDetail>(
+              (value) => new ClientInfoDetail.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -1819,7 +1822,8 @@
   NetworkConfigurationCatalog.fromJson(core.Map _json) {
     if (_json.containsKey("configurations")) {
       configurations = _json["configurations"]
-          .map((value) => new NetworkConfiguration.fromJson(value))
+          .map<NetworkConfiguration>(
+              (value) => new NetworkConfiguration.fromJson(value))
           .toList();
     }
   }
@@ -2487,7 +2491,7 @@
     }
     if (_json.containsKey("testExecutions")) {
       testExecutions = _json["testExecutions"]
-          .map((value) => new TestExecution.fromJson(value))
+          .map<TestExecution>((value) => new TestExecution.fromJson(value))
           .toList();
     }
     if (_json.containsKey("testMatrixId")) {
@@ -2582,12 +2586,13 @@
     }
     if (_json.containsKey("environmentVariables")) {
       environmentVariables = _json["environmentVariables"]
-          .map((value) => new EnvironmentVariable.fromJson(value))
+          .map<EnvironmentVariable>(
+              (value) => new EnvironmentVariable.fromJson(value))
           .toList();
     }
     if (_json.containsKey("filesToPush")) {
       filesToPush = _json["filesToPush"]
-          .map((value) => new DeviceFile.fromJson(value))
+          .map<DeviceFile>((value) => new DeviceFile.fromJson(value))
           .toList();
     }
     if (_json.containsKey("networkProfile")) {
diff --git a/generated/googleapis/lib/translate/v2.dart b/generated/googleapis/lib/translate/v2.dart
index 0f7dcce..74321c8 100644
--- a/generated/googleapis/lib/translate/v2.dart
+++ b/generated/googleapis/lib/translate/v2.dart
@@ -64,7 +64,7 @@
   async.Future<DetectionsListResponse> detect(DetectLanguageRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -108,7 +108,7 @@
   async.Future<DetectionsListResponse> list(core.List<core.String> q,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -162,7 +162,7 @@
   async.Future<LanguagesListResponse> list(
       {core.String target, core.String model, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -244,7 +244,7 @@
       core.String source,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -305,7 +305,7 @@
   async.Future<TranslationsListResponse> translate(TranslateTextRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -364,7 +364,8 @@
   DetectionsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("detections")) {
       detections = _json["detections"]
-          .map((value) => new DetectionsResource.fromJson(value))
+          .map<DetectionsResource>(
+              (value) => new DetectionsResource.fromJson(value))
           .toList();
     }
   }
@@ -487,7 +488,8 @@
   LanguagesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("languages")) {
       languages = _json["languages"]
-          .map((value) => new LanguagesResource.fromJson(value))
+          .map<LanguagesResource>(
+              (value) => new LanguagesResource.fromJson(value))
           .toList();
     }
   }
@@ -612,7 +614,8 @@
   TranslationsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("translations")) {
       translations = _json["translations"]
-          .map((value) => new TranslationsResource.fromJson(value))
+          .map<TranslationsResource>(
+              (value) => new TranslationsResource.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/urlshortener/v1.dart b/generated/googleapis/lib/urlshortener/v1.dart
index ec31dd4..92087ce 100644
--- a/generated/googleapis/lib/urlshortener/v1.dart
+++ b/generated/googleapis/lib/urlshortener/v1.dart
@@ -61,7 +61,7 @@
   async.Future<Url> get(core.String shortUrl,
       {core.String projection, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -107,7 +107,7 @@
   /// this method will complete with the same error.
   async.Future<Url> insert(Url request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -155,7 +155,7 @@
   async.Future<UrlHistory> list(
       {core.String projection, core.String start_token, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -211,12 +211,12 @@
   AnalyticsSnapshot.fromJson(core.Map _json) {
     if (_json.containsKey("browsers")) {
       browsers = _json["browsers"]
-          .map((value) => new StringCount.fromJson(value))
+          .map<StringCount>((value) => new StringCount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("countries")) {
       countries = _json["countries"]
-          .map((value) => new StringCount.fromJson(value))
+          .map<StringCount>((value) => new StringCount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("longUrlClicks")) {
@@ -224,12 +224,12 @@
     }
     if (_json.containsKey("platforms")) {
       platforms = _json["platforms"]
-          .map((value) => new StringCount.fromJson(value))
+          .map<StringCount>((value) => new StringCount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("referrers")) {
       referrers = _json["referrers"]
-          .map((value) => new StringCount.fromJson(value))
+          .map<StringCount>((value) => new StringCount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shortUrlClicks")) {
@@ -445,7 +445,8 @@
 
   UrlHistory.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Url.fromJson(value)).toList();
+      items =
+          _json["items"].map<Url>((value) => new Url.fromJson(value)).toList();
     }
     if (_json.containsKey("itemsPerPage")) {
       itemsPerPage = _json["itemsPerPage"];
diff --git a/generated/googleapis/lib/vault/v1.dart b/generated/googleapis/lib/vault/v1.dart
index dbc0377..0c19fdc 100644
--- a/generated/googleapis/lib/vault/v1.dart
+++ b/generated/googleapis/lib/vault/v1.dart
@@ -63,7 +63,7 @@
       AddMatterPermissionsRequest request, core.String matterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -114,7 +114,7 @@
       CloseMatterRequest request, core.String matterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -163,7 +163,7 @@
   /// this method will complete with the same error.
   async.Future<Matter> create(Matter request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -205,7 +205,7 @@
   /// this method will complete with the same error.
   async.Future<Matter> delete(core.String matterId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -254,7 +254,7 @@
   async.Future<Matter> get(core.String matterId,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -322,7 +322,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -377,7 +377,7 @@
       RemoveMatterPermissionsRequest request, core.String matterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -428,7 +428,7 @@
       ReopenMatterRequest request, core.String matterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -478,7 +478,7 @@
       UndeleteMatterRequest request, core.String matterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -531,7 +531,7 @@
   async.Future<Matter> update(Matter request, core.String matterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -588,7 +588,7 @@
   async.Future<Hold> create(Hold request, core.String matterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -637,7 +637,7 @@
   async.Future<Empty> delete(core.String matterId, core.String holdId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -688,7 +688,7 @@
   async.Future<Hold> get(core.String matterId, core.String holdId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -745,7 +745,7 @@
   async.Future<ListHoldsResponse> list(core.String matterId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -802,7 +802,7 @@
       Hold request, core.String matterId, core.String holdId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -868,7 +868,7 @@
       HeldAccount request, core.String matterId, core.String holdId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -927,7 +927,7 @@
       core.String matterId, core.String holdId, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -987,7 +987,7 @@
       core.String matterId, core.String holdId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1381,7 +1381,7 @@
   Hold.fromJson(core.Map _json) {
     if (_json.containsKey("accounts")) {
       accounts = _json["accounts"]
-          .map((value) => new HeldAccount.fromJson(value))
+          .map<HeldAccount>((value) => new HeldAccount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("corpus")) {
@@ -1442,7 +1442,7 @@
   ListHeldAccountsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("accounts")) {
       accounts = _json["accounts"]
-          .map((value) => new HeldAccount.fromJson(value))
+          .map<HeldAccount>((value) => new HeldAccount.fromJson(value))
           .toList();
     }
   }
@@ -1470,7 +1470,9 @@
 
   ListHoldsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("holds")) {
-      holds = _json["holds"].map((value) => new Hold.fromJson(value)).toList();
+      holds = _json["holds"]
+          .map<Hold>((value) => new Hold.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -1502,8 +1504,9 @@
 
   ListMattersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("matters")) {
-      matters =
-          _json["matters"].map((value) => new Matter.fromJson(value)).toList();
+      matters = _json["matters"]
+          .map<Matter>((value) => new Matter.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -1558,7 +1561,8 @@
     }
     if (_json.containsKey("matterPermissions")) {
       matterPermissions = _json["matterPermissions"]
-          .map((value) => new MatterPermission.fromJson(value))
+          .map<MatterPermission>(
+              (value) => new MatterPermission.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
diff --git a/generated/googleapis/lib/vision/v1.dart b/generated/googleapis/lib/vision/v1.dart
index df6dea7..1300bd9 100644
--- a/generated/googleapis/lib/vision/v1.dart
+++ b/generated/googleapis/lib/vision/v1.dart
@@ -62,7 +62,7 @@
       BatchAnnotateImagesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -105,7 +105,7 @@
   AnnotateImageRequest.fromJson(core.Map _json) {
     if (_json.containsKey("features")) {
       features = _json["features"]
-          .map((value) => new Feature.fromJson(value))
+          .map<Feature>((value) => new Feature.fromJson(value))
           .toList();
     }
     if (_json.containsKey("image")) {
@@ -184,7 +184,7 @@
     }
     if (_json.containsKey("faceAnnotations")) {
       faceAnnotations = _json["faceAnnotations"]
-          .map((value) => new FaceAnnotation.fromJson(value))
+          .map<FaceAnnotation>((value) => new FaceAnnotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("fullTextAnnotation")) {
@@ -197,17 +197,20 @@
     }
     if (_json.containsKey("labelAnnotations")) {
       labelAnnotations = _json["labelAnnotations"]
-          .map((value) => new EntityAnnotation.fromJson(value))
+          .map<EntityAnnotation>(
+              (value) => new EntityAnnotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("landmarkAnnotations")) {
       landmarkAnnotations = _json["landmarkAnnotations"]
-          .map((value) => new EntityAnnotation.fromJson(value))
+          .map<EntityAnnotation>(
+              (value) => new EntityAnnotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("logoAnnotations")) {
       logoAnnotations = _json["logoAnnotations"]
-          .map((value) => new EntityAnnotation.fromJson(value))
+          .map<EntityAnnotation>(
+              (value) => new EntityAnnotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("safeSearchAnnotation")) {
@@ -216,7 +219,8 @@
     }
     if (_json.containsKey("textAnnotations")) {
       textAnnotations = _json["textAnnotations"]
-          .map((value) => new EntityAnnotation.fromJson(value))
+          .map<EntityAnnotation>(
+              (value) => new EntityAnnotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("webDetection")) {
@@ -279,7 +283,8 @@
   BatchAnnotateImagesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("requests")) {
       requests = _json["requests"]
-          .map((value) => new AnnotateImageRequest.fromJson(value))
+          .map<AnnotateImageRequest>(
+              (value) => new AnnotateImageRequest.fromJson(value))
           .toList();
     }
   }
@@ -304,7 +309,8 @@
   BatchAnnotateImagesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("responses")) {
       responses = _json["responses"]
-          .map((value) => new AnnotateImageResponse.fromJson(value))
+          .map<AnnotateImageResponse>(
+              (value) => new AnnotateImageResponse.fromJson(value))
           .toList();
     }
   }
@@ -376,7 +382,7 @@
     }
     if (_json.containsKey("paragraphs")) {
       paragraphs = _json["paragraphs"]
-          .map((value) => new Paragraph.fromJson(value))
+          .map<Paragraph>((value) => new Paragraph.fromJson(value))
           .toList();
     }
     if (_json.containsKey("property")) {
@@ -416,8 +422,9 @@
 
   BoundingPoly.fromJson(core.Map _json) {
     if (_json.containsKey("vertices")) {
-      vertices =
-          _json["vertices"].map((value) => new Vertex.fromJson(value)).toList();
+      vertices = _json["vertices"]
+          .map<Vertex>((value) => new Vertex.fromJson(value))
+          .toList();
     }
   }
 
@@ -700,7 +707,7 @@
   CropHintsAnnotation.fromJson(core.Map _json) {
     if (_json.containsKey("cropHints")) {
       cropHints = _json["cropHints"]
-          .map((value) => new CropHint.fromJson(value))
+          .map<CropHint>((value) => new CropHint.fromJson(value))
           .toList();
     }
   }
@@ -828,7 +835,7 @@
   DominantColorsAnnotation.fromJson(core.Map _json) {
     if (_json.containsKey("colors")) {
       colors = _json["colors"]
-          .map((value) => new ColorInfo.fromJson(value))
+          .map<ColorInfo>((value) => new ColorInfo.fromJson(value))
           .toList();
     }
   }
@@ -906,7 +913,7 @@
     }
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new LocationInfo.fromJson(value))
+          .map<LocationInfo>((value) => new LocationInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("mid")) {
@@ -914,7 +921,7 @@
     }
     if (_json.containsKey("properties")) {
       properties = _json["properties"]
-          .map((value) => new Property.fromJson(value))
+          .map<Property>((value) => new Property.fromJson(value))
           .toList();
     }
     if (_json.containsKey("score")) {
@@ -1137,7 +1144,7 @@
     }
     if (_json.containsKey("landmarks")) {
       landmarks = _json["landmarks"]
-          .map((value) => new Landmark.fromJson(value))
+          .map<Landmark>((value) => new Landmark.fromJson(value))
           .toList();
     }
     if (_json.containsKey("panAngle")) {
@@ -1639,8 +1646,9 @@
 
   Page.fromJson(core.Map _json) {
     if (_json.containsKey("blocks")) {
-      blocks =
-          _json["blocks"].map((value) => new Block.fromJson(value)).toList();
+      blocks = _json["blocks"]
+          .map<Block>((value) => new Block.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("confidence")) {
       confidence = _json["confidence"];
@@ -1719,7 +1727,9 @@
       property = new TextProperty.fromJson(_json["property"]);
     }
     if (_json.containsKey("words")) {
-      words = _json["words"].map((value) => new Word.fromJson(value)).toList();
+      words = _json["words"]
+          .map<Word>((value) => new Word.fromJson(value))
+          .toList();
     }
   }
 
@@ -2139,7 +2149,9 @@
 
   TextAnnotation.fromJson(core.Map _json) {
     if (_json.containsKey("pages")) {
-      pages = _json["pages"].map((value) => new Page.fromJson(value)).toList();
+      pages = _json["pages"]
+          .map<Page>((value) => new Page.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("text")) {
       text = _json["text"];
@@ -2175,7 +2187,8 @@
     }
     if (_json.containsKey("detectedLanguages")) {
       detectedLanguages = _json["detectedLanguages"]
-          .map((value) => new DetectedLanguage.fromJson(value))
+          .map<DetectedLanguage>(
+              (value) => new DetectedLanguage.fromJson(value))
           .toList();
     }
   }
@@ -2255,32 +2268,32 @@
   WebDetection.fromJson(core.Map _json) {
     if (_json.containsKey("bestGuessLabels")) {
       bestGuessLabels = _json["bestGuessLabels"]
-          .map((value) => new WebLabel.fromJson(value))
+          .map<WebLabel>((value) => new WebLabel.fromJson(value))
           .toList();
     }
     if (_json.containsKey("fullMatchingImages")) {
       fullMatchingImages = _json["fullMatchingImages"]
-          .map((value) => new WebImage.fromJson(value))
+          .map<WebImage>((value) => new WebImage.fromJson(value))
           .toList();
     }
     if (_json.containsKey("pagesWithMatchingImages")) {
       pagesWithMatchingImages = _json["pagesWithMatchingImages"]
-          .map((value) => new WebPage.fromJson(value))
+          .map<WebPage>((value) => new WebPage.fromJson(value))
           .toList();
     }
     if (_json.containsKey("partialMatchingImages")) {
       partialMatchingImages = _json["partialMatchingImages"]
-          .map((value) => new WebImage.fromJson(value))
+          .map<WebImage>((value) => new WebImage.fromJson(value))
           .toList();
     }
     if (_json.containsKey("visuallySimilarImages")) {
       visuallySimilarImages = _json["visuallySimilarImages"]
-          .map((value) => new WebImage.fromJson(value))
+          .map<WebImage>((value) => new WebImage.fromJson(value))
           .toList();
     }
     if (_json.containsKey("webEntities")) {
       webEntities = _json["webEntities"]
-          .map((value) => new WebEntity.fromJson(value))
+          .map<WebEntity>((value) => new WebEntity.fromJson(value))
           .toList();
     }
   }
@@ -2473,7 +2486,7 @@
   WebPage.fromJson(core.Map _json) {
     if (_json.containsKey("fullMatchingImages")) {
       fullMatchingImages = _json["fullMatchingImages"]
-          .map((value) => new WebImage.fromJson(value))
+          .map<WebImage>((value) => new WebImage.fromJson(value))
           .toList();
     }
     if (_json.containsKey("pageTitle")) {
@@ -2481,7 +2494,7 @@
     }
     if (_json.containsKey("partialMatchingImages")) {
       partialMatchingImages = _json["partialMatchingImages"]
-          .map((value) => new WebImage.fromJson(value))
+          .map<WebImage>((value) => new WebImage.fromJson(value))
           .toList();
     }
     if (_json.containsKey("score")) {
@@ -2558,8 +2571,9 @@
       property = new TextProperty.fromJson(_json["property"]);
     }
     if (_json.containsKey("symbols")) {
-      symbols =
-          _json["symbols"].map((value) => new Symbol.fromJson(value)).toList();
+      symbols = _json["symbols"]
+          .map<Symbol>((value) => new Symbol.fromJson(value))
+          .toList();
     }
   }
 
diff --git a/generated/googleapis/lib/webfonts/v1.dart b/generated/googleapis/lib/webfonts/v1.dart
index ee62b22..e64ca71 100644
--- a/generated/googleapis/lib/webfonts/v1.dart
+++ b/generated/googleapis/lib/webfonts/v1.dart
@@ -58,7 +58,7 @@
   /// this method will complete with the same error.
   async.Future<WebfontList> list({core.String sort, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -181,8 +181,9 @@
 
   WebfontList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Webfont.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Webfont>((value) => new Webfont.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
diff --git a/generated/googleapis/lib/webmasters/v3.dart b/generated/googleapis/lib/webmasters/v3.dart
index 76738fa..32b972c 100644
--- a/generated/googleapis/lib/webmasters/v3.dart
+++ b/generated/googleapis/lib/webmasters/v3.dart
@@ -76,7 +76,7 @@
       SearchAnalyticsQueryRequest request, core.String siteUrl,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -133,7 +133,7 @@
   async.Future delete(core.String siteUrl, core.String feedpath,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -188,7 +188,7 @@
   async.Future<WmxSitemap> get(core.String siteUrl, core.String feedpath,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -242,7 +242,7 @@
   async.Future<SitemapsListResponse> list(core.String siteUrl,
       {core.String sitemapIndex, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -290,7 +290,7 @@
   async.Future submit(core.String siteUrl, core.String feedpath,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -344,7 +344,7 @@
   /// this method will complete with the same error.
   async.Future add(core.String siteUrl, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -389,7 +389,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String siteUrl, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -436,7 +436,7 @@
   /// this method will complete with the same error.
   async.Future<WmxSite> get(core.String siteUrl, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -476,7 +476,7 @@
   /// this method will complete with the same error.
   async.Future<SitesListResponse> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -550,7 +550,7 @@
       core.String platform,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -638,7 +638,7 @@
       core.String category, core.String platform,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -717,7 +717,7 @@
       core.String siteUrl, core.String category, core.String platform,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -796,7 +796,7 @@
       core.String category, core.String platform,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -930,7 +930,8 @@
   ApiDimensionFilterGroup.fromJson(core.Map _json) {
     if (_json.containsKey("filters")) {
       filters = _json["filters"]
-          .map((value) => new ApiDimensionFilter.fromJson(value))
+          .map<ApiDimensionFilter>(
+              (value) => new ApiDimensionFilter.fromJson(value))
           .toList();
     }
     if (_json.containsKey("groupType")) {
@@ -1009,7 +1010,8 @@
     }
     if (_json.containsKey("dimensionFilterGroups")) {
       dimensionFilterGroups = _json["dimensionFilterGroups"]
-          .map((value) => new ApiDimensionFilterGroup.fromJson(value))
+          .map<ApiDimensionFilterGroup>(
+              (value) => new ApiDimensionFilterGroup.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dimensions")) {
@@ -1081,8 +1083,9 @@
       responseAggregationType = _json["responseAggregationType"];
     }
     if (_json.containsKey("rows")) {
-      rows =
-          _json["rows"].map((value) => new ApiDataRow.fromJson(value)).toList();
+      rows = _json["rows"]
+          .map<ApiDataRow>((value) => new ApiDataRow.fromJson(value))
+          .toList();
     }
   }
 
@@ -1109,7 +1112,7 @@
   SitemapsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("sitemap")) {
       sitemap = _json["sitemap"]
-          .map((value) => new WmxSitemap.fromJson(value))
+          .map<WmxSitemap>((value) => new WmxSitemap.fromJson(value))
           .toList();
     }
   }
@@ -1135,7 +1138,7 @@
   SitesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("siteEntry")) {
       siteEntry = _json["siteEntry"]
-          .map((value) => new WmxSite.fromJson(value))
+          .map<WmxSite>((value) => new WmxSite.fromJson(value))
           .toList();
     }
   }
@@ -1203,7 +1206,8 @@
     }
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new UrlCrawlErrorCount.fromJson(value))
+          .map<UrlCrawlErrorCount>(
+              (value) => new UrlCrawlErrorCount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("platform")) {
@@ -1239,7 +1243,8 @@
   UrlCrawlErrorsCountsQueryResponse.fromJson(core.Map _json) {
     if (_json.containsKey("countPerTypes")) {
       countPerTypes = _json["countPerTypes"]
-          .map((value) => new UrlCrawlErrorCountsPerType.fromJson(value))
+          .map<UrlCrawlErrorCountsPerType>(
+              (value) => new UrlCrawlErrorCountsPerType.fromJson(value))
           .toList();
     }
   }
@@ -1324,7 +1329,8 @@
   UrlCrawlErrorsSamplesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("urlCrawlErrorSample")) {
       urlCrawlErrorSample = _json["urlCrawlErrorSample"]
-          .map((value) => new UrlCrawlErrorsSample.fromJson(value))
+          .map<UrlCrawlErrorsSample>(
+              (value) => new UrlCrawlErrorsSample.fromJson(value))
           .toList();
     }
   }
@@ -1443,7 +1449,8 @@
   WmxSitemap.fromJson(core.Map _json) {
     if (_json.containsKey("contents")) {
       contents = _json["contents"]
-          .map((value) => new WmxSitemapContent.fromJson(value))
+          .map<WmxSitemapContent>(
+              (value) => new WmxSitemapContent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("errors")) {
diff --git a/generated/googleapis/lib/youtube/v3.dart b/generated/googleapis/lib/youtube/v3.dart
index b747da6..52126a9 100644
--- a/generated/googleapis/lib/youtube/v3.dart
+++ b/generated/googleapis/lib/youtube/v3.dart
@@ -138,7 +138,7 @@
   async.Future<Activity> insert(Activity request, core.String part,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -242,7 +242,7 @@
       core.String regionCode,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -334,7 +334,7 @@
       core.String onBehalfOfContentOwner,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -431,7 +431,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -532,7 +532,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -628,7 +628,7 @@
       core.String onBehalfOfContentOwner,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -727,7 +727,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -841,7 +841,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -918,7 +918,7 @@
   async.Future delete(core.String id,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1009,7 +1009,7 @@
       core.String onBehalfOfContentOwnerChannel,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1110,7 +1110,7 @@
       core.String onBehalfOfContentOwner,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1190,7 +1190,7 @@
   async.Future<ChannelSection> update(ChannelSection request, core.String part,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1315,7 +1315,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1413,7 +1413,7 @@
   async.Future<Channel> update(Channel request, core.String part,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1474,7 +1474,7 @@
   async.Future<CommentThread> insert(CommentThread request, core.String part,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1603,7 +1603,7 @@
       core.String videoId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1685,7 +1685,7 @@
   async.Future<CommentThread> update(CommentThread request, core.String part,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1736,7 +1736,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1787,7 +1787,7 @@
   async.Future<Comment> insert(Comment request, core.String part,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1870,7 +1870,7 @@
       core.String textFormat,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1928,7 +1928,7 @@
   /// this method will complete with the same error.
   async.Future markAsSpam(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1996,7 +1996,7 @@
   async.Future setModerationStatus(core.String id, core.String moderationStatus,
       {core.bool banAuthor, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2054,7 +2054,7 @@
   async.Future<Comment> update(Comment request, core.String part,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2130,7 +2130,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2207,7 +2207,7 @@
       core.String regionCode,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2271,7 +2271,7 @@
   async.Future<I18nLanguageListResponse> list(core.String part,
       {core.String hl, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2329,7 +2329,7 @@
   async.Future<I18nRegionListResponse> list(core.String part,
       {core.String hl, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2432,7 +2432,7 @@
       core.String streamId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2558,7 +2558,7 @@
       core.DateTime walltime,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2657,7 +2657,7 @@
       core.String onBehalfOfContentOwnerChannel,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2753,7 +2753,7 @@
       core.String onBehalfOfContentOwnerChannel,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2885,7 +2885,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3016,7 +3016,7 @@
       core.String onBehalfOfContentOwnerChannel,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3129,7 +3129,7 @@
       core.String onBehalfOfContentOwnerChannel,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3188,7 +3188,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3239,7 +3239,7 @@
   async.Future<LiveChatBan> insert(LiveChatBan request, core.String part,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3291,7 +3291,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3342,7 +3342,7 @@
       LiveChatMessage request, core.String part,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3421,7 +3421,7 @@
       core.int profileImageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3487,7 +3487,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3539,7 +3539,7 @@
       LiveChatModerator request, core.String part,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3599,7 +3599,7 @@
       core.String liveChatId, core.String part,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3694,7 +3694,7 @@
       core.String onBehalfOfContentOwnerChannel,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3791,7 +3791,7 @@
       core.String onBehalfOfContentOwnerChannel,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3904,7 +3904,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4016,7 +4016,7 @@
       core.String onBehalfOfContentOwnerChannel,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4090,7 +4090,7 @@
   async.Future delete(core.String id,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4156,7 +4156,7 @@
   async.Future<PlaylistItem> insert(PlaylistItem request, core.String part,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4255,7 +4255,7 @@
       core.String videoId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4347,7 +4347,7 @@
   async.Future<PlaylistItem> update(PlaylistItem request, core.String part,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4416,7 +4416,7 @@
   async.Future delete(core.String id,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4504,7 +4504,7 @@
       core.String onBehalfOfContentOwnerChannel,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4630,7 +4630,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4725,7 +4725,7 @@
   async.Future<Playlist> update(Playlist request, core.String part,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5051,7 +5051,7 @@
       core.String videoType,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5209,7 +5209,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5267,7 +5267,7 @@
   /// this method will complete with the same error.
   async.Future delete(core.String id, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5317,7 +5317,7 @@
   async.Future<Subscription> insert(Subscription request, core.String part,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5452,7 +5452,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5560,7 +5560,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5643,7 +5643,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5711,7 +5711,7 @@
   async.Future<VideoAbuseReportReasonListResponse> list(core.String part,
       {core.String hl, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5780,7 +5780,7 @@
       core.String regionCode,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5853,7 +5853,7 @@
   async.Future delete(core.String id,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -5918,7 +5918,7 @@
   async.Future<VideoGetRatingResponse> getRating(core.String id,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6036,7 +6036,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6205,7 +6205,7 @@
       core.String videoCategoryId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6290,7 +6290,7 @@
   /// this method will complete with the same error.
   async.Future rate(core.String id, core.String rating, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6351,7 +6351,7 @@
   async.Future reportAbuse(VideoAbuseReport request,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6433,7 +6433,7 @@
   async.Future<Video> update(Video request, core.String part,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6512,7 +6512,7 @@
       commons.UploadOptions uploadOptions: commons.UploadOptions.Default,
       commons.Media uploadMedia}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -6584,7 +6584,7 @@
   async.Future unset(core.String channelId,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -7330,8 +7330,9 @@
       eventId = _json["eventId"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Activity.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Activity>((value) => new Activity.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -7575,8 +7576,9 @@
       eventId = _json["eventId"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Caption.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Caption>((value) => new Caption.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -8130,7 +8132,7 @@
     }
     if (_json.containsKey("hints")) {
       hints = _json["hints"]
-          .map((value) => new PropertyValue.fromJson(value))
+          .map<PropertyValue>((value) => new PropertyValue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("image")) {
@@ -8342,7 +8344,8 @@
   ChannelConversionPings.fromJson(core.Map _json) {
     if (_json.containsKey("pings")) {
       pings = _json["pings"]
-          .map((value) => new ChannelConversionPing.fromJson(value))
+          .map<ChannelConversionPing>(
+              (value) => new ChannelConversionPing.fromJson(value))
           .toList();
     }
   }
@@ -8394,8 +8397,9 @@
       eventId = _json["eventId"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Channel.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Channel>((value) => new Channel.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -8680,7 +8684,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ChannelSection.fromJson(value))
+          .map<ChannelSection>((value) => new ChannelSection.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -9334,8 +9338,9 @@
       eventId = _json["eventId"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Comment.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Comment>((value) => new Comment.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -9657,7 +9662,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new CommentThread.fromJson(value))
+          .map<CommentThread>((value) => new CommentThread.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -9720,7 +9725,7 @@
   CommentThreadReplies.fromJson(core.Map _json) {
     if (_json.containsKey("comments")) {
       comments = _json["comments"]
-          .map((value) => new Comment.fromJson(value))
+          .map<Comment>((value) => new Comment.fromJson(value))
           .toList();
     }
   }
@@ -11099,7 +11104,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new FanFundingEvent.fromJson(value))
+          .map<FanFundingEvent>((value) => new FanFundingEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -11367,7 +11372,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new GuideCategory.fromJson(value))
+          .map<GuideCategory>((value) => new GuideCategory.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -11537,7 +11542,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new I18nLanguage.fromJson(value))
+          .map<I18nLanguage>((value) => new I18nLanguage.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -11684,7 +11689,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new I18nRegion.fromJson(value))
+          .map<I18nRegion>((value) => new I18nRegion.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -12155,7 +12160,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new PromotedItem.fromJson(value))
+          .map<PromotedItem>((value) => new PromotedItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("position")) {
@@ -12586,7 +12591,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new LiveBroadcast.fromJson(value))
+          .map<LiveBroadcast>((value) => new LiveBroadcast.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -13251,7 +13256,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new LiveChatMessage.fromJson(value))
+          .map<LiveChatMessage>((value) => new LiveChatMessage.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -13606,7 +13611,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new LiveChatModerator.fromJson(value))
+          .map<LiveChatModerator>(
+              (value) => new LiveChatModerator.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -13730,7 +13736,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new LiveChatPollItem.fromJson(value))
+          .map<LiveChatPollItem>(
+              (value) => new LiveChatPollItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("prompt")) {
@@ -13796,7 +13803,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new LiveChatPollItem.fromJson(value))
+          .map<LiveChatPollItem>(
+              (value) => new LiveChatPollItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("prompt")) {
@@ -14215,7 +14223,8 @@
   LiveStreamHealthStatus.fromJson(core.Map _json) {
     if (_json.containsKey("configurationIssues")) {
       configurationIssues = _json["configurationIssues"]
-          .map((value) => new LiveStreamConfigurationIssue.fromJson(value))
+          .map<LiveStreamConfigurationIssue>(
+              (value) => new LiveStreamConfigurationIssue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("lastUpdateTimeSeconds")) {
@@ -14281,7 +14290,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new LiveStream.fromJson(value))
+          .map<LiveStream>((value) => new LiveStream.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -14453,7 +14462,7 @@
     }
     if (_json.containsKey("localized")) {
       localized = _json["localized"]
-          .map((value) => new LocalizedString.fromJson(value))
+          .map<LocalizedString>((value) => new LocalizedString.fromJson(value))
           .toList();
     }
   }
@@ -14978,7 +14987,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new PlaylistItem.fromJson(value))
+          .map<PlaylistItem>((value) => new PlaylistItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -15202,8 +15211,9 @@
       eventId = _json["eventId"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Playlist.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Playlist>((value) => new Playlist.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -15681,7 +15691,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new SearchResult.fromJson(value))
+          .map<SearchResult>((value) => new SearchResult.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -15978,8 +15988,9 @@
       eventId = _json["eventId"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Sponsor.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Sponsor>((value) => new Sponsor.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -16230,7 +16241,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new Subscription.fromJson(value))
+          .map<Subscription>((value) => new Subscription.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -16506,7 +16517,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new SuperChatEvent.fromJson(value))
+          .map<SuperChatEvent>((value) => new SuperChatEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -16794,7 +16805,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ThumbnailDetails.fromJson(value))
+          .map<ThumbnailDetails>(
+              (value) => new ThumbnailDetails.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -17196,7 +17208,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new VideoAbuseReportReason.fromJson(value))
+          .map<VideoAbuseReportReason>(
+              (value) => new VideoAbuseReportReason.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -17246,7 +17259,8 @@
     }
     if (_json.containsKey("secondaryReasons")) {
       secondaryReasons = _json["secondaryReasons"]
-          .map((value) => new VideoAbuseReportSecondaryReason.fromJson(value))
+          .map<VideoAbuseReportSecondaryReason>(
+              (value) => new VideoAbuseReportSecondaryReason.fromJson(value))
           .toList();
     }
   }
@@ -17439,7 +17453,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new VideoCategory.fromJson(value))
+          .map<VideoCategory>((value) => new VideoCategory.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -17761,7 +17775,8 @@
   VideoFileDetails.fromJson(core.Map _json) {
     if (_json.containsKey("audioStreams")) {
       audioStreams = _json["audioStreams"]
-          .map((value) => new VideoFileDetailsAudioStream.fromJson(value))
+          .map<VideoFileDetailsAudioStream>(
+              (value) => new VideoFileDetailsAudioStream.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bitrateBps")) {
@@ -17787,7 +17802,8 @@
     }
     if (_json.containsKey("videoStreams")) {
       videoStreams = _json["videoStreams"]
-          .map((value) => new VideoFileDetailsVideoStream.fromJson(value))
+          .map<VideoFileDetailsVideoStream>(
+              (value) => new VideoFileDetailsVideoStream.fromJson(value))
           .toList();
     }
   }
@@ -18003,7 +18019,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new VideoRating.fromJson(value))
+          .map<VideoRating>((value) => new VideoRating.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -18073,7 +18089,9 @@
       eventId = _json["eventId"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Video.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Video>((value) => new Video.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -18946,7 +18964,8 @@
     }
     if (_json.containsKey("tagSuggestions")) {
       tagSuggestions = _json["tagSuggestions"]
-          .map((value) => new VideoSuggestionsTagSuggestion.fromJson(value))
+          .map<VideoSuggestionsTagSuggestion>(
+              (value) => new VideoSuggestionsTagSuggestion.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis/lib/youtubeanalytics/v1.dart b/generated/googleapis/lib/youtubeanalytics/v1.dart
index 776fcf7..4daaabb 100644
--- a/generated/googleapis/lib/youtubeanalytics/v1.dart
+++ b/generated/googleapis/lib/youtubeanalytics/v1.dart
@@ -85,7 +85,7 @@
   async.Future delete(core.String id,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -147,7 +147,7 @@
   async.Future<GroupItem> insert(GroupItem request,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -207,7 +207,7 @@
   async.Future<GroupItemListResponse> list(core.String groupId,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -272,7 +272,7 @@
   async.Future delete(core.String id,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -334,7 +334,7 @@
   async.Future<Group> insert(Group request,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -408,7 +408,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -473,7 +473,7 @@
   async.Future<Group> update(Group request,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -592,7 +592,7 @@
       core.int start_index,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -850,8 +850,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new GroupItem.fromJson(value)).toList();
+      items = _json["items"]
+          .map<GroupItem>((value) => new GroupItem.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -889,7 +890,9 @@
       etag = _json["etag"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Group.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Group>((value) => new Group.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -997,7 +1000,8 @@
   ResultTable.fromJson(core.Map _json) {
     if (_json.containsKey("columnHeaders")) {
       columnHeaders = _json["columnHeaders"]
-          .map((value) => new ResultTableColumnHeaders.fromJson(value))
+          .map<ResultTableColumnHeaders>(
+              (value) => new ResultTableColumnHeaders.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
diff --git a/generated/googleapis/lib/youtubereporting/v1.dart b/generated/googleapis/lib/youtubereporting/v1.dart
index 529c033..fefae30 100644
--- a/generated/googleapis/lib/youtubereporting/v1.dart
+++ b/generated/googleapis/lib/youtubereporting/v1.dart
@@ -78,7 +78,7 @@
   async.Future<Job> create(Job request,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -128,7 +128,7 @@
   async.Future<Empty> delete(core.String jobId,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -178,7 +178,7 @@
   async.Future<Job> get(core.String jobId,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -245,7 +245,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -309,7 +309,7 @@
   async.Future<Report> get(core.String jobId, core.String reportId,
       {core.String onBehalfOfContentOwner, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -393,7 +393,7 @@
       core.String startTimeBefore,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -472,7 +472,7 @@
       commons.DownloadOptions downloadOptions:
           commons.DownloadOptions.Metadata}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -549,7 +549,7 @@
       core.String onBehalfOfContentOwner,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1309,7 +1309,8 @@
     }
     if (_json.containsKey("compositeMedia")) {
       compositeMedia = _json["compositeMedia"]
-          .map((value) => new GdataCompositeMedia.fromJson(value))
+          .map<GdataCompositeMedia>(
+              (value) => new GdataCompositeMedia.fromJson(value))
           .toList();
     }
     if (_json.containsKey("contentType")) {
@@ -1622,7 +1623,8 @@
 
   ListJobsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("jobs")) {
-      jobs = _json["jobs"].map((value) => new Job.fromJson(value)).toList();
+      jobs =
+          _json["jobs"].map<Job>((value) => new Job.fromJson(value)).toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -1663,7 +1665,7 @@
     }
     if (_json.containsKey("reportTypes")) {
       reportTypes = _json["reportTypes"]
-          .map((value) => new ReportType.fromJson(value))
+          .map<ReportType>((value) => new ReportType.fromJson(value))
           .toList();
     }
   }
@@ -1701,8 +1703,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("reports")) {
-      reports =
-          _json["reports"].map((value) => new Report.fromJson(value)).toList();
+      reports = _json["reports"]
+          .map<Report>((value) => new Report.fromJson(value))
+          .toList();
     }
   }
 
diff --git a/generated/googleapis/pubspec.yaml b/generated/googleapis/pubspec.yaml
index 9c00c4a..70f282c 100644
--- a/generated/googleapis/pubspec.yaml
+++ b/generated/googleapis/pubspec.yaml
@@ -1,5 +1,5 @@
 name: googleapis
-version: 0.50.0
+version: 0.50.1
 author: Dart Team <misc@dartlang.org>
 description: "Auto-generated client libraries for accessing the following APIs:abusiveexperiencereport:v1, acceleratedmobilepageurl:v1, adexchangebuyer:v1.3, adexchangebuyer:v1.4, adexchangeseller:v1.1, adexchangeseller:v2.0, adexperiencereport:v1, admin:datatransfer_v1, admin:directory_v1, admin:reports_v1, adsense:v1.4, adsensehost:v4.1, analytics:v3, analyticsreporting:v4, androiddeviceprovisioning:v1, androidenterprise:v1, androidmanagement:v1, androidpublisher:v2, appengine:v1, appsactivity:v1, appstate:v1, bigquery:v2, bigquerydatatransfer:v1, blogger:v3, books:v1, calendar:v3, civicinfo:v2, classroom:v1, cloudbilling:v1, cloudbuild:v1, clouddebugger:v2, cloudfunctions:v1, cloudiot:v1, cloudkms:v1, cloudresourcemanager:v1, cloudresourcemanager:v2beta1, cloudshell:v1, cloudtrace:v1, cloudtrace:v2, compute:v1, container:v1, content:v2, content:v2sandbox, customsearch:v1, dataproc:v1, datastore:v1, deploymentmanager:v2, dfareporting:v2.8, dfareporting:v3.0, digitalassetlinks:v1, discovery:v1, dns:v1, doubleclickbidmanager:v1, doubleclicksearch:v2, drive:v2, drive:v3, firebasedynamiclinks:v1, firebaseremoteconfig:v1, firebaserules:v1, fitness:v1, fusiontables:v1, fusiontables:v2, games:v1, gamesConfiguration:v1configuration, gamesManagement:v1management, genomics:v1, gmail:v1, groupsmigration:v1, groupssettings:v1, iam:v1, identitytoolkit:v3, kgsearch:v1, language:v1, licensing:v1, logging:v2, manufacturers:v1, mirror:v1, ml:v1, monitoring:v3, oauth2:v2, oslogin:v1, pagespeedonline:v1, pagespeedonline:v2, partners:v2, people:v1, playcustomapp:v1, plus:v1, plusDomains:v1, poly:v1, prediction:v1.6, pubsub:v1, reseller:v1, runtimeconfig:v1, safebrowsing:v4, script:v1, searchconsole:v1, serviceconsumermanagement:v1, servicecontrol:v1, servicemanagement:v1, serviceusage:v1, serviceuser:v1, sheets:v4, siteVerification:v1, slides:v1, sourcerepo:v1, spanner:v1, speech:v1, storage:v1, storagetransfer:v1, streetviewpublish:v1, surveys:v2, tagmanager:v1, tagmanager:v2, tasks:v1, testing:v1, translate:v2, urlshortener:v1, vault:v1, vision:v1, webfonts:v1, webmasters:v3, youtube:v3, youtubeAnalytics:v1, youtubereporting:v1"
 homepage: http://www.dartlang.org/googleapis/
diff --git a/generated/googleapis/test/abusiveexperiencereport/v1_test.dart b/generated/googleapis/test/abusiveexperiencereport/v1_test.dart
index a539375..9f0f4e4 100644
--- a/generated/googleapis/test/abusiveexperiencereport/v1_test.dart
+++ b/generated/googleapis/test/abusiveexperiencereport/v1_test.dart
@@ -81,14 +81,14 @@
   buildCounterSiteSummaryResponse--;
 }
 
-buildUnnamed1181() {
+buildUnnamed1634() {
   var o = new core.List<api.SiteSummaryResponse>();
   o.add(buildSiteSummaryResponse());
   o.add(buildSiteSummaryResponse());
   return o;
 }
 
-checkUnnamed1181(core.List<api.SiteSummaryResponse> o) {
+checkUnnamed1634(core.List<api.SiteSummaryResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSiteSummaryResponse(o[0]);
   checkSiteSummaryResponse(o[1]);
@@ -99,7 +99,7 @@
   var o = new api.ViolatingSitesResponse();
   buildCounterViolatingSitesResponse++;
   if (buildCounterViolatingSitesResponse < 3) {
-    o.violatingSites = buildUnnamed1181();
+    o.violatingSites = buildUnnamed1634();
   }
   buildCounterViolatingSitesResponse--;
   return o;
@@ -108,7 +108,7 @@
 checkViolatingSitesResponse(api.ViolatingSitesResponse o) {
   buildCounterViolatingSitesResponse++;
   if (buildCounterViolatingSitesResponse < 3) {
-    checkUnnamed1181(o.violatingSites);
+    checkUnnamed1634(o.violatingSites);
   }
   buildCounterViolatingSitesResponse--;
 }
@@ -177,7 +177,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SiteSummaryResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSiteSummaryResponse(response);
       })));
     });
@@ -227,9 +227,7 @@
         var resp = convert.JSON.encode(buildViolatingSitesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ViolatingSitesResponse response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkViolatingSitesResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/acceleratedmobilepageurl/v1_test.dart b/generated/googleapis/test/acceleratedmobilepageurl/v1_test.dart
index 1f212c8..c83c6bd 100644
--- a/generated/googleapis/test/acceleratedmobilepageurl/v1_test.dart
+++ b/generated/googleapis/test/acceleratedmobilepageurl/v1_test.dart
@@ -96,14 +96,14 @@
   buildCounterAmpUrlError--;
 }
 
-buildUnnamed1818() {
+buildUnnamed2021() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1818(core.List<core.String> o) {
+checkUnnamed2021(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -115,7 +115,7 @@
   buildCounterBatchGetAmpUrlsRequest++;
   if (buildCounterBatchGetAmpUrlsRequest < 3) {
     o.lookupStrategy = "foo";
-    o.urls = buildUnnamed1818();
+    o.urls = buildUnnamed2021();
   }
   buildCounterBatchGetAmpUrlsRequest--;
   return o;
@@ -125,32 +125,32 @@
   buildCounterBatchGetAmpUrlsRequest++;
   if (buildCounterBatchGetAmpUrlsRequest < 3) {
     unittest.expect(o.lookupStrategy, unittest.equals('foo'));
-    checkUnnamed1818(o.urls);
+    checkUnnamed2021(o.urls);
   }
   buildCounterBatchGetAmpUrlsRequest--;
 }
 
-buildUnnamed1819() {
+buildUnnamed2022() {
   var o = new core.List<api.AmpUrl>();
   o.add(buildAmpUrl());
   o.add(buildAmpUrl());
   return o;
 }
 
-checkUnnamed1819(core.List<api.AmpUrl> o) {
+checkUnnamed2022(core.List<api.AmpUrl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAmpUrl(o[0]);
   checkAmpUrl(o[1]);
 }
 
-buildUnnamed1820() {
+buildUnnamed2023() {
   var o = new core.List<api.AmpUrlError>();
   o.add(buildAmpUrlError());
   o.add(buildAmpUrlError());
   return o;
 }
 
-checkUnnamed1820(core.List<api.AmpUrlError> o) {
+checkUnnamed2023(core.List<api.AmpUrlError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAmpUrlError(o[0]);
   checkAmpUrlError(o[1]);
@@ -161,8 +161,8 @@
   var o = new api.BatchGetAmpUrlsResponse();
   buildCounterBatchGetAmpUrlsResponse++;
   if (buildCounterBatchGetAmpUrlsResponse < 3) {
-    o.ampUrls = buildUnnamed1819();
-    o.urlErrors = buildUnnamed1820();
+    o.ampUrls = buildUnnamed2022();
+    o.urlErrors = buildUnnamed2023();
   }
   buildCounterBatchGetAmpUrlsResponse--;
   return o;
@@ -171,8 +171,8 @@
 checkBatchGetAmpUrlsResponse(api.BatchGetAmpUrlsResponse o) {
   buildCounterBatchGetAmpUrlsResponse++;
   if (buildCounterBatchGetAmpUrlsResponse < 3) {
-    checkUnnamed1819(o.ampUrls);
-    checkUnnamed1820(o.urlErrors);
+    checkUnnamed2022(o.ampUrls);
+    checkUnnamed2023(o.urlErrors);
   }
   buildCounterBatchGetAmpUrlsResponse--;
 }
@@ -260,7 +260,7 @@
       }), true);
       res
           .batchGet(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BatchGetAmpUrlsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBatchGetAmpUrlsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/adexchangebuyer/v1_3_test.dart b/generated/googleapis/test/adexchangebuyer/v1_3_test.dart
index 9456000..bcb0a31 100644
--- a/generated/googleapis/test/adexchangebuyer/v1_3_test.dart
+++ b/generated/googleapis/test/adexchangebuyer/v1_3_test.dart
@@ -73,14 +73,14 @@
   buildCounterAccountBidderLocation--;
 }
 
-buildUnnamed3475() {
+buildUnnamed2648() {
   var o = new core.List<api.AccountBidderLocation>();
   o.add(buildAccountBidderLocation());
   o.add(buildAccountBidderLocation());
   return o;
 }
 
-checkUnnamed3475(core.List<api.AccountBidderLocation> o) {
+checkUnnamed2648(core.List<api.AccountBidderLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountBidderLocation(o[0]);
   checkAccountBidderLocation(o[1]);
@@ -91,7 +91,7 @@
   var o = new api.Account();
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    o.bidderLocation = buildUnnamed3475();
+    o.bidderLocation = buildUnnamed2648();
     o.cookieMatchingNid = "foo";
     o.cookieMatchingUrl = "foo";
     o.id = 42;
@@ -107,7 +107,7 @@
 checkAccount(api.Account o) {
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    checkUnnamed3475(o.bidderLocation);
+    checkUnnamed2648(o.bidderLocation);
     unittest.expect(o.cookieMatchingNid, unittest.equals('foo'));
     unittest.expect(o.cookieMatchingUrl, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals(42));
@@ -119,14 +119,14 @@
   buildCounterAccount--;
 }
 
-buildUnnamed3476() {
+buildUnnamed2649() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed3476(core.List<api.Account> o) {
+checkUnnamed2649(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -137,7 +137,7 @@
   var o = new api.AccountsList();
   buildCounterAccountsList++;
   if (buildCounterAccountsList < 3) {
-    o.items = buildUnnamed3476();
+    o.items = buildUnnamed2649();
     o.kind = "foo";
   }
   buildCounterAccountsList--;
@@ -147,20 +147,20 @@
 checkAccountsList(api.AccountsList o) {
   buildCounterAccountsList++;
   if (buildCounterAccountsList < 3) {
-    checkUnnamed3476(o.items);
+    checkUnnamed2649(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountsList--;
 }
 
-buildUnnamed3477() {
+buildUnnamed2650() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3477(core.List<core.String> o) {
+checkUnnamed2650(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -173,7 +173,7 @@
   if (buildCounterBillingInfo < 3) {
     o.accountId = 42;
     o.accountName = "foo";
-    o.billingId = buildUnnamed3477();
+    o.billingId = buildUnnamed2650();
     o.kind = "foo";
   }
   buildCounterBillingInfo--;
@@ -185,20 +185,20 @@
   if (buildCounterBillingInfo < 3) {
     unittest.expect(o.accountId, unittest.equals(42));
     unittest.expect(o.accountName, unittest.equals('foo'));
-    checkUnnamed3477(o.billingId);
+    checkUnnamed2650(o.billingId);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBillingInfo--;
 }
 
-buildUnnamed3478() {
+buildUnnamed2651() {
   var o = new core.List<api.BillingInfo>();
   o.add(buildBillingInfo());
   o.add(buildBillingInfo());
   return o;
 }
 
-checkUnnamed3478(core.List<api.BillingInfo> o) {
+checkUnnamed2651(core.List<api.BillingInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBillingInfo(o[0]);
   checkBillingInfo(o[1]);
@@ -209,7 +209,7 @@
   var o = new api.BillingInfoList();
   buildCounterBillingInfoList++;
   if (buildCounterBillingInfoList < 3) {
-    o.items = buildUnnamed3478();
+    o.items = buildUnnamed2651();
     o.kind = "foo";
   }
   buildCounterBillingInfoList--;
@@ -219,7 +219,7 @@
 checkBillingInfoList(api.BillingInfoList o) {
   buildCounterBillingInfoList++;
   if (buildCounterBillingInfoList < 3) {
-    checkUnnamed3478(o.items);
+    checkUnnamed2651(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBillingInfoList--;
@@ -254,53 +254,53 @@
   buildCounterBudget--;
 }
 
-buildUnnamed3479() {
+buildUnnamed2652() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3479(core.List<core.String> o) {
+checkUnnamed2652(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3480() {
+buildUnnamed2653() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed3480(core.List<core.int> o) {
+checkUnnamed2653(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed3481() {
+buildUnnamed2654() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3481(core.List<core.String> o) {
+checkUnnamed2654(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3482() {
+buildUnnamed2655() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3482(core.List<core.String> o) {
+checkUnnamed2655(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -311,7 +311,7 @@
   var o = new api.CreativeCorrections();
   buildCounterCreativeCorrections++;
   if (buildCounterCreativeCorrections < 3) {
-    o.details = buildUnnamed3482();
+    o.details = buildUnnamed2655();
     o.reason = "foo";
   }
   buildCounterCreativeCorrections--;
@@ -321,33 +321,33 @@
 checkCreativeCorrections(api.CreativeCorrections o) {
   buildCounterCreativeCorrections++;
   if (buildCounterCreativeCorrections < 3) {
-    checkUnnamed3482(o.details);
+    checkUnnamed2655(o.details);
     unittest.expect(o.reason, unittest.equals('foo'));
   }
   buildCounterCreativeCorrections--;
 }
 
-buildUnnamed3483() {
+buildUnnamed2656() {
   var o = new core.List<api.CreativeCorrections>();
   o.add(buildCreativeCorrections());
   o.add(buildCreativeCorrections());
   return o;
 }
 
-checkUnnamed3483(core.List<api.CreativeCorrections> o) {
+checkUnnamed2656(core.List<api.CreativeCorrections> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCorrections(o[0]);
   checkCreativeCorrections(o[1]);
 }
 
-buildUnnamed3484() {
+buildUnnamed2657() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3484(core.List<core.String> o) {
+checkUnnamed2657(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -358,7 +358,7 @@
   var o = new api.CreativeDisapprovalReasons();
   buildCounterCreativeDisapprovalReasons++;
   if (buildCounterCreativeDisapprovalReasons < 3) {
-    o.details = buildUnnamed3484();
+    o.details = buildUnnamed2657();
     o.reason = "foo";
   }
   buildCounterCreativeDisapprovalReasons--;
@@ -368,20 +368,20 @@
 checkCreativeDisapprovalReasons(api.CreativeDisapprovalReasons o) {
   buildCounterCreativeDisapprovalReasons++;
   if (buildCounterCreativeDisapprovalReasons < 3) {
-    checkUnnamed3484(o.details);
+    checkUnnamed2657(o.details);
     unittest.expect(o.reason, unittest.equals('foo'));
   }
   buildCounterCreativeDisapprovalReasons--;
 }
 
-buildUnnamed3485() {
+buildUnnamed2658() {
   var o = new core.List<api.CreativeDisapprovalReasons>();
   o.add(buildCreativeDisapprovalReasons());
   o.add(buildCreativeDisapprovalReasons());
   return o;
 }
 
-checkUnnamed3485(core.List<api.CreativeDisapprovalReasons> o) {
+checkUnnamed2658(core.List<api.CreativeDisapprovalReasons> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeDisapprovalReasons(o[0]);
   checkCreativeDisapprovalReasons(o[1]);
@@ -408,14 +408,14 @@
   buildCounterCreativeFilteringReasonsReasons--;
 }
 
-buildUnnamed3486() {
+buildUnnamed2659() {
   var o = new core.List<api.CreativeFilteringReasonsReasons>();
   o.add(buildCreativeFilteringReasonsReasons());
   o.add(buildCreativeFilteringReasonsReasons());
   return o;
 }
 
-checkUnnamed3486(core.List<api.CreativeFilteringReasonsReasons> o) {
+checkUnnamed2659(core.List<api.CreativeFilteringReasonsReasons> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeFilteringReasonsReasons(o[0]);
   checkCreativeFilteringReasonsReasons(o[1]);
@@ -427,7 +427,7 @@
   buildCounterCreativeFilteringReasons++;
   if (buildCounterCreativeFilteringReasons < 3) {
     o.date = "foo";
-    o.reasons = buildUnnamed3486();
+    o.reasons = buildUnnamed2659();
   }
   buildCounterCreativeFilteringReasons--;
   return o;
@@ -437,19 +437,19 @@
   buildCounterCreativeFilteringReasons++;
   if (buildCounterCreativeFilteringReasons < 3) {
     unittest.expect(o.date, unittest.equals('foo'));
-    checkUnnamed3486(o.reasons);
+    checkUnnamed2659(o.reasons);
   }
   buildCounterCreativeFilteringReasons--;
 }
 
-buildUnnamed3487() {
+buildUnnamed2660() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3487(core.List<core.String> o) {
+checkUnnamed2660(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -501,14 +501,14 @@
   buildCounterCreativeNativeAdImage--;
 }
 
-buildUnnamed3488() {
+buildUnnamed2661() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3488(core.List<core.String> o) {
+checkUnnamed2661(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -549,7 +549,7 @@
     o.clickTrackingUrl = "foo";
     o.headline = "foo";
     o.image = buildCreativeNativeAdImage();
-    o.impressionTrackingUrl = buildUnnamed3488();
+    o.impressionTrackingUrl = buildUnnamed2661();
     o.logo = buildCreativeNativeAdLogo();
     o.price = "foo";
     o.starRating = 42.0;
@@ -569,7 +569,7 @@
     unittest.expect(o.clickTrackingUrl, unittest.equals('foo'));
     unittest.expect(o.headline, unittest.equals('foo'));
     checkCreativeNativeAdImage(o.image);
-    checkUnnamed3488(o.impressionTrackingUrl);
+    checkUnnamed2661(o.impressionTrackingUrl);
     checkCreativeNativeAdLogo(o.logo);
     unittest.expect(o.price, unittest.equals('foo'));
     unittest.expect(o.starRating, unittest.equals(42.0));
@@ -578,53 +578,53 @@
   buildCounterCreativeNativeAd--;
 }
 
-buildUnnamed3489() {
+buildUnnamed2662() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed3489(core.List<core.int> o) {
+checkUnnamed2662(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed3490() {
+buildUnnamed2663() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed3490(core.List<core.int> o) {
+checkUnnamed2663(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed3491() {
+buildUnnamed2664() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed3491(core.List<core.int> o) {
+checkUnnamed2664(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed3492() {
+buildUnnamed2665() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed3492(core.List<core.int> o) {
+checkUnnamed2665(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -637,25 +637,25 @@
   if (buildCounterCreative < 3) {
     o.HTMLSnippet = "foo";
     o.accountId = 42;
-    o.advertiserId = buildUnnamed3479();
+    o.advertiserId = buildUnnamed2652();
     o.advertiserName = "foo";
     o.agencyId = "foo";
     o.apiUploadTimestamp = core.DateTime.parse("2002-02-27T14:01:02");
-    o.attribute = buildUnnamed3480();
+    o.attribute = buildUnnamed2653();
     o.buyerCreativeId = "foo";
-    o.clickThroughUrl = buildUnnamed3481();
-    o.corrections = buildUnnamed3483();
-    o.disapprovalReasons = buildUnnamed3485();
+    o.clickThroughUrl = buildUnnamed2654();
+    o.corrections = buildUnnamed2656();
+    o.disapprovalReasons = buildUnnamed2658();
     o.filteringReasons = buildCreativeFilteringReasons();
     o.height = 42;
-    o.impressionTrackingUrl = buildUnnamed3487();
+    o.impressionTrackingUrl = buildUnnamed2660();
     o.kind = "foo";
     o.nativeAd = buildCreativeNativeAd();
-    o.productCategories = buildUnnamed3489();
-    o.restrictedCategories = buildUnnamed3490();
-    o.sensitiveCategories = buildUnnamed3491();
+    o.productCategories = buildUnnamed2662();
+    o.restrictedCategories = buildUnnamed2663();
+    o.sensitiveCategories = buildUnnamed2664();
     o.status = "foo";
-    o.vendorType = buildUnnamed3492();
+    o.vendorType = buildUnnamed2665();
     o.version = 42;
     o.videoURL = "foo";
     o.width = 42;
@@ -669,26 +669,26 @@
   if (buildCounterCreative < 3) {
     unittest.expect(o.HTMLSnippet, unittest.equals('foo'));
     unittest.expect(o.accountId, unittest.equals(42));
-    checkUnnamed3479(o.advertiserId);
+    checkUnnamed2652(o.advertiserId);
     unittest.expect(o.advertiserName, unittest.equals('foo'));
     unittest.expect(o.agencyId, unittest.equals('foo'));
     unittest.expect(o.apiUploadTimestamp,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed3480(o.attribute);
+    checkUnnamed2653(o.attribute);
     unittest.expect(o.buyerCreativeId, unittest.equals('foo'));
-    checkUnnamed3481(o.clickThroughUrl);
-    checkUnnamed3483(o.corrections);
-    checkUnnamed3485(o.disapprovalReasons);
+    checkUnnamed2654(o.clickThroughUrl);
+    checkUnnamed2656(o.corrections);
+    checkUnnamed2658(o.disapprovalReasons);
     checkCreativeFilteringReasons(o.filteringReasons);
     unittest.expect(o.height, unittest.equals(42));
-    checkUnnamed3487(o.impressionTrackingUrl);
+    checkUnnamed2660(o.impressionTrackingUrl);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkCreativeNativeAd(o.nativeAd);
-    checkUnnamed3489(o.productCategories);
-    checkUnnamed3490(o.restrictedCategories);
-    checkUnnamed3491(o.sensitiveCategories);
+    checkUnnamed2662(o.productCategories);
+    checkUnnamed2663(o.restrictedCategories);
+    checkUnnamed2664(o.sensitiveCategories);
     unittest.expect(o.status, unittest.equals('foo'));
-    checkUnnamed3492(o.vendorType);
+    checkUnnamed2665(o.vendorType);
     unittest.expect(o.version, unittest.equals(42));
     unittest.expect(o.videoURL, unittest.equals('foo'));
     unittest.expect(o.width, unittest.equals(42));
@@ -696,14 +696,14 @@
   buildCounterCreative--;
 }
 
-buildUnnamed3493() {
+buildUnnamed2666() {
   var o = new core.List<api.Creative>();
   o.add(buildCreative());
   o.add(buildCreative());
   return o;
 }
 
-checkUnnamed3493(core.List<api.Creative> o) {
+checkUnnamed2666(core.List<api.Creative> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreative(o[0]);
   checkCreative(o[1]);
@@ -714,7 +714,7 @@
   var o = new api.CreativesList();
   buildCounterCreativesList++;
   if (buildCounterCreativesList < 3) {
-    o.items = buildUnnamed3493();
+    o.items = buildUnnamed2666();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -725,7 +725,7 @@
 checkCreativesList(api.CreativesList o) {
   buildCounterCreativesList++;
   if (buildCounterCreativesList < 3) {
-    checkUnnamed3493(o.items);
+    checkUnnamed2666(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -779,14 +779,14 @@
   buildCounterDirectDeal--;
 }
 
-buildUnnamed3494() {
+buildUnnamed2667() {
   var o = new core.List<api.DirectDeal>();
   o.add(buildDirectDeal());
   o.add(buildDirectDeal());
   return o;
 }
 
-checkUnnamed3494(core.List<api.DirectDeal> o) {
+checkUnnamed2667(core.List<api.DirectDeal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectDeal(o[0]);
   checkDirectDeal(o[1]);
@@ -797,7 +797,7 @@
   var o = new api.DirectDealsList();
   buildCounterDirectDealsList++;
   if (buildCounterDirectDealsList < 3) {
-    o.directDeals = buildUnnamed3494();
+    o.directDeals = buildUnnamed2667();
     o.kind = "foo";
   }
   buildCounterDirectDealsList--;
@@ -807,13 +807,13 @@
 checkDirectDealsList(api.DirectDealsList o) {
   buildCounterDirectDealsList++;
   if (buildCounterDirectDealsList < 3) {
-    checkUnnamed3494(o.directDeals);
+    checkUnnamed2667(o.directDeals);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDirectDealsList--;
 }
 
-buildUnnamed3495() {
+buildUnnamed2668() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -828,7 +828,7 @@
   return o;
 }
 
-checkUnnamed3495(core.List<core.Object> o) {
+checkUnnamed2668(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -842,7 +842,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3496() {
+buildUnnamed2669() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -857,7 +857,7 @@
   return o;
 }
 
-checkUnnamed3496(core.List<core.Object> o) {
+checkUnnamed2669(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o[0]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -871,7 +871,7 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3497() {
+buildUnnamed2670() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -886,7 +886,7 @@
   return o;
 }
 
-checkUnnamed3497(core.List<core.Object> o) {
+checkUnnamed2670(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o[0]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -900,7 +900,7 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3498() {
+buildUnnamed2671() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -915,7 +915,7 @@
   return o;
 }
 
-checkUnnamed3498(core.List<core.Object> o) {
+checkUnnamed2671(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o[0]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -936,11 +936,11 @@
   if (buildCounterPerformanceReport < 3) {
     o.bidRate = 42.0;
     o.bidRequestRate = 42.0;
-    o.calloutStatusRate = buildUnnamed3495();
-    o.cookieMatcherStatusRate = buildUnnamed3496();
-    o.creativeStatusRate = buildUnnamed3497();
+    o.calloutStatusRate = buildUnnamed2668();
+    o.cookieMatcherStatusRate = buildUnnamed2669();
+    o.creativeStatusRate = buildUnnamed2670();
     o.filteredBidRate = 42.0;
-    o.hostedMatchStatusRate = buildUnnamed3498();
+    o.hostedMatchStatusRate = buildUnnamed2671();
     o.inventoryMatchRate = 42.0;
     o.kind = "foo";
     o.latency50thPercentile = 42.0;
@@ -966,11 +966,11 @@
   if (buildCounterPerformanceReport < 3) {
     unittest.expect(o.bidRate, unittest.equals(42.0));
     unittest.expect(o.bidRequestRate, unittest.equals(42.0));
-    checkUnnamed3495(o.calloutStatusRate);
-    checkUnnamed3496(o.cookieMatcherStatusRate);
-    checkUnnamed3497(o.creativeStatusRate);
+    checkUnnamed2668(o.calloutStatusRate);
+    checkUnnamed2669(o.cookieMatcherStatusRate);
+    checkUnnamed2670(o.creativeStatusRate);
     unittest.expect(o.filteredBidRate, unittest.equals(42.0));
-    checkUnnamed3498(o.hostedMatchStatusRate);
+    checkUnnamed2671(o.hostedMatchStatusRate);
     unittest.expect(o.inventoryMatchRate, unittest.equals(42.0));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.latency50thPercentile, unittest.equals(42.0));
@@ -990,14 +990,14 @@
   buildCounterPerformanceReport--;
 }
 
-buildUnnamed3499() {
+buildUnnamed2672() {
   var o = new core.List<api.PerformanceReport>();
   o.add(buildPerformanceReport());
   o.add(buildPerformanceReport());
   return o;
 }
 
-checkUnnamed3499(core.List<api.PerformanceReport> o) {
+checkUnnamed2672(core.List<api.PerformanceReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerformanceReport(o[0]);
   checkPerformanceReport(o[1]);
@@ -1009,7 +1009,7 @@
   buildCounterPerformanceReportList++;
   if (buildCounterPerformanceReportList < 3) {
     o.kind = "foo";
-    o.performanceReport = buildUnnamed3499();
+    o.performanceReport = buildUnnamed2672();
   }
   buildCounterPerformanceReportList--;
   return o;
@@ -1019,19 +1019,19 @@
   buildCounterPerformanceReportList++;
   if (buildCounterPerformanceReportList < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3499(o.performanceReport);
+    checkUnnamed2672(o.performanceReport);
   }
   buildCounterPerformanceReportList--;
 }
 
-buildUnnamed3500() {
+buildUnnamed2673() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3500(core.List<core.String> o) {
+checkUnnamed2673(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1058,40 +1058,40 @@
   buildCounterPretargetingConfigDimensions--;
 }
 
-buildUnnamed3501() {
+buildUnnamed2674() {
   var o = new core.List<api.PretargetingConfigDimensions>();
   o.add(buildPretargetingConfigDimensions());
   o.add(buildPretargetingConfigDimensions());
   return o;
 }
 
-checkUnnamed3501(core.List<api.PretargetingConfigDimensions> o) {
+checkUnnamed2674(core.List<api.PretargetingConfigDimensions> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfigDimensions(o[0]);
   checkPretargetingConfigDimensions(o[1]);
 }
 
-buildUnnamed3502() {
+buildUnnamed2675() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3502(core.List<core.String> o) {
+checkUnnamed2675(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3503() {
+buildUnnamed2676() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3503(core.List<core.String> o) {
+checkUnnamed2676(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1119,105 +1119,105 @@
   buildCounterPretargetingConfigExcludedPlacements--;
 }
 
-buildUnnamed3504() {
+buildUnnamed2677() {
   var o = new core.List<api.PretargetingConfigExcludedPlacements>();
   o.add(buildPretargetingConfigExcludedPlacements());
   o.add(buildPretargetingConfigExcludedPlacements());
   return o;
 }
 
-checkUnnamed3504(core.List<api.PretargetingConfigExcludedPlacements> o) {
+checkUnnamed2677(core.List<api.PretargetingConfigExcludedPlacements> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfigExcludedPlacements(o[0]);
   checkPretargetingConfigExcludedPlacements(o[1]);
 }
 
-buildUnnamed3505() {
+buildUnnamed2678() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3505(core.List<core.String> o) {
+checkUnnamed2678(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3506() {
+buildUnnamed2679() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3506(core.List<core.String> o) {
+checkUnnamed2679(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3507() {
+buildUnnamed2680() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3507(core.List<core.String> o) {
+checkUnnamed2680(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3508() {
+buildUnnamed2681() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3508(core.List<core.String> o) {
+checkUnnamed2681(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3509() {
+buildUnnamed2682() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3509(core.List<core.String> o) {
+checkUnnamed2682(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3510() {
+buildUnnamed2683() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3510(core.List<core.String> o) {
+checkUnnamed2683(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3511() {
+buildUnnamed2684() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3511(core.List<core.String> o) {
+checkUnnamed2684(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1244,79 +1244,79 @@
   buildCounterPretargetingConfigPlacements--;
 }
 
-buildUnnamed3512() {
+buildUnnamed2685() {
   var o = new core.List<api.PretargetingConfigPlacements>();
   o.add(buildPretargetingConfigPlacements());
   o.add(buildPretargetingConfigPlacements());
   return o;
 }
 
-checkUnnamed3512(core.List<api.PretargetingConfigPlacements> o) {
+checkUnnamed2685(core.List<api.PretargetingConfigPlacements> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfigPlacements(o[0]);
   checkPretargetingConfigPlacements(o[1]);
 }
 
-buildUnnamed3513() {
+buildUnnamed2686() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3513(core.List<core.String> o) {
+checkUnnamed2686(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3514() {
+buildUnnamed2687() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3514(core.List<core.String> o) {
+checkUnnamed2687(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3515() {
+buildUnnamed2688() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3515(core.List<core.String> o) {
+checkUnnamed2688(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3516() {
+buildUnnamed2689() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3516(core.List<core.String> o) {
+checkUnnamed2689(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3517() {
+buildUnnamed2690() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3517(core.List<core.String> o) {
+checkUnnamed2690(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1330,26 +1330,26 @@
     o.billingId = "foo";
     o.configId = "foo";
     o.configName = "foo";
-    o.creativeType = buildUnnamed3500();
-    o.dimensions = buildUnnamed3501();
-    o.excludedContentLabels = buildUnnamed3502();
-    o.excludedGeoCriteriaIds = buildUnnamed3503();
-    o.excludedPlacements = buildUnnamed3504();
-    o.excludedUserLists = buildUnnamed3505();
-    o.excludedVerticals = buildUnnamed3506();
-    o.geoCriteriaIds = buildUnnamed3507();
+    o.creativeType = buildUnnamed2673();
+    o.dimensions = buildUnnamed2674();
+    o.excludedContentLabels = buildUnnamed2675();
+    o.excludedGeoCriteriaIds = buildUnnamed2676();
+    o.excludedPlacements = buildUnnamed2677();
+    o.excludedUserLists = buildUnnamed2678();
+    o.excludedVerticals = buildUnnamed2679();
+    o.geoCriteriaIds = buildUnnamed2680();
     o.isActive = true;
     o.kind = "foo";
-    o.languages = buildUnnamed3508();
-    o.mobileCarriers = buildUnnamed3509();
-    o.mobileDevices = buildUnnamed3510();
-    o.mobileOperatingSystemVersions = buildUnnamed3511();
-    o.placements = buildUnnamed3512();
-    o.platforms = buildUnnamed3513();
-    o.supportedCreativeAttributes = buildUnnamed3514();
-    o.userLists = buildUnnamed3515();
-    o.vendorTypes = buildUnnamed3516();
-    o.verticals = buildUnnamed3517();
+    o.languages = buildUnnamed2681();
+    o.mobileCarriers = buildUnnamed2682();
+    o.mobileDevices = buildUnnamed2683();
+    o.mobileOperatingSystemVersions = buildUnnamed2684();
+    o.placements = buildUnnamed2685();
+    o.platforms = buildUnnamed2686();
+    o.supportedCreativeAttributes = buildUnnamed2687();
+    o.userLists = buildUnnamed2688();
+    o.vendorTypes = buildUnnamed2689();
+    o.verticals = buildUnnamed2690();
   }
   buildCounterPretargetingConfig--;
   return o;
@@ -1361,38 +1361,38 @@
     unittest.expect(o.billingId, unittest.equals('foo'));
     unittest.expect(o.configId, unittest.equals('foo'));
     unittest.expect(o.configName, unittest.equals('foo'));
-    checkUnnamed3500(o.creativeType);
-    checkUnnamed3501(o.dimensions);
-    checkUnnamed3502(o.excludedContentLabels);
-    checkUnnamed3503(o.excludedGeoCriteriaIds);
-    checkUnnamed3504(o.excludedPlacements);
-    checkUnnamed3505(o.excludedUserLists);
-    checkUnnamed3506(o.excludedVerticals);
-    checkUnnamed3507(o.geoCriteriaIds);
+    checkUnnamed2673(o.creativeType);
+    checkUnnamed2674(o.dimensions);
+    checkUnnamed2675(o.excludedContentLabels);
+    checkUnnamed2676(o.excludedGeoCriteriaIds);
+    checkUnnamed2677(o.excludedPlacements);
+    checkUnnamed2678(o.excludedUserLists);
+    checkUnnamed2679(o.excludedVerticals);
+    checkUnnamed2680(o.geoCriteriaIds);
     unittest.expect(o.isActive, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3508(o.languages);
-    checkUnnamed3509(o.mobileCarriers);
-    checkUnnamed3510(o.mobileDevices);
-    checkUnnamed3511(o.mobileOperatingSystemVersions);
-    checkUnnamed3512(o.placements);
-    checkUnnamed3513(o.platforms);
-    checkUnnamed3514(o.supportedCreativeAttributes);
-    checkUnnamed3515(o.userLists);
-    checkUnnamed3516(o.vendorTypes);
-    checkUnnamed3517(o.verticals);
+    checkUnnamed2681(o.languages);
+    checkUnnamed2682(o.mobileCarriers);
+    checkUnnamed2683(o.mobileDevices);
+    checkUnnamed2684(o.mobileOperatingSystemVersions);
+    checkUnnamed2685(o.placements);
+    checkUnnamed2686(o.platforms);
+    checkUnnamed2687(o.supportedCreativeAttributes);
+    checkUnnamed2688(o.userLists);
+    checkUnnamed2689(o.vendorTypes);
+    checkUnnamed2690(o.verticals);
   }
   buildCounterPretargetingConfig--;
 }
 
-buildUnnamed3518() {
+buildUnnamed2691() {
   var o = new core.List<api.PretargetingConfig>();
   o.add(buildPretargetingConfig());
   o.add(buildPretargetingConfig());
   return o;
 }
 
-checkUnnamed3518(core.List<api.PretargetingConfig> o) {
+checkUnnamed2691(core.List<api.PretargetingConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfig(o[0]);
   checkPretargetingConfig(o[1]);
@@ -1403,7 +1403,7 @@
   var o = new api.PretargetingConfigList();
   buildCounterPretargetingConfigList++;
   if (buildCounterPretargetingConfigList < 3) {
-    o.items = buildUnnamed3518();
+    o.items = buildUnnamed2691();
     o.kind = "foo";
   }
   buildCounterPretargetingConfigList--;
@@ -1413,33 +1413,33 @@
 checkPretargetingConfigList(api.PretargetingConfigList o) {
   buildCounterPretargetingConfigList++;
   if (buildCounterPretargetingConfigList < 3) {
-    checkUnnamed3518(o.items);
+    checkUnnamed2691(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPretargetingConfigList--;
 }
 
-buildUnnamed3519() {
+buildUnnamed2692() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed3519(core.List<core.int> o) {
+checkUnnamed2692(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed3520() {
+buildUnnamed2693() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3520(core.List<core.String> o) {
+checkUnnamed2693(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1699,7 +1699,7 @@
       }), true);
       res
           .get(arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -1749,9 +1749,7 @@
         var resp = convert.JSON.encode(buildAccountsList());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountsList response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkAccountsList(response);
       })));
     });
@@ -1811,7 +1809,7 @@
       }), true);
       res
           .patch(arg_request, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -1871,7 +1869,7 @@
       }), true);
       res
           .update(arg_request, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -1930,7 +1928,7 @@
       }), true);
       res
           .get(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BillingInfo response) {
+          .then(unittest.expectAsync1(((response) {
         checkBillingInfo(response);
       })));
     });
@@ -1981,9 +1979,7 @@
         var resp = convert.JSON.encode(buildBillingInfoList());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BillingInfoList response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkBillingInfoList(response);
       })));
     });
@@ -2051,7 +2047,7 @@
       }), true);
       res
           .get(arg_accountId, arg_billingId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Budget response) {
+          .then(unittest.expectAsync1(((response) {
         checkBudget(response);
       })));
     });
@@ -2122,7 +2118,7 @@
       res
           .patch(arg_request, arg_accountId, arg_billingId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Budget response) {
+          .then(unittest.expectAsync1(((response) {
         checkBudget(response);
       })));
     });
@@ -2193,7 +2189,7 @@
       res
           .update(arg_request, arg_accountId, arg_billingId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Budget response) {
+          .then(unittest.expectAsync1(((response) {
         checkBudget(response);
       })));
     });
@@ -2261,7 +2257,7 @@
       }), true);
       res
           .get(arg_accountId, arg_buyerCreativeId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -2317,7 +2313,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -2325,8 +2321,8 @@
     unittest.test("method--list", () {
       var mock = new HttpServerMock();
       api.CreativesResourceApi res = new api.AdexchangebuyerApi(mock).creatives;
-      var arg_accountId = buildUnnamed3519();
-      var arg_buyerCreativeId = buildUnnamed3520();
+      var arg_accountId = buildUnnamed2692();
+      var arg_buyerCreativeId = buildUnnamed2693();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_statusFilter = "foo";
@@ -2390,7 +2386,7 @@
               pageToken: arg_pageToken,
               statusFilter: arg_statusFilter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativesList response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativesList(response);
       })));
     });
@@ -2449,7 +2445,7 @@
       }), true);
       res
           .get(arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DirectDeal response) {
+          .then(unittest.expectAsync1(((response) {
         checkDirectDeal(response);
       })));
     });
@@ -2500,9 +2496,7 @@
         var resp = convert.JSON.encode(buildDirectDealsList());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DirectDealsList response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkDirectDealsList(response);
       })));
     });
@@ -2575,7 +2569,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PerformanceReportList response) {
+          .then(unittest.expectAsync1(((response) {
         checkPerformanceReportList(response);
       })));
     });
@@ -2709,7 +2703,7 @@
       }), true);
       res
           .get(arg_accountId, arg_configId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PretargetingConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkPretargetingConfig(response);
       })));
     });
@@ -2770,7 +2764,7 @@
       }), true);
       res
           .insert(arg_request, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PretargetingConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkPretargetingConfig(response);
       })));
     });
@@ -2827,7 +2821,7 @@
       }), true);
       res
           .list(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PretargetingConfigList response) {
+          .then(unittest.expectAsync1(((response) {
         checkPretargetingConfigList(response);
       })));
     });
@@ -2898,7 +2892,7 @@
       }), true);
       res
           .patch(arg_request, arg_accountId, arg_configId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PretargetingConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkPretargetingConfig(response);
       })));
     });
@@ -2970,7 +2964,7 @@
       res
           .update(arg_request, arg_accountId, arg_configId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PretargetingConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkPretargetingConfig(response);
       })));
     });
diff --git a/generated/googleapis/test/adexchangebuyer/v1_4_test.dart b/generated/googleapis/test/adexchangebuyer/v1_4_test.dart
index 678cc0a..f317072 100644
--- a/generated/googleapis/test/adexchangebuyer/v1_4_test.dart
+++ b/generated/googleapis/test/adexchangebuyer/v1_4_test.dart
@@ -75,14 +75,14 @@
   buildCounterAccountBidderLocation--;
 }
 
-buildUnnamed2669() {
+buildUnnamed3639() {
   var o = new core.List<api.AccountBidderLocation>();
   o.add(buildAccountBidderLocation());
   o.add(buildAccountBidderLocation());
   return o;
 }
 
-checkUnnamed2669(core.List<api.AccountBidderLocation> o) {
+checkUnnamed3639(core.List<api.AccountBidderLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountBidderLocation(o[0]);
   checkAccountBidderLocation(o[1]);
@@ -93,7 +93,7 @@
   var o = new api.Account();
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    o.bidderLocation = buildUnnamed2669();
+    o.bidderLocation = buildUnnamed3639();
     o.cookieMatchingNid = "foo";
     o.cookieMatchingUrl = "foo";
     o.id = 42;
@@ -109,7 +109,7 @@
 checkAccount(api.Account o) {
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    checkUnnamed2669(o.bidderLocation);
+    checkUnnamed3639(o.bidderLocation);
     unittest.expect(o.cookieMatchingNid, unittest.equals('foo'));
     unittest.expect(o.cookieMatchingUrl, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals(42));
@@ -121,14 +121,14 @@
   buildCounterAccount--;
 }
 
-buildUnnamed2670() {
+buildUnnamed3640() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed2670(core.List<api.Account> o) {
+checkUnnamed3640(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -139,7 +139,7 @@
   var o = new api.AccountsList();
   buildCounterAccountsList++;
   if (buildCounterAccountsList < 3) {
-    o.items = buildUnnamed2670();
+    o.items = buildUnnamed3640();
     o.kind = "foo";
   }
   buildCounterAccountsList--;
@@ -149,20 +149,20 @@
 checkAccountsList(api.AccountsList o) {
   buildCounterAccountsList++;
   if (buildCounterAccountsList < 3) {
-    checkUnnamed2670(o.items);
+    checkUnnamed3640(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountsList--;
 }
 
-buildUnnamed2671() {
+buildUnnamed3641() {
   var o = new core.List<api.MarketplaceDeal>();
   o.add(buildMarketplaceDeal());
   o.add(buildMarketplaceDeal());
   return o;
 }
 
-checkUnnamed2671(core.List<api.MarketplaceDeal> o) {
+checkUnnamed3641(core.List<api.MarketplaceDeal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMarketplaceDeal(o[0]);
   checkMarketplaceDeal(o[1]);
@@ -173,7 +173,7 @@
   var o = new api.AddOrderDealsRequest();
   buildCounterAddOrderDealsRequest++;
   if (buildCounterAddOrderDealsRequest < 3) {
-    o.deals = buildUnnamed2671();
+    o.deals = buildUnnamed3641();
     o.proposalRevisionNumber = "foo";
     o.updateAction = "foo";
   }
@@ -184,21 +184,21 @@
 checkAddOrderDealsRequest(api.AddOrderDealsRequest o) {
   buildCounterAddOrderDealsRequest++;
   if (buildCounterAddOrderDealsRequest < 3) {
-    checkUnnamed2671(o.deals);
+    checkUnnamed3641(o.deals);
     unittest.expect(o.proposalRevisionNumber, unittest.equals('foo'));
     unittest.expect(o.updateAction, unittest.equals('foo'));
   }
   buildCounterAddOrderDealsRequest--;
 }
 
-buildUnnamed2672() {
+buildUnnamed3642() {
   var o = new core.List<api.MarketplaceDeal>();
   o.add(buildMarketplaceDeal());
   o.add(buildMarketplaceDeal());
   return o;
 }
 
-checkUnnamed2672(core.List<api.MarketplaceDeal> o) {
+checkUnnamed3642(core.List<api.MarketplaceDeal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMarketplaceDeal(o[0]);
   checkMarketplaceDeal(o[1]);
@@ -209,7 +209,7 @@
   var o = new api.AddOrderDealsResponse();
   buildCounterAddOrderDealsResponse++;
   if (buildCounterAddOrderDealsResponse < 3) {
-    o.deals = buildUnnamed2672();
+    o.deals = buildUnnamed3642();
     o.proposalRevisionNumber = "foo";
   }
   buildCounterAddOrderDealsResponse--;
@@ -219,20 +219,20 @@
 checkAddOrderDealsResponse(api.AddOrderDealsResponse o) {
   buildCounterAddOrderDealsResponse++;
   if (buildCounterAddOrderDealsResponse < 3) {
-    checkUnnamed2672(o.deals);
+    checkUnnamed3642(o.deals);
     unittest.expect(o.proposalRevisionNumber, unittest.equals('foo'));
   }
   buildCounterAddOrderDealsResponse--;
 }
 
-buildUnnamed2673() {
+buildUnnamed3643() {
   var o = new core.List<api.MarketplaceNote>();
   o.add(buildMarketplaceNote());
   o.add(buildMarketplaceNote());
   return o;
 }
 
-checkUnnamed2673(core.List<api.MarketplaceNote> o) {
+checkUnnamed3643(core.List<api.MarketplaceNote> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMarketplaceNote(o[0]);
   checkMarketplaceNote(o[1]);
@@ -243,7 +243,7 @@
   var o = new api.AddOrderNotesRequest();
   buildCounterAddOrderNotesRequest++;
   if (buildCounterAddOrderNotesRequest < 3) {
-    o.notes = buildUnnamed2673();
+    o.notes = buildUnnamed3643();
   }
   buildCounterAddOrderNotesRequest--;
   return o;
@@ -252,19 +252,19 @@
 checkAddOrderNotesRequest(api.AddOrderNotesRequest o) {
   buildCounterAddOrderNotesRequest++;
   if (buildCounterAddOrderNotesRequest < 3) {
-    checkUnnamed2673(o.notes);
+    checkUnnamed3643(o.notes);
   }
   buildCounterAddOrderNotesRequest--;
 }
 
-buildUnnamed2674() {
+buildUnnamed3644() {
   var o = new core.List<api.MarketplaceNote>();
   o.add(buildMarketplaceNote());
   o.add(buildMarketplaceNote());
   return o;
 }
 
-checkUnnamed2674(core.List<api.MarketplaceNote> o) {
+checkUnnamed3644(core.List<api.MarketplaceNote> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMarketplaceNote(o[0]);
   checkMarketplaceNote(o[1]);
@@ -275,7 +275,7 @@
   var o = new api.AddOrderNotesResponse();
   buildCounterAddOrderNotesResponse++;
   if (buildCounterAddOrderNotesResponse < 3) {
-    o.notes = buildUnnamed2674();
+    o.notes = buildUnnamed3644();
   }
   buildCounterAddOrderNotesResponse--;
   return o;
@@ -284,19 +284,19 @@
 checkAddOrderNotesResponse(api.AddOrderNotesResponse o) {
   buildCounterAddOrderNotesResponse++;
   if (buildCounterAddOrderNotesResponse < 3) {
-    checkUnnamed2674(o.notes);
+    checkUnnamed3644(o.notes);
   }
   buildCounterAddOrderNotesResponse--;
 }
 
-buildUnnamed2675() {
+buildUnnamed3645() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2675(core.List<core.String> o) {
+checkUnnamed3645(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -309,7 +309,7 @@
   if (buildCounterBillingInfo < 3) {
     o.accountId = 42;
     o.accountName = "foo";
-    o.billingId = buildUnnamed2675();
+    o.billingId = buildUnnamed3645();
     o.kind = "foo";
   }
   buildCounterBillingInfo--;
@@ -321,20 +321,20 @@
   if (buildCounterBillingInfo < 3) {
     unittest.expect(o.accountId, unittest.equals(42));
     unittest.expect(o.accountName, unittest.equals('foo'));
-    checkUnnamed2675(o.billingId);
+    checkUnnamed3645(o.billingId);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBillingInfo--;
 }
 
-buildUnnamed2676() {
+buildUnnamed3646() {
   var o = new core.List<api.BillingInfo>();
   o.add(buildBillingInfo());
   o.add(buildBillingInfo());
   return o;
 }
 
-checkUnnamed2676(core.List<api.BillingInfo> o) {
+checkUnnamed3646(core.List<api.BillingInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBillingInfo(o[0]);
   checkBillingInfo(o[1]);
@@ -345,7 +345,7 @@
   var o = new api.BillingInfoList();
   buildCounterBillingInfoList++;
   if (buildCounterBillingInfoList < 3) {
-    o.items = buildUnnamed2676();
+    o.items = buildUnnamed3646();
     o.kind = "foo";
   }
   buildCounterBillingInfoList--;
@@ -355,7 +355,7 @@
 checkBillingInfoList(api.BillingInfoList o) {
   buildCounterBillingInfoList++;
   if (buildCounterBillingInfoList < 3) {
-    checkUnnamed2676(o.items);
+    checkUnnamed3646(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBillingInfoList--;
@@ -430,14 +430,14 @@
   buildCounterContactInformation--;
 }
 
-buildUnnamed2677() {
+buildUnnamed3647() {
   var o = new core.List<api.Proposal>();
   o.add(buildProposal());
   o.add(buildProposal());
   return o;
 }
 
-checkUnnamed2677(core.List<api.Proposal> o) {
+checkUnnamed3647(core.List<api.Proposal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProposal(o[0]);
   checkProposal(o[1]);
@@ -448,7 +448,7 @@
   var o = new api.CreateOrdersRequest();
   buildCounterCreateOrdersRequest++;
   if (buildCounterCreateOrdersRequest < 3) {
-    o.proposals = buildUnnamed2677();
+    o.proposals = buildUnnamed3647();
     o.webPropertyCode = "foo";
   }
   buildCounterCreateOrdersRequest--;
@@ -458,20 +458,20 @@
 checkCreateOrdersRequest(api.CreateOrdersRequest o) {
   buildCounterCreateOrdersRequest++;
   if (buildCounterCreateOrdersRequest < 3) {
-    checkUnnamed2677(o.proposals);
+    checkUnnamed3647(o.proposals);
     unittest.expect(o.webPropertyCode, unittest.equals('foo'));
   }
   buildCounterCreateOrdersRequest--;
 }
 
-buildUnnamed2678() {
+buildUnnamed3648() {
   var o = new core.List<api.Proposal>();
   o.add(buildProposal());
   o.add(buildProposal());
   return o;
 }
 
-checkUnnamed2678(core.List<api.Proposal> o) {
+checkUnnamed3648(core.List<api.Proposal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProposal(o[0]);
   checkProposal(o[1]);
@@ -482,7 +482,7 @@
   var o = new api.CreateOrdersResponse();
   buildCounterCreateOrdersResponse++;
   if (buildCounterCreateOrdersResponse < 3) {
-    o.proposals = buildUnnamed2678();
+    o.proposals = buildUnnamed3648();
   }
   buildCounterCreateOrdersResponse--;
   return o;
@@ -491,84 +491,84 @@
 checkCreateOrdersResponse(api.CreateOrdersResponse o) {
   buildCounterCreateOrdersResponse++;
   if (buildCounterCreateOrdersResponse < 3) {
-    checkUnnamed2678(o.proposals);
+    checkUnnamed3648(o.proposals);
   }
   buildCounterCreateOrdersResponse--;
 }
 
-buildUnnamed2679() {
+buildUnnamed3649() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2679(core.List<core.String> o) {
+checkUnnamed3649(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2680() {
+buildUnnamed3650() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed2680(core.List<core.int> o) {
+checkUnnamed3650(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed2681() {
+buildUnnamed3651() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2681(core.List<core.String> o) {
+checkUnnamed3651(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2682() {
+buildUnnamed3652() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2682(core.List<core.String> o) {
+checkUnnamed3652(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2683() {
+buildUnnamed3653() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed2683(core.List<core.int> o) {
+checkUnnamed3653(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed2684() {
+buildUnnamed3654() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2684(core.List<core.String> o) {
+checkUnnamed3654(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -579,10 +579,10 @@
   var o = new api.CreativeCorrectionsContexts();
   buildCounterCreativeCorrectionsContexts++;
   if (buildCounterCreativeCorrectionsContexts < 3) {
-    o.auctionType = buildUnnamed2682();
+    o.auctionType = buildUnnamed3652();
     o.contextType = "foo";
-    o.geoCriteriaId = buildUnnamed2683();
-    o.platform = buildUnnamed2684();
+    o.geoCriteriaId = buildUnnamed3653();
+    o.platform = buildUnnamed3654();
   }
   buildCounterCreativeCorrectionsContexts--;
   return o;
@@ -591,35 +591,35 @@
 checkCreativeCorrectionsContexts(api.CreativeCorrectionsContexts o) {
   buildCounterCreativeCorrectionsContexts++;
   if (buildCounterCreativeCorrectionsContexts < 3) {
-    checkUnnamed2682(o.auctionType);
+    checkUnnamed3652(o.auctionType);
     unittest.expect(o.contextType, unittest.equals('foo'));
-    checkUnnamed2683(o.geoCriteriaId);
-    checkUnnamed2684(o.platform);
+    checkUnnamed3653(o.geoCriteriaId);
+    checkUnnamed3654(o.platform);
   }
   buildCounterCreativeCorrectionsContexts--;
 }
 
-buildUnnamed2685() {
+buildUnnamed3655() {
   var o = new core.List<api.CreativeCorrectionsContexts>();
   o.add(buildCreativeCorrectionsContexts());
   o.add(buildCreativeCorrectionsContexts());
   return o;
 }
 
-checkUnnamed2685(core.List<api.CreativeCorrectionsContexts> o) {
+checkUnnamed3655(core.List<api.CreativeCorrectionsContexts> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCorrectionsContexts(o[0]);
   checkCreativeCorrectionsContexts(o[1]);
 }
 
-buildUnnamed2686() {
+buildUnnamed3656() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2686(core.List<core.String> o) {
+checkUnnamed3656(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -630,8 +630,8 @@
   var o = new api.CreativeCorrections();
   buildCounterCreativeCorrections++;
   if (buildCounterCreativeCorrections < 3) {
-    o.contexts = buildUnnamed2685();
-    o.details = buildUnnamed2686();
+    o.contexts = buildUnnamed3655();
+    o.details = buildUnnamed3656();
     o.reason = "foo";
   }
   buildCounterCreativeCorrections--;
@@ -641,34 +641,34 @@
 checkCreativeCorrections(api.CreativeCorrections o) {
   buildCounterCreativeCorrections++;
   if (buildCounterCreativeCorrections < 3) {
-    checkUnnamed2685(o.contexts);
-    checkUnnamed2686(o.details);
+    checkUnnamed3655(o.contexts);
+    checkUnnamed3656(o.details);
     unittest.expect(o.reason, unittest.equals('foo'));
   }
   buildCounterCreativeCorrections--;
 }
 
-buildUnnamed2687() {
+buildUnnamed3657() {
   var o = new core.List<api.CreativeCorrections>();
   o.add(buildCreativeCorrections());
   o.add(buildCreativeCorrections());
   return o;
 }
 
-checkUnnamed2687(core.List<api.CreativeCorrections> o) {
+checkUnnamed3657(core.List<api.CreativeCorrections> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCorrections(o[0]);
   checkCreativeCorrections(o[1]);
 }
 
-buildUnnamed2688() {
+buildUnnamed3658() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2688(core.List<core.String> o) {
+checkUnnamed3658(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -695,14 +695,14 @@
   buildCounterCreativeFilteringReasonsReasons--;
 }
 
-buildUnnamed2689() {
+buildUnnamed3659() {
   var o = new core.List<api.CreativeFilteringReasonsReasons>();
   o.add(buildCreativeFilteringReasonsReasons());
   o.add(buildCreativeFilteringReasonsReasons());
   return o;
 }
 
-checkUnnamed2689(core.List<api.CreativeFilteringReasonsReasons> o) {
+checkUnnamed3659(core.List<api.CreativeFilteringReasonsReasons> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeFilteringReasonsReasons(o[0]);
   checkCreativeFilteringReasonsReasons(o[1]);
@@ -714,7 +714,7 @@
   buildCounterCreativeFilteringReasons++;
   if (buildCounterCreativeFilteringReasons < 3) {
     o.date = "foo";
-    o.reasons = buildUnnamed2689();
+    o.reasons = buildUnnamed3659();
   }
   buildCounterCreativeFilteringReasons--;
   return o;
@@ -724,32 +724,32 @@
   buildCounterCreativeFilteringReasons++;
   if (buildCounterCreativeFilteringReasons < 3) {
     unittest.expect(o.date, unittest.equals('foo'));
-    checkUnnamed2689(o.reasons);
+    checkUnnamed3659(o.reasons);
   }
   buildCounterCreativeFilteringReasons--;
 }
 
-buildUnnamed2690() {
+buildUnnamed3660() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2690(core.List<core.String> o) {
+checkUnnamed3660(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2691() {
+buildUnnamed3661() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2691(core.List<core.String> o) {
+checkUnnamed3661(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -801,14 +801,14 @@
   buildCounterCreativeNativeAdImage--;
 }
 
-buildUnnamed2692() {
+buildUnnamed3662() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2692(core.List<core.String> o) {
+checkUnnamed3662(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -850,7 +850,7 @@
     o.clickTrackingUrl = "foo";
     o.headline = "foo";
     o.image = buildCreativeNativeAdImage();
-    o.impressionTrackingUrl = buildUnnamed2692();
+    o.impressionTrackingUrl = buildUnnamed3662();
     o.logo = buildCreativeNativeAdLogo();
     o.price = "foo";
     o.starRating = 42.0;
@@ -872,7 +872,7 @@
     unittest.expect(o.clickTrackingUrl, unittest.equals('foo'));
     unittest.expect(o.headline, unittest.equals('foo'));
     checkCreativeNativeAdImage(o.image);
-    checkUnnamed2692(o.impressionTrackingUrl);
+    checkUnnamed3662(o.impressionTrackingUrl);
     checkCreativeNativeAdLogo(o.logo);
     unittest.expect(o.price, unittest.equals('foo'));
     unittest.expect(o.starRating, unittest.equals(42.0));
@@ -882,79 +882,79 @@
   buildCounterCreativeNativeAd--;
 }
 
-buildUnnamed2693() {
+buildUnnamed3663() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed2693(core.List<core.int> o) {
+checkUnnamed3663(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed2694() {
+buildUnnamed3664() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed2694(core.List<core.int> o) {
+checkUnnamed3664(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed2695() {
+buildUnnamed3665() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed2695(core.List<core.int> o) {
+checkUnnamed3665(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed2696() {
+buildUnnamed3666() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2696(core.List<core.String> o) {
+checkUnnamed3666(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2697() {
+buildUnnamed3667() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed2697(core.List<core.int> o) {
+checkUnnamed3667(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed2698() {
+buildUnnamed3668() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2698(core.List<core.String> o) {
+checkUnnamed3668(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -965,10 +965,10 @@
   var o = new api.CreativeServingRestrictionsContexts();
   buildCounterCreativeServingRestrictionsContexts++;
   if (buildCounterCreativeServingRestrictionsContexts < 3) {
-    o.auctionType = buildUnnamed2696();
+    o.auctionType = buildUnnamed3666();
     o.contextType = "foo";
-    o.geoCriteriaId = buildUnnamed2697();
-    o.platform = buildUnnamed2698();
+    o.geoCriteriaId = buildUnnamed3667();
+    o.platform = buildUnnamed3668();
   }
   buildCounterCreativeServingRestrictionsContexts--;
   return o;
@@ -978,35 +978,35 @@
     api.CreativeServingRestrictionsContexts o) {
   buildCounterCreativeServingRestrictionsContexts++;
   if (buildCounterCreativeServingRestrictionsContexts < 3) {
-    checkUnnamed2696(o.auctionType);
+    checkUnnamed3666(o.auctionType);
     unittest.expect(o.contextType, unittest.equals('foo'));
-    checkUnnamed2697(o.geoCriteriaId);
-    checkUnnamed2698(o.platform);
+    checkUnnamed3667(o.geoCriteriaId);
+    checkUnnamed3668(o.platform);
   }
   buildCounterCreativeServingRestrictionsContexts--;
 }
 
-buildUnnamed2699() {
+buildUnnamed3669() {
   var o = new core.List<api.CreativeServingRestrictionsContexts>();
   o.add(buildCreativeServingRestrictionsContexts());
   o.add(buildCreativeServingRestrictionsContexts());
   return o;
 }
 
-checkUnnamed2699(core.List<api.CreativeServingRestrictionsContexts> o) {
+checkUnnamed3669(core.List<api.CreativeServingRestrictionsContexts> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeServingRestrictionsContexts(o[0]);
   checkCreativeServingRestrictionsContexts(o[1]);
 }
 
-buildUnnamed2700() {
+buildUnnamed3670() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2700(core.List<core.String> o) {
+checkUnnamed3670(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1017,7 +1017,7 @@
   var o = new api.CreativeServingRestrictionsDisapprovalReasons();
   buildCounterCreativeServingRestrictionsDisapprovalReasons++;
   if (buildCounterCreativeServingRestrictionsDisapprovalReasons < 3) {
-    o.details = buildUnnamed2700();
+    o.details = buildUnnamed3670();
     o.reason = "foo";
   }
   buildCounterCreativeServingRestrictionsDisapprovalReasons--;
@@ -1028,20 +1028,20 @@
     api.CreativeServingRestrictionsDisapprovalReasons o) {
   buildCounterCreativeServingRestrictionsDisapprovalReasons++;
   if (buildCounterCreativeServingRestrictionsDisapprovalReasons < 3) {
-    checkUnnamed2700(o.details);
+    checkUnnamed3670(o.details);
     unittest.expect(o.reason, unittest.equals('foo'));
   }
   buildCounterCreativeServingRestrictionsDisapprovalReasons--;
 }
 
-buildUnnamed2701() {
+buildUnnamed3671() {
   var o = new core.List<api.CreativeServingRestrictionsDisapprovalReasons>();
   o.add(buildCreativeServingRestrictionsDisapprovalReasons());
   o.add(buildCreativeServingRestrictionsDisapprovalReasons());
   return o;
 }
 
-checkUnnamed2701(
+checkUnnamed3671(
     core.List<api.CreativeServingRestrictionsDisapprovalReasons> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeServingRestrictionsDisapprovalReasons(o[0]);
@@ -1053,8 +1053,8 @@
   var o = new api.CreativeServingRestrictions();
   buildCounterCreativeServingRestrictions++;
   if (buildCounterCreativeServingRestrictions < 3) {
-    o.contexts = buildUnnamed2699();
-    o.disapprovalReasons = buildUnnamed2701();
+    o.contexts = buildUnnamed3669();
+    o.disapprovalReasons = buildUnnamed3671();
     o.reason = "foo";
   }
   buildCounterCreativeServingRestrictions--;
@@ -1064,34 +1064,34 @@
 checkCreativeServingRestrictions(api.CreativeServingRestrictions o) {
   buildCounterCreativeServingRestrictions++;
   if (buildCounterCreativeServingRestrictions < 3) {
-    checkUnnamed2699(o.contexts);
-    checkUnnamed2701(o.disapprovalReasons);
+    checkUnnamed3669(o.contexts);
+    checkUnnamed3671(o.disapprovalReasons);
     unittest.expect(o.reason, unittest.equals('foo'));
   }
   buildCounterCreativeServingRestrictions--;
 }
 
-buildUnnamed2702() {
+buildUnnamed3672() {
   var o = new core.List<api.CreativeServingRestrictions>();
   o.add(buildCreativeServingRestrictions());
   o.add(buildCreativeServingRestrictions());
   return o;
 }
 
-checkUnnamed2702(core.List<api.CreativeServingRestrictions> o) {
+checkUnnamed3672(core.List<api.CreativeServingRestrictions> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeServingRestrictions(o[0]);
   checkCreativeServingRestrictions(o[1]);
 }
 
-buildUnnamed2703() {
+buildUnnamed3673() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed2703(core.List<core.int> o) {
+checkUnnamed3673(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -1105,28 +1105,28 @@
     o.HTMLSnippet = "foo";
     o.accountId = 42;
     o.adChoicesDestinationUrl = "foo";
-    o.advertiserId = buildUnnamed2679();
+    o.advertiserId = buildUnnamed3649();
     o.advertiserName = "foo";
     o.agencyId = "foo";
     o.apiUploadTimestamp = core.DateTime.parse("2002-02-27T14:01:02");
-    o.attribute = buildUnnamed2680();
+    o.attribute = buildUnnamed3650();
     o.buyerCreativeId = "foo";
-    o.clickThroughUrl = buildUnnamed2681();
-    o.corrections = buildUnnamed2687();
+    o.clickThroughUrl = buildUnnamed3651();
+    o.corrections = buildUnnamed3657();
     o.dealsStatus = "foo";
-    o.detectedDomains = buildUnnamed2688();
+    o.detectedDomains = buildUnnamed3658();
     o.filteringReasons = buildCreativeFilteringReasons();
     o.height = 42;
-    o.impressionTrackingUrl = buildUnnamed2690();
+    o.impressionTrackingUrl = buildUnnamed3660();
     o.kind = "foo";
-    o.languages = buildUnnamed2691();
+    o.languages = buildUnnamed3661();
     o.nativeAd = buildCreativeNativeAd();
     o.openAuctionStatus = "foo";
-    o.productCategories = buildUnnamed2693();
-    o.restrictedCategories = buildUnnamed2694();
-    o.sensitiveCategories = buildUnnamed2695();
-    o.servingRestrictions = buildUnnamed2702();
-    o.vendorType = buildUnnamed2703();
+    o.productCategories = buildUnnamed3663();
+    o.restrictedCategories = buildUnnamed3664();
+    o.sensitiveCategories = buildUnnamed3665();
+    o.servingRestrictions = buildUnnamed3672();
+    o.vendorType = buildUnnamed3673();
     o.version = 42;
     o.videoURL = "foo";
     o.width = 42;
@@ -1141,29 +1141,29 @@
     unittest.expect(o.HTMLSnippet, unittest.equals('foo'));
     unittest.expect(o.accountId, unittest.equals(42));
     unittest.expect(o.adChoicesDestinationUrl, unittest.equals('foo'));
-    checkUnnamed2679(o.advertiserId);
+    checkUnnamed3649(o.advertiserId);
     unittest.expect(o.advertiserName, unittest.equals('foo'));
     unittest.expect(o.agencyId, unittest.equals('foo'));
     unittest.expect(o.apiUploadTimestamp,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed2680(o.attribute);
+    checkUnnamed3650(o.attribute);
     unittest.expect(o.buyerCreativeId, unittest.equals('foo'));
-    checkUnnamed2681(o.clickThroughUrl);
-    checkUnnamed2687(o.corrections);
+    checkUnnamed3651(o.clickThroughUrl);
+    checkUnnamed3657(o.corrections);
     unittest.expect(o.dealsStatus, unittest.equals('foo'));
-    checkUnnamed2688(o.detectedDomains);
+    checkUnnamed3658(o.detectedDomains);
     checkCreativeFilteringReasons(o.filteringReasons);
     unittest.expect(o.height, unittest.equals(42));
-    checkUnnamed2690(o.impressionTrackingUrl);
+    checkUnnamed3660(o.impressionTrackingUrl);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2691(o.languages);
+    checkUnnamed3661(o.languages);
     checkCreativeNativeAd(o.nativeAd);
     unittest.expect(o.openAuctionStatus, unittest.equals('foo'));
-    checkUnnamed2693(o.productCategories);
-    checkUnnamed2694(o.restrictedCategories);
-    checkUnnamed2695(o.sensitiveCategories);
-    checkUnnamed2702(o.servingRestrictions);
-    checkUnnamed2703(o.vendorType);
+    checkUnnamed3663(o.productCategories);
+    checkUnnamed3664(o.restrictedCategories);
+    checkUnnamed3665(o.sensitiveCategories);
+    checkUnnamed3672(o.servingRestrictions);
+    checkUnnamed3673(o.vendorType);
     unittest.expect(o.version, unittest.equals(42));
     unittest.expect(o.videoURL, unittest.equals('foo'));
     unittest.expect(o.width, unittest.equals(42));
@@ -1194,14 +1194,14 @@
   buildCounterCreativeDealIdsDealStatuses--;
 }
 
-buildUnnamed2704() {
+buildUnnamed3674() {
   var o = new core.List<api.CreativeDealIdsDealStatuses>();
   o.add(buildCreativeDealIdsDealStatuses());
   o.add(buildCreativeDealIdsDealStatuses());
   return o;
 }
 
-checkUnnamed2704(core.List<api.CreativeDealIdsDealStatuses> o) {
+checkUnnamed3674(core.List<api.CreativeDealIdsDealStatuses> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeDealIdsDealStatuses(o[0]);
   checkCreativeDealIdsDealStatuses(o[1]);
@@ -1212,7 +1212,7 @@
   var o = new api.CreativeDealIds();
   buildCounterCreativeDealIds++;
   if (buildCounterCreativeDealIds < 3) {
-    o.dealStatuses = buildUnnamed2704();
+    o.dealStatuses = buildUnnamed3674();
     o.kind = "foo";
   }
   buildCounterCreativeDealIds--;
@@ -1222,20 +1222,20 @@
 checkCreativeDealIds(api.CreativeDealIds o) {
   buildCounterCreativeDealIds++;
   if (buildCounterCreativeDealIds < 3) {
-    checkUnnamed2704(o.dealStatuses);
+    checkUnnamed3674(o.dealStatuses);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCreativeDealIds--;
 }
 
-buildUnnamed2705() {
+buildUnnamed3675() {
   var o = new core.List<api.Creative>();
   o.add(buildCreative());
   o.add(buildCreative());
   return o;
 }
 
-checkUnnamed2705(core.List<api.Creative> o) {
+checkUnnamed3675(core.List<api.Creative> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreative(o[0]);
   checkCreative(o[1]);
@@ -1246,7 +1246,7 @@
   var o = new api.CreativesList();
   buildCounterCreativesList++;
   if (buildCounterCreativesList < 3) {
-    o.items = buildUnnamed2705();
+    o.items = buildUnnamed3675();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1257,7 +1257,7 @@
 checkCreativesList(api.CreativesList o) {
   buildCounterCreativesList++;
   if (buildCounterCreativesList < 3) {
-    checkUnnamed2705(o.items);
+    checkUnnamed3675(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1351,14 +1351,14 @@
   buildCounterDealTerms--;
 }
 
-buildUnnamed2706() {
+buildUnnamed3676() {
   var o = new core.List<api.PricePerBuyer>();
   o.add(buildPricePerBuyer());
   o.add(buildPricePerBuyer());
   return o;
 }
 
-checkUnnamed2706(core.List<api.PricePerBuyer> o) {
+checkUnnamed3676(core.List<api.PricePerBuyer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPricePerBuyer(o[0]);
   checkPricePerBuyer(o[1]);
@@ -1370,7 +1370,7 @@
   buildCounterDealTermsGuaranteedFixedPriceTerms++;
   if (buildCounterDealTermsGuaranteedFixedPriceTerms < 3) {
     o.billingInfo = buildDealTermsGuaranteedFixedPriceTermsBillingInfo();
-    o.fixedPrices = buildUnnamed2706();
+    o.fixedPrices = buildUnnamed3676();
     o.guaranteedImpressions = "foo";
     o.guaranteedLooks = "foo";
     o.minimumDailyLooks = "foo";
@@ -1384,7 +1384,7 @@
   buildCounterDealTermsGuaranteedFixedPriceTerms++;
   if (buildCounterDealTermsGuaranteedFixedPriceTerms < 3) {
     checkDealTermsGuaranteedFixedPriceTermsBillingInfo(o.billingInfo);
-    checkUnnamed2706(o.fixedPrices);
+    checkUnnamed3676(o.fixedPrices);
     unittest.expect(o.guaranteedImpressions, unittest.equals('foo'));
     unittest.expect(o.guaranteedLooks, unittest.equals('foo'));
     unittest.expect(o.minimumDailyLooks, unittest.equals('foo'));
@@ -1418,14 +1418,14 @@
   buildCounterDealTermsGuaranteedFixedPriceTermsBillingInfo--;
 }
 
-buildUnnamed2707() {
+buildUnnamed3677() {
   var o = new core.List<api.PricePerBuyer>();
   o.add(buildPricePerBuyer());
   o.add(buildPricePerBuyer());
   return o;
 }
 
-checkUnnamed2707(core.List<api.PricePerBuyer> o) {
+checkUnnamed3677(core.List<api.PricePerBuyer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPricePerBuyer(o[0]);
   checkPricePerBuyer(o[1]);
@@ -1437,7 +1437,7 @@
   buildCounterDealTermsNonGuaranteedAuctionTerms++;
   if (buildCounterDealTermsNonGuaranteedAuctionTerms < 3) {
     o.autoOptimizePrivateAuction = true;
-    o.reservePricePerBuyers = buildUnnamed2707();
+    o.reservePricePerBuyers = buildUnnamed3677();
   }
   buildCounterDealTermsNonGuaranteedAuctionTerms--;
   return o;
@@ -1448,19 +1448,19 @@
   buildCounterDealTermsNonGuaranteedAuctionTerms++;
   if (buildCounterDealTermsNonGuaranteedAuctionTerms < 3) {
     unittest.expect(o.autoOptimizePrivateAuction, unittest.isTrue);
-    checkUnnamed2707(o.reservePricePerBuyers);
+    checkUnnamed3677(o.reservePricePerBuyers);
   }
   buildCounterDealTermsNonGuaranteedAuctionTerms--;
 }
 
-buildUnnamed2708() {
+buildUnnamed3678() {
   var o = new core.List<api.PricePerBuyer>();
   o.add(buildPricePerBuyer());
   o.add(buildPricePerBuyer());
   return o;
 }
 
-checkUnnamed2708(core.List<api.PricePerBuyer> o) {
+checkUnnamed3678(core.List<api.PricePerBuyer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPricePerBuyer(o[0]);
   checkPricePerBuyer(o[1]);
@@ -1471,7 +1471,7 @@
   var o = new api.DealTermsNonGuaranteedFixedPriceTerms();
   buildCounterDealTermsNonGuaranteedFixedPriceTerms++;
   if (buildCounterDealTermsNonGuaranteedFixedPriceTerms < 3) {
-    o.fixedPrices = buildUnnamed2708();
+    o.fixedPrices = buildUnnamed3678();
   }
   buildCounterDealTermsNonGuaranteedFixedPriceTerms--;
   return o;
@@ -1481,7 +1481,7 @@
     api.DealTermsNonGuaranteedFixedPriceTerms o) {
   buildCounterDealTermsNonGuaranteedFixedPriceTerms++;
   if (buildCounterDealTermsNonGuaranteedFixedPriceTerms < 3) {
-    checkUnnamed2708(o.fixedPrices);
+    checkUnnamed3678(o.fixedPrices);
   }
   buildCounterDealTermsNonGuaranteedFixedPriceTerms--;
 }
@@ -1508,14 +1508,14 @@
   buildCounterDealTermsRubiconNonGuaranteedTerms--;
 }
 
-buildUnnamed2709() {
+buildUnnamed3679() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2709(core.List<core.String> o) {
+checkUnnamed3679(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1526,7 +1526,7 @@
   var o = new api.DeleteOrderDealsRequest();
   buildCounterDeleteOrderDealsRequest++;
   if (buildCounterDeleteOrderDealsRequest < 3) {
-    o.dealIds = buildUnnamed2709();
+    o.dealIds = buildUnnamed3679();
     o.proposalRevisionNumber = "foo";
     o.updateAction = "foo";
   }
@@ -1537,21 +1537,21 @@
 checkDeleteOrderDealsRequest(api.DeleteOrderDealsRequest o) {
   buildCounterDeleteOrderDealsRequest++;
   if (buildCounterDeleteOrderDealsRequest < 3) {
-    checkUnnamed2709(o.dealIds);
+    checkUnnamed3679(o.dealIds);
     unittest.expect(o.proposalRevisionNumber, unittest.equals('foo'));
     unittest.expect(o.updateAction, unittest.equals('foo'));
   }
   buildCounterDeleteOrderDealsRequest--;
 }
 
-buildUnnamed2710() {
+buildUnnamed3680() {
   var o = new core.List<api.MarketplaceDeal>();
   o.add(buildMarketplaceDeal());
   o.add(buildMarketplaceDeal());
   return o;
 }
 
-checkUnnamed2710(core.List<api.MarketplaceDeal> o) {
+checkUnnamed3680(core.List<api.MarketplaceDeal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMarketplaceDeal(o[0]);
   checkMarketplaceDeal(o[1]);
@@ -1562,7 +1562,7 @@
   var o = new api.DeleteOrderDealsResponse();
   buildCounterDeleteOrderDealsResponse++;
   if (buildCounterDeleteOrderDealsResponse < 3) {
-    o.deals = buildUnnamed2710();
+    o.deals = buildUnnamed3680();
     o.proposalRevisionNumber = "foo";
   }
   buildCounterDeleteOrderDealsResponse--;
@@ -1572,20 +1572,20 @@
 checkDeleteOrderDealsResponse(api.DeleteOrderDealsResponse o) {
   buildCounterDeleteOrderDealsResponse++;
   if (buildCounterDeleteOrderDealsResponse < 3) {
-    checkUnnamed2710(o.deals);
+    checkUnnamed3680(o.deals);
     unittest.expect(o.proposalRevisionNumber, unittest.equals('foo'));
   }
   buildCounterDeleteOrderDealsResponse--;
 }
 
-buildUnnamed2711() {
+buildUnnamed3681() {
   var o = new core.List<api.DeliveryControlFrequencyCap>();
   o.add(buildDeliveryControlFrequencyCap());
   o.add(buildDeliveryControlFrequencyCap());
   return o;
 }
 
-checkUnnamed2711(core.List<api.DeliveryControlFrequencyCap> o) {
+checkUnnamed3681(core.List<api.DeliveryControlFrequencyCap> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeliveryControlFrequencyCap(o[0]);
   checkDeliveryControlFrequencyCap(o[1]);
@@ -1598,7 +1598,7 @@
   if (buildCounterDeliveryControl < 3) {
     o.creativeBlockingLevel = "foo";
     o.deliveryRateType = "foo";
-    o.frequencyCaps = buildUnnamed2711();
+    o.frequencyCaps = buildUnnamed3681();
   }
   buildCounterDeliveryControl--;
   return o;
@@ -1609,7 +1609,7 @@
   if (buildCounterDeliveryControl < 3) {
     unittest.expect(o.creativeBlockingLevel, unittest.equals('foo'));
     unittest.expect(o.deliveryRateType, unittest.equals('foo'));
-    checkUnnamed2711(o.frequencyCaps);
+    checkUnnamed3681(o.frequencyCaps);
   }
   buildCounterDeliveryControl--;
 }
@@ -1637,14 +1637,14 @@
   buildCounterDeliveryControlFrequencyCap--;
 }
 
-buildUnnamed2712() {
+buildUnnamed3682() {
   var o = new core.List<api.DimensionDimensionValue>();
   o.add(buildDimensionDimensionValue());
   o.add(buildDimensionDimensionValue());
   return o;
 }
 
-checkUnnamed2712(core.List<api.DimensionDimensionValue> o) {
+checkUnnamed3682(core.List<api.DimensionDimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionDimensionValue(o[0]);
   checkDimensionDimensionValue(o[1]);
@@ -1656,7 +1656,7 @@
   buildCounterDimension++;
   if (buildCounterDimension < 3) {
     o.dimensionType = "foo";
-    o.dimensionValues = buildUnnamed2712();
+    o.dimensionValues = buildUnnamed3682();
   }
   buildCounterDimension--;
   return o;
@@ -1666,7 +1666,7 @@
   buildCounterDimension++;
   if (buildCounterDimension < 3) {
     unittest.expect(o.dimensionType, unittest.equals('foo'));
-    checkUnnamed2712(o.dimensionValues);
+    checkUnnamed3682(o.dimensionValues);
   }
   buildCounterDimension--;
 }
@@ -1694,14 +1694,14 @@
   buildCounterDimensionDimensionValue--;
 }
 
-buildUnnamed2713() {
+buildUnnamed3683() {
   var o = new core.List<api.MarketplaceDeal>();
   o.add(buildMarketplaceDeal());
   o.add(buildMarketplaceDeal());
   return o;
 }
 
-checkUnnamed2713(core.List<api.MarketplaceDeal> o) {
+checkUnnamed3683(core.List<api.MarketplaceDeal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMarketplaceDeal(o[0]);
   checkMarketplaceDeal(o[1]);
@@ -1712,7 +1712,7 @@
   var o = new api.EditAllOrderDealsRequest();
   buildCounterEditAllOrderDealsRequest++;
   if (buildCounterEditAllOrderDealsRequest < 3) {
-    o.deals = buildUnnamed2713();
+    o.deals = buildUnnamed3683();
     o.proposal = buildProposal();
     o.proposalRevisionNumber = "foo";
     o.updateAction = "foo";
@@ -1724,7 +1724,7 @@
 checkEditAllOrderDealsRequest(api.EditAllOrderDealsRequest o) {
   buildCounterEditAllOrderDealsRequest++;
   if (buildCounterEditAllOrderDealsRequest < 3) {
-    checkUnnamed2713(o.deals);
+    checkUnnamed3683(o.deals);
     checkProposal(o.proposal);
     unittest.expect(o.proposalRevisionNumber, unittest.equals('foo'));
     unittest.expect(o.updateAction, unittest.equals('foo'));
@@ -1732,14 +1732,14 @@
   buildCounterEditAllOrderDealsRequest--;
 }
 
-buildUnnamed2714() {
+buildUnnamed3684() {
   var o = new core.List<api.MarketplaceDeal>();
   o.add(buildMarketplaceDeal());
   o.add(buildMarketplaceDeal());
   return o;
 }
 
-checkUnnamed2714(core.List<api.MarketplaceDeal> o) {
+checkUnnamed3684(core.List<api.MarketplaceDeal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMarketplaceDeal(o[0]);
   checkMarketplaceDeal(o[1]);
@@ -1750,7 +1750,7 @@
   var o = new api.EditAllOrderDealsResponse();
   buildCounterEditAllOrderDealsResponse++;
   if (buildCounterEditAllOrderDealsResponse < 3) {
-    o.deals = buildUnnamed2714();
+    o.deals = buildUnnamed3684();
     o.orderRevisionNumber = "foo";
   }
   buildCounterEditAllOrderDealsResponse--;
@@ -1760,20 +1760,20 @@
 checkEditAllOrderDealsResponse(api.EditAllOrderDealsResponse o) {
   buildCounterEditAllOrderDealsResponse++;
   if (buildCounterEditAllOrderDealsResponse < 3) {
-    checkUnnamed2714(o.deals);
+    checkUnnamed3684(o.deals);
     unittest.expect(o.orderRevisionNumber, unittest.equals('foo'));
   }
   buildCounterEditAllOrderDealsResponse--;
 }
 
-buildUnnamed2715() {
+buildUnnamed3685() {
   var o = new core.List<api.Product>();
   o.add(buildProduct());
   o.add(buildProduct());
   return o;
 }
 
-checkUnnamed2715(core.List<api.Product> o) {
+checkUnnamed3685(core.List<api.Product> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProduct(o[0]);
   checkProduct(o[1]);
@@ -1784,7 +1784,7 @@
   var o = new api.GetOffersResponse();
   buildCounterGetOffersResponse++;
   if (buildCounterGetOffersResponse < 3) {
-    o.products = buildUnnamed2715();
+    o.products = buildUnnamed3685();
   }
   buildCounterGetOffersResponse--;
   return o;
@@ -1793,19 +1793,19 @@
 checkGetOffersResponse(api.GetOffersResponse o) {
   buildCounterGetOffersResponse++;
   if (buildCounterGetOffersResponse < 3) {
-    checkUnnamed2715(o.products);
+    checkUnnamed3685(o.products);
   }
   buildCounterGetOffersResponse--;
 }
 
-buildUnnamed2716() {
+buildUnnamed3686() {
   var o = new core.List<api.MarketplaceDeal>();
   o.add(buildMarketplaceDeal());
   o.add(buildMarketplaceDeal());
   return o;
 }
 
-checkUnnamed2716(core.List<api.MarketplaceDeal> o) {
+checkUnnamed3686(core.List<api.MarketplaceDeal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMarketplaceDeal(o[0]);
   checkMarketplaceDeal(o[1]);
@@ -1816,7 +1816,7 @@
   var o = new api.GetOrderDealsResponse();
   buildCounterGetOrderDealsResponse++;
   if (buildCounterGetOrderDealsResponse < 3) {
-    o.deals = buildUnnamed2716();
+    o.deals = buildUnnamed3686();
   }
   buildCounterGetOrderDealsResponse--;
   return o;
@@ -1825,19 +1825,19 @@
 checkGetOrderDealsResponse(api.GetOrderDealsResponse o) {
   buildCounterGetOrderDealsResponse++;
   if (buildCounterGetOrderDealsResponse < 3) {
-    checkUnnamed2716(o.deals);
+    checkUnnamed3686(o.deals);
   }
   buildCounterGetOrderDealsResponse--;
 }
 
-buildUnnamed2717() {
+buildUnnamed3687() {
   var o = new core.List<api.MarketplaceNote>();
   o.add(buildMarketplaceNote());
   o.add(buildMarketplaceNote());
   return o;
 }
 
-checkUnnamed2717(core.List<api.MarketplaceNote> o) {
+checkUnnamed3687(core.List<api.MarketplaceNote> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMarketplaceNote(o[0]);
   checkMarketplaceNote(o[1]);
@@ -1848,7 +1848,7 @@
   var o = new api.GetOrderNotesResponse();
   buildCounterGetOrderNotesResponse++;
   if (buildCounterGetOrderNotesResponse < 3) {
-    o.notes = buildUnnamed2717();
+    o.notes = buildUnnamed3687();
   }
   buildCounterGetOrderNotesResponse--;
   return o;
@@ -1857,19 +1857,19 @@
 checkGetOrderNotesResponse(api.GetOrderNotesResponse o) {
   buildCounterGetOrderNotesResponse++;
   if (buildCounterGetOrderNotesResponse < 3) {
-    checkUnnamed2717(o.notes);
+    checkUnnamed3687(o.notes);
   }
   buildCounterGetOrderNotesResponse--;
 }
 
-buildUnnamed2718() {
+buildUnnamed3688() {
   var o = new core.List<api.Proposal>();
   o.add(buildProposal());
   o.add(buildProposal());
   return o;
 }
 
-checkUnnamed2718(core.List<api.Proposal> o) {
+checkUnnamed3688(core.List<api.Proposal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProposal(o[0]);
   checkProposal(o[1]);
@@ -1880,7 +1880,7 @@
   var o = new api.GetOrdersResponse();
   buildCounterGetOrdersResponse++;
   if (buildCounterGetOrdersResponse < 3) {
-    o.proposals = buildUnnamed2718();
+    o.proposals = buildUnnamed3688();
   }
   buildCounterGetOrdersResponse--;
   return o;
@@ -1889,19 +1889,19 @@
 checkGetOrdersResponse(api.GetOrdersResponse o) {
   buildCounterGetOrdersResponse++;
   if (buildCounterGetOrdersResponse < 3) {
-    checkUnnamed2718(o.proposals);
+    checkUnnamed3688(o.proposals);
   }
   buildCounterGetOrdersResponse--;
 }
 
-buildUnnamed2719() {
+buildUnnamed3689() {
   var o = new core.List<api.PublisherProfileApiProto>();
   o.add(buildPublisherProfileApiProto());
   o.add(buildPublisherProfileApiProto());
   return o;
 }
 
-checkUnnamed2719(core.List<api.PublisherProfileApiProto> o) {
+checkUnnamed3689(core.List<api.PublisherProfileApiProto> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPublisherProfileApiProto(o[0]);
   checkPublisherProfileApiProto(o[1]);
@@ -1912,7 +1912,7 @@
   var o = new api.GetPublisherProfilesByAccountIdResponse();
   buildCounterGetPublisherProfilesByAccountIdResponse++;
   if (buildCounterGetPublisherProfilesByAccountIdResponse < 3) {
-    o.profiles = buildUnnamed2719();
+    o.profiles = buildUnnamed3689();
   }
   buildCounterGetPublisherProfilesByAccountIdResponse--;
   return o;
@@ -1922,32 +1922,32 @@
     api.GetPublisherProfilesByAccountIdResponse o) {
   buildCounterGetPublisherProfilesByAccountIdResponse++;
   if (buildCounterGetPublisherProfilesByAccountIdResponse < 3) {
-    checkUnnamed2719(o.profiles);
+    checkUnnamed3689(o.profiles);
   }
   buildCounterGetPublisherProfilesByAccountIdResponse--;
 }
 
-buildUnnamed2720() {
+buildUnnamed3690() {
   var o = new core.List<api.ContactInformation>();
   o.add(buildContactInformation());
   o.add(buildContactInformation());
   return o;
 }
 
-checkUnnamed2720(core.List<api.ContactInformation> o) {
+checkUnnamed3690(core.List<api.ContactInformation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContactInformation(o[0]);
   checkContactInformation(o[1]);
 }
 
-buildUnnamed2721() {
+buildUnnamed3691() {
   var o = new core.List<api.SharedTargeting>();
   o.add(buildSharedTargeting());
   o.add(buildSharedTargeting());
   return o;
 }
 
-checkUnnamed2721(core.List<api.SharedTargeting> o) {
+checkUnnamed3691(core.List<api.SharedTargeting> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSharedTargeting(o[0]);
   checkSharedTargeting(o[1]);
@@ -1978,8 +1978,8 @@
     o.productRevisionNumber = "foo";
     o.programmaticCreativeSource = "foo";
     o.proposalId = "foo";
-    o.sellerContacts = buildUnnamed2720();
-    o.sharedTargetings = buildUnnamed2721();
+    o.sellerContacts = buildUnnamed3690();
+    o.sharedTargetings = buildUnnamed3691();
     o.syndicationProduct = "foo";
     o.terms = buildDealTerms();
     o.webPropertyCode = "foo";
@@ -2011,8 +2011,8 @@
     unittest.expect(o.productRevisionNumber, unittest.equals('foo'));
     unittest.expect(o.programmaticCreativeSource, unittest.equals('foo'));
     unittest.expect(o.proposalId, unittest.equals('foo'));
-    checkUnnamed2720(o.sellerContacts);
-    checkUnnamed2721(o.sharedTargetings);
+    checkUnnamed3690(o.sellerContacts);
+    checkUnnamed3691(o.sharedTargetings);
     unittest.expect(o.syndicationProduct, unittest.equals('foo'));
     checkDealTerms(o.terms);
     unittest.expect(o.webPropertyCode, unittest.equals('foo'));
@@ -2099,7 +2099,7 @@
   buildCounterMarketplaceNote--;
 }
 
-buildUnnamed2722() {
+buildUnnamed3692() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -2114,7 +2114,7 @@
   return o;
 }
 
-checkUnnamed2722(core.List<core.Object> o) {
+checkUnnamed3692(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -2128,7 +2128,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2723() {
+buildUnnamed3693() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -2143,7 +2143,7 @@
   return o;
 }
 
-checkUnnamed2723(core.List<core.Object> o) {
+checkUnnamed3693(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o[0]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -2157,7 +2157,7 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2724() {
+buildUnnamed3694() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -2172,7 +2172,7 @@
   return o;
 }
 
-checkUnnamed2724(core.List<core.Object> o) {
+checkUnnamed3694(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o[0]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -2186,7 +2186,7 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2725() {
+buildUnnamed3695() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -2201,7 +2201,7 @@
   return o;
 }
 
-checkUnnamed2725(core.List<core.Object> o) {
+checkUnnamed3695(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o[0]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -2222,11 +2222,11 @@
   if (buildCounterPerformanceReport < 3) {
     o.bidRate = 42.0;
     o.bidRequestRate = 42.0;
-    o.calloutStatusRate = buildUnnamed2722();
-    o.cookieMatcherStatusRate = buildUnnamed2723();
-    o.creativeStatusRate = buildUnnamed2724();
+    o.calloutStatusRate = buildUnnamed3692();
+    o.cookieMatcherStatusRate = buildUnnamed3693();
+    o.creativeStatusRate = buildUnnamed3694();
     o.filteredBidRate = 42.0;
-    o.hostedMatchStatusRate = buildUnnamed2725();
+    o.hostedMatchStatusRate = buildUnnamed3695();
     o.inventoryMatchRate = 42.0;
     o.kind = "foo";
     o.latency50thPercentile = 42.0;
@@ -2252,11 +2252,11 @@
   if (buildCounterPerformanceReport < 3) {
     unittest.expect(o.bidRate, unittest.equals(42.0));
     unittest.expect(o.bidRequestRate, unittest.equals(42.0));
-    checkUnnamed2722(o.calloutStatusRate);
-    checkUnnamed2723(o.cookieMatcherStatusRate);
-    checkUnnamed2724(o.creativeStatusRate);
+    checkUnnamed3692(o.calloutStatusRate);
+    checkUnnamed3693(o.cookieMatcherStatusRate);
+    checkUnnamed3694(o.creativeStatusRate);
     unittest.expect(o.filteredBidRate, unittest.equals(42.0));
-    checkUnnamed2725(o.hostedMatchStatusRate);
+    checkUnnamed3695(o.hostedMatchStatusRate);
     unittest.expect(o.inventoryMatchRate, unittest.equals(42.0));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.latency50thPercentile, unittest.equals(42.0));
@@ -2276,14 +2276,14 @@
   buildCounterPerformanceReport--;
 }
 
-buildUnnamed2726() {
+buildUnnamed3696() {
   var o = new core.List<api.PerformanceReport>();
   o.add(buildPerformanceReport());
   o.add(buildPerformanceReport());
   return o;
 }
 
-checkUnnamed2726(core.List<api.PerformanceReport> o) {
+checkUnnamed3696(core.List<api.PerformanceReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerformanceReport(o[0]);
   checkPerformanceReport(o[1]);
@@ -2295,7 +2295,7 @@
   buildCounterPerformanceReportList++;
   if (buildCounterPerformanceReportList < 3) {
     o.kind = "foo";
-    o.performanceReport = buildUnnamed2726();
+    o.performanceReport = buildUnnamed3696();
   }
   buildCounterPerformanceReportList--;
   return o;
@@ -2305,19 +2305,19 @@
   buildCounterPerformanceReportList++;
   if (buildCounterPerformanceReportList < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2726(o.performanceReport);
+    checkUnnamed3696(o.performanceReport);
   }
   buildCounterPerformanceReportList--;
 }
 
-buildUnnamed2727() {
+buildUnnamed3697() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2727(core.List<core.String> o) {
+checkUnnamed3697(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2344,40 +2344,40 @@
   buildCounterPretargetingConfigDimensions--;
 }
 
-buildUnnamed2728() {
+buildUnnamed3698() {
   var o = new core.List<api.PretargetingConfigDimensions>();
   o.add(buildPretargetingConfigDimensions());
   o.add(buildPretargetingConfigDimensions());
   return o;
 }
 
-checkUnnamed2728(core.List<api.PretargetingConfigDimensions> o) {
+checkUnnamed3698(core.List<api.PretargetingConfigDimensions> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfigDimensions(o[0]);
   checkPretargetingConfigDimensions(o[1]);
 }
 
-buildUnnamed2729() {
+buildUnnamed3699() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2729(core.List<core.String> o) {
+checkUnnamed3699(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2730() {
+buildUnnamed3700() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2730(core.List<core.String> o) {
+checkUnnamed3700(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2405,105 +2405,105 @@
   buildCounterPretargetingConfigExcludedPlacements--;
 }
 
-buildUnnamed2731() {
+buildUnnamed3701() {
   var o = new core.List<api.PretargetingConfigExcludedPlacements>();
   o.add(buildPretargetingConfigExcludedPlacements());
   o.add(buildPretargetingConfigExcludedPlacements());
   return o;
 }
 
-checkUnnamed2731(core.List<api.PretargetingConfigExcludedPlacements> o) {
+checkUnnamed3701(core.List<api.PretargetingConfigExcludedPlacements> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfigExcludedPlacements(o[0]);
   checkPretargetingConfigExcludedPlacements(o[1]);
 }
 
-buildUnnamed2732() {
+buildUnnamed3702() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2732(core.List<core.String> o) {
+checkUnnamed3702(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2733() {
+buildUnnamed3703() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2733(core.List<core.String> o) {
+checkUnnamed3703(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2734() {
+buildUnnamed3704() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2734(core.List<core.String> o) {
+checkUnnamed3704(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2735() {
+buildUnnamed3705() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2735(core.List<core.String> o) {
+checkUnnamed3705(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2736() {
+buildUnnamed3706() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2736(core.List<core.String> o) {
+checkUnnamed3706(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2737() {
+buildUnnamed3707() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2737(core.List<core.String> o) {
+checkUnnamed3707(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2738() {
+buildUnnamed3708() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2738(core.List<core.String> o) {
+checkUnnamed3708(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2530,92 +2530,92 @@
   buildCounterPretargetingConfigPlacements--;
 }
 
-buildUnnamed2739() {
+buildUnnamed3709() {
   var o = new core.List<api.PretargetingConfigPlacements>();
   o.add(buildPretargetingConfigPlacements());
   o.add(buildPretargetingConfigPlacements());
   return o;
 }
 
-checkUnnamed2739(core.List<api.PretargetingConfigPlacements> o) {
+checkUnnamed3709(core.List<api.PretargetingConfigPlacements> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfigPlacements(o[0]);
   checkPretargetingConfigPlacements(o[1]);
 }
 
-buildUnnamed2740() {
+buildUnnamed3710() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2740(core.List<core.String> o) {
+checkUnnamed3710(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2741() {
+buildUnnamed3711() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2741(core.List<core.String> o) {
+checkUnnamed3711(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2742() {
+buildUnnamed3712() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2742(core.List<core.String> o) {
+checkUnnamed3712(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2743() {
+buildUnnamed3713() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2743(core.List<core.String> o) {
+checkUnnamed3713(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2744() {
+buildUnnamed3714() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2744(core.List<core.String> o) {
+checkUnnamed3714(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2745() {
+buildUnnamed3715() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2745(core.List<core.String> o) {
+checkUnnamed3715(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2645,14 +2645,14 @@
   buildCounterPretargetingConfigVideoPlayerSizes--;
 }
 
-buildUnnamed2746() {
+buildUnnamed3716() {
   var o = new core.List<api.PretargetingConfigVideoPlayerSizes>();
   o.add(buildPretargetingConfigVideoPlayerSizes());
   o.add(buildPretargetingConfigVideoPlayerSizes());
   return o;
 }
 
-checkUnnamed2746(core.List<api.PretargetingConfigVideoPlayerSizes> o) {
+checkUnnamed3716(core.List<api.PretargetingConfigVideoPlayerSizes> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfigVideoPlayerSizes(o[0]);
   checkPretargetingConfigVideoPlayerSizes(o[1]);
@@ -2666,29 +2666,29 @@
     o.billingId = "foo";
     o.configId = "foo";
     o.configName = "foo";
-    o.creativeType = buildUnnamed2727();
-    o.dimensions = buildUnnamed2728();
-    o.excludedContentLabels = buildUnnamed2729();
-    o.excludedGeoCriteriaIds = buildUnnamed2730();
-    o.excludedPlacements = buildUnnamed2731();
-    o.excludedUserLists = buildUnnamed2732();
-    o.excludedVerticals = buildUnnamed2733();
-    o.geoCriteriaIds = buildUnnamed2734();
+    o.creativeType = buildUnnamed3697();
+    o.dimensions = buildUnnamed3698();
+    o.excludedContentLabels = buildUnnamed3699();
+    o.excludedGeoCriteriaIds = buildUnnamed3700();
+    o.excludedPlacements = buildUnnamed3701();
+    o.excludedUserLists = buildUnnamed3702();
+    o.excludedVerticals = buildUnnamed3703();
+    o.geoCriteriaIds = buildUnnamed3704();
     o.isActive = true;
     o.kind = "foo";
-    o.languages = buildUnnamed2735();
+    o.languages = buildUnnamed3705();
     o.minimumViewabilityDecile = 42;
-    o.mobileCarriers = buildUnnamed2736();
-    o.mobileDevices = buildUnnamed2737();
-    o.mobileOperatingSystemVersions = buildUnnamed2738();
-    o.placements = buildUnnamed2739();
-    o.platforms = buildUnnamed2740();
-    o.supportedCreativeAttributes = buildUnnamed2741();
-    o.userIdentifierDataRequired = buildUnnamed2742();
-    o.userLists = buildUnnamed2743();
-    o.vendorTypes = buildUnnamed2744();
-    o.verticals = buildUnnamed2745();
-    o.videoPlayerSizes = buildUnnamed2746();
+    o.mobileCarriers = buildUnnamed3706();
+    o.mobileDevices = buildUnnamed3707();
+    o.mobileOperatingSystemVersions = buildUnnamed3708();
+    o.placements = buildUnnamed3709();
+    o.platforms = buildUnnamed3710();
+    o.supportedCreativeAttributes = buildUnnamed3711();
+    o.userIdentifierDataRequired = buildUnnamed3712();
+    o.userLists = buildUnnamed3713();
+    o.vendorTypes = buildUnnamed3714();
+    o.verticals = buildUnnamed3715();
+    o.videoPlayerSizes = buildUnnamed3716();
   }
   buildCounterPretargetingConfig--;
   return o;
@@ -2700,41 +2700,41 @@
     unittest.expect(o.billingId, unittest.equals('foo'));
     unittest.expect(o.configId, unittest.equals('foo'));
     unittest.expect(o.configName, unittest.equals('foo'));
-    checkUnnamed2727(o.creativeType);
-    checkUnnamed2728(o.dimensions);
-    checkUnnamed2729(o.excludedContentLabels);
-    checkUnnamed2730(o.excludedGeoCriteriaIds);
-    checkUnnamed2731(o.excludedPlacements);
-    checkUnnamed2732(o.excludedUserLists);
-    checkUnnamed2733(o.excludedVerticals);
-    checkUnnamed2734(o.geoCriteriaIds);
+    checkUnnamed3697(o.creativeType);
+    checkUnnamed3698(o.dimensions);
+    checkUnnamed3699(o.excludedContentLabels);
+    checkUnnamed3700(o.excludedGeoCriteriaIds);
+    checkUnnamed3701(o.excludedPlacements);
+    checkUnnamed3702(o.excludedUserLists);
+    checkUnnamed3703(o.excludedVerticals);
+    checkUnnamed3704(o.geoCriteriaIds);
     unittest.expect(o.isActive, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2735(o.languages);
+    checkUnnamed3705(o.languages);
     unittest.expect(o.minimumViewabilityDecile, unittest.equals(42));
-    checkUnnamed2736(o.mobileCarriers);
-    checkUnnamed2737(o.mobileDevices);
-    checkUnnamed2738(o.mobileOperatingSystemVersions);
-    checkUnnamed2739(o.placements);
-    checkUnnamed2740(o.platforms);
-    checkUnnamed2741(o.supportedCreativeAttributes);
-    checkUnnamed2742(o.userIdentifierDataRequired);
-    checkUnnamed2743(o.userLists);
-    checkUnnamed2744(o.vendorTypes);
-    checkUnnamed2745(o.verticals);
-    checkUnnamed2746(o.videoPlayerSizes);
+    checkUnnamed3706(o.mobileCarriers);
+    checkUnnamed3707(o.mobileDevices);
+    checkUnnamed3708(o.mobileOperatingSystemVersions);
+    checkUnnamed3709(o.placements);
+    checkUnnamed3710(o.platforms);
+    checkUnnamed3711(o.supportedCreativeAttributes);
+    checkUnnamed3712(o.userIdentifierDataRequired);
+    checkUnnamed3713(o.userLists);
+    checkUnnamed3714(o.vendorTypes);
+    checkUnnamed3715(o.verticals);
+    checkUnnamed3716(o.videoPlayerSizes);
   }
   buildCounterPretargetingConfig--;
 }
 
-buildUnnamed2747() {
+buildUnnamed3717() {
   var o = new core.List<api.PretargetingConfig>();
   o.add(buildPretargetingConfig());
   o.add(buildPretargetingConfig());
   return o;
 }
 
-checkUnnamed2747(core.List<api.PretargetingConfig> o) {
+checkUnnamed3717(core.List<api.PretargetingConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPretargetingConfig(o[0]);
   checkPretargetingConfig(o[1]);
@@ -2745,7 +2745,7 @@
   var o = new api.PretargetingConfigList();
   buildCounterPretargetingConfigList++;
   if (buildCounterPretargetingConfigList < 3) {
-    o.items = buildUnnamed2747();
+    o.items = buildUnnamed3717();
     o.kind = "foo";
   }
   buildCounterPretargetingConfigList--;
@@ -2755,7 +2755,7 @@
 checkPretargetingConfigList(api.PretargetingConfigList o) {
   buildCounterPretargetingConfigList++;
   if (buildCounterPretargetingConfigList < 3) {
-    checkUnnamed2747(o.items);
+    checkUnnamed3717(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPretargetingConfigList--;
@@ -2832,40 +2832,40 @@
   buildCounterPrivateData--;
 }
 
-buildUnnamed2748() {
+buildUnnamed3718() {
   var o = new core.List<api.ContactInformation>();
   o.add(buildContactInformation());
   o.add(buildContactInformation());
   return o;
 }
 
-checkUnnamed2748(core.List<api.ContactInformation> o) {
+checkUnnamed3718(core.List<api.ContactInformation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContactInformation(o[0]);
   checkContactInformation(o[1]);
 }
 
-buildUnnamed2749() {
+buildUnnamed3719() {
   var o = new core.List<api.MarketplaceLabel>();
   o.add(buildMarketplaceLabel());
   o.add(buildMarketplaceLabel());
   return o;
 }
 
-checkUnnamed2749(core.List<api.MarketplaceLabel> o) {
+checkUnnamed3719(core.List<api.MarketplaceLabel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMarketplaceLabel(o[0]);
   checkMarketplaceLabel(o[1]);
 }
 
-buildUnnamed2750() {
+buildUnnamed3720() {
   var o = new core.List<api.SharedTargeting>();
   o.add(buildSharedTargeting());
   o.add(buildSharedTargeting());
   return o;
 }
 
-checkUnnamed2750(core.List<api.SharedTargeting> o) {
+checkUnnamed3720(core.List<api.SharedTargeting> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSharedTargeting(o[0]);
   checkSharedTargeting(o[1]);
@@ -2879,7 +2879,7 @@
     o.billedBuyer = buildBuyer();
     o.buyer = buildBuyer();
     o.creationTimeMs = "foo";
-    o.creatorContacts = buildUnnamed2748();
+    o.creatorContacts = buildUnnamed3718();
     o.creatorRole = "foo";
     o.deliveryControl = buildDeliveryControl();
     o.flightEndTimeMs = "foo";
@@ -2887,7 +2887,7 @@
     o.hasCreatorSignedOff = true;
     o.inventorySource = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed2749();
+    o.labels = buildUnnamed3719();
     o.lastUpdateTimeMs = "foo";
     o.legacyOfferId = "foo";
     o.marketplacePublisherProfileId = "foo";
@@ -2898,7 +2898,7 @@
     o.publisherProvidedForecast = buildPublisherProvidedForecast();
     o.revisionNumber = "foo";
     o.seller = buildSeller();
-    o.sharedTargetings = buildUnnamed2750();
+    o.sharedTargetings = buildUnnamed3720();
     o.state = "foo";
     o.syndicationProduct = "foo";
     o.terms = buildDealTerms();
@@ -2914,7 +2914,7 @@
     checkBuyer(o.billedBuyer);
     checkBuyer(o.buyer);
     unittest.expect(o.creationTimeMs, unittest.equals('foo'));
-    checkUnnamed2748(o.creatorContacts);
+    checkUnnamed3718(o.creatorContacts);
     unittest.expect(o.creatorRole, unittest.equals('foo'));
     checkDeliveryControl(o.deliveryControl);
     unittest.expect(o.flightEndTimeMs, unittest.equals('foo'));
@@ -2922,7 +2922,7 @@
     unittest.expect(o.hasCreatorSignedOff, unittest.isTrue);
     unittest.expect(o.inventorySource, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2749(o.labels);
+    checkUnnamed3719(o.labels);
     unittest.expect(o.lastUpdateTimeMs, unittest.equals('foo'));
     unittest.expect(o.legacyOfferId, unittest.equals('foo'));
     unittest.expect(o.marketplacePublisherProfileId, unittest.equals('foo'));
@@ -2933,7 +2933,7 @@
     checkPublisherProvidedForecast(o.publisherProvidedForecast);
     unittest.expect(o.revisionNumber, unittest.equals('foo'));
     checkSeller(o.seller);
-    checkUnnamed2750(o.sharedTargetings);
+    checkUnnamed3720(o.sharedTargetings);
     unittest.expect(o.state, unittest.equals('foo'));
     unittest.expect(o.syndicationProduct, unittest.equals('foo'));
     checkDealTerms(o.terms);
@@ -2942,53 +2942,53 @@
   buildCounterProduct--;
 }
 
-buildUnnamed2751() {
+buildUnnamed3721() {
   var o = new core.List<api.ContactInformation>();
   o.add(buildContactInformation());
   o.add(buildContactInformation());
   return o;
 }
 
-checkUnnamed2751(core.List<api.ContactInformation> o) {
+checkUnnamed3721(core.List<api.ContactInformation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContactInformation(o[0]);
   checkContactInformation(o[1]);
 }
 
-buildUnnamed2752() {
+buildUnnamed3722() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2752(core.List<core.String> o) {
+checkUnnamed3722(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2753() {
+buildUnnamed3723() {
   var o = new core.List<api.MarketplaceLabel>();
   o.add(buildMarketplaceLabel());
   o.add(buildMarketplaceLabel());
   return o;
 }
 
-checkUnnamed2753(core.List<api.MarketplaceLabel> o) {
+checkUnnamed3723(core.List<api.MarketplaceLabel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMarketplaceLabel(o[0]);
   checkMarketplaceLabel(o[1]);
 }
 
-buildUnnamed2754() {
+buildUnnamed3724() {
   var o = new core.List<api.ContactInformation>();
   o.add(buildContactInformation());
   o.add(buildContactInformation());
   return o;
 }
 
-checkUnnamed2754(core.List<api.ContactInformation> o) {
+checkUnnamed3724(core.List<api.ContactInformation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContactInformation(o[0]);
   checkContactInformation(o[1]);
@@ -3001,16 +3001,16 @@
   if (buildCounterProposal < 3) {
     o.billedBuyer = buildBuyer();
     o.buyer = buildBuyer();
-    o.buyerContacts = buildUnnamed2751();
+    o.buyerContacts = buildUnnamed3721();
     o.buyerPrivateData = buildPrivateData();
-    o.dbmAdvertiserIds = buildUnnamed2752();
+    o.dbmAdvertiserIds = buildUnnamed3722();
     o.hasBuyerSignedOff = true;
     o.hasSellerSignedOff = true;
     o.inventorySource = "foo";
     o.isRenegotiating = true;
     o.isSetupComplete = true;
     o.kind = "foo";
-    o.labels = buildUnnamed2753();
+    o.labels = buildUnnamed3723();
     o.lastUpdaterOrCommentorRole = "foo";
     o.name = "foo";
     o.negotiationId = "foo";
@@ -3021,7 +3021,7 @@
     o.revisionNumber = "foo";
     o.revisionTimeMs = "foo";
     o.seller = buildSeller();
-    o.sellerContacts = buildUnnamed2754();
+    o.sellerContacts = buildUnnamed3724();
   }
   buildCounterProposal--;
   return o;
@@ -3032,16 +3032,16 @@
   if (buildCounterProposal < 3) {
     checkBuyer(o.billedBuyer);
     checkBuyer(o.buyer);
-    checkUnnamed2751(o.buyerContacts);
+    checkUnnamed3721(o.buyerContacts);
     checkPrivateData(o.buyerPrivateData);
-    checkUnnamed2752(o.dbmAdvertiserIds);
+    checkUnnamed3722(o.dbmAdvertiserIds);
     unittest.expect(o.hasBuyerSignedOff, unittest.isTrue);
     unittest.expect(o.hasSellerSignedOff, unittest.isTrue);
     unittest.expect(o.inventorySource, unittest.equals('foo'));
     unittest.expect(o.isRenegotiating, unittest.isTrue);
     unittest.expect(o.isSetupComplete, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2753(o.labels);
+    checkUnnamed3723(o.labels);
     unittest.expect(o.lastUpdaterOrCommentorRole, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.negotiationId, unittest.equals('foo'));
@@ -3052,32 +3052,32 @@
     unittest.expect(o.revisionNumber, unittest.equals('foo'));
     unittest.expect(o.revisionTimeMs, unittest.equals('foo'));
     checkSeller(o.seller);
-    checkUnnamed2754(o.sellerContacts);
+    checkUnnamed3724(o.sellerContacts);
   }
   buildCounterProposal--;
 }
 
-buildUnnamed2755() {
+buildUnnamed3725() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2755(core.List<core.String> o) {
+checkUnnamed3725(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2756() {
+buildUnnamed3726() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2756(core.List<core.String> o) {
+checkUnnamed3726(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3103,14 +3103,14 @@
     o.overview = "foo";
     o.profileId = 42;
     o.programmaticContact = "foo";
-    o.publisherDomains = buildUnnamed2755();
+    o.publisherDomains = buildUnnamed3725();
     o.publisherProfileId = "foo";
     o.publisherProvidedForecast = buildPublisherProvidedForecast();
     o.rateCardInfoLink = "foo";
     o.samplePageLink = "foo";
     o.seller = buildSeller();
     o.state = "foo";
-    o.topHeadlines = buildUnnamed2756();
+    o.topHeadlines = buildUnnamed3726();
   }
   buildCounterPublisherProfileApiProto--;
   return o;
@@ -3134,26 +3134,26 @@
     unittest.expect(o.overview, unittest.equals('foo'));
     unittest.expect(o.profileId, unittest.equals(42));
     unittest.expect(o.programmaticContact, unittest.equals('foo'));
-    checkUnnamed2755(o.publisherDomains);
+    checkUnnamed3725(o.publisherDomains);
     unittest.expect(o.publisherProfileId, unittest.equals('foo'));
     checkPublisherProvidedForecast(o.publisherProvidedForecast);
     unittest.expect(o.rateCardInfoLink, unittest.equals('foo'));
     unittest.expect(o.samplePageLink, unittest.equals('foo'));
     checkSeller(o.seller);
     unittest.expect(o.state, unittest.equals('foo'));
-    checkUnnamed2756(o.topHeadlines);
+    checkUnnamed3726(o.topHeadlines);
   }
   buildCounterPublisherProfileApiProto--;
 }
 
-buildUnnamed2757() {
+buildUnnamed3727() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed2757(core.List<api.Dimension> o) {
+checkUnnamed3727(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
@@ -3164,7 +3164,7 @@
   var o = new api.PublisherProvidedForecast();
   buildCounterPublisherProvidedForecast++;
   if (buildCounterPublisherProvidedForecast < 3) {
-    o.dimensions = buildUnnamed2757();
+    o.dimensions = buildUnnamed3727();
     o.weeklyImpressions = "foo";
     o.weeklyUniques = "foo";
   }
@@ -3175,7 +3175,7 @@
 checkPublisherProvidedForecast(api.PublisherProvidedForecast o) {
   buildCounterPublisherProvidedForecast++;
   if (buildCounterPublisherProvidedForecast < 3) {
-    checkUnnamed2757(o.dimensions);
+    checkUnnamed3727(o.dimensions);
     unittest.expect(o.weeklyImpressions, unittest.equals('foo'));
     unittest.expect(o.weeklyUniques, unittest.equals('foo'));
   }
@@ -3203,27 +3203,27 @@
   buildCounterSeller--;
 }
 
-buildUnnamed2758() {
+buildUnnamed3728() {
   var o = new core.List<api.TargetingValue>();
   o.add(buildTargetingValue());
   o.add(buildTargetingValue());
   return o;
 }
 
-checkUnnamed2758(core.List<api.TargetingValue> o) {
+checkUnnamed3728(core.List<api.TargetingValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetingValue(o[0]);
   checkTargetingValue(o[1]);
 }
 
-buildUnnamed2759() {
+buildUnnamed3729() {
   var o = new core.List<api.TargetingValue>();
   o.add(buildTargetingValue());
   o.add(buildTargetingValue());
   return o;
 }
 
-checkUnnamed2759(core.List<api.TargetingValue> o) {
+checkUnnamed3729(core.List<api.TargetingValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetingValue(o[0]);
   checkTargetingValue(o[1]);
@@ -3234,8 +3234,8 @@
   var o = new api.SharedTargeting();
   buildCounterSharedTargeting++;
   if (buildCounterSharedTargeting < 3) {
-    o.exclusions = buildUnnamed2758();
-    o.inclusions = buildUnnamed2759();
+    o.exclusions = buildUnnamed3728();
+    o.inclusions = buildUnnamed3729();
     o.key = "foo";
   }
   buildCounterSharedTargeting--;
@@ -3245,8 +3245,8 @@
 checkSharedTargeting(api.SharedTargeting o) {
   buildCounterSharedTargeting++;
   if (buildCounterSharedTargeting < 3) {
-    checkUnnamed2758(o.exclusions);
-    checkUnnamed2759(o.inclusions);
+    checkUnnamed3728(o.exclusions);
+    checkUnnamed3729(o.inclusions);
     unittest.expect(o.key, unittest.equals('foo'));
   }
   buildCounterSharedTargeting--;
@@ -3277,14 +3277,14 @@
   buildCounterTargetingValue--;
 }
 
-buildUnnamed2760() {
+buildUnnamed3730() {
   var o = new core.List<api.TargetingValueSize>();
   o.add(buildTargetingValueSize());
   o.add(buildTargetingValueSize());
   return o;
 }
 
-checkUnnamed2760(core.List<api.TargetingValueSize> o) {
+checkUnnamed3730(core.List<api.TargetingValueSize> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetingValueSize(o[0]);
   checkTargetingValueSize(o[1]);
@@ -3295,7 +3295,7 @@
   var o = new api.TargetingValueCreativeSize();
   buildCounterTargetingValueCreativeSize++;
   if (buildCounterTargetingValueCreativeSize < 3) {
-    o.companionSizes = buildUnnamed2760();
+    o.companionSizes = buildUnnamed3730();
     o.creativeSizeType = "foo";
     o.nativeTemplate = "foo";
     o.size = buildTargetingValueSize();
@@ -3308,7 +3308,7 @@
 checkTargetingValueCreativeSize(api.TargetingValueCreativeSize o) {
   buildCounterTargetingValueCreativeSize++;
   if (buildCounterTargetingValueCreativeSize < 3) {
-    checkUnnamed2760(o.companionSizes);
+    checkUnnamed3730(o.companionSizes);
     unittest.expect(o.creativeSizeType, unittest.equals('foo'));
     unittest.expect(o.nativeTemplate, unittest.equals('foo'));
     checkTargetingValueSize(o.size);
@@ -3317,14 +3317,14 @@
   buildCounterTargetingValueCreativeSize--;
 }
 
-buildUnnamed2761() {
+buildUnnamed3731() {
   var o = new core.List<api.TargetingValueDayPartTargetingDayPart>();
   o.add(buildTargetingValueDayPartTargetingDayPart());
   o.add(buildTargetingValueDayPartTargetingDayPart());
   return o;
 }
 
-checkUnnamed2761(core.List<api.TargetingValueDayPartTargetingDayPart> o) {
+checkUnnamed3731(core.List<api.TargetingValueDayPartTargetingDayPart> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetingValueDayPartTargetingDayPart(o[0]);
   checkTargetingValueDayPartTargetingDayPart(o[1]);
@@ -3335,7 +3335,7 @@
   var o = new api.TargetingValueDayPartTargeting();
   buildCounterTargetingValueDayPartTargeting++;
   if (buildCounterTargetingValueDayPartTargeting < 3) {
-    o.dayParts = buildUnnamed2761();
+    o.dayParts = buildUnnamed3731();
     o.timeZoneType = "foo";
   }
   buildCounterTargetingValueDayPartTargeting--;
@@ -3345,7 +3345,7 @@
 checkTargetingValueDayPartTargeting(api.TargetingValueDayPartTargeting o) {
   buildCounterTargetingValueDayPartTargeting++;
   if (buildCounterTargetingValueDayPartTargeting < 3) {
-    checkUnnamed2761(o.dayParts);
+    checkUnnamed3731(o.dayParts);
     unittest.expect(o.timeZoneType, unittest.equals('foo'));
   }
   buildCounterTargetingValueDayPartTargeting--;
@@ -3426,27 +3426,27 @@
   buildCounterUpdatePrivateAuctionProposalRequest--;
 }
 
-buildUnnamed2762() {
+buildUnnamed3732() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed2762(core.List<core.int> o) {
+checkUnnamed3732(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed2763() {
+buildUnnamed3733() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2763(core.List<core.String> o) {
+checkUnnamed3733(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4129,7 +4129,7 @@
       }), true);
       res
           .get(arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -4179,9 +4179,7 @@
         var resp = convert.JSON.encode(buildAccountsList());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountsList response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkAccountsList(response);
       })));
     });
@@ -4246,7 +4244,7 @@
           .patch(arg_request, arg_id,
               confirmUnsafeAccountChange: arg_confirmUnsafeAccountChange,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -4311,7 +4309,7 @@
           .update(arg_request, arg_id,
               confirmUnsafeAccountChange: arg_confirmUnsafeAccountChange,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -4370,7 +4368,7 @@
       }), true);
       res
           .get(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BillingInfo response) {
+          .then(unittest.expectAsync1(((response) {
         checkBillingInfo(response);
       })));
     });
@@ -4421,9 +4419,7 @@
         var resp = convert.JSON.encode(buildBillingInfoList());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BillingInfoList response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkBillingInfoList(response);
       })));
     });
@@ -4491,7 +4487,7 @@
       }), true);
       res
           .get(arg_accountId, arg_billingId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Budget response) {
+          .then(unittest.expectAsync1(((response) {
         checkBudget(response);
       })));
     });
@@ -4562,7 +4558,7 @@
       res
           .patch(arg_request, arg_accountId, arg_billingId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Budget response) {
+          .then(unittest.expectAsync1(((response) {
         checkBudget(response);
       })));
     });
@@ -4633,7 +4629,7 @@
       res
           .update(arg_request, arg_accountId, arg_billingId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Budget response) {
+          .then(unittest.expectAsync1(((response) {
         checkBudget(response);
       })));
     });
@@ -4776,7 +4772,7 @@
       }), true);
       res
           .get(arg_accountId, arg_buyerCreativeId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -4832,7 +4828,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -4840,8 +4836,8 @@
     unittest.test("method--list", () {
       var mock = new HttpServerMock();
       api.CreativesResourceApi res = new api.AdexchangebuyerApi(mock).creatives;
-      var arg_accountId = buildUnnamed2762();
-      var arg_buyerCreativeId = buildUnnamed2763();
+      var arg_accountId = buildUnnamed3732();
+      var arg_buyerCreativeId = buildUnnamed3733();
       var arg_dealsStatusFilter = "foo";
       var arg_maxResults = 42;
       var arg_openAuctionStatusFilter = "foo";
@@ -4909,7 +4905,7 @@
               openAuctionStatusFilter: arg_openAuctionStatusFilter,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativesList response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativesList(response);
       })));
     });
@@ -4981,7 +4977,7 @@
       }), true);
       res
           .listDeals(arg_accountId, arg_buyerCreativeId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeDealIds response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeDealIds(response);
       })));
     });
@@ -5125,7 +5121,7 @@
       }), true);
       res
           .delete(arg_request, arg_proposalId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DeleteOrderDealsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeleteOrderDealsResponse(response);
       })));
     });
@@ -5192,7 +5188,7 @@
       }), true);
       res
           .insert(arg_request, arg_proposalId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AddOrderDealsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAddOrderDealsResponse(response);
       })));
     });
@@ -5258,7 +5254,7 @@
       }), true);
       res
           .list(arg_proposalId, pqlQuery: arg_pqlQuery, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetOrderDealsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetOrderDealsResponse(response);
       })));
     });
@@ -5323,8 +5319,9 @@
         var resp = convert.JSON.encode(buildEditAllOrderDealsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.update(arg_request, arg_proposalId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.EditAllOrderDealsResponse response) {
+      res
+          .update(arg_request, arg_proposalId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkEditAllOrderDealsResponse(response);
       })));
     });
@@ -5393,7 +5390,7 @@
       }), true);
       res
           .insert(arg_request, arg_proposalId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AddOrderNotesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAddOrderNotesResponse(response);
       })));
     });
@@ -5459,7 +5456,7 @@
       }), true);
       res
           .list(arg_proposalId, pqlQuery: arg_pqlQuery, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetOrderNotesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetOrderNotesResponse(response);
       })));
     });
@@ -5600,7 +5597,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PerformanceReportList response) {
+          .then(unittest.expectAsync1(((response) {
         checkPerformanceReportList(response);
       })));
     });
@@ -5734,7 +5731,7 @@
       }), true);
       res
           .get(arg_accountId, arg_configId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PretargetingConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkPretargetingConfig(response);
       })));
     });
@@ -5795,7 +5792,7 @@
       }), true);
       res
           .insert(arg_request, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PretargetingConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkPretargetingConfig(response);
       })));
     });
@@ -5852,7 +5849,7 @@
       }), true);
       res
           .list(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PretargetingConfigList response) {
+          .then(unittest.expectAsync1(((response) {
         checkPretargetingConfigList(response);
       })));
     });
@@ -5923,7 +5920,7 @@
       }), true);
       res
           .patch(arg_request, arg_accountId, arg_configId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PretargetingConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkPretargetingConfig(response);
       })));
     });
@@ -5995,7 +5992,7 @@
       res
           .update(arg_request, arg_accountId, arg_configId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PretargetingConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkPretargetingConfig(response);
       })));
     });
@@ -6053,7 +6050,7 @@
       }), true);
       res
           .get(arg_productId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Product response) {
+          .then(unittest.expectAsync1(((response) {
         checkProduct(response);
       })));
     });
@@ -6108,7 +6105,7 @@
       }), true);
       res
           .search(pqlQuery: arg_pqlQuery, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetOffersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetOffersResponse(response);
       })));
     });
@@ -6166,7 +6163,7 @@
       }), true);
       res
           .get(arg_proposalId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Proposal response) {
+          .then(unittest.expectAsync1(((response) {
         checkProposal(response);
       })));
     });
@@ -6222,7 +6219,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreateOrdersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreateOrdersResponse(response);
       })));
     });
@@ -6304,7 +6301,7 @@
           .patch(
               arg_request, arg_proposalId, arg_revisionNumber, arg_updateAction,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Proposal response) {
+          .then(unittest.expectAsync1(((response) {
         checkProposal(response);
       })));
     });
@@ -6359,7 +6356,7 @@
       }), true);
       res
           .search(pqlQuery: arg_pqlQuery, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetOrdersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetOrdersResponse(response);
       })));
     });
@@ -6501,7 +6498,7 @@
           .update(
               arg_request, arg_proposalId, arg_revisionNumber, arg_updateAction,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Proposal response) {
+          .then(unittest.expectAsync1(((response) {
         checkProposal(response);
       })));
     });
@@ -6565,8 +6562,9 @@
             convert.JSON.encode(buildGetPublisherProfilesByAccountIdResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_accountId, $fields: arg_$fields).then(unittest.expectAsync1(
-          ((api.GetPublisherProfilesByAccountIdResponse response) {
+      res
+          .list(arg_accountId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGetPublisherProfilesByAccountIdResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/adexchangeseller/v1_1_test.dart b/generated/googleapis/test/adexchangeseller/v1_1_test.dart
index dbe7697..1a8a0c0 100644
--- a/generated/googleapis/test/adexchangeseller/v1_1_test.dart
+++ b/generated/googleapis/test/adexchangeseller/v1_1_test.dart
@@ -100,14 +100,14 @@
   buildCounterAdClient--;
 }
 
-buildUnnamed7() {
+buildUnnamed1479() {
   var o = new core.List<api.AdClient>();
   o.add(buildAdClient());
   o.add(buildAdClient());
   return o;
 }
 
-checkUnnamed7(core.List<api.AdClient> o) {
+checkUnnamed1479(core.List<api.AdClient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdClient(o[0]);
   checkAdClient(o[1]);
@@ -119,7 +119,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed7();
+    o.items = buildUnnamed1479();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -131,7 +131,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed7(o.items);
+    checkUnnamed1479(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -165,14 +165,14 @@
   buildCounterAdUnit--;
 }
 
-buildUnnamed8() {
+buildUnnamed1480() {
   var o = new core.List<api.AdUnit>();
   o.add(buildAdUnit());
   o.add(buildAdUnit());
   return o;
 }
 
-checkUnnamed8(core.List<api.AdUnit> o) {
+checkUnnamed1480(core.List<api.AdUnit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdUnit(o[0]);
   checkAdUnit(o[1]);
@@ -184,7 +184,7 @@
   buildCounterAdUnits++;
   if (buildCounterAdUnits < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed8();
+    o.items = buildUnnamed1480();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -196,7 +196,7 @@
   buildCounterAdUnits++;
   if (buildCounterAdUnits < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed8(o.items);
+    checkUnnamed1480(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -230,14 +230,14 @@
   buildCounterAlert--;
 }
 
-buildUnnamed9() {
+buildUnnamed1481() {
   var o = new core.List<api.Alert>();
   o.add(buildAlert());
   o.add(buildAlert());
   return o;
 }
 
-checkUnnamed9(core.List<api.Alert> o) {
+checkUnnamed1481(core.List<api.Alert> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAlert(o[0]);
   checkAlert(o[1]);
@@ -248,7 +248,7 @@
   var o = new api.Alerts();
   buildCounterAlerts++;
   if (buildCounterAlerts < 3) {
-    o.items = buildUnnamed9();
+    o.items = buildUnnamed1481();
     o.kind = "foo";
   }
   buildCounterAlerts--;
@@ -258,7 +258,7 @@
 checkAlerts(api.Alerts o) {
   buildCounterAlerts++;
   if (buildCounterAlerts < 3) {
-    checkUnnamed9(o.items);
+    checkUnnamed1481(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAlerts--;
@@ -316,14 +316,14 @@
   buildCounterCustomChannel--;
 }
 
-buildUnnamed10() {
+buildUnnamed1482() {
   var o = new core.List<api.CustomChannel>();
   o.add(buildCustomChannel());
   o.add(buildCustomChannel());
   return o;
 }
 
-checkUnnamed10(core.List<api.CustomChannel> o) {
+checkUnnamed1482(core.List<api.CustomChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomChannel(o[0]);
   checkCustomChannel(o[1]);
@@ -335,7 +335,7 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed10();
+    o.items = buildUnnamed1482();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -347,21 +347,21 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed10(o.items);
+    checkUnnamed1482(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCustomChannels--;
 }
 
-buildUnnamed11() {
+buildUnnamed1483() {
   var o = new core.List<api.ReportingMetadataEntry>();
   o.add(buildReportingMetadataEntry());
   o.add(buildReportingMetadataEntry());
   return o;
 }
 
-checkUnnamed11(core.List<api.ReportingMetadataEntry> o) {
+checkUnnamed1483(core.List<api.ReportingMetadataEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportingMetadataEntry(o[0]);
   checkReportingMetadataEntry(o[1]);
@@ -372,7 +372,7 @@
   var o = new api.Metadata();
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    o.items = buildUnnamed11();
+    o.items = buildUnnamed1483();
     o.kind = "foo";
   }
   buildCounterMetadata--;
@@ -382,7 +382,7 @@
 checkMetadata(api.Metadata o) {
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    checkUnnamed11(o.items);
+    checkUnnamed1483(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterMetadata--;
@@ -421,14 +421,14 @@
   buildCounterPreferredDeal--;
 }
 
-buildUnnamed12() {
+buildUnnamed1484() {
   var o = new core.List<api.PreferredDeal>();
   o.add(buildPreferredDeal());
   o.add(buildPreferredDeal());
   return o;
 }
 
-checkUnnamed12(core.List<api.PreferredDeal> o) {
+checkUnnamed1484(core.List<api.PreferredDeal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPreferredDeal(o[0]);
   checkPreferredDeal(o[1]);
@@ -439,7 +439,7 @@
   var o = new api.PreferredDeals();
   buildCounterPreferredDeals++;
   if (buildCounterPreferredDeals < 3) {
-    o.items = buildUnnamed12();
+    o.items = buildUnnamed1484();
     o.kind = "foo";
   }
   buildCounterPreferredDeals--;
@@ -449,20 +449,20 @@
 checkPreferredDeals(api.PreferredDeals o) {
   buildCounterPreferredDeals++;
   if (buildCounterPreferredDeals < 3) {
-    checkUnnamed12(o.items);
+    checkUnnamed1484(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPreferredDeals--;
 }
 
-buildUnnamed13() {
+buildUnnamed1485() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed13(core.List<core.String> o) {
+checkUnnamed1485(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -491,66 +491,66 @@
   buildCounterReportHeaders--;
 }
 
-buildUnnamed14() {
+buildUnnamed1486() {
   var o = new core.List<api.ReportHeaders>();
   o.add(buildReportHeaders());
   o.add(buildReportHeaders());
   return o;
 }
 
-checkUnnamed14(core.List<api.ReportHeaders> o) {
+checkUnnamed1486(core.List<api.ReportHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportHeaders(o[0]);
   checkReportHeaders(o[1]);
 }
 
-buildUnnamed15() {
+buildUnnamed1487() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed15(core.List<core.String> o) {
+checkUnnamed1487(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed16() {
+buildUnnamed1488() {
   var o = new core.List<core.List<core.String>>();
-  o.add(buildUnnamed15());
-  o.add(buildUnnamed15());
+  o.add(buildUnnamed1487());
+  o.add(buildUnnamed1487());
   return o;
 }
 
-checkUnnamed16(core.List<core.List<core.String>> o) {
+checkUnnamed1488(core.List<core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed15(o[0]);
-  checkUnnamed15(o[1]);
+  checkUnnamed1487(o[0]);
+  checkUnnamed1487(o[1]);
 }
 
-buildUnnamed17() {
+buildUnnamed1489() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed17(core.List<core.String> o) {
+checkUnnamed1489(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed18() {
+buildUnnamed1490() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed18(core.List<core.String> o) {
+checkUnnamed1490(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -561,13 +561,13 @@
   var o = new api.Report();
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    o.averages = buildUnnamed13();
-    o.headers = buildUnnamed14();
+    o.averages = buildUnnamed1485();
+    o.headers = buildUnnamed1486();
     o.kind = "foo";
-    o.rows = buildUnnamed16();
+    o.rows = buildUnnamed1488();
     o.totalMatchedRows = "foo";
-    o.totals = buildUnnamed17();
-    o.warnings = buildUnnamed18();
+    o.totals = buildUnnamed1489();
+    o.warnings = buildUnnamed1490();
   }
   buildCounterReport--;
   return o;
@@ -576,77 +576,77 @@
 checkReport(api.Report o) {
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    checkUnnamed13(o.averages);
-    checkUnnamed14(o.headers);
+    checkUnnamed1485(o.averages);
+    checkUnnamed1486(o.headers);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed16(o.rows);
+    checkUnnamed1488(o.rows);
     unittest.expect(o.totalMatchedRows, unittest.equals('foo'));
-    checkUnnamed17(o.totals);
-    checkUnnamed18(o.warnings);
+    checkUnnamed1489(o.totals);
+    checkUnnamed1490(o.warnings);
   }
   buildCounterReport--;
 }
 
-buildUnnamed19() {
+buildUnnamed1491() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed19(core.List<core.String> o) {
+checkUnnamed1491(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed20() {
+buildUnnamed1492() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed20(core.List<core.String> o) {
+checkUnnamed1492(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed21() {
+buildUnnamed1493() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed21(core.List<core.String> o) {
+checkUnnamed1493(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed22() {
+buildUnnamed1494() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed22(core.List<core.String> o) {
+checkUnnamed1494(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed23() {
+buildUnnamed1495() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed23(core.List<core.String> o) {
+checkUnnamed1495(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -657,13 +657,13 @@
   var o = new api.ReportingMetadataEntry();
   buildCounterReportingMetadataEntry++;
   if (buildCounterReportingMetadataEntry < 3) {
-    o.compatibleDimensions = buildUnnamed19();
-    o.compatibleMetrics = buildUnnamed20();
+    o.compatibleDimensions = buildUnnamed1491();
+    o.compatibleMetrics = buildUnnamed1492();
     o.id = "foo";
     o.kind = "foo";
-    o.requiredDimensions = buildUnnamed21();
-    o.requiredMetrics = buildUnnamed22();
-    o.supportedProducts = buildUnnamed23();
+    o.requiredDimensions = buildUnnamed1493();
+    o.requiredMetrics = buildUnnamed1494();
+    o.supportedProducts = buildUnnamed1495();
   }
   buildCounterReportingMetadataEntry--;
   return o;
@@ -672,13 +672,13 @@
 checkReportingMetadataEntry(api.ReportingMetadataEntry o) {
   buildCounterReportingMetadataEntry++;
   if (buildCounterReportingMetadataEntry < 3) {
-    checkUnnamed19(o.compatibleDimensions);
-    checkUnnamed20(o.compatibleMetrics);
+    checkUnnamed1491(o.compatibleDimensions);
+    checkUnnamed1492(o.compatibleMetrics);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed21(o.requiredDimensions);
-    checkUnnamed22(o.requiredMetrics);
-    checkUnnamed23(o.supportedProducts);
+    checkUnnamed1493(o.requiredDimensions);
+    checkUnnamed1494(o.requiredMetrics);
+    checkUnnamed1495(o.supportedProducts);
   }
   buildCounterReportingMetadataEntry--;
 }
@@ -706,14 +706,14 @@
   buildCounterSavedReport--;
 }
 
-buildUnnamed24() {
+buildUnnamed1496() {
   var o = new core.List<api.SavedReport>();
   o.add(buildSavedReport());
   o.add(buildSavedReport());
   return o;
 }
 
-checkUnnamed24(core.List<api.SavedReport> o) {
+checkUnnamed1496(core.List<api.SavedReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSavedReport(o[0]);
   checkSavedReport(o[1]);
@@ -725,7 +725,7 @@
   buildCounterSavedReports++;
   if (buildCounterSavedReports < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed24();
+    o.items = buildUnnamed1496();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -737,7 +737,7 @@
   buildCounterSavedReports++;
   if (buildCounterSavedReports < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed24(o.items);
+    checkUnnamed1496(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -767,14 +767,14 @@
   buildCounterUrlChannel--;
 }
 
-buildUnnamed25() {
+buildUnnamed1497() {
   var o = new core.List<api.UrlChannel>();
   o.add(buildUrlChannel());
   o.add(buildUrlChannel());
   return o;
 }
 
-checkUnnamed25(core.List<api.UrlChannel> o) {
+checkUnnamed1497(core.List<api.UrlChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlChannel(o[0]);
   checkUrlChannel(o[1]);
@@ -786,7 +786,7 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed25();
+    o.items = buildUnnamed1497();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -798,60 +798,60 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed25(o.items);
+    checkUnnamed1497(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterUrlChannels--;
 }
 
-buildUnnamed26() {
+buildUnnamed1498() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed26(core.List<core.String> o) {
+checkUnnamed1498(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed27() {
+buildUnnamed1499() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed27(core.List<core.String> o) {
+checkUnnamed1499(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed28() {
+buildUnnamed1500() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed28(core.List<core.String> o) {
+checkUnnamed1500(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed29() {
+buildUnnamed1501() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed29(core.List<core.String> o) {
+checkUnnamed1501(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1070,7 +1070,7 @@
       }), true);
       res
           .get(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -1134,7 +1134,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdClients response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdClients(response);
       })));
     });
@@ -1202,7 +1202,7 @@
       }), true);
       res
           .get(arg_adClientId, arg_adUnitId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnit(response);
       })));
     });
@@ -1277,7 +1277,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnits response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnits(response);
       })));
     });
@@ -1361,7 +1361,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannels(response);
       })));
     });
@@ -1417,7 +1417,7 @@
       }), true);
       res
           .list(locale: arg_locale, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Alerts response) {
+          .then(unittest.expectAsync1(((response) {
         checkAlerts(response);
       })));
     });
@@ -1486,7 +1486,7 @@
       }), true);
       res
           .get(arg_adClientId, arg_customChannelId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannel response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannel(response);
       })));
     });
@@ -1558,7 +1558,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannels(response);
       })));
     });
@@ -1646,7 +1646,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnits response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnits(response);
       })));
     });
@@ -1699,9 +1699,7 @@
         var resp = convert.JSON.encode(buildMetadata());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Metadata response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkMetadata(response);
       })));
     });
@@ -1754,9 +1752,7 @@
         var resp = convert.JSON.encode(buildMetadata());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Metadata response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkMetadata(response);
       })));
     });
@@ -1815,7 +1811,7 @@
       }), true);
       res
           .get(arg_dealId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PreferredDeal response) {
+          .then(unittest.expectAsync1(((response) {
         checkPreferredDeal(response);
       })));
     });
@@ -1866,9 +1862,7 @@
         var resp = convert.JSON.encode(buildPreferredDeals());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PreferredDeals response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkPreferredDeals(response);
       })));
     });
@@ -1883,12 +1877,12 @@
       api.ReportsResourceApi res = new api.AdexchangesellerApi(mock).reports;
       var arg_startDate = "foo";
       var arg_endDate = "foo";
-      var arg_dimension = buildUnnamed26();
-      var arg_filter = buildUnnamed27();
+      var arg_dimension = buildUnnamed1498();
+      var arg_filter = buildUnnamed1499();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_metric = buildUnnamed28();
-      var arg_sort = buildUnnamed29();
+      var arg_metric = buildUnnamed1500();
+      var arg_sort = buildUnnamed1501();
       var arg_startIndex = 42;
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -1955,7 +1949,7 @@
               sort: arg_sort,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -2026,7 +2020,7 @@
               maxResults: arg_maxResults,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -2088,7 +2082,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SavedReports response) {
+          .then(unittest.expectAsync1(((response) {
         checkSavedReports(response);
       })));
     });
@@ -2162,7 +2156,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UrlChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlChannels(response);
       })));
     });
diff --git a/generated/googleapis/test/adexchangeseller/v2_0_test.dart b/generated/googleapis/test/adexchangeseller/v2_0_test.dart
index 082ad13..07b022d 100644
--- a/generated/googleapis/test/adexchangeseller/v2_0_test.dart
+++ b/generated/googleapis/test/adexchangeseller/v2_0_test.dart
@@ -73,14 +73,14 @@
   buildCounterAccount--;
 }
 
-buildUnnamed3695() {
+buildUnnamed1233() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed3695(core.List<api.Account> o) {
+checkUnnamed1233(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -92,7 +92,7 @@
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3695();
+    o.items = buildUnnamed1233();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -104,7 +104,7 @@
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3695(o.items);
+    checkUnnamed1233(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -138,14 +138,14 @@
   buildCounterAdClient--;
 }
 
-buildUnnamed3696() {
+buildUnnamed1234() {
   var o = new core.List<api.AdClient>();
   o.add(buildAdClient());
   o.add(buildAdClient());
   return o;
 }
 
-checkUnnamed3696(core.List<api.AdClient> o) {
+checkUnnamed1234(core.List<api.AdClient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdClient(o[0]);
   checkAdClient(o[1]);
@@ -157,7 +157,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3696();
+    o.items = buildUnnamed1234();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -169,7 +169,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3696(o.items);
+    checkUnnamed1234(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -203,14 +203,14 @@
   buildCounterAlert--;
 }
 
-buildUnnamed3697() {
+buildUnnamed1235() {
   var o = new core.List<api.Alert>();
   o.add(buildAlert());
   o.add(buildAlert());
   return o;
 }
 
-checkUnnamed3697(core.List<api.Alert> o) {
+checkUnnamed1235(core.List<api.Alert> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAlert(o[0]);
   checkAlert(o[1]);
@@ -221,7 +221,7 @@
   var o = new api.Alerts();
   buildCounterAlerts++;
   if (buildCounterAlerts < 3) {
-    o.items = buildUnnamed3697();
+    o.items = buildUnnamed1235();
     o.kind = "foo";
   }
   buildCounterAlerts--;
@@ -231,7 +231,7 @@
 checkAlerts(api.Alerts o) {
   buildCounterAlerts++;
   if (buildCounterAlerts < 3) {
-    checkUnnamed3697(o.items);
+    checkUnnamed1235(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAlerts--;
@@ -289,14 +289,14 @@
   buildCounterCustomChannel--;
 }
 
-buildUnnamed3698() {
+buildUnnamed1236() {
   var o = new core.List<api.CustomChannel>();
   o.add(buildCustomChannel());
   o.add(buildCustomChannel());
   return o;
 }
 
-checkUnnamed3698(core.List<api.CustomChannel> o) {
+checkUnnamed1236(core.List<api.CustomChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomChannel(o[0]);
   checkCustomChannel(o[1]);
@@ -308,7 +308,7 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3698();
+    o.items = buildUnnamed1236();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -320,21 +320,21 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3698(o.items);
+    checkUnnamed1236(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCustomChannels--;
 }
 
-buildUnnamed3699() {
+buildUnnamed1237() {
   var o = new core.List<api.ReportingMetadataEntry>();
   o.add(buildReportingMetadataEntry());
   o.add(buildReportingMetadataEntry());
   return o;
 }
 
-checkUnnamed3699(core.List<api.ReportingMetadataEntry> o) {
+checkUnnamed1237(core.List<api.ReportingMetadataEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportingMetadataEntry(o[0]);
   checkReportingMetadataEntry(o[1]);
@@ -345,7 +345,7 @@
   var o = new api.Metadata();
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    o.items = buildUnnamed3699();
+    o.items = buildUnnamed1237();
     o.kind = "foo";
   }
   buildCounterMetadata--;
@@ -355,7 +355,7 @@
 checkMetadata(api.Metadata o) {
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    checkUnnamed3699(o.items);
+    checkUnnamed1237(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterMetadata--;
@@ -394,14 +394,14 @@
   buildCounterPreferredDeal--;
 }
 
-buildUnnamed3700() {
+buildUnnamed1238() {
   var o = new core.List<api.PreferredDeal>();
   o.add(buildPreferredDeal());
   o.add(buildPreferredDeal());
   return o;
 }
 
-checkUnnamed3700(core.List<api.PreferredDeal> o) {
+checkUnnamed1238(core.List<api.PreferredDeal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPreferredDeal(o[0]);
   checkPreferredDeal(o[1]);
@@ -412,7 +412,7 @@
   var o = new api.PreferredDeals();
   buildCounterPreferredDeals++;
   if (buildCounterPreferredDeals < 3) {
-    o.items = buildUnnamed3700();
+    o.items = buildUnnamed1238();
     o.kind = "foo";
   }
   buildCounterPreferredDeals--;
@@ -422,20 +422,20 @@
 checkPreferredDeals(api.PreferredDeals o) {
   buildCounterPreferredDeals++;
   if (buildCounterPreferredDeals < 3) {
-    checkUnnamed3700(o.items);
+    checkUnnamed1238(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPreferredDeals--;
 }
 
-buildUnnamed3701() {
+buildUnnamed1239() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3701(core.List<core.String> o) {
+checkUnnamed1239(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -464,66 +464,66 @@
   buildCounterReportHeaders--;
 }
 
-buildUnnamed3702() {
+buildUnnamed1240() {
   var o = new core.List<api.ReportHeaders>();
   o.add(buildReportHeaders());
   o.add(buildReportHeaders());
   return o;
 }
 
-checkUnnamed3702(core.List<api.ReportHeaders> o) {
+checkUnnamed1240(core.List<api.ReportHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportHeaders(o[0]);
   checkReportHeaders(o[1]);
 }
 
-buildUnnamed3703() {
+buildUnnamed1241() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3703(core.List<core.String> o) {
+checkUnnamed1241(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3704() {
+buildUnnamed1242() {
   var o = new core.List<core.List<core.String>>();
-  o.add(buildUnnamed3703());
-  o.add(buildUnnamed3703());
+  o.add(buildUnnamed1241());
+  o.add(buildUnnamed1241());
   return o;
 }
 
-checkUnnamed3704(core.List<core.List<core.String>> o) {
+checkUnnamed1242(core.List<core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3703(o[0]);
-  checkUnnamed3703(o[1]);
+  checkUnnamed1241(o[0]);
+  checkUnnamed1241(o[1]);
 }
 
-buildUnnamed3705() {
+buildUnnamed1243() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3705(core.List<core.String> o) {
+checkUnnamed1243(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3706() {
+buildUnnamed1244() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3706(core.List<core.String> o) {
+checkUnnamed1244(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -534,13 +534,13 @@
   var o = new api.Report();
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    o.averages = buildUnnamed3701();
-    o.headers = buildUnnamed3702();
+    o.averages = buildUnnamed1239();
+    o.headers = buildUnnamed1240();
     o.kind = "foo";
-    o.rows = buildUnnamed3704();
+    o.rows = buildUnnamed1242();
     o.totalMatchedRows = "foo";
-    o.totals = buildUnnamed3705();
-    o.warnings = buildUnnamed3706();
+    o.totals = buildUnnamed1243();
+    o.warnings = buildUnnamed1244();
   }
   buildCounterReport--;
   return o;
@@ -549,77 +549,77 @@
 checkReport(api.Report o) {
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    checkUnnamed3701(o.averages);
-    checkUnnamed3702(o.headers);
+    checkUnnamed1239(o.averages);
+    checkUnnamed1240(o.headers);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3704(o.rows);
+    checkUnnamed1242(o.rows);
     unittest.expect(o.totalMatchedRows, unittest.equals('foo'));
-    checkUnnamed3705(o.totals);
-    checkUnnamed3706(o.warnings);
+    checkUnnamed1243(o.totals);
+    checkUnnamed1244(o.warnings);
   }
   buildCounterReport--;
 }
 
-buildUnnamed3707() {
+buildUnnamed1245() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3707(core.List<core.String> o) {
+checkUnnamed1245(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3708() {
+buildUnnamed1246() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3708(core.List<core.String> o) {
+checkUnnamed1246(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3709() {
+buildUnnamed1247() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3709(core.List<core.String> o) {
+checkUnnamed1247(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3710() {
+buildUnnamed1248() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3710(core.List<core.String> o) {
+checkUnnamed1248(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3711() {
+buildUnnamed1249() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3711(core.List<core.String> o) {
+checkUnnamed1249(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -630,13 +630,13 @@
   var o = new api.ReportingMetadataEntry();
   buildCounterReportingMetadataEntry++;
   if (buildCounterReportingMetadataEntry < 3) {
-    o.compatibleDimensions = buildUnnamed3707();
-    o.compatibleMetrics = buildUnnamed3708();
+    o.compatibleDimensions = buildUnnamed1245();
+    o.compatibleMetrics = buildUnnamed1246();
     o.id = "foo";
     o.kind = "foo";
-    o.requiredDimensions = buildUnnamed3709();
-    o.requiredMetrics = buildUnnamed3710();
-    o.supportedProducts = buildUnnamed3711();
+    o.requiredDimensions = buildUnnamed1247();
+    o.requiredMetrics = buildUnnamed1248();
+    o.supportedProducts = buildUnnamed1249();
   }
   buildCounterReportingMetadataEntry--;
   return o;
@@ -645,13 +645,13 @@
 checkReportingMetadataEntry(api.ReportingMetadataEntry o) {
   buildCounterReportingMetadataEntry++;
   if (buildCounterReportingMetadataEntry < 3) {
-    checkUnnamed3707(o.compatibleDimensions);
-    checkUnnamed3708(o.compatibleMetrics);
+    checkUnnamed1245(o.compatibleDimensions);
+    checkUnnamed1246(o.compatibleMetrics);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3709(o.requiredDimensions);
-    checkUnnamed3710(o.requiredMetrics);
-    checkUnnamed3711(o.supportedProducts);
+    checkUnnamed1247(o.requiredDimensions);
+    checkUnnamed1248(o.requiredMetrics);
+    checkUnnamed1249(o.supportedProducts);
   }
   buildCounterReportingMetadataEntry--;
 }
@@ -679,14 +679,14 @@
   buildCounterSavedReport--;
 }
 
-buildUnnamed3712() {
+buildUnnamed1250() {
   var o = new core.List<api.SavedReport>();
   o.add(buildSavedReport());
   o.add(buildSavedReport());
   return o;
 }
 
-checkUnnamed3712(core.List<api.SavedReport> o) {
+checkUnnamed1250(core.List<api.SavedReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSavedReport(o[0]);
   checkSavedReport(o[1]);
@@ -698,7 +698,7 @@
   buildCounterSavedReports++;
   if (buildCounterSavedReports < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3712();
+    o.items = buildUnnamed1250();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -710,7 +710,7 @@
   buildCounterSavedReports++;
   if (buildCounterSavedReports < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3712(o.items);
+    checkUnnamed1250(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -740,14 +740,14 @@
   buildCounterUrlChannel--;
 }
 
-buildUnnamed3713() {
+buildUnnamed1251() {
   var o = new core.List<api.UrlChannel>();
   o.add(buildUrlChannel());
   o.add(buildUrlChannel());
   return o;
 }
 
-checkUnnamed3713(core.List<api.UrlChannel> o) {
+checkUnnamed1251(core.List<api.UrlChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlChannel(o[0]);
   checkUrlChannel(o[1]);
@@ -759,7 +759,7 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3713();
+    o.items = buildUnnamed1251();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -771,60 +771,60 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3713(o.items);
+    checkUnnamed1251(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterUrlChannels--;
 }
 
-buildUnnamed3714() {
+buildUnnamed1252() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3714(core.List<core.String> o) {
+checkUnnamed1252(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3715() {
+buildUnnamed1253() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3715(core.List<core.String> o) {
+checkUnnamed1253(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3716() {
+buildUnnamed1254() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3716(core.List<core.String> o) {
+checkUnnamed1254(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3717() {
+buildUnnamed1255() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3717(core.List<core.String> o) {
+checkUnnamed1255(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1035,7 +1035,7 @@
       }), true);
       res
           .get(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -1096,7 +1096,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Accounts response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccounts(response);
       })));
     });
@@ -1170,7 +1170,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdClients response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdClients(response);
       })));
     });
@@ -1237,7 +1237,7 @@
       }), true);
       res
           .list(arg_accountId, locale: arg_locale, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Alerts response) {
+          .then(unittest.expectAsync1(((response) {
         checkAlerts(response);
       })));
     });
@@ -1317,7 +1317,7 @@
       res
           .get(arg_accountId, arg_adClientId, arg_customChannelId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannel response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannel(response);
       })));
     });
@@ -1399,7 +1399,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannels(response);
       })));
     });
@@ -1464,7 +1464,7 @@
       }), true);
       res
           .list(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Metadata response) {
+          .then(unittest.expectAsync1(((response) {
         checkMetadata(response);
       })));
     });
@@ -1529,7 +1529,7 @@
       }), true);
       res
           .list(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Metadata response) {
+          .then(unittest.expectAsync1(((response) {
         checkMetadata(response);
       })));
     });
@@ -1598,7 +1598,7 @@
       }), true);
       res
           .get(arg_accountId, arg_dealId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PreferredDeal response) {
+          .then(unittest.expectAsync1(((response) {
         checkPreferredDeal(response);
       })));
     });
@@ -1661,7 +1661,7 @@
       }), true);
       res
           .list(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PreferredDeals response) {
+          .then(unittest.expectAsync1(((response) {
         checkPreferredDeals(response);
       })));
     });
@@ -1678,12 +1678,12 @@
       var arg_accountId = "foo";
       var arg_startDate = "foo";
       var arg_endDate = "foo";
-      var arg_dimension = buildUnnamed3714();
-      var arg_filter = buildUnnamed3715();
+      var arg_dimension = buildUnnamed1252();
+      var arg_filter = buildUnnamed1253();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_metric = buildUnnamed3716();
-      var arg_sort = buildUnnamed3717();
+      var arg_metric = buildUnnamed1254();
+      var arg_sort = buildUnnamed1255();
       var arg_startIndex = 42;
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -1759,7 +1759,7 @@
               sort: arg_sort,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -1840,7 +1840,7 @@
               maxResults: arg_maxResults,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -1912,7 +1912,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SavedReports response) {
+          .then(unittest.expectAsync1(((response) {
         checkSavedReports(response);
       })));
     });
@@ -1996,7 +1996,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UrlChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlChannels(response);
       })));
     });
diff --git a/generated/googleapis/test/adexperiencereport/v1_test.dart b/generated/googleapis/test/adexperiencereport/v1_test.dart
index 21fcd01..a25769f 100644
--- a/generated/googleapis/test/adexperiencereport/v1_test.dart
+++ b/generated/googleapis/test/adexperiencereport/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2475() {
+buildUnnamed3457() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2475(core.List<core.String> o) {
+checkUnnamed3457(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -72,7 +72,7 @@
     o.enforcementTime = "foo";
     o.filterStatus = "foo";
     o.lastChangeTime = "foo";
-    o.region = buildUnnamed2475();
+    o.region = buildUnnamed3457();
     o.reportUrl = "foo";
     o.underReview = true;
   }
@@ -87,7 +87,7 @@
     unittest.expect(o.enforcementTime, unittest.equals('foo'));
     unittest.expect(o.filterStatus, unittest.equals('foo'));
     unittest.expect(o.lastChangeTime, unittest.equals('foo'));
-    checkUnnamed2475(o.region);
+    checkUnnamed3457(o.region);
     unittest.expect(o.reportUrl, unittest.equals('foo'));
     unittest.expect(o.underReview, unittest.isTrue);
   }
@@ -117,14 +117,14 @@
   buildCounterSiteSummaryResponse--;
 }
 
-buildUnnamed2476() {
+buildUnnamed3458() {
   var o = new core.List<api.SiteSummaryResponse>();
   o.add(buildSiteSummaryResponse());
   o.add(buildSiteSummaryResponse());
   return o;
 }
 
-checkUnnamed2476(core.List<api.SiteSummaryResponse> o) {
+checkUnnamed3458(core.List<api.SiteSummaryResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSiteSummaryResponse(o[0]);
   checkSiteSummaryResponse(o[1]);
@@ -135,7 +135,7 @@
   var o = new api.ViolatingSitesResponse();
   buildCounterViolatingSitesResponse++;
   if (buildCounterViolatingSitesResponse < 3) {
-    o.violatingSites = buildUnnamed2476();
+    o.violatingSites = buildUnnamed3458();
   }
   buildCounterViolatingSitesResponse--;
   return o;
@@ -144,7 +144,7 @@
 checkViolatingSitesResponse(api.ViolatingSitesResponse o) {
   buildCounterViolatingSitesResponse++;
   if (buildCounterViolatingSitesResponse < 3) {
-    checkUnnamed2476(o.violatingSites);
+    checkUnnamed3458(o.violatingSites);
   }
   buildCounterViolatingSitesResponse--;
 }
@@ -221,7 +221,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SiteSummaryResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSiteSummaryResponse(response);
       })));
     });
@@ -271,9 +271,7 @@
         var resp = convert.JSON.encode(buildViolatingSitesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ViolatingSitesResponse response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkViolatingSitesResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/admin/datatransfer_v1_test.dart b/generated/googleapis/test/admin/datatransfer_v1_test.dart
index e245d47..f750007 100644
--- a/generated/googleapis/test/admin/datatransfer_v1_test.dart
+++ b/generated/googleapis/test/admin/datatransfer_v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed1159() {
+buildUnnamed0() {
   var o = new core.List<api.ApplicationTransferParam>();
   o.add(buildApplicationTransferParam());
   o.add(buildApplicationTransferParam());
   return o;
 }
 
-checkUnnamed1159(core.List<api.ApplicationTransferParam> o) {
+checkUnnamed0(core.List<api.ApplicationTransferParam> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApplicationTransferParam(o[0]);
   checkApplicationTransferParam(o[1]);
@@ -72,7 +72,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.transferParams = buildUnnamed1159();
+    o.transferParams = buildUnnamed0();
   }
   buildCounterApplication--;
   return o;
@@ -85,19 +85,19 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1159(o.transferParams);
+    checkUnnamed0(o.transferParams);
   }
   buildCounterApplication--;
 }
 
-buildUnnamed1160() {
+buildUnnamed1() {
   var o = new core.List<api.ApplicationTransferParam>();
   o.add(buildApplicationTransferParam());
   o.add(buildApplicationTransferParam());
   return o;
 }
 
-checkUnnamed1160(core.List<api.ApplicationTransferParam> o) {
+checkUnnamed1(core.List<api.ApplicationTransferParam> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApplicationTransferParam(o[0]);
   checkApplicationTransferParam(o[1]);
@@ -109,7 +109,7 @@
   buildCounterApplicationDataTransfer++;
   if (buildCounterApplicationDataTransfer < 3) {
     o.applicationId = "foo";
-    o.applicationTransferParams = buildUnnamed1160();
+    o.applicationTransferParams = buildUnnamed1();
     o.applicationTransferStatus = "foo";
   }
   buildCounterApplicationDataTransfer--;
@@ -120,20 +120,20 @@
   buildCounterApplicationDataTransfer++;
   if (buildCounterApplicationDataTransfer < 3) {
     unittest.expect(o.applicationId, unittest.equals('foo'));
-    checkUnnamed1160(o.applicationTransferParams);
+    checkUnnamed1(o.applicationTransferParams);
     unittest.expect(o.applicationTransferStatus, unittest.equals('foo'));
   }
   buildCounterApplicationDataTransfer--;
 }
 
-buildUnnamed1161() {
+buildUnnamed2() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1161(core.List<core.String> o) {
+checkUnnamed2(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -145,7 +145,7 @@
   buildCounterApplicationTransferParam++;
   if (buildCounterApplicationTransferParam < 3) {
     o.key = "foo";
-    o.value = buildUnnamed1161();
+    o.value = buildUnnamed2();
   }
   buildCounterApplicationTransferParam--;
   return o;
@@ -155,19 +155,19 @@
   buildCounterApplicationTransferParam++;
   if (buildCounterApplicationTransferParam < 3) {
     unittest.expect(o.key, unittest.equals('foo'));
-    checkUnnamed1161(o.value);
+    checkUnnamed2(o.value);
   }
   buildCounterApplicationTransferParam--;
 }
 
-buildUnnamed1162() {
+buildUnnamed3() {
   var o = new core.List<api.Application>();
   o.add(buildApplication());
   o.add(buildApplication());
   return o;
 }
 
-checkUnnamed1162(core.List<api.Application> o) {
+checkUnnamed3(core.List<api.Application> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApplication(o[0]);
   checkApplication(o[1]);
@@ -178,7 +178,7 @@
   var o = new api.ApplicationsListResponse();
   buildCounterApplicationsListResponse++;
   if (buildCounterApplicationsListResponse < 3) {
-    o.applications = buildUnnamed1162();
+    o.applications = buildUnnamed3();
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
@@ -190,7 +190,7 @@
 checkApplicationsListResponse(api.ApplicationsListResponse o) {
   buildCounterApplicationsListResponse++;
   if (buildCounterApplicationsListResponse < 3) {
-    checkUnnamed1162(o.applications);
+    checkUnnamed3(o.applications);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -198,14 +198,14 @@
   buildCounterApplicationsListResponse--;
 }
 
-buildUnnamed1163() {
+buildUnnamed4() {
   var o = new core.List<api.ApplicationDataTransfer>();
   o.add(buildApplicationDataTransfer());
   o.add(buildApplicationDataTransfer());
   return o;
 }
 
-checkUnnamed1163(core.List<api.ApplicationDataTransfer> o) {
+checkUnnamed4(core.List<api.ApplicationDataTransfer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApplicationDataTransfer(o[0]);
   checkApplicationDataTransfer(o[1]);
@@ -216,7 +216,7 @@
   var o = new api.DataTransfer();
   buildCounterDataTransfer++;
   if (buildCounterDataTransfer < 3) {
-    o.applicationDataTransfers = buildUnnamed1163();
+    o.applicationDataTransfers = buildUnnamed4();
     o.etag = "foo";
     o.id = "foo";
     o.kind = "foo";
@@ -232,7 +232,7 @@
 checkDataTransfer(api.DataTransfer o) {
   buildCounterDataTransfer++;
   if (buildCounterDataTransfer < 3) {
-    checkUnnamed1163(o.applicationDataTransfers);
+    checkUnnamed4(o.applicationDataTransfers);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -245,14 +245,14 @@
   buildCounterDataTransfer--;
 }
 
-buildUnnamed1164() {
+buildUnnamed5() {
   var o = new core.List<api.DataTransfer>();
   o.add(buildDataTransfer());
   o.add(buildDataTransfer());
   return o;
 }
 
-checkUnnamed1164(core.List<api.DataTransfer> o) {
+checkUnnamed5(core.List<api.DataTransfer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataTransfer(o[0]);
   checkDataTransfer(o[1]);
@@ -263,7 +263,7 @@
   var o = new api.DataTransfersListResponse();
   buildCounterDataTransfersListResponse++;
   if (buildCounterDataTransfersListResponse < 3) {
-    o.dataTransfers = buildUnnamed1164();
+    o.dataTransfers = buildUnnamed5();
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
@@ -275,7 +275,7 @@
 checkDataTransfersListResponse(api.DataTransfersListResponse o) {
   buildCounterDataTransfersListResponse++;
   if (buildCounterDataTransfersListResponse < 3) {
-    checkUnnamed1164(o.dataTransfers);
+    checkUnnamed5(o.dataTransfers);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -384,7 +384,7 @@
       }), true);
       res
           .get(arg_applicationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Application response) {
+          .then(unittest.expectAsync1(((response) {
         checkApplication(response);
       })));
     });
@@ -449,7 +449,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ApplicationsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkApplicationsListResponse(response);
       })));
     });
@@ -507,7 +507,7 @@
       }), true);
       res
           .get(arg_dataTransferId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DataTransfer response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataTransfer(response);
       })));
     });
@@ -563,7 +563,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DataTransfer response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataTransfer(response);
       })));
     });
@@ -639,8 +639,7 @@
               pageToken: arg_pageToken,
               status: arg_status,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.DataTransfersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataTransfersListResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/admin/directory_v1_test.dart b/generated/googleapis/test/admin/directory_v1_test.dart
index da053cc..ea04c5d 100644
--- a/generated/googleapis/test/admin/directory_v1_test.dart
+++ b/generated/googleapis/test/admin/directory_v1_test.dart
@@ -77,7 +77,7 @@
   buildCounterAlias--;
 }
 
-buildUnnamed3396() {
+buildUnnamed1784() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -92,7 +92,7 @@
   return o;
 }
 
-checkUnnamed3396(core.List<core.Object> o) {
+checkUnnamed1784(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -111,7 +111,7 @@
   var o = new api.Aliases();
   buildCounterAliases++;
   if (buildCounterAliases < 3) {
-    o.aliases = buildUnnamed3396();
+    o.aliases = buildUnnamed1784();
     o.etag = "foo";
     o.kind = "foo";
   }
@@ -122,21 +122,21 @@
 checkAliases(api.Aliases o) {
   buildCounterAliases++;
   if (buildCounterAliases < 3) {
-    checkUnnamed3396(o.aliases);
+    checkUnnamed1784(o.aliases);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAliases--;
 }
 
-buildUnnamed3397() {
+buildUnnamed1785() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3397(core.List<core.String> o) {
+checkUnnamed1785(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -147,7 +147,7 @@
   var o = new api.AppAccessCollections();
   buildCounterAppAccessCollections++;
   if (buildCounterAppAccessCollections < 3) {
-    o.blockedApiAccessBuckets = buildUnnamed3397();
+    o.blockedApiAccessBuckets = buildUnnamed1785();
     o.enforceSettingsForAndroidDrive = true;
     o.errorMessage = "foo";
     o.etag = "foo";
@@ -163,7 +163,7 @@
 checkAppAccessCollections(api.AppAccessCollections o) {
   buildCounterAppAccessCollections++;
   if (buildCounterAppAccessCollections < 3) {
-    checkUnnamed3397(o.blockedApiAccessBuckets);
+    checkUnnamed1785(o.blockedApiAccessBuckets);
     unittest.expect(o.enforceSettingsForAndroidDrive, unittest.isTrue);
     unittest.expect(o.errorMessage, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
@@ -206,14 +206,14 @@
   buildCounterAsp--;
 }
 
-buildUnnamed3398() {
+buildUnnamed1786() {
   var o = new core.List<api.Asp>();
   o.add(buildAsp());
   o.add(buildAsp());
   return o;
 }
 
-checkUnnamed3398(core.List<api.Asp> o) {
+checkUnnamed1786(core.List<api.Asp> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAsp(o[0]);
   checkAsp(o[1]);
@@ -225,7 +225,7 @@
   buildCounterAsps++;
   if (buildCounterAsps < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3398();
+    o.items = buildUnnamed1786();
     o.kind = "foo";
   }
   buildCounterAsps--;
@@ -236,20 +236,20 @@
   buildCounterAsps++;
   if (buildCounterAsps < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3398(o.items);
+    checkUnnamed1786(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAsps--;
 }
 
-buildUnnamed3399() {
+buildUnnamed1787() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3399(core.List<core.String> o) {
+checkUnnamed1787(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -265,7 +265,7 @@
     o.coordinates = buildBuildingCoordinates();
     o.description = "foo";
     o.etags = "foo";
-    o.floorNames = buildUnnamed3399();
+    o.floorNames = buildUnnamed1787();
     o.kind = "foo";
   }
   buildCounterBuilding--;
@@ -280,7 +280,7 @@
     checkBuildingCoordinates(o.coordinates);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.etags, unittest.equals('foo'));
-    checkUnnamed3399(o.floorNames);
+    checkUnnamed1787(o.floorNames);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBuilding--;
@@ -307,14 +307,14 @@
   buildCounterBuildingCoordinates--;
 }
 
-buildUnnamed3400() {
+buildUnnamed1788() {
   var o = new core.List<api.Building>();
   o.add(buildBuilding());
   o.add(buildBuilding());
   return o;
 }
 
-checkUnnamed3400(core.List<api.Building> o) {
+checkUnnamed1788(core.List<api.Building> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBuilding(o[0]);
   checkBuilding(o[1]);
@@ -325,7 +325,7 @@
   var o = new api.Buildings();
   buildCounterBuildings++;
   if (buildCounterBuildings < 3) {
-    o.buildings = buildUnnamed3400();
+    o.buildings = buildUnnamed1788();
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
@@ -337,7 +337,7 @@
 checkBuildings(api.Buildings o) {
   buildCounterBuildings++;
   if (buildCounterBuildings < 3) {
-    checkUnnamed3400(o.buildings);
+    checkUnnamed1788(o.buildings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -400,14 +400,14 @@
   buildCounterCalendarResource--;
 }
 
-buildUnnamed3401() {
+buildUnnamed1789() {
   var o = new core.List<api.CalendarResource>();
   o.add(buildCalendarResource());
   o.add(buildCalendarResource());
   return o;
 }
 
-checkUnnamed3401(core.List<api.CalendarResource> o) {
+checkUnnamed1789(core.List<api.CalendarResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCalendarResource(o[0]);
   checkCalendarResource(o[1]);
@@ -419,7 +419,7 @@
   buildCounterCalendarResources++;
   if (buildCounterCalendarResources < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3401();
+    o.items = buildUnnamed1789();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -431,21 +431,21 @@
   buildCounterCalendarResources++;
   if (buildCounterCalendarResources < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3401(o.items);
+    checkUnnamed1789(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCalendarResources--;
 }
 
-buildUnnamed3402() {
+buildUnnamed1790() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3402(core.Map<core.String, core.String> o) {
+checkUnnamed1790(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -460,7 +460,7 @@
     o.expiration = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.params = buildUnnamed3402();
+    o.params = buildUnnamed1790();
     o.payload = true;
     o.resourceId = "foo";
     o.resourceUri = "foo";
@@ -478,7 +478,7 @@
     unittest.expect(o.expiration, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3402(o.params);
+    checkUnnamed1790(o.params);
     unittest.expect(o.payload, unittest.isTrue);
     unittest.expect(o.resourceId, unittest.equals('foo'));
     unittest.expect(o.resourceUri, unittest.equals('foo'));
@@ -510,14 +510,14 @@
   buildCounterChromeOsDeviceActiveTimeRanges--;
 }
 
-buildUnnamed3403() {
+buildUnnamed1791() {
   var o = new core.List<api.ChromeOsDeviceActiveTimeRanges>();
   o.add(buildChromeOsDeviceActiveTimeRanges());
   o.add(buildChromeOsDeviceActiveTimeRanges());
   return o;
 }
 
-checkUnnamed3403(core.List<api.ChromeOsDeviceActiveTimeRanges> o) {
+checkUnnamed1791(core.List<api.ChromeOsDeviceActiveTimeRanges> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChromeOsDeviceActiveTimeRanges(o[0]);
   checkChromeOsDeviceActiveTimeRanges(o[1]);
@@ -549,14 +549,14 @@
   buildCounterChromeOsDeviceDeviceFiles--;
 }
 
-buildUnnamed3404() {
+buildUnnamed1792() {
   var o = new core.List<api.ChromeOsDeviceDeviceFiles>();
   o.add(buildChromeOsDeviceDeviceFiles());
   o.add(buildChromeOsDeviceDeviceFiles());
   return o;
 }
 
-checkUnnamed3404(core.List<api.ChromeOsDeviceDeviceFiles> o) {
+checkUnnamed1792(core.List<api.ChromeOsDeviceDeviceFiles> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChromeOsDeviceDeviceFiles(o[0]);
   checkChromeOsDeviceDeviceFiles(o[1]);
@@ -583,14 +583,14 @@
   buildCounterChromeOsDeviceRecentUsers--;
 }
 
-buildUnnamed3405() {
+buildUnnamed1793() {
   var o = new core.List<api.ChromeOsDeviceRecentUsers>();
   o.add(buildChromeOsDeviceRecentUsers());
   o.add(buildChromeOsDeviceRecentUsers());
   return o;
 }
 
-checkUnnamed3405(core.List<api.ChromeOsDeviceRecentUsers> o) {
+checkUnnamed1793(core.List<api.ChromeOsDeviceRecentUsers> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChromeOsDeviceRecentUsers(o[0]);
   checkChromeOsDeviceRecentUsers(o[1]);
@@ -630,12 +630,12 @@
   var o = new api.ChromeOsDevice();
   buildCounterChromeOsDevice++;
   if (buildCounterChromeOsDevice < 3) {
-    o.activeTimeRanges = buildUnnamed3403();
+    o.activeTimeRanges = buildUnnamed1791();
     o.annotatedAssetId = "foo";
     o.annotatedLocation = "foo";
     o.annotatedUser = "foo";
     o.bootMode = "foo";
-    o.deviceFiles = buildUnnamed3404();
+    o.deviceFiles = buildUnnamed1792();
     o.deviceId = "foo";
     o.etag = "foo";
     o.ethernetMacAddress = "foo";
@@ -651,7 +651,7 @@
     o.orgUnitPath = "foo";
     o.osVersion = "foo";
     o.platformVersion = "foo";
-    o.recentUsers = buildUnnamed3405();
+    o.recentUsers = buildUnnamed1793();
     o.serialNumber = "foo";
     o.status = "foo";
     o.supportEndDate = core.DateTime.parse("2002-02-27T14:01:02");
@@ -665,12 +665,12 @@
 checkChromeOsDevice(api.ChromeOsDevice o) {
   buildCounterChromeOsDevice++;
   if (buildCounterChromeOsDevice < 3) {
-    checkUnnamed3403(o.activeTimeRanges);
+    checkUnnamed1791(o.activeTimeRanges);
     unittest.expect(o.annotatedAssetId, unittest.equals('foo'));
     unittest.expect(o.annotatedLocation, unittest.equals('foo'));
     unittest.expect(o.annotatedUser, unittest.equals('foo'));
     unittest.expect(o.bootMode, unittest.equals('foo'));
-    checkUnnamed3404(o.deviceFiles);
+    checkUnnamed1792(o.deviceFiles);
     unittest.expect(o.deviceId, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.ethernetMacAddress, unittest.equals('foo'));
@@ -688,7 +688,7 @@
     unittest.expect(o.orgUnitPath, unittest.equals('foo'));
     unittest.expect(o.osVersion, unittest.equals('foo'));
     unittest.expect(o.platformVersion, unittest.equals('foo'));
-    checkUnnamed3405(o.recentUsers);
+    checkUnnamed1793(o.recentUsers);
     unittest.expect(o.serialNumber, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.supportEndDate,
@@ -720,14 +720,14 @@
   buildCounterChromeOsDeviceAction--;
 }
 
-buildUnnamed3406() {
+buildUnnamed1794() {
   var o = new core.List<api.ChromeOsDevice>();
   o.add(buildChromeOsDevice());
   o.add(buildChromeOsDevice());
   return o;
 }
 
-checkUnnamed3406(core.List<api.ChromeOsDevice> o) {
+checkUnnamed1794(core.List<api.ChromeOsDevice> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChromeOsDevice(o[0]);
   checkChromeOsDevice(o[1]);
@@ -738,7 +738,7 @@
   var o = new api.ChromeOsDevices();
   buildCounterChromeOsDevices++;
   if (buildCounterChromeOsDevices < 3) {
-    o.chromeosdevices = buildUnnamed3406();
+    o.chromeosdevices = buildUnnamed1794();
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
@@ -750,7 +750,7 @@
 checkChromeOsDevices(api.ChromeOsDevices o) {
   buildCounterChromeOsDevices++;
   if (buildCounterChromeOsDevices < 3) {
-    checkUnnamed3406(o.chromeosdevices);
+    checkUnnamed1794(o.chromeosdevices);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -758,14 +758,14 @@
   buildCounterChromeOsDevices--;
 }
 
-buildUnnamed3407() {
+buildUnnamed1795() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3407(core.List<core.String> o) {
+checkUnnamed1795(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -776,7 +776,7 @@
   var o = new api.ChromeOsMoveDevicesToOu();
   buildCounterChromeOsMoveDevicesToOu++;
   if (buildCounterChromeOsMoveDevicesToOu < 3) {
-    o.deviceIds = buildUnnamed3407();
+    o.deviceIds = buildUnnamed1795();
   }
   buildCounterChromeOsMoveDevicesToOu--;
   return o;
@@ -785,7 +785,7 @@
 checkChromeOsMoveDevicesToOu(api.ChromeOsMoveDevicesToOu o) {
   buildCounterChromeOsMoveDevicesToOu++;
   if (buildCounterChromeOsMoveDevicesToOu < 3) {
-    checkUnnamed3407(o.deviceIds);
+    checkUnnamed1795(o.deviceIds);
   }
   buildCounterChromeOsMoveDevicesToOu--;
 }
@@ -890,14 +890,14 @@
   buildCounterDomainAlias--;
 }
 
-buildUnnamed3408() {
+buildUnnamed1796() {
   var o = new core.List<api.DomainAlias>();
   o.add(buildDomainAlias());
   o.add(buildDomainAlias());
   return o;
 }
 
-checkUnnamed3408(core.List<api.DomainAlias> o) {
+checkUnnamed1796(core.List<api.DomainAlias> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDomainAlias(o[0]);
   checkDomainAlias(o[1]);
@@ -908,7 +908,7 @@
   var o = new api.DomainAliases();
   buildCounterDomainAliases++;
   if (buildCounterDomainAliases < 3) {
-    o.domainAliases = buildUnnamed3408();
+    o.domainAliases = buildUnnamed1796();
     o.etag = "foo";
     o.kind = "foo";
   }
@@ -919,21 +919,21 @@
 checkDomainAliases(api.DomainAliases o) {
   buildCounterDomainAliases++;
   if (buildCounterDomainAliases < 3) {
-    checkUnnamed3408(o.domainAliases);
+    checkUnnamed1796(o.domainAliases);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDomainAliases--;
 }
 
-buildUnnamed3409() {
+buildUnnamed1797() {
   var o = new core.List<api.DomainAlias>();
   o.add(buildDomainAlias());
   o.add(buildDomainAlias());
   return o;
 }
 
-checkUnnamed3409(core.List<api.DomainAlias> o) {
+checkUnnamed1797(core.List<api.DomainAlias> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDomainAlias(o[0]);
   checkDomainAlias(o[1]);
@@ -945,7 +945,7 @@
   buildCounterDomains++;
   if (buildCounterDomains < 3) {
     o.creationTime = "foo";
-    o.domainAliases = buildUnnamed3409();
+    o.domainAliases = buildUnnamed1797();
     o.domainName = "foo";
     o.etag = "foo";
     o.isPrimary = true;
@@ -960,7 +960,7 @@
   buildCounterDomains++;
   if (buildCounterDomains < 3) {
     unittest.expect(o.creationTime, unittest.equals('foo'));
-    checkUnnamed3409(o.domainAliases);
+    checkUnnamed1797(o.domainAliases);
     unittest.expect(o.domainName, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.isPrimary, unittest.isTrue);
@@ -970,14 +970,14 @@
   buildCounterDomains--;
 }
 
-buildUnnamed3410() {
+buildUnnamed1798() {
   var o = new core.List<api.Domains>();
   o.add(buildDomains());
   o.add(buildDomains());
   return o;
 }
 
-checkUnnamed3410(core.List<api.Domains> o) {
+checkUnnamed1798(core.List<api.Domains> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDomains(o[0]);
   checkDomains(o[1]);
@@ -988,7 +988,7 @@
   var o = new api.Domains2();
   buildCounterDomains2++;
   if (buildCounterDomains2 < 3) {
-    o.domains = buildUnnamed3410();
+    o.domains = buildUnnamed1798();
     o.etag = "foo";
     o.kind = "foo";
   }
@@ -999,7 +999,7 @@
 checkDomains2(api.Domains2 o) {
   buildCounterDomains2++;
   if (buildCounterDomains2 < 3) {
-    checkUnnamed3410(o.domains);
+    checkUnnamed1798(o.domains);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
   }
@@ -1067,14 +1067,14 @@
   buildCounterFeatureRename--;
 }
 
-buildUnnamed3411() {
+buildUnnamed1799() {
   var o = new core.List<api.Feature>();
   o.add(buildFeature());
   o.add(buildFeature());
   return o;
 }
 
-checkUnnamed3411(core.List<api.Feature> o) {
+checkUnnamed1799(core.List<api.Feature> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFeature(o[0]);
   checkFeature(o[1]);
@@ -1086,7 +1086,7 @@
   buildCounterFeatures++;
   if (buildCounterFeatures < 3) {
     o.etag = "foo";
-    o.features = buildUnnamed3411();
+    o.features = buildUnnamed1799();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1098,34 +1098,34 @@
   buildCounterFeatures++;
   if (buildCounterFeatures < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3411(o.features);
+    checkUnnamed1799(o.features);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterFeatures--;
 }
 
-buildUnnamed3412() {
+buildUnnamed1800() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3412(core.List<core.String> o) {
+checkUnnamed1800(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3413() {
+buildUnnamed1801() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3413(core.List<core.String> o) {
+checkUnnamed1801(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1137,7 +1137,7 @@
   buildCounterGroup++;
   if (buildCounterGroup < 3) {
     o.adminCreated = true;
-    o.aliases = buildUnnamed3412();
+    o.aliases = buildUnnamed1800();
     o.description = "foo";
     o.directMembersCount = "foo";
     o.email = "foo";
@@ -1145,7 +1145,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.nonEditableAliases = buildUnnamed3413();
+    o.nonEditableAliases = buildUnnamed1801();
   }
   buildCounterGroup--;
   return o;
@@ -1155,7 +1155,7 @@
   buildCounterGroup++;
   if (buildCounterGroup < 3) {
     unittest.expect(o.adminCreated, unittest.isTrue);
-    checkUnnamed3412(o.aliases);
+    checkUnnamed1800(o.aliases);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.directMembersCount, unittest.equals('foo'));
     unittest.expect(o.email, unittest.equals('foo'));
@@ -1163,19 +1163,19 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3413(o.nonEditableAliases);
+    checkUnnamed1801(o.nonEditableAliases);
   }
   buildCounterGroup--;
 }
 
-buildUnnamed3414() {
+buildUnnamed1802() {
   var o = new core.List<api.Group>();
   o.add(buildGroup());
   o.add(buildGroup());
   return o;
 }
 
-checkUnnamed3414(core.List<api.Group> o) {
+checkUnnamed1802(core.List<api.Group> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGroup(o[0]);
   checkGroup(o[1]);
@@ -1187,7 +1187,7 @@
   buildCounterGroups++;
   if (buildCounterGroups < 3) {
     o.etag = "foo";
-    o.groups = buildUnnamed3414();
+    o.groups = buildUnnamed1802();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1199,7 +1199,7 @@
   buildCounterGroups++;
   if (buildCounterGroups < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3414(o.groups);
+    checkUnnamed1802(o.groups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1237,14 +1237,14 @@
   buildCounterMember--;
 }
 
-buildUnnamed3415() {
+buildUnnamed1803() {
   var o = new core.List<api.Member>();
   o.add(buildMember());
   o.add(buildMember());
   return o;
 }
 
-checkUnnamed3415(core.List<api.Member> o) {
+checkUnnamed1803(core.List<api.Member> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMember(o[0]);
   checkMember(o[1]);
@@ -1257,7 +1257,7 @@
   if (buildCounterMembers < 3) {
     o.etag = "foo";
     o.kind = "foo";
-    o.members = buildUnnamed3415();
+    o.members = buildUnnamed1803();
     o.nextPageToken = "foo";
   }
   buildCounterMembers--;
@@ -1269,7 +1269,7 @@
   if (buildCounterMembers < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3415(o.members);
+    checkUnnamed1803(o.members);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterMembers--;
@@ -1294,14 +1294,14 @@
   buildCounterMembersHasMember--;
 }
 
-buildUnnamed3416() {
+buildUnnamed1804() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3416(core.List<core.String> o) {
+checkUnnamed1804(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1314,7 +1314,7 @@
   if (buildCounterMobileDeviceApplications < 3) {
     o.displayName = "foo";
     o.packageName = "foo";
-    o.permission = buildUnnamed3416();
+    o.permission = buildUnnamed1804();
     o.versionCode = 42;
     o.versionName = "foo";
   }
@@ -1327,60 +1327,60 @@
   if (buildCounterMobileDeviceApplications < 3) {
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.packageName, unittest.equals('foo'));
-    checkUnnamed3416(o.permission);
+    checkUnnamed1804(o.permission);
     unittest.expect(o.versionCode, unittest.equals(42));
     unittest.expect(o.versionName, unittest.equals('foo'));
   }
   buildCounterMobileDeviceApplications--;
 }
 
-buildUnnamed3417() {
+buildUnnamed1805() {
   var o = new core.List<api.MobileDeviceApplications>();
   o.add(buildMobileDeviceApplications());
   o.add(buildMobileDeviceApplications());
   return o;
 }
 
-checkUnnamed3417(core.List<api.MobileDeviceApplications> o) {
+checkUnnamed1805(core.List<api.MobileDeviceApplications> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMobileDeviceApplications(o[0]);
   checkMobileDeviceApplications(o[1]);
 }
 
-buildUnnamed3418() {
+buildUnnamed1806() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3418(core.List<core.String> o) {
+checkUnnamed1806(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3419() {
+buildUnnamed1807() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3419(core.List<core.String> o) {
+checkUnnamed1807(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3420() {
+buildUnnamed1808() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3420(core.List<core.String> o) {
+checkUnnamed1808(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1392,7 +1392,7 @@
   buildCounterMobileDevice++;
   if (buildCounterMobileDevice < 3) {
     o.adbStatus = true;
-    o.applications = buildUnnamed3417();
+    o.applications = buildUnnamed1805();
     o.basebandVersion = "foo";
     o.bootloaderVersion = "foo";
     o.brand = "foo";
@@ -1402,7 +1402,7 @@
     o.deviceCompromisedStatus = "foo";
     o.deviceId = "foo";
     o.devicePasswordStatus = "foo";
-    o.email = buildUnnamed3418();
+    o.email = buildUnnamed1806();
     o.encryptionStatus = "foo";
     o.etag = "foo";
     o.firstSync = core.DateTime.parse("2002-02-27T14:01:02");
@@ -1416,10 +1416,10 @@
     o.manufacturer = "foo";
     o.meid = "foo";
     o.model = "foo";
-    o.name = buildUnnamed3419();
+    o.name = buildUnnamed1807();
     o.networkOperator = "foo";
     o.os = "foo";
-    o.otherAccountsInfo = buildUnnamed3420();
+    o.otherAccountsInfo = buildUnnamed1808();
     o.privilege = "foo";
     o.releaseVersion = "foo";
     o.resourceId = "foo";
@@ -1440,7 +1440,7 @@
   buildCounterMobileDevice++;
   if (buildCounterMobileDevice < 3) {
     unittest.expect(o.adbStatus, unittest.isTrue);
-    checkUnnamed3417(o.applications);
+    checkUnnamed1805(o.applications);
     unittest.expect(o.basebandVersion, unittest.equals('foo'));
     unittest.expect(o.bootloaderVersion, unittest.equals('foo'));
     unittest.expect(o.brand, unittest.equals('foo'));
@@ -1450,7 +1450,7 @@
     unittest.expect(o.deviceCompromisedStatus, unittest.equals('foo'));
     unittest.expect(o.deviceId, unittest.equals('foo'));
     unittest.expect(o.devicePasswordStatus, unittest.equals('foo'));
-    checkUnnamed3418(o.email);
+    checkUnnamed1806(o.email);
     unittest.expect(o.encryptionStatus, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.firstSync,
@@ -1466,10 +1466,10 @@
     unittest.expect(o.manufacturer, unittest.equals('foo'));
     unittest.expect(o.meid, unittest.equals('foo'));
     unittest.expect(o.model, unittest.equals('foo'));
-    checkUnnamed3419(o.name);
+    checkUnnamed1807(o.name);
     unittest.expect(o.networkOperator, unittest.equals('foo'));
     unittest.expect(o.os, unittest.equals('foo'));
-    checkUnnamed3420(o.otherAccountsInfo);
+    checkUnnamed1808(o.otherAccountsInfo);
     unittest.expect(o.privilege, unittest.equals('foo'));
     unittest.expect(o.releaseVersion, unittest.equals('foo'));
     unittest.expect(o.resourceId, unittest.equals('foo'));
@@ -1504,14 +1504,14 @@
   buildCounterMobileDeviceAction--;
 }
 
-buildUnnamed3421() {
+buildUnnamed1809() {
   var o = new core.List<api.MobileDevice>();
   o.add(buildMobileDevice());
   o.add(buildMobileDevice());
   return o;
 }
 
-checkUnnamed3421(core.List<api.MobileDevice> o) {
+checkUnnamed1809(core.List<api.MobileDevice> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMobileDevice(o[0]);
   checkMobileDevice(o[1]);
@@ -1524,7 +1524,7 @@
   if (buildCounterMobileDevices < 3) {
     o.etag = "foo";
     o.kind = "foo";
-    o.mobiledevices = buildUnnamed3421();
+    o.mobiledevices = buildUnnamed1809();
     o.nextPageToken = "foo";
   }
   buildCounterMobileDevices--;
@@ -1536,7 +1536,7 @@
   if (buildCounterMobileDevices < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3421(o.mobiledevices);
+    checkUnnamed1809(o.mobiledevices);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterMobileDevices--;
@@ -1576,14 +1576,14 @@
   buildCounterNotification--;
 }
 
-buildUnnamed3422() {
+buildUnnamed1810() {
   var o = new core.List<api.Notification>();
   o.add(buildNotification());
   o.add(buildNotification());
   return o;
 }
 
-checkUnnamed3422(core.List<api.Notification> o) {
+checkUnnamed1810(core.List<api.Notification> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNotification(o[0]);
   checkNotification(o[1]);
@@ -1595,7 +1595,7 @@
   buildCounterNotifications++;
   if (buildCounterNotifications < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3422();
+    o.items = buildUnnamed1810();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.unreadNotificationsCount = 42;
@@ -1608,7 +1608,7 @@
   buildCounterNotifications++;
   if (buildCounterNotifications < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3422(o.items);
+    checkUnnamed1810(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.unreadNotificationsCount, unittest.equals(42));
@@ -1651,14 +1651,14 @@
   buildCounterOrgUnit--;
 }
 
-buildUnnamed3423() {
+buildUnnamed1811() {
   var o = new core.List<api.OrgUnit>();
   o.add(buildOrgUnit());
   o.add(buildOrgUnit());
   return o;
 }
 
-checkUnnamed3423(core.List<api.OrgUnit> o) {
+checkUnnamed1811(core.List<api.OrgUnit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrgUnit(o[0]);
   checkOrgUnit(o[1]);
@@ -1671,7 +1671,7 @@
   if (buildCounterOrgUnits < 3) {
     o.etag = "foo";
     o.kind = "foo";
-    o.organizationUnits = buildUnnamed3423();
+    o.organizationUnits = buildUnnamed1811();
   }
   buildCounterOrgUnits--;
   return o;
@@ -1682,19 +1682,19 @@
   if (buildCounterOrgUnits < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3423(o.organizationUnits);
+    checkUnnamed1811(o.organizationUnits);
   }
   buildCounterOrgUnits--;
 }
 
-buildUnnamed3424() {
+buildUnnamed1812() {
   var o = new core.List<api.Privilege>();
   o.add(buildPrivilege());
   o.add(buildPrivilege());
   return o;
 }
 
-checkUnnamed3424(core.List<api.Privilege> o) {
+checkUnnamed1812(core.List<api.Privilege> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPrivilege(o[0]);
   checkPrivilege(o[1]);
@@ -1705,7 +1705,7 @@
   var o = new api.Privilege();
   buildCounterPrivilege++;
   if (buildCounterPrivilege < 3) {
-    o.childPrivileges = buildUnnamed3424();
+    o.childPrivileges = buildUnnamed1812();
     o.etag = "foo";
     o.isOuScopable = true;
     o.kind = "foo";
@@ -1720,7 +1720,7 @@
 checkPrivilege(api.Privilege o) {
   buildCounterPrivilege++;
   if (buildCounterPrivilege < 3) {
-    checkUnnamed3424(o.childPrivileges);
+    checkUnnamed1812(o.childPrivileges);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.isOuScopable, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -1731,14 +1731,14 @@
   buildCounterPrivilege--;
 }
 
-buildUnnamed3425() {
+buildUnnamed1813() {
   var o = new core.List<api.Privilege>();
   o.add(buildPrivilege());
   o.add(buildPrivilege());
   return o;
 }
 
-checkUnnamed3425(core.List<api.Privilege> o) {
+checkUnnamed1813(core.List<api.Privilege> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPrivilege(o[0]);
   checkPrivilege(o[1]);
@@ -1750,7 +1750,7 @@
   buildCounterPrivileges++;
   if (buildCounterPrivileges < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3425();
+    o.items = buildUnnamed1813();
     o.kind = "foo";
   }
   buildCounterPrivileges--;
@@ -1761,7 +1761,7 @@
   buildCounterPrivileges++;
   if (buildCounterPrivileges < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3425(o.items);
+    checkUnnamed1813(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPrivileges--;
@@ -1788,14 +1788,14 @@
   buildCounterRoleRolePrivileges--;
 }
 
-buildUnnamed3426() {
+buildUnnamed1814() {
   var o = new core.List<api.RoleRolePrivileges>();
   o.add(buildRoleRolePrivileges());
   o.add(buildRoleRolePrivileges());
   return o;
 }
 
-checkUnnamed3426(core.List<api.RoleRolePrivileges> o) {
+checkUnnamed1814(core.List<api.RoleRolePrivileges> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoleRolePrivileges(o[0]);
   checkRoleRolePrivileges(o[1]);
@@ -1813,7 +1813,7 @@
     o.roleDescription = "foo";
     o.roleId = "foo";
     o.roleName = "foo";
-    o.rolePrivileges = buildUnnamed3426();
+    o.rolePrivileges = buildUnnamed1814();
   }
   buildCounterRole--;
   return o;
@@ -1829,7 +1829,7 @@
     unittest.expect(o.roleDescription, unittest.equals('foo'));
     unittest.expect(o.roleId, unittest.equals('foo'));
     unittest.expect(o.roleName, unittest.equals('foo'));
-    checkUnnamed3426(o.rolePrivileges);
+    checkUnnamed1814(o.rolePrivileges);
   }
   buildCounterRole--;
 }
@@ -1865,14 +1865,14 @@
   buildCounterRoleAssignment--;
 }
 
-buildUnnamed3427() {
+buildUnnamed1815() {
   var o = new core.List<api.RoleAssignment>();
   o.add(buildRoleAssignment());
   o.add(buildRoleAssignment());
   return o;
 }
 
-checkUnnamed3427(core.List<api.RoleAssignment> o) {
+checkUnnamed1815(core.List<api.RoleAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoleAssignment(o[0]);
   checkRoleAssignment(o[1]);
@@ -1884,7 +1884,7 @@
   buildCounterRoleAssignments++;
   if (buildCounterRoleAssignments < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3427();
+    o.items = buildUnnamed1815();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1896,21 +1896,21 @@
   buildCounterRoleAssignments++;
   if (buildCounterRoleAssignments < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3427(o.items);
+    checkUnnamed1815(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterRoleAssignments--;
 }
 
-buildUnnamed3428() {
+buildUnnamed1816() {
   var o = new core.List<api.Role>();
   o.add(buildRole());
   o.add(buildRole());
   return o;
 }
 
-checkUnnamed3428(core.List<api.Role> o) {
+checkUnnamed1816(core.List<api.Role> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRole(o[0]);
   checkRole(o[1]);
@@ -1922,7 +1922,7 @@
   buildCounterRoles++;
   if (buildCounterRoles < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3428();
+    o.items = buildUnnamed1816();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1934,21 +1934,21 @@
   buildCounterRoles++;
   if (buildCounterRoles < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3428(o.items);
+    checkUnnamed1816(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterRoles--;
 }
 
-buildUnnamed3429() {
+buildUnnamed1817() {
   var o = new core.List<api.SchemaFieldSpec>();
   o.add(buildSchemaFieldSpec());
   o.add(buildSchemaFieldSpec());
   return o;
 }
 
-checkUnnamed3429(core.List<api.SchemaFieldSpec> o) {
+checkUnnamed1817(core.List<api.SchemaFieldSpec> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSchemaFieldSpec(o[0]);
   checkSchemaFieldSpec(o[1]);
@@ -1960,7 +1960,7 @@
   buildCounterSchema++;
   if (buildCounterSchema < 3) {
     o.etag = "foo";
-    o.fields = buildUnnamed3429();
+    o.fields = buildUnnamed1817();
     o.kind = "foo";
     o.schemaId = "foo";
     o.schemaName = "foo";
@@ -1973,7 +1973,7 @@
   buildCounterSchema++;
   if (buildCounterSchema < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3429(o.fields);
+    checkUnnamed1817(o.fields);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.schemaId, unittest.equals('foo'));
     unittest.expect(o.schemaName, unittest.equals('foo'));
@@ -2038,14 +2038,14 @@
   buildCounterSchemaFieldSpec--;
 }
 
-buildUnnamed3430() {
+buildUnnamed1818() {
   var o = new core.List<api.Schema>();
   o.add(buildSchema());
   o.add(buildSchema());
   return o;
 }
 
-checkUnnamed3430(core.List<api.Schema> o) {
+checkUnnamed1818(core.List<api.Schema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSchema(o[0]);
   checkSchema(o[1]);
@@ -2058,7 +2058,7 @@
   if (buildCounterSchemas < 3) {
     o.etag = "foo";
     o.kind = "foo";
-    o.schemas = buildUnnamed3430();
+    o.schemas = buildUnnamed1818();
   }
   buildCounterSchemas--;
   return o;
@@ -2069,19 +2069,19 @@
   if (buildCounterSchemas < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3430(o.schemas);
+    checkUnnamed1818(o.schemas);
   }
   buildCounterSchemas--;
 }
 
-buildUnnamed3431() {
+buildUnnamed1819() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3431(core.List<core.String> o) {
+checkUnnamed1819(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2098,7 +2098,7 @@
     o.etag = "foo";
     o.kind = "foo";
     o.nativeApp = true;
-    o.scopes = buildUnnamed3431();
+    o.scopes = buildUnnamed1819();
     o.userKey = "foo";
   }
   buildCounterToken--;
@@ -2114,20 +2114,20 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nativeApp, unittest.isTrue);
-    checkUnnamed3431(o.scopes);
+    checkUnnamed1819(o.scopes);
     unittest.expect(o.userKey, unittest.equals('foo'));
   }
   buildCounterToken--;
 }
 
-buildUnnamed3432() {
+buildUnnamed1820() {
   var o = new core.List<api.Token>();
   o.add(buildToken());
   o.add(buildToken());
   return o;
 }
 
-checkUnnamed3432(core.List<api.Token> o) {
+checkUnnamed1820(core.List<api.Token> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkToken(o[0]);
   checkToken(o[1]);
@@ -2139,7 +2139,7 @@
   buildCounterTokens++;
   if (buildCounterTokens < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3432();
+    o.items = buildUnnamed1820();
     o.kind = "foo";
   }
   buildCounterTokens--;
@@ -2150,7 +2150,7 @@
   buildCounterTokens++;
   if (buildCounterTokens < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3432(o.items);
+    checkUnnamed1820(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTokens--;
@@ -2183,14 +2183,14 @@
   buildCounterTrustedAppId--;
 }
 
-buildUnnamed3433() {
+buildUnnamed1821() {
   var o = new core.List<api.TrustedAppId>();
   o.add(buildTrustedAppId());
   o.add(buildTrustedAppId());
   return o;
 }
 
-checkUnnamed3433(core.List<api.TrustedAppId> o) {
+checkUnnamed1821(core.List<api.TrustedAppId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrustedAppId(o[0]);
   checkTrustedAppId(o[1]);
@@ -2204,7 +2204,7 @@
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.trustedApps = buildUnnamed3433();
+    o.trustedApps = buildUnnamed1821();
   }
   buildCounterTrustedApps--;
   return o;
@@ -2216,45 +2216,45 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3433(o.trustedApps);
+    checkUnnamed1821(o.trustedApps);
   }
   buildCounterTrustedApps--;
 }
 
-buildUnnamed3434() {
+buildUnnamed1822() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3434(core.List<core.String> o) {
+checkUnnamed1822(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3435() {
+buildUnnamed1823() {
   var o = new core.Map<core.String, api.UserCustomProperties>();
   o["x"] = buildUserCustomProperties();
   o["y"] = buildUserCustomProperties();
   return o;
 }
 
-checkUnnamed3435(core.Map<core.String, api.UserCustomProperties> o) {
+checkUnnamed1823(core.Map<core.String, api.UserCustomProperties> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserCustomProperties(o["x"]);
   checkUserCustomProperties(o["y"]);
 }
 
-buildUnnamed3436() {
+buildUnnamed1824() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3436(core.List<core.String> o) {
+checkUnnamed1824(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2271,10 +2271,10 @@
       'string': 'foo'
     };
     o.agreedToTerms = true;
-    o.aliases = buildUnnamed3434();
+    o.aliases = buildUnnamed1822();
     o.changePasswordAtNextLogin = true;
     o.creationTime = core.DateTime.parse("2002-02-27T14:01:02");
-    o.customSchemas = buildUnnamed3435();
+    o.customSchemas = buildUnnamed1823();
     o.customerId = "foo";
     o.deletionTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.emails = {
@@ -2325,7 +2325,7 @@
       'string': 'foo'
     };
     o.name = buildUserName();
-    o.nonEditableAliases = buildUnnamed3436();
+    o.nonEditableAliases = buildUnnamed1824();
     o.notes = {
       'list': [1, 2, 3],
       'bool': true,
@@ -2382,11 +2382,11 @@
     unittest.expect(casted4["bool"], unittest.equals(true));
     unittest.expect(casted4["string"], unittest.equals('foo'));
     unittest.expect(o.agreedToTerms, unittest.isTrue);
-    checkUnnamed3434(o.aliases);
+    checkUnnamed1822(o.aliases);
     unittest.expect(o.changePasswordAtNextLogin, unittest.isTrue);
     unittest.expect(o.creationTime,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed3435(o.customSchemas);
+    checkUnnamed1823(o.customSchemas);
     unittest.expect(o.customerId, unittest.equals('foo'));
     unittest.expect(o.deletionTime,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -2439,7 +2439,7 @@
     unittest.expect(casted11["bool"], unittest.equals(true));
     unittest.expect(casted11["string"], unittest.equals('foo'));
     checkUserName(o.name);
-    checkUnnamed3436(o.nonEditableAliases);
+    checkUnnamed1824(o.nonEditableAliases);
     var casted12 = (o.notes) as core.Map;
     unittest.expect(casted12, unittest.hasLength(3));
     unittest.expect(casted12["list"], unittest.equals([1, 2, 3]));
@@ -3020,14 +3020,14 @@
   buildCounterUserWebsite--;
 }
 
-buildUnnamed3437() {
+buildUnnamed1825() {
   var o = new core.List<api.User>();
   o.add(buildUser());
   o.add(buildUser());
   return o;
 }
 
-checkUnnamed3437(core.List<api.User> o) {
+checkUnnamed1825(core.List<api.User> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUser(o[0]);
   checkUser(o[1]);
@@ -3042,7 +3042,7 @@
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.triggerEvent = "foo";
-    o.users = buildUnnamed3437();
+    o.users = buildUnnamed1825();
   }
   buildCounterUsers--;
   return o;
@@ -3055,7 +3055,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.triggerEvent, unittest.equals('foo'));
-    checkUnnamed3437(o.users);
+    checkUnnamed1825(o.users);
   }
   buildCounterUsers--;
 }
@@ -3085,14 +3085,14 @@
   buildCounterVerificationCode--;
 }
 
-buildUnnamed3438() {
+buildUnnamed1826() {
   var o = new core.List<api.VerificationCode>();
   o.add(buildVerificationCode());
   o.add(buildVerificationCode());
   return o;
 }
 
-checkUnnamed3438(core.List<api.VerificationCode> o) {
+checkUnnamed1826(core.List<api.VerificationCode> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVerificationCode(o[0]);
   checkVerificationCode(o[1]);
@@ -3104,7 +3104,7 @@
   buildCounterVerificationCodes++;
   if (buildCounterVerificationCodes < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3438();
+    o.items = buildUnnamed1826();
     o.kind = "foo";
   }
   buildCounterVerificationCodes--;
@@ -3115,59 +3115,59 @@
   buildCounterVerificationCodes++;
   if (buildCounterVerificationCodes < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3438(o.items);
+    checkUnnamed1826(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterVerificationCodes--;
 }
 
-buildUnnamed3439() {
+buildUnnamed1827() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3439(core.List<core.String> o) {
+checkUnnamed1827(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3440() {
+buildUnnamed1828() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3440(core.List<core.String> o) {
+checkUnnamed1828(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3441() {
+buildUnnamed1829() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3441(core.List<core.String> o) {
+checkUnnamed1829(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3442() {
+buildUnnamed1830() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3442(core.List<core.String> o) {
+checkUnnamed1830(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3948,7 +3948,7 @@
       }), true);
       res
           .get(arg_userKey, arg_codeId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Asp response) {
+          .then(unittest.expectAsync1(((response) {
         checkAsp(response);
       })));
     });
@@ -4010,7 +4010,7 @@
       }), true);
       res
           .list(arg_userKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Asps response) {
+          .then(unittest.expectAsync1(((response) {
         checkAsps(response);
       })));
     });
@@ -4212,7 +4212,7 @@
       res
           .get(arg_customerId, arg_deviceId,
               projection: arg_projection, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChromeOsDevice response) {
+          .then(unittest.expectAsync1(((response) {
         checkChromeOsDevice(response);
       })));
     });
@@ -4303,7 +4303,7 @@
               query: arg_query,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChromeOsDevices response) {
+          .then(unittest.expectAsync1(((response) {
         checkChromeOsDevices(response);
       })));
     });
@@ -4447,7 +4447,7 @@
       res
           .patch(arg_request, arg_customerId, arg_deviceId,
               projection: arg_projection, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChromeOsDevice response) {
+          .then(unittest.expectAsync1(((response) {
         checkChromeOsDevice(response);
       })));
     });
@@ -4522,7 +4522,7 @@
       res
           .update(arg_request, arg_customerId, arg_deviceId,
               projection: arg_projection, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChromeOsDevice response) {
+          .then(unittest.expectAsync1(((response) {
         checkChromeOsDevice(response);
       })));
     });
@@ -4580,7 +4580,7 @@
       }), true);
       res
           .get(arg_customerKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Customer response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomer(response);
       })));
     });
@@ -4640,7 +4640,7 @@
       }), true);
       res
           .patch(arg_request, arg_customerKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Customer response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomer(response);
       })));
     });
@@ -4700,7 +4700,7 @@
       }), true);
       res
           .update(arg_request, arg_customerKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Customer response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomer(response);
       })));
     });
@@ -4832,7 +4832,7 @@
       }), true);
       res
           .get(arg_customer, arg_domainAliasName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DomainAlias response) {
+          .then(unittest.expectAsync1(((response) {
         checkDomainAlias(response);
       })));
     });
@@ -4898,7 +4898,7 @@
       }), true);
       res
           .insert(arg_request, arg_customer, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DomainAlias response) {
+          .then(unittest.expectAsync1(((response) {
         checkDomainAlias(response);
       })));
     });
@@ -4964,7 +4964,7 @@
       res
           .list(arg_customer,
               parentDomainName: arg_parentDomainName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DomainAliases response) {
+          .then(unittest.expectAsync1(((response) {
         checkDomainAliases(response);
       })));
     });
@@ -5096,7 +5096,7 @@
       }), true);
       res
           .get(arg_customer, arg_domainName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Domains response) {
+          .then(unittest.expectAsync1(((response) {
         checkDomains(response);
       })));
     });
@@ -5162,7 +5162,7 @@
       }), true);
       res
           .insert(arg_request, arg_customer, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Domains response) {
+          .then(unittest.expectAsync1(((response) {
         checkDomains(response);
       })));
     });
@@ -5224,7 +5224,7 @@
       }), true);
       res
           .list(arg_customer, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Domains2 response) {
+          .then(unittest.expectAsync1(((response) {
         checkDomains2(response);
       })));
     });
@@ -5336,7 +5336,7 @@
       }), true);
       res
           .get(arg_groupKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Group response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroup(response);
       })));
     });
@@ -5392,7 +5392,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Group response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroup(response);
       })));
     });
@@ -5464,7 +5464,7 @@
               pageToken: arg_pageToken,
               userKey: arg_userKey,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Groups response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroups(response);
       })));
     });
@@ -5524,7 +5524,7 @@
       }), true);
       res
           .patch(arg_request, arg_groupKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Group response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroup(response);
       })));
     });
@@ -5584,7 +5584,7 @@
       }), true);
       res
           .update(arg_request, arg_groupKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Group response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroup(response);
       })));
     });
@@ -5716,7 +5716,7 @@
       }), true);
       res
           .insert(arg_request, arg_groupKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Alias response) {
+          .then(unittest.expectAsync1(((response) {
         checkAlias(response);
       })));
     });
@@ -5778,7 +5778,7 @@
       }), true);
       res
           .list(arg_groupKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Aliases response) {
+          .then(unittest.expectAsync1(((response) {
         checkAliases(response);
       })));
     });
@@ -5910,7 +5910,7 @@
       }), true);
       res
           .get(arg_groupKey, arg_memberKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Member response) {
+          .then(unittest.expectAsync1(((response) {
         checkMember(response);
       })));
     });
@@ -5976,7 +5976,7 @@
       }), true);
       res
           .hasMember(arg_groupKey, arg_memberKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MembersHasMember response) {
+          .then(unittest.expectAsync1(((response) {
         checkMembersHasMember(response);
       })));
     });
@@ -6042,7 +6042,7 @@
       }), true);
       res
           .insert(arg_request, arg_groupKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Member response) {
+          .then(unittest.expectAsync1(((response) {
         checkMember(response);
       })));
     });
@@ -6116,7 +6116,7 @@
               pageToken: arg_pageToken,
               roles: arg_roles,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Members response) {
+          .then(unittest.expectAsync1(((response) {
         checkMembers(response);
       })));
     });
@@ -6186,7 +6186,7 @@
       }), true);
       res
           .patch(arg_request, arg_groupKey, arg_memberKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Member response) {
+          .then(unittest.expectAsync1(((response) {
         checkMember(response);
       })));
     });
@@ -6257,7 +6257,7 @@
       res
           .update(arg_request, arg_groupKey, arg_memberKey,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Member response) {
+          .then(unittest.expectAsync1(((response) {
         checkMember(response);
       })));
     });
@@ -6468,7 +6468,7 @@
       res
           .get(arg_customerId, arg_resourceId,
               projection: arg_projection, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MobileDevice response) {
+          .then(unittest.expectAsync1(((response) {
         checkMobileDevice(response);
       })));
     });
@@ -6554,7 +6554,7 @@
               query: arg_query,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MobileDevices response) {
+          .then(unittest.expectAsync1(((response) {
         checkMobileDevices(response);
       })));
     });
@@ -6686,7 +6686,7 @@
       }), true);
       res
           .get(arg_customer, arg_notificationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Notification response) {
+          .then(unittest.expectAsync1(((response) {
         checkNotification(response);
       })));
     });
@@ -6761,7 +6761,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Notifications response) {
+          .then(unittest.expectAsync1(((response) {
         checkNotifications(response);
       })));
     });
@@ -6832,7 +6832,7 @@
       res
           .patch(arg_request, arg_customer, arg_notificationId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Notification response) {
+          .then(unittest.expectAsync1(((response) {
         checkNotification(response);
       })));
     });
@@ -6903,7 +6903,7 @@
       res
           .update(arg_request, arg_customer, arg_notificationId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Notification response) {
+          .then(unittest.expectAsync1(((response) {
         checkNotification(response);
       })));
     });
@@ -6914,7 +6914,7 @@
       var mock = new HttpServerMock();
       api.OrgunitsResourceApi res = new api.AdminApi(mock).orgunits;
       var arg_customerId = "foo";
-      var arg_orgUnitPath = buildUnnamed3439();
+      var arg_orgUnitPath = buildUnnamed1827();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -6982,7 +6982,7 @@
       var mock = new HttpServerMock();
       api.OrgunitsResourceApi res = new api.AdminApi(mock).orgunits;
       var arg_customerId = "foo";
-      var arg_orgUnitPath = buildUnnamed3440();
+      var arg_orgUnitPath = buildUnnamed1828();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -7043,7 +7043,7 @@
       }), true);
       res
           .get(arg_customerId, arg_orgUnitPath, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgUnit(response);
       })));
     });
@@ -7109,7 +7109,7 @@
       }), true);
       res
           .insert(arg_request, arg_customerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgUnit(response);
       })));
     });
@@ -7179,7 +7179,7 @@
               orgUnitPath: arg_orgUnitPath,
               type: arg_type,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgUnits response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgUnits(response);
       })));
     });
@@ -7189,7 +7189,7 @@
       api.OrgunitsResourceApi res = new api.AdminApi(mock).orgunits;
       var arg_request = buildOrgUnit();
       var arg_customerId = "foo";
-      var arg_orgUnitPath = buildUnnamed3441();
+      var arg_orgUnitPath = buildUnnamed1829();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.OrgUnit.fromJson(json);
@@ -7254,7 +7254,7 @@
       res
           .patch(arg_request, arg_customerId, arg_orgUnitPath,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgUnit(response);
       })));
     });
@@ -7264,7 +7264,7 @@
       api.OrgunitsResourceApi res = new api.AdminApi(mock).orgunits;
       var arg_request = buildOrgUnit();
       var arg_customerId = "foo";
-      var arg_orgUnitPath = buildUnnamed3442();
+      var arg_orgUnitPath = buildUnnamed1830();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.OrgUnit.fromJson(json);
@@ -7329,7 +7329,7 @@
       res
           .update(arg_request, arg_customerId, arg_orgUnitPath,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgUnit(response);
       })));
     });
@@ -7393,7 +7393,7 @@
       }), true);
       res
           .list(arg_customer, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Privileges response) {
+          .then(unittest.expectAsync1(((response) {
         checkPrivileges(response);
       })));
     });
@@ -7448,7 +7448,7 @@
       }), true);
       res
           .GetSettings($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AppAccessCollections response) {
+          .then(unittest.expectAsync1(((response) {
         checkAppAccessCollections(response);
       })));
     });
@@ -7501,7 +7501,7 @@
       }), true);
       res
           .ListTrustedApps($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TrustedApps response) {
+          .then(unittest.expectAsync1(((response) {
         checkTrustedApps(response);
       })));
     });
@@ -7635,7 +7635,7 @@
       }), true);
       res
           .get(arg_customer, arg_buildingId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Building response) {
+          .then(unittest.expectAsync1(((response) {
         checkBuilding(response);
       })));
     });
@@ -7702,7 +7702,7 @@
       }), true);
       res
           .insert(arg_request, arg_customer, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Building response) {
+          .then(unittest.expectAsync1(((response) {
         checkBuilding(response);
       })));
     });
@@ -7765,7 +7765,7 @@
       }), true);
       res
           .list(arg_customer, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Buildings response) {
+          .then(unittest.expectAsync1(((response) {
         checkBuildings(response);
       })));
     });
@@ -7837,7 +7837,7 @@
       res
           .patch(arg_request, arg_customer, arg_buildingId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Building response) {
+          .then(unittest.expectAsync1(((response) {
         checkBuilding(response);
       })));
     });
@@ -7909,7 +7909,7 @@
       res
           .update(arg_request, arg_customer, arg_buildingId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Building response) {
+          .then(unittest.expectAsync1(((response) {
         checkBuilding(response);
       })));
     });
@@ -8043,7 +8043,7 @@
       }), true);
       res
           .get(arg_customer, arg_calendarResourceId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CalendarResource response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendarResource(response);
       })));
     });
@@ -8110,7 +8110,7 @@
       }), true);
       res
           .insert(arg_request, arg_customer, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CalendarResource response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendarResource(response);
       })));
     });
@@ -8189,7 +8189,7 @@
               pageToken: arg_pageToken,
               query: arg_query,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CalendarResources response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendarResources(response);
       })));
     });
@@ -8261,7 +8261,7 @@
       res
           .patch(arg_request, arg_customer, arg_calendarResourceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CalendarResource response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendarResource(response);
       })));
     });
@@ -8333,7 +8333,7 @@
       res
           .update(arg_request, arg_customer, arg_calendarResourceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CalendarResource response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendarResource(response);
       })));
     });
@@ -8467,7 +8467,7 @@
       }), true);
       res
           .get(arg_customer, arg_featureKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Feature response) {
+          .then(unittest.expectAsync1(((response) {
         checkFeature(response);
       })));
     });
@@ -8534,7 +8534,7 @@
       }), true);
       res
           .insert(arg_request, arg_customer, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Feature response) {
+          .then(unittest.expectAsync1(((response) {
         checkFeature(response);
       })));
     });
@@ -8600,7 +8600,7 @@
       }), true);
       res
           .list(arg_customer, pageToken: arg_pageToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Features response) {
+          .then(unittest.expectAsync1(((response) {
         checkFeatures(response);
       })));
     });
@@ -8672,7 +8672,7 @@
       res
           .patch(arg_request, arg_customer, arg_featureKey,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Feature response) {
+          .then(unittest.expectAsync1(((response) {
         checkFeature(response);
       })));
     });
@@ -8819,7 +8819,7 @@
       res
           .update(arg_request, arg_customer, arg_featureKey,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Feature response) {
+          .then(unittest.expectAsync1(((response) {
         checkFeature(response);
       })));
     });
@@ -8953,7 +8953,7 @@
       }), true);
       res
           .get(arg_customer, arg_roleAssignmentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RoleAssignment response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoleAssignment(response);
       })));
     });
@@ -9020,7 +9020,7 @@
       }), true);
       res
           .insert(arg_request, arg_customer, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RoleAssignment response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoleAssignment(response);
       })));
     });
@@ -9099,7 +9099,7 @@
               roleId: arg_roleId,
               userKey: arg_userKey,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RoleAssignments response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoleAssignments(response);
       })));
     });
@@ -9231,7 +9231,7 @@
       }), true);
       res
           .get(arg_customer, arg_roleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -9297,7 +9297,7 @@
       }), true);
       res
           .insert(arg_request, arg_customer, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -9368,7 +9368,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Roles response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoles(response);
       })));
     });
@@ -9438,7 +9438,7 @@
       }), true);
       res
           .patch(arg_request, arg_customer, arg_roleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -9508,7 +9508,7 @@
       }), true);
       res
           .update(arg_request, arg_customer, arg_roleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -9640,7 +9640,7 @@
       }), true);
       res
           .get(arg_customerId, arg_schemaKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Schema response) {
+          .then(unittest.expectAsync1(((response) {
         checkSchema(response);
       })));
     });
@@ -9706,7 +9706,7 @@
       }), true);
       res
           .insert(arg_request, arg_customerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Schema response) {
+          .then(unittest.expectAsync1(((response) {
         checkSchema(response);
       })));
     });
@@ -9768,7 +9768,7 @@
       }), true);
       res
           .list(arg_customerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Schemas response) {
+          .then(unittest.expectAsync1(((response) {
         checkSchemas(response);
       })));
     });
@@ -9839,7 +9839,7 @@
       res
           .patch(arg_request, arg_customerId, arg_schemaKey,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Schema response) {
+          .then(unittest.expectAsync1(((response) {
         checkSchema(response);
       })));
     });
@@ -9910,7 +9910,7 @@
       res
           .update(arg_request, arg_customerId, arg_schemaKey,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Schema response) {
+          .then(unittest.expectAsync1(((response) {
         checkSchema(response);
       })));
     });
@@ -10042,7 +10042,7 @@
       }), true);
       res
           .get(arg_userKey, arg_clientId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Token response) {
+          .then(unittest.expectAsync1(((response) {
         checkToken(response);
       })));
     });
@@ -10104,7 +10104,7 @@
       }), true);
       res
           .list(arg_userKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Tokens response) {
+          .then(unittest.expectAsync1(((response) {
         checkTokens(response);
       })));
     });
@@ -10229,7 +10229,7 @@
               projection: arg_projection,
               viewType: arg_viewType,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.User response) {
+          .then(unittest.expectAsync1(((response) {
         checkUser(response);
       })));
     });
@@ -10285,7 +10285,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.User response) {
+          .then(unittest.expectAsync1(((response) {
         checkUser(response);
       })));
     });
@@ -10383,7 +10383,7 @@
               sortOrder: arg_sortOrder,
               viewType: arg_viewType,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Users response) {
+          .then(unittest.expectAsync1(((response) {
         checkUsers(response);
       })));
     });
@@ -10507,7 +10507,7 @@
       }), true);
       res
           .patch(arg_request, arg_userKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.User response) {
+          .then(unittest.expectAsync1(((response) {
         checkUser(response);
       })));
     });
@@ -10631,7 +10631,7 @@
       }), true);
       res
           .update(arg_request, arg_userKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.User response) {
+          .then(unittest.expectAsync1(((response) {
         checkUser(response);
       })));
     });
@@ -10733,7 +10733,7 @@
               sortOrder: arg_sortOrder,
               viewType: arg_viewType,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
@@ -10865,7 +10865,7 @@
       }), true);
       res
           .insert(arg_request, arg_userKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Alias response) {
+          .then(unittest.expectAsync1(((response) {
         checkAlias(response);
       })));
     });
@@ -10929,7 +10929,7 @@
       }), true);
       res
           .list(arg_userKey, event: arg_event, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Aliases response) {
+          .then(unittest.expectAsync1(((response) {
         checkAliases(response);
       })));
     });
@@ -10998,7 +10998,7 @@
       res
           .watch(arg_request, arg_userKey,
               event: arg_event, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
@@ -11122,7 +11122,7 @@
       }), true);
       res
           .get(arg_userKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserPhoto response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserPhoto(response);
       })));
     });
@@ -11188,7 +11188,7 @@
       }), true);
       res
           .patch(arg_request, arg_userKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserPhoto response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserPhoto(response);
       })));
     });
@@ -11254,7 +11254,7 @@
       }), true);
       res
           .update(arg_request, arg_userKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserPhoto response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserPhoto(response);
       })));
     });
@@ -11441,7 +11441,7 @@
       }), true);
       res
           .list(arg_userKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VerificationCodes response) {
+          .then(unittest.expectAsync1(((response) {
         checkVerificationCodes(response);
       })));
     });
diff --git a/generated/googleapis/test/admin/reports_v1_test.dart b/generated/googleapis/test/admin/reports_v1_test.dart
index 3d5a00b..5257291 100644
--- a/generated/googleapis/test/admin/reports_v1_test.dart
+++ b/generated/googleapis/test/admin/reports_v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3288() {
+buildUnnamed425() {
   var o = new core.List<api.Activity>();
   o.add(buildActivity());
   o.add(buildActivity());
   return o;
 }
 
-checkUnnamed3288(core.List<api.Activity> o) {
+checkUnnamed425(core.List<api.Activity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivity(o[0]);
   checkActivity(o[1]);
@@ -69,7 +69,7 @@
   buildCounterActivities++;
   if (buildCounterActivities < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3288();
+    o.items = buildUnnamed425();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -81,7 +81,7 @@
   buildCounterActivities++;
   if (buildCounterActivities < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3288(o.items);
+    checkUnnamed425(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -113,27 +113,27 @@
   buildCounterActivityActor--;
 }
 
-buildUnnamed3289() {
+buildUnnamed426() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3289(core.List<core.String> o) {
+checkUnnamed426(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3290() {
+buildUnnamed427() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3290(core.List<core.String> o) {
+checkUnnamed427(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -146,8 +146,8 @@
   if (buildCounterActivityEventsParameters < 3) {
     o.boolValue = true;
     o.intValue = "foo";
-    o.multiIntValue = buildUnnamed3289();
-    o.multiValue = buildUnnamed3290();
+    o.multiIntValue = buildUnnamed426();
+    o.multiValue = buildUnnamed427();
     o.name = "foo";
     o.value = "foo";
   }
@@ -160,22 +160,22 @@
   if (buildCounterActivityEventsParameters < 3) {
     unittest.expect(o.boolValue, unittest.isTrue);
     unittest.expect(o.intValue, unittest.equals('foo'));
-    checkUnnamed3289(o.multiIntValue);
-    checkUnnamed3290(o.multiValue);
+    checkUnnamed426(o.multiIntValue);
+    checkUnnamed427(o.multiValue);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterActivityEventsParameters--;
 }
 
-buildUnnamed3291() {
+buildUnnamed428() {
   var o = new core.List<api.ActivityEventsParameters>();
   o.add(buildActivityEventsParameters());
   o.add(buildActivityEventsParameters());
   return o;
 }
 
-checkUnnamed3291(core.List<api.ActivityEventsParameters> o) {
+checkUnnamed428(core.List<api.ActivityEventsParameters> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityEventsParameters(o[0]);
   checkActivityEventsParameters(o[1]);
@@ -187,7 +187,7 @@
   buildCounterActivityEvents++;
   if (buildCounterActivityEvents < 3) {
     o.name = "foo";
-    o.parameters = buildUnnamed3291();
+    o.parameters = buildUnnamed428();
     o.type = "foo";
   }
   buildCounterActivityEvents--;
@@ -198,20 +198,20 @@
   buildCounterActivityEvents++;
   if (buildCounterActivityEvents < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3291(o.parameters);
+    checkUnnamed428(o.parameters);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterActivityEvents--;
 }
 
-buildUnnamed3292() {
+buildUnnamed429() {
   var o = new core.List<api.ActivityEvents>();
   o.add(buildActivityEvents());
   o.add(buildActivityEvents());
   return o;
 }
 
-checkUnnamed3292(core.List<api.ActivityEvents> o) {
+checkUnnamed429(core.List<api.ActivityEvents> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityEvents(o[0]);
   checkActivityEvents(o[1]);
@@ -250,7 +250,7 @@
   if (buildCounterActivity < 3) {
     o.actor = buildActivityActor();
     o.etag = "foo";
-    o.events = buildUnnamed3292();
+    o.events = buildUnnamed429();
     o.id = buildActivityId();
     o.ipAddress = "foo";
     o.kind = "foo";
@@ -265,7 +265,7 @@
   if (buildCounterActivity < 3) {
     checkActivityActor(o.actor);
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3292(o.events);
+    checkUnnamed429(o.events);
     checkActivityId(o.id);
     unittest.expect(o.ipAddress, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -274,14 +274,14 @@
   buildCounterActivity--;
 }
 
-buildUnnamed3293() {
+buildUnnamed430() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3293(core.Map<core.String, core.String> o) {
+checkUnnamed430(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -296,7 +296,7 @@
     o.expiration = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.params = buildUnnamed3293();
+    o.params = buildUnnamed430();
     o.payload = true;
     o.resourceId = "foo";
     o.resourceUri = "foo";
@@ -314,7 +314,7 @@
     unittest.expect(o.expiration, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3293(o.params);
+    checkUnnamed430(o.params);
     unittest.expect(o.payload, unittest.isTrue);
     unittest.expect(o.resourceId, unittest.equals('foo'));
     unittest.expect(o.resourceUri, unittest.equals('foo'));
@@ -351,7 +351,7 @@
   buildCounterUsageReportEntity--;
 }
 
-buildUnnamed3294() {
+buildUnnamed431() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -366,7 +366,7 @@
   return o;
 }
 
-checkUnnamed3294(core.Map<core.String, core.Object> o) {
+checkUnnamed431(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -380,17 +380,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3295() {
+buildUnnamed432() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3294());
-  o.add(buildUnnamed3294());
+  o.add(buildUnnamed431());
+  o.add(buildUnnamed431());
   return o;
 }
 
-checkUnnamed3295(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed432(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3294(o[0]);
-  checkUnnamed3294(o[1]);
+  checkUnnamed431(o[0]);
+  checkUnnamed431(o[1]);
 }
 
 core.int buildCounterUsageReportParameters = 0;
@@ -401,7 +401,7 @@
     o.boolValue = true;
     o.datetimeValue = core.DateTime.parse("2002-02-27T14:01:02");
     o.intValue = "foo";
-    o.msgValue = buildUnnamed3295();
+    o.msgValue = buildUnnamed432();
     o.name = "foo";
     o.stringValue = "foo";
   }
@@ -416,21 +416,21 @@
     unittest.expect(o.datetimeValue,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.intValue, unittest.equals('foo'));
-    checkUnnamed3295(o.msgValue);
+    checkUnnamed432(o.msgValue);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.stringValue, unittest.equals('foo'));
   }
   buildCounterUsageReportParameters--;
 }
 
-buildUnnamed3296() {
+buildUnnamed433() {
   var o = new core.List<api.UsageReportParameters>();
   o.add(buildUsageReportParameters());
   o.add(buildUsageReportParameters());
   return o;
 }
 
-checkUnnamed3296(core.List<api.UsageReportParameters> o) {
+checkUnnamed433(core.List<api.UsageReportParameters> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageReportParameters(o[0]);
   checkUsageReportParameters(o[1]);
@@ -445,7 +445,7 @@
     o.entity = buildUsageReportEntity();
     o.etag = "foo";
     o.kind = "foo";
-    o.parameters = buildUnnamed3296();
+    o.parameters = buildUnnamed433();
   }
   buildCounterUsageReport--;
   return o;
@@ -458,19 +458,19 @@
     checkUsageReportEntity(o.entity);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3296(o.parameters);
+    checkUnnamed433(o.parameters);
   }
   buildCounterUsageReport--;
 }
 
-buildUnnamed3297() {
+buildUnnamed434() {
   var o = new core.List<api.UsageReport>();
   o.add(buildUsageReport());
   o.add(buildUsageReport());
   return o;
 }
 
-checkUnnamed3297(core.List<api.UsageReport> o) {
+checkUnnamed434(core.List<api.UsageReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageReport(o[0]);
   checkUsageReport(o[1]);
@@ -497,14 +497,14 @@
   buildCounterUsageReportsWarningsData--;
 }
 
-buildUnnamed3298() {
+buildUnnamed435() {
   var o = new core.List<api.UsageReportsWarningsData>();
   o.add(buildUsageReportsWarningsData());
   o.add(buildUsageReportsWarningsData());
   return o;
 }
 
-checkUnnamed3298(core.List<api.UsageReportsWarningsData> o) {
+checkUnnamed435(core.List<api.UsageReportsWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageReportsWarningsData(o[0]);
   checkUsageReportsWarningsData(o[1]);
@@ -516,7 +516,7 @@
   buildCounterUsageReportsWarnings++;
   if (buildCounterUsageReportsWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed3298();
+    o.data = buildUnnamed435();
     o.message = "foo";
   }
   buildCounterUsageReportsWarnings--;
@@ -527,20 +527,20 @@
   buildCounterUsageReportsWarnings++;
   if (buildCounterUsageReportsWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed3298(o.data);
+    checkUnnamed435(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterUsageReportsWarnings--;
 }
 
-buildUnnamed3299() {
+buildUnnamed436() {
   var o = new core.List<api.UsageReportsWarnings>();
   o.add(buildUsageReportsWarnings());
   o.add(buildUsageReportsWarnings());
   return o;
 }
 
-checkUnnamed3299(core.List<api.UsageReportsWarnings> o) {
+checkUnnamed436(core.List<api.UsageReportsWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageReportsWarnings(o[0]);
   checkUsageReportsWarnings(o[1]);
@@ -554,8 +554,8 @@
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.usageReports = buildUnnamed3297();
-    o.warnings = buildUnnamed3299();
+    o.usageReports = buildUnnamed434();
+    o.warnings = buildUnnamed436();
   }
   buildCounterUsageReports--;
   return o;
@@ -567,8 +567,8 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3297(o.usageReports);
-    checkUnnamed3299(o.warnings);
+    checkUnnamed434(o.usageReports);
+    checkUnnamed436(o.warnings);
   }
   buildCounterUsageReports--;
 }
@@ -773,7 +773,7 @@
               pageToken: arg_pageToken,
               startTime: arg_startTime,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Activities response) {
+          .then(unittest.expectAsync1(((response) {
         checkActivities(response);
       })));
     });
@@ -882,7 +882,7 @@
               pageToken: arg_pageToken,
               startTime: arg_startTime,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
@@ -1007,7 +1007,7 @@
               pageToken: arg_pageToken,
               parameters: arg_parameters,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UsageReports response) {
+          .then(unittest.expectAsync1(((response) {
         checkUsageReports(response);
       })));
     });
@@ -1107,7 +1107,7 @@
               pageToken: arg_pageToken,
               parameters: arg_parameters,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UsageReports response) {
+          .then(unittest.expectAsync1(((response) {
         checkUsageReports(response);
       })));
     });
@@ -1197,7 +1197,7 @@
               pageToken: arg_pageToken,
               parameters: arg_parameters,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UsageReports response) {
+          .then(unittest.expectAsync1(((response) {
         checkUsageReports(response);
       })));
     });
diff --git a/generated/googleapis/test/adsense/v1_4_test.dart b/generated/googleapis/test/adsense/v1_4_test.dart
index ae5ba89..2279832 100644
--- a/generated/googleapis/test/adsense/v1_4_test.dart
+++ b/generated/googleapis/test/adsense/v1_4_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2252() {
+buildUnnamed3528() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed2252(core.List<api.Account> o) {
+checkUnnamed3528(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -73,7 +73,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.premium = true;
-    o.subAccounts = buildUnnamed2252();
+    o.subAccounts = buildUnnamed3528();
     o.timezone = "foo";
   }
   buildCounterAccount--;
@@ -88,20 +88,20 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.premium, unittest.isTrue);
-    checkUnnamed2252(o.subAccounts);
+    checkUnnamed3528(o.subAccounts);
     unittest.expect(o.timezone, unittest.equals('foo'));
   }
   buildCounterAccount--;
 }
 
-buildUnnamed2253() {
+buildUnnamed3529() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed2253(core.List<api.Account> o) {
+checkUnnamed3529(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -113,7 +113,7 @@
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2253();
+    o.items = buildUnnamed3529();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -125,7 +125,7 @@
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2253(o.items);
+    checkUnnamed3529(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -159,14 +159,14 @@
   buildCounterAdClient--;
 }
 
-buildUnnamed2254() {
+buildUnnamed3530() {
   var o = new core.List<api.AdClient>();
   o.add(buildAdClient());
   o.add(buildAdClient());
   return o;
 }
 
-checkUnnamed2254(core.List<api.AdClient> o) {
+checkUnnamed3530(core.List<api.AdClient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdClient(o[0]);
   checkAdClient(o[1]);
@@ -178,7 +178,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2254();
+    o.items = buildUnnamed3530();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -190,7 +190,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2254(o.items);
+    checkUnnamed3530(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -425,14 +425,14 @@
   buildCounterAdUnit--;
 }
 
-buildUnnamed2255() {
+buildUnnamed3531() {
   var o = new core.List<api.AdUnit>();
   o.add(buildAdUnit());
   o.add(buildAdUnit());
   return o;
 }
 
-checkUnnamed2255(core.List<api.AdUnit> o) {
+checkUnnamed3531(core.List<api.AdUnit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdUnit(o[0]);
   checkAdUnit(o[1]);
@@ -444,7 +444,7 @@
   buildCounterAdUnits++;
   if (buildCounterAdUnits < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2255();
+    o.items = buildUnnamed3531();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -456,21 +456,21 @@
   buildCounterAdUnits++;
   if (buildCounterAdUnits < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2255(o.items);
+    checkUnnamed3531(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAdUnits--;
 }
 
-buildUnnamed2256() {
+buildUnnamed3532() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2256(core.List<core.String> o) {
+checkUnnamed3532(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -500,66 +500,66 @@
   buildCounterAdsenseReportsGenerateResponseHeaders--;
 }
 
-buildUnnamed2257() {
+buildUnnamed3533() {
   var o = new core.List<api.AdsenseReportsGenerateResponseHeaders>();
   o.add(buildAdsenseReportsGenerateResponseHeaders());
   o.add(buildAdsenseReportsGenerateResponseHeaders());
   return o;
 }
 
-checkUnnamed2257(core.List<api.AdsenseReportsGenerateResponseHeaders> o) {
+checkUnnamed3533(core.List<api.AdsenseReportsGenerateResponseHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdsenseReportsGenerateResponseHeaders(o[0]);
   checkAdsenseReportsGenerateResponseHeaders(o[1]);
 }
 
-buildUnnamed2258() {
+buildUnnamed3534() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2258(core.List<core.String> o) {
+checkUnnamed3534(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2259() {
+buildUnnamed3535() {
   var o = new core.List<core.List<core.String>>();
-  o.add(buildUnnamed2258());
-  o.add(buildUnnamed2258());
+  o.add(buildUnnamed3534());
+  o.add(buildUnnamed3534());
   return o;
 }
 
-checkUnnamed2259(core.List<core.List<core.String>> o) {
+checkUnnamed3535(core.List<core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2258(o[0]);
-  checkUnnamed2258(o[1]);
+  checkUnnamed3534(o[0]);
+  checkUnnamed3534(o[1]);
 }
 
-buildUnnamed2260() {
+buildUnnamed3536() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2260(core.List<core.String> o) {
+checkUnnamed3536(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2261() {
+buildUnnamed3537() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2261(core.List<core.String> o) {
+checkUnnamed3537(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -570,15 +570,15 @@
   var o = new api.AdsenseReportsGenerateResponse();
   buildCounterAdsenseReportsGenerateResponse++;
   if (buildCounterAdsenseReportsGenerateResponse < 3) {
-    o.averages = buildUnnamed2256();
+    o.averages = buildUnnamed3532();
     o.endDate = "foo";
-    o.headers = buildUnnamed2257();
+    o.headers = buildUnnamed3533();
     o.kind = "foo";
-    o.rows = buildUnnamed2259();
+    o.rows = buildUnnamed3535();
     o.startDate = "foo";
     o.totalMatchedRows = "foo";
-    o.totals = buildUnnamed2260();
-    o.warnings = buildUnnamed2261();
+    o.totals = buildUnnamed3536();
+    o.warnings = buildUnnamed3537();
   }
   buildCounterAdsenseReportsGenerateResponse--;
   return o;
@@ -587,15 +587,15 @@
 checkAdsenseReportsGenerateResponse(api.AdsenseReportsGenerateResponse o) {
   buildCounterAdsenseReportsGenerateResponse++;
   if (buildCounterAdsenseReportsGenerateResponse < 3) {
-    checkUnnamed2256(o.averages);
+    checkUnnamed3532(o.averages);
     unittest.expect(o.endDate, unittest.equals('foo'));
-    checkUnnamed2257(o.headers);
+    checkUnnamed3533(o.headers);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2259(o.rows);
+    checkUnnamed3535(o.rows);
     unittest.expect(o.startDate, unittest.equals('foo'));
     unittest.expect(o.totalMatchedRows, unittest.equals('foo'));
-    checkUnnamed2260(o.totals);
-    checkUnnamed2261(o.warnings);
+    checkUnnamed3536(o.totals);
+    checkUnnamed3537(o.warnings);
   }
   buildCounterAdsenseReportsGenerateResponse--;
 }
@@ -629,14 +629,14 @@
   buildCounterAlert--;
 }
 
-buildUnnamed2262() {
+buildUnnamed3538() {
   var o = new core.List<api.Alert>();
   o.add(buildAlert());
   o.add(buildAlert());
   return o;
 }
 
-checkUnnamed2262(core.List<api.Alert> o) {
+checkUnnamed3538(core.List<api.Alert> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAlert(o[0]);
   checkAlert(o[1]);
@@ -647,7 +647,7 @@
   var o = new api.Alerts();
   buildCounterAlerts++;
   if (buildCounterAlerts < 3) {
-    o.items = buildUnnamed2262();
+    o.items = buildUnnamed3538();
     o.kind = "foo";
   }
   buildCounterAlerts--;
@@ -657,7 +657,7 @@
 checkAlerts(api.Alerts o) {
   buildCounterAlerts++;
   if (buildCounterAlerts < 3) {
-    checkUnnamed2262(o.items);
+    checkUnnamed3538(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAlerts--;
@@ -715,14 +715,14 @@
   buildCounterCustomChannel--;
 }
 
-buildUnnamed2263() {
+buildUnnamed3539() {
   var o = new core.List<api.CustomChannel>();
   o.add(buildCustomChannel());
   o.add(buildCustomChannel());
   return o;
 }
 
-checkUnnamed2263(core.List<api.CustomChannel> o) {
+checkUnnamed3539(core.List<api.CustomChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomChannel(o[0]);
   checkCustomChannel(o[1]);
@@ -734,7 +734,7 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2263();
+    o.items = buildUnnamed3539();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -746,21 +746,21 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2263(o.items);
+    checkUnnamed3539(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCustomChannels--;
 }
 
-buildUnnamed2264() {
+buildUnnamed3540() {
   var o = new core.List<api.ReportingMetadataEntry>();
   o.add(buildReportingMetadataEntry());
   o.add(buildReportingMetadataEntry());
   return o;
 }
 
-checkUnnamed2264(core.List<api.ReportingMetadataEntry> o) {
+checkUnnamed3540(core.List<api.ReportingMetadataEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportingMetadataEntry(o[0]);
   checkReportingMetadataEntry(o[1]);
@@ -771,7 +771,7 @@
   var o = new api.Metadata();
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    o.items = buildUnnamed2264();
+    o.items = buildUnnamed3540();
     o.kind = "foo";
   }
   buildCounterMetadata--;
@@ -781,7 +781,7 @@
 checkMetadata(api.Metadata o) {
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    checkUnnamed2264(o.items);
+    checkUnnamed3540(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterMetadata--;
@@ -814,14 +814,14 @@
   buildCounterPayment--;
 }
 
-buildUnnamed2265() {
+buildUnnamed3541() {
   var o = new core.List<api.Payment>();
   o.add(buildPayment());
   o.add(buildPayment());
   return o;
 }
 
-checkUnnamed2265(core.List<api.Payment> o) {
+checkUnnamed3541(core.List<api.Payment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPayment(o[0]);
   checkPayment(o[1]);
@@ -832,7 +832,7 @@
   var o = new api.Payments();
   buildCounterPayments++;
   if (buildCounterPayments < 3) {
-    o.items = buildUnnamed2265();
+    o.items = buildUnnamed3541();
     o.kind = "foo";
   }
   buildCounterPayments--;
@@ -842,72 +842,72 @@
 checkPayments(api.Payments o) {
   buildCounterPayments++;
   if (buildCounterPayments < 3) {
-    checkUnnamed2265(o.items);
+    checkUnnamed3541(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPayments--;
 }
 
-buildUnnamed2266() {
+buildUnnamed3542() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2266(core.List<core.String> o) {
+checkUnnamed3542(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2267() {
+buildUnnamed3543() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2267(core.List<core.String> o) {
+checkUnnamed3543(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2268() {
+buildUnnamed3544() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2268(core.List<core.String> o) {
+checkUnnamed3544(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2269() {
+buildUnnamed3545() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2269(core.List<core.String> o) {
+checkUnnamed3545(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2270() {
+buildUnnamed3546() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2270(core.List<core.String> o) {
+checkUnnamed3546(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -918,13 +918,13 @@
   var o = new api.ReportingMetadataEntry();
   buildCounterReportingMetadataEntry++;
   if (buildCounterReportingMetadataEntry < 3) {
-    o.compatibleDimensions = buildUnnamed2266();
-    o.compatibleMetrics = buildUnnamed2267();
+    o.compatibleDimensions = buildUnnamed3542();
+    o.compatibleMetrics = buildUnnamed3543();
     o.id = "foo";
     o.kind = "foo";
-    o.requiredDimensions = buildUnnamed2268();
-    o.requiredMetrics = buildUnnamed2269();
-    o.supportedProducts = buildUnnamed2270();
+    o.requiredDimensions = buildUnnamed3544();
+    o.requiredMetrics = buildUnnamed3545();
+    o.supportedProducts = buildUnnamed3546();
   }
   buildCounterReportingMetadataEntry--;
   return o;
@@ -933,13 +933,13 @@
 checkReportingMetadataEntry(api.ReportingMetadataEntry o) {
   buildCounterReportingMetadataEntry++;
   if (buildCounterReportingMetadataEntry < 3) {
-    checkUnnamed2266(o.compatibleDimensions);
-    checkUnnamed2267(o.compatibleMetrics);
+    checkUnnamed3542(o.compatibleDimensions);
+    checkUnnamed3543(o.compatibleMetrics);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2268(o.requiredDimensions);
-    checkUnnamed2269(o.requiredMetrics);
-    checkUnnamed2270(o.supportedProducts);
+    checkUnnamed3544(o.requiredDimensions);
+    checkUnnamed3545(o.requiredMetrics);
+    checkUnnamed3546(o.supportedProducts);
   }
   buildCounterReportingMetadataEntry--;
 }
@@ -969,14 +969,14 @@
   buildCounterSavedAdStyle--;
 }
 
-buildUnnamed2271() {
+buildUnnamed3547() {
   var o = new core.List<api.SavedAdStyle>();
   o.add(buildSavedAdStyle());
   o.add(buildSavedAdStyle());
   return o;
 }
 
-checkUnnamed2271(core.List<api.SavedAdStyle> o) {
+checkUnnamed3547(core.List<api.SavedAdStyle> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSavedAdStyle(o[0]);
   checkSavedAdStyle(o[1]);
@@ -988,7 +988,7 @@
   buildCounterSavedAdStyles++;
   if (buildCounterSavedAdStyles < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2271();
+    o.items = buildUnnamed3547();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1000,7 +1000,7 @@
   buildCounterSavedAdStyles++;
   if (buildCounterSavedAdStyles < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2271(o.items);
+    checkUnnamed3547(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1030,14 +1030,14 @@
   buildCounterSavedReport--;
 }
 
-buildUnnamed2272() {
+buildUnnamed3548() {
   var o = new core.List<api.SavedReport>();
   o.add(buildSavedReport());
   o.add(buildSavedReport());
   return o;
 }
 
-checkUnnamed2272(core.List<api.SavedReport> o) {
+checkUnnamed3548(core.List<api.SavedReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSavedReport(o[0]);
   checkSavedReport(o[1]);
@@ -1049,7 +1049,7 @@
   buildCounterSavedReports++;
   if (buildCounterSavedReports < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2272();
+    o.items = buildUnnamed3548();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1061,7 +1061,7 @@
   buildCounterSavedReports++;
   if (buildCounterSavedReports < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2272(o.items);
+    checkUnnamed3548(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1091,14 +1091,14 @@
   buildCounterUrlChannel--;
 }
 
-buildUnnamed2273() {
+buildUnnamed3549() {
   var o = new core.List<api.UrlChannel>();
   o.add(buildUrlChannel());
   o.add(buildUrlChannel());
   return o;
 }
 
-checkUnnamed2273(core.List<api.UrlChannel> o) {
+checkUnnamed3549(core.List<api.UrlChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlChannel(o[0]);
   checkUrlChannel(o[1]);
@@ -1110,7 +1110,7 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2273();
+    o.items = buildUnnamed3549();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1122,125 +1122,125 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2273(o.items);
+    checkUnnamed3549(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterUrlChannels--;
 }
 
-buildUnnamed2274() {
+buildUnnamed3550() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2274(core.List<core.String> o) {
+checkUnnamed3550(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2275() {
+buildUnnamed3551() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2275(core.List<core.String> o) {
+checkUnnamed3551(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2276() {
+buildUnnamed3552() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2276(core.List<core.String> o) {
+checkUnnamed3552(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2277() {
+buildUnnamed3553() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2277(core.List<core.String> o) {
+checkUnnamed3553(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2278() {
+buildUnnamed3554() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2278(core.List<core.String> o) {
+checkUnnamed3554(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2279() {
+buildUnnamed3555() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2279(core.List<core.String> o) {
+checkUnnamed3555(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2280() {
+buildUnnamed3556() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2280(core.List<core.String> o) {
+checkUnnamed3556(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2281() {
+buildUnnamed3557() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2281(core.List<core.String> o) {
+checkUnnamed3557(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2282() {
+buildUnnamed3558() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2282(core.List<core.String> o) {
+checkUnnamed3558(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1551,7 +1551,7 @@
       }), true);
       res
           .get(arg_accountId, tree: arg_tree, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -1612,7 +1612,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Accounts response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccounts(response);
       })));
     });
@@ -1686,7 +1686,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdClients response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdClients(response);
       })));
     });
@@ -1766,7 +1766,7 @@
       res
           .get(arg_accountId, arg_adClientId, arg_adUnitId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnit(response);
       })));
     });
@@ -1850,7 +1850,7 @@
       res
           .getAdCode(arg_accountId, arg_adClientId, arg_adUnitId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdCode response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdCode(response);
       })));
     });
@@ -1936,7 +1936,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnits response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnits(response);
       })));
     });
@@ -2030,7 +2030,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannels(response);
       })));
     });
@@ -2162,7 +2162,7 @@
       }), true);
       res
           .list(arg_accountId, locale: arg_locale, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Alerts response) {
+          .then(unittest.expectAsync1(((response) {
         checkAlerts(response);
       })));
     });
@@ -2242,7 +2242,7 @@
       res
           .get(arg_accountId, arg_adClientId, arg_customChannelId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannel response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannel(response);
       })));
     });
@@ -2324,7 +2324,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannels(response);
       })));
     });
@@ -2422,7 +2422,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnits response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnits(response);
       })));
     });
@@ -2487,7 +2487,7 @@
       }), true);
       res
           .list(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Payments response) {
+          .then(unittest.expectAsync1(((response) {
         checkPayments(response);
       })));
     });
@@ -2505,12 +2505,12 @@
       var arg_startDate = "foo";
       var arg_endDate = "foo";
       var arg_currency = "foo";
-      var arg_dimension = buildUnnamed2274();
-      var arg_filter = buildUnnamed2275();
+      var arg_dimension = buildUnnamed3550();
+      var arg_filter = buildUnnamed3551();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_metric = buildUnnamed2276();
-      var arg_sort = buildUnnamed2277();
+      var arg_metric = buildUnnamed3552();
+      var arg_sort = buildUnnamed3553();
       var arg_startIndex = 42;
       var arg_useTimezoneReporting = true;
       var arg_$fields = "foo";
@@ -2593,8 +2593,7 @@
               startIndex: arg_startIndex,
               useTimezoneReporting: arg_useTimezoneReporting,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AdsenseReportsGenerateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdsenseReportsGenerateResponse(response);
       })));
     });
@@ -2675,8 +2674,7 @@
               maxResults: arg_maxResults,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AdsenseReportsGenerateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdsenseReportsGenerateResponse(response);
       })));
     });
@@ -2748,7 +2746,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SavedReports response) {
+          .then(unittest.expectAsync1(((response) {
         checkSavedReports(response);
       })));
     });
@@ -2817,7 +2815,7 @@
       }), true);
       res
           .get(arg_accountId, arg_savedAdStyleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SavedAdStyle response) {
+          .then(unittest.expectAsync1(((response) {
         checkSavedAdStyle(response);
       })));
     });
@@ -2889,7 +2887,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SavedAdStyles response) {
+          .then(unittest.expectAsync1(((response) {
         checkSavedAdStyles(response);
       })));
     });
@@ -2973,7 +2971,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UrlChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlChannels(response);
       })));
     });
@@ -3036,7 +3034,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdClients response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdClients(response);
       })));
     });
@@ -3104,7 +3102,7 @@
       }), true);
       res
           .get(arg_adClientId, arg_adUnitId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnit(response);
       })));
     });
@@ -3176,7 +3174,7 @@
       }), true);
       res
           .getAdCode(arg_adClientId, arg_adUnitId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdCode response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdCode(response);
       })));
     });
@@ -3251,7 +3249,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnits response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnits(response);
       })));
     });
@@ -3335,7 +3333,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannels(response);
       })));
     });
@@ -3445,7 +3443,7 @@
       }), true);
       res
           .list(locale: arg_locale, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Alerts response) {
+          .then(unittest.expectAsync1(((response) {
         checkAlerts(response);
       })));
     });
@@ -3514,7 +3512,7 @@
       }), true);
       res
           .get(arg_adClientId, arg_customChannelId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannel response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannel(response);
       })));
     });
@@ -3586,7 +3584,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannels(response);
       })));
     });
@@ -3674,7 +3672,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnits response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnits(response);
       })));
     });
@@ -3727,9 +3725,7 @@
         var resp = convert.JSON.encode(buildMetadata());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Metadata response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkMetadata(response);
       })));
     });
@@ -3782,9 +3778,7 @@
         var resp = convert.JSON.encode(buildMetadata());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Metadata response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkMetadata(response);
       })));
     });
@@ -3836,9 +3830,7 @@
         var resp = convert.JSON.encode(buildPayments());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Payments response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkPayments(response);
       })));
     });
@@ -3853,14 +3845,14 @@
       api.ReportsResourceApi res = new api.AdsenseApi(mock).reports;
       var arg_startDate = "foo";
       var arg_endDate = "foo";
-      var arg_accountId = buildUnnamed2278();
+      var arg_accountId = buildUnnamed3554();
       var arg_currency = "foo";
-      var arg_dimension = buildUnnamed2279();
-      var arg_filter = buildUnnamed2280();
+      var arg_dimension = buildUnnamed3555();
+      var arg_filter = buildUnnamed3556();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_metric = buildUnnamed2281();
-      var arg_sort = buildUnnamed2282();
+      var arg_metric = buildUnnamed3557();
+      var arg_sort = buildUnnamed3558();
       var arg_startIndex = 42;
       var arg_useTimezoneReporting = true;
       var arg_$fields = "foo";
@@ -3936,8 +3928,7 @@
               startIndex: arg_startIndex,
               useTimezoneReporting: arg_useTimezoneReporting,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AdsenseReportsGenerateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdsenseReportsGenerateResponse(response);
       })));
     });
@@ -4007,8 +3998,7 @@
               maxResults: arg_maxResults,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AdsenseReportsGenerateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdsenseReportsGenerateResponse(response);
       })));
     });
@@ -4069,7 +4059,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SavedReports response) {
+          .then(unittest.expectAsync1(((response) {
         checkSavedReports(response);
       })));
     });
@@ -4127,7 +4117,7 @@
       }), true);
       res
           .get(arg_savedAdStyleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SavedAdStyle response) {
+          .then(unittest.expectAsync1(((response) {
         checkSavedAdStyle(response);
       })));
     });
@@ -4188,7 +4178,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SavedAdStyles response) {
+          .then(unittest.expectAsync1(((response) {
         checkSavedAdStyles(response);
       })));
     });
@@ -4261,7 +4251,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UrlChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlChannels(response);
       })));
     });
diff --git a/generated/googleapis/test/adsensehost/v4_1_test.dart b/generated/googleapis/test/adsensehost/v4_1_test.dart
index eaab430..aaf32bd 100644
--- a/generated/googleapis/test/adsensehost/v4_1_test.dart
+++ b/generated/googleapis/test/adsensehost/v4_1_test.dart
@@ -75,14 +75,14 @@
   buildCounterAccount--;
 }
 
-buildUnnamed2153() {
+buildUnnamed2831() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed2153(core.List<api.Account> o) {
+checkUnnamed2831(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -94,7 +94,7 @@
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2153();
+    o.items = buildUnnamed2831();
     o.kind = "foo";
   }
   buildCounterAccounts--;
@@ -105,7 +105,7 @@
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2153(o.items);
+    checkUnnamed2831(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccounts--;
@@ -138,14 +138,14 @@
   buildCounterAdClient--;
 }
 
-buildUnnamed2154() {
+buildUnnamed2832() {
   var o = new core.List<api.AdClient>();
   o.add(buildAdClient());
   o.add(buildAdClient());
   return o;
 }
 
-checkUnnamed2154(core.List<api.AdClient> o) {
+checkUnnamed2832(core.List<api.AdClient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdClient(o[0]);
   checkAdClient(o[1]);
@@ -157,7 +157,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2154();
+    o.items = buildUnnamed2832();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -169,7 +169,7 @@
   buildCounterAdClients++;
   if (buildCounterAdClients < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2154(o.items);
+    checkUnnamed2832(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -375,14 +375,14 @@
   buildCounterAdUnit--;
 }
 
-buildUnnamed2155() {
+buildUnnamed2833() {
   var o = new core.List<api.AdUnit>();
   o.add(buildAdUnit());
   o.add(buildAdUnit());
   return o;
 }
 
-checkUnnamed2155(core.List<api.AdUnit> o) {
+checkUnnamed2833(core.List<api.AdUnit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdUnit(o[0]);
   checkAdUnit(o[1]);
@@ -394,7 +394,7 @@
   buildCounterAdUnits++;
   if (buildCounterAdUnits < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2155();
+    o.items = buildUnnamed2833();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -406,21 +406,21 @@
   buildCounterAdUnits++;
   if (buildCounterAdUnits < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2155(o.items);
+    checkUnnamed2833(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAdUnits--;
 }
 
-buildUnnamed2156() {
+buildUnnamed2834() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2156(core.List<core.String> o) {
+checkUnnamed2834(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -434,7 +434,7 @@
     o.accountId = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.productCodes = buildUnnamed2156();
+    o.productCodes = buildUnnamed2834();
     o.redirectUrl = "foo";
     o.status = "foo";
     o.userLocale = "foo";
@@ -451,7 +451,7 @@
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2156(o.productCodes);
+    checkUnnamed2834(o.productCodes);
     unittest.expect(o.redirectUrl, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.userLocale, unittest.equals('foo'));
@@ -486,14 +486,14 @@
   buildCounterCustomChannel--;
 }
 
-buildUnnamed2157() {
+buildUnnamed2835() {
   var o = new core.List<api.CustomChannel>();
   o.add(buildCustomChannel());
   o.add(buildCustomChannel());
   return o;
 }
 
-checkUnnamed2157(core.List<api.CustomChannel> o) {
+checkUnnamed2835(core.List<api.CustomChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomChannel(o[0]);
   checkCustomChannel(o[1]);
@@ -505,7 +505,7 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2157();
+    o.items = buildUnnamed2835();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -517,21 +517,21 @@
   buildCounterCustomChannels++;
   if (buildCounterCustomChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2157(o.items);
+    checkUnnamed2835(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCustomChannels--;
 }
 
-buildUnnamed2158() {
+buildUnnamed2836() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2158(core.List<core.String> o) {
+checkUnnamed2836(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -560,66 +560,66 @@
   buildCounterReportHeaders--;
 }
 
-buildUnnamed2159() {
+buildUnnamed2837() {
   var o = new core.List<api.ReportHeaders>();
   o.add(buildReportHeaders());
   o.add(buildReportHeaders());
   return o;
 }
 
-checkUnnamed2159(core.List<api.ReportHeaders> o) {
+checkUnnamed2837(core.List<api.ReportHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportHeaders(o[0]);
   checkReportHeaders(o[1]);
 }
 
-buildUnnamed2160() {
+buildUnnamed2838() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2160(core.List<core.String> o) {
+checkUnnamed2838(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2161() {
+buildUnnamed2839() {
   var o = new core.List<core.List<core.String>>();
-  o.add(buildUnnamed2160());
-  o.add(buildUnnamed2160());
+  o.add(buildUnnamed2838());
+  o.add(buildUnnamed2838());
   return o;
 }
 
-checkUnnamed2161(core.List<core.List<core.String>> o) {
+checkUnnamed2839(core.List<core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2160(o[0]);
-  checkUnnamed2160(o[1]);
+  checkUnnamed2838(o[0]);
+  checkUnnamed2838(o[1]);
 }
 
-buildUnnamed2162() {
+buildUnnamed2840() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2162(core.List<core.String> o) {
+checkUnnamed2840(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2163() {
+buildUnnamed2841() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2163(core.List<core.String> o) {
+checkUnnamed2841(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -630,13 +630,13 @@
   var o = new api.Report();
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    o.averages = buildUnnamed2158();
-    o.headers = buildUnnamed2159();
+    o.averages = buildUnnamed2836();
+    o.headers = buildUnnamed2837();
     o.kind = "foo";
-    o.rows = buildUnnamed2161();
+    o.rows = buildUnnamed2839();
     o.totalMatchedRows = "foo";
-    o.totals = buildUnnamed2162();
-    o.warnings = buildUnnamed2163();
+    o.totals = buildUnnamed2840();
+    o.warnings = buildUnnamed2841();
   }
   buildCounterReport--;
   return o;
@@ -645,13 +645,13 @@
 checkReport(api.Report o) {
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    checkUnnamed2158(o.averages);
-    checkUnnamed2159(o.headers);
+    checkUnnamed2836(o.averages);
+    checkUnnamed2837(o.headers);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2161(o.rows);
+    checkUnnamed2839(o.rows);
     unittest.expect(o.totalMatchedRows, unittest.equals('foo'));
-    checkUnnamed2162(o.totals);
-    checkUnnamed2163(o.warnings);
+    checkUnnamed2840(o.totals);
+    checkUnnamed2841(o.warnings);
   }
   buildCounterReport--;
 }
@@ -679,14 +679,14 @@
   buildCounterUrlChannel--;
 }
 
-buildUnnamed2164() {
+buildUnnamed2842() {
   var o = new core.List<api.UrlChannel>();
   o.add(buildUrlChannel());
   o.add(buildUrlChannel());
   return o;
 }
 
-checkUnnamed2164(core.List<api.UrlChannel> o) {
+checkUnnamed2842(core.List<api.UrlChannel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlChannel(o[0]);
   checkUrlChannel(o[1]);
@@ -698,7 +698,7 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2164();
+    o.items = buildUnnamed2842();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -710,151 +710,151 @@
   buildCounterUrlChannels++;
   if (buildCounterUrlChannels < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2164(o.items);
+    checkUnnamed2842(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterUrlChannels--;
 }
 
-buildUnnamed2165() {
+buildUnnamed2843() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2165(core.List<core.String> o) {
+checkUnnamed2843(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2166() {
+buildUnnamed2844() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2166(core.List<core.String> o) {
+checkUnnamed2844(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2167() {
+buildUnnamed2845() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2167(core.List<core.String> o) {
+checkUnnamed2845(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2168() {
+buildUnnamed2846() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2168(core.List<core.String> o) {
+checkUnnamed2846(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2169() {
+buildUnnamed2847() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2169(core.List<core.String> o) {
+checkUnnamed2847(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2170() {
+buildUnnamed2848() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2170(core.List<core.String> o) {
+checkUnnamed2848(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2171() {
+buildUnnamed2849() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2171(core.List<core.String> o) {
+checkUnnamed2849(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2172() {
+buildUnnamed2850() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2172(core.List<core.String> o) {
+checkUnnamed2850(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2173() {
+buildUnnamed2851() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2173(core.List<core.String> o) {
+checkUnnamed2851(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2174() {
+buildUnnamed2852() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2174(core.List<core.String> o) {
+checkUnnamed2852(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2175() {
+buildUnnamed2853() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2175(core.List<core.String> o) {
+checkUnnamed2853(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1074,7 +1074,7 @@
       }), true);
       res
           .get(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -1082,7 +1082,7 @@
     unittest.test("method--list", () {
       var mock = new HttpServerMock();
       api.AccountsResourceApi res = new api.AdsensehostApi(mock).accounts;
-      var arg_filterAdClientId = buildUnnamed2165();
+      var arg_filterAdClientId = buildUnnamed2843();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1129,7 +1129,7 @@
       }), true);
       res
           .list(arg_filterAdClientId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Accounts response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccounts(response);
       })));
     });
@@ -1198,7 +1198,7 @@
       }), true);
       res
           .get(arg_accountId, arg_adClientId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdClient response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdClient(response);
       })));
     });
@@ -1270,7 +1270,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdClients response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdClients(response);
       })));
     });
@@ -1350,7 +1350,7 @@
       res
           .delete(arg_accountId, arg_adClientId, arg_adUnitId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnit(response);
       })));
     });
@@ -1428,7 +1428,7 @@
       res
           .get(arg_accountId, arg_adClientId, arg_adUnitId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnit(response);
       })));
     });
@@ -1440,7 +1440,7 @@
       var arg_accountId = "foo";
       var arg_adClientId = "foo";
       var arg_adUnitId = "foo";
-      var arg_hostCustomChannelId = buildUnnamed2166();
+      var arg_hostCustomChannelId = buildUnnamed2844();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1516,7 +1516,7 @@
           .getAdCode(arg_accountId, arg_adClientId, arg_adUnitId,
               hostCustomChannelId: arg_hostCustomChannelId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdCode response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdCode(response);
       })));
     });
@@ -1594,7 +1594,7 @@
       res
           .insert(arg_request, arg_accountId, arg_adClientId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnit(response);
       })));
     });
@@ -1680,7 +1680,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnits response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnits(response);
       })));
     });
@@ -1761,7 +1761,7 @@
       res
           .patch(arg_request, arg_accountId, arg_adClientId, arg_adUnitId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnit(response);
       })));
     });
@@ -1839,7 +1839,7 @@
       res
           .update(arg_request, arg_accountId, arg_adClientId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdUnit(response);
       })));
     });
@@ -1853,12 +1853,12 @@
       var arg_accountId = "foo";
       var arg_startDate = "foo";
       var arg_endDate = "foo";
-      var arg_dimension = buildUnnamed2167();
-      var arg_filter = buildUnnamed2168();
+      var arg_dimension = buildUnnamed2845();
+      var arg_filter = buildUnnamed2846();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_metric = buildUnnamed2169();
-      var arg_sort = buildUnnamed2170();
+      var arg_metric = buildUnnamed2847();
+      var arg_sort = buildUnnamed2848();
       var arg_startIndex = 42;
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -1934,7 +1934,7 @@
               sort: arg_sort,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -1992,7 +1992,7 @@
       }), true);
       res
           .get(arg_adClientId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdClient response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdClient(response);
       })));
     });
@@ -2053,7 +2053,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdClients response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdClients(response);
       })));
     });
@@ -2064,7 +2064,7 @@
       var mock = new HttpServerMock();
       api.AssociationsessionsResourceApi res =
           new api.AdsensehostApi(mock).associationsessions;
-      var arg_productCode = buildUnnamed2171();
+      var arg_productCode = buildUnnamed2849();
       var arg_websiteUrl = "foo";
       var arg_userLocale = "foo";
       var arg_websiteLocale = "foo";
@@ -2123,7 +2123,7 @@
               userLocale: arg_userLocale,
               websiteLocale: arg_websiteLocale,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AssociationSession response) {
+          .then(unittest.expectAsync1(((response) {
         checkAssociationSession(response);
       })));
     });
@@ -2178,7 +2178,7 @@
       }), true);
       res
           .verify(arg_token, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AssociationSession response) {
+          .then(unittest.expectAsync1(((response) {
         checkAssociationSession(response);
       })));
     });
@@ -2247,7 +2247,7 @@
       }), true);
       res
           .delete(arg_adClientId, arg_customChannelId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannel response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannel(response);
       })));
     });
@@ -2314,7 +2314,7 @@
       }), true);
       res
           .get(arg_adClientId, arg_customChannelId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannel response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannel(response);
       })));
     });
@@ -2381,7 +2381,7 @@
       }), true);
       res
           .insert(arg_request, arg_adClientId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannel response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannel(response);
       })));
     });
@@ -2453,7 +2453,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannels(response);
       })));
     });
@@ -2524,7 +2524,7 @@
       res
           .patch(arg_request, arg_adClientId, arg_customChannelId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannel response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannel(response);
       })));
     });
@@ -2591,7 +2591,7 @@
       }), true);
       res
           .update(arg_request, arg_adClientId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomChannel response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomChannel(response);
       })));
     });
@@ -2603,12 +2603,12 @@
       api.ReportsResourceApi res = new api.AdsensehostApi(mock).reports;
       var arg_startDate = "foo";
       var arg_endDate = "foo";
-      var arg_dimension = buildUnnamed2172();
-      var arg_filter = buildUnnamed2173();
+      var arg_dimension = buildUnnamed2850();
+      var arg_filter = buildUnnamed2851();
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_metric = buildUnnamed2174();
-      var arg_sort = buildUnnamed2175();
+      var arg_metric = buildUnnamed2852();
+      var arg_sort = buildUnnamed2853();
       var arg_startIndex = 42;
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -2675,7 +2675,7 @@
               sort: arg_sort,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -2743,7 +2743,7 @@
       }), true);
       res
           .delete(arg_adClientId, arg_urlChannelId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UrlChannel response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlChannel(response);
       })));
     });
@@ -2809,7 +2809,7 @@
       }), true);
       res
           .insert(arg_request, arg_adClientId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UrlChannel response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlChannel(response);
       })));
     });
@@ -2880,7 +2880,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UrlChannels response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlChannels(response);
       })));
     });
diff --git a/generated/googleapis/test/analytics/v3_test.dart b/generated/googleapis/test/analytics/v3_test.dart
index 04486e8..f9a7b01 100644
--- a/generated/googleapis/test/analytics/v3_test.dart
+++ b/generated/googleapis/test/analytics/v3_test.dart
@@ -71,14 +71,14 @@
   buildCounterAccountChildLink--;
 }
 
-buildUnnamed36() {
+buildUnnamed804() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed36(core.List<core.String> o) {
+checkUnnamed804(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -89,7 +89,7 @@
   var o = new api.AccountPermissions();
   buildCounterAccountPermissions++;
   if (buildCounterAccountPermissions < 3) {
-    o.effective = buildUnnamed36();
+    o.effective = buildUnnamed804();
   }
   buildCounterAccountPermissions--;
   return o;
@@ -98,7 +98,7 @@
 checkAccountPermissions(api.AccountPermissions o) {
   buildCounterAccountPermissions++;
   if (buildCounterAccountPermissions < 3) {
-    checkUnnamed36(o.effective);
+    checkUnnamed804(o.effective);
   }
   buildCounterAccountPermissions--;
 }
@@ -165,14 +165,14 @@
   buildCounterAccountRef--;
 }
 
-buildUnnamed37() {
+buildUnnamed805() {
   var o = new core.List<api.AccountSummary>();
   o.add(buildAccountSummary());
   o.add(buildAccountSummary());
   return o;
 }
 
-checkUnnamed37(core.List<api.AccountSummary> o) {
+checkUnnamed805(core.List<api.AccountSummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountSummary(o[0]);
   checkAccountSummary(o[1]);
@@ -183,7 +183,7 @@
   var o = new api.AccountSummaries();
   buildCounterAccountSummaries++;
   if (buildCounterAccountSummaries < 3) {
-    o.items = buildUnnamed37();
+    o.items = buildUnnamed805();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -199,7 +199,7 @@
 checkAccountSummaries(api.AccountSummaries o) {
   buildCounterAccountSummaries++;
   if (buildCounterAccountSummaries < 3) {
-    checkUnnamed37(o.items);
+    checkUnnamed805(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -211,14 +211,14 @@
   buildCounterAccountSummaries--;
 }
 
-buildUnnamed38() {
+buildUnnamed806() {
   var o = new core.List<api.WebPropertySummary>();
   o.add(buildWebPropertySummary());
   o.add(buildWebPropertySummary());
   return o;
 }
 
-checkUnnamed38(core.List<api.WebPropertySummary> o) {
+checkUnnamed806(core.List<api.WebPropertySummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebPropertySummary(o[0]);
   checkWebPropertySummary(o[1]);
@@ -233,7 +233,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.starred = true;
-    o.webProperties = buildUnnamed38();
+    o.webProperties = buildUnnamed806();
   }
   buildCounterAccountSummary--;
   return o;
@@ -246,7 +246,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.starred, unittest.isTrue);
-    checkUnnamed38(o.webProperties);
+    checkUnnamed806(o.webProperties);
   }
   buildCounterAccountSummary--;
 }
@@ -398,14 +398,14 @@
   buildCounterAccountTreeResponse--;
 }
 
-buildUnnamed39() {
+buildUnnamed807() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed39(core.List<api.Account> o) {
+checkUnnamed807(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -416,7 +416,7 @@
   var o = new api.Accounts();
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
-    o.items = buildUnnamed39();
+    o.items = buildUnnamed807();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -432,7 +432,7 @@
 checkAccounts(api.Accounts o) {
   buildCounterAccounts++;
   if (buildCounterAccounts < 3) {
-    checkUnnamed39(o.items);
+    checkUnnamed807(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -467,14 +467,14 @@
   buildCounterAdWordsAccount--;
 }
 
-buildUnnamed40() {
+buildUnnamed808() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed40(core.List<core.String> o) {
+checkUnnamed808(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -485,7 +485,7 @@
   var o = new api.AnalyticsDataimportDeleteUploadDataRequest();
   buildCounterAnalyticsDataimportDeleteUploadDataRequest++;
   if (buildCounterAnalyticsDataimportDeleteUploadDataRequest < 3) {
-    o.customDataImportUids = buildUnnamed40();
+    o.customDataImportUids = buildUnnamed808();
   }
   buildCounterAnalyticsDataimportDeleteUploadDataRequest--;
   return o;
@@ -495,19 +495,19 @@
     api.AnalyticsDataimportDeleteUploadDataRequest o) {
   buildCounterAnalyticsDataimportDeleteUploadDataRequest++;
   if (buildCounterAnalyticsDataimportDeleteUploadDataRequest < 3) {
-    checkUnnamed40(o.customDataImportUids);
+    checkUnnamed808(o.customDataImportUids);
   }
   buildCounterAnalyticsDataimportDeleteUploadDataRequest--;
 }
 
-buildUnnamed41() {
+buildUnnamed809() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed41(core.Map<core.String, core.String> o) {
+checkUnnamed809(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -518,7 +518,7 @@
   var o = new api.Column();
   buildCounterColumn++;
   if (buildCounterColumn < 3) {
-    o.attributes = buildUnnamed41();
+    o.attributes = buildUnnamed809();
     o.id = "foo";
     o.kind = "foo";
   }
@@ -529,34 +529,34 @@
 checkColumn(api.Column o) {
   buildCounterColumn++;
   if (buildCounterColumn < 3) {
-    checkUnnamed41(o.attributes);
+    checkUnnamed809(o.attributes);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterColumn--;
 }
 
-buildUnnamed42() {
+buildUnnamed810() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed42(core.List<core.String> o) {
+checkUnnamed810(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed43() {
+buildUnnamed811() {
   var o = new core.List<api.Column>();
   o.add(buildColumn());
   o.add(buildColumn());
   return o;
 }
 
-checkUnnamed43(core.List<api.Column> o) {
+checkUnnamed811(core.List<api.Column> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColumn(o[0]);
   checkColumn(o[1]);
@@ -567,9 +567,9 @@
   var o = new api.Columns();
   buildCounterColumns++;
   if (buildCounterColumns < 3) {
-    o.attributeNames = buildUnnamed42();
+    o.attributeNames = buildUnnamed810();
     o.etag = "foo";
-    o.items = buildUnnamed43();
+    o.items = buildUnnamed811();
     o.kind = "foo";
     o.totalResults = 42;
   }
@@ -580,9 +580,9 @@
 checkColumns(api.Columns o) {
   buildCounterColumns++;
   if (buildCounterColumns < 3) {
-    checkUnnamed42(o.attributeNames);
+    checkUnnamed810(o.attributeNames);
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed43(o.items);
+    checkUnnamed811(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.totalResults, unittest.equals(42));
   }
@@ -631,27 +631,27 @@
   buildCounterCustomDataSourceParentLink--;
 }
 
-buildUnnamed44() {
+buildUnnamed812() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed44(core.List<core.String> o) {
+checkUnnamed812(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed45() {
+buildUnnamed813() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed45(core.List<core.String> o) {
+checkUnnamed813(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -671,8 +671,8 @@
     o.kind = "foo";
     o.name = "foo";
     o.parentLink = buildCustomDataSourceParentLink();
-    o.profilesLinked = buildUnnamed44();
-    o.schema = buildUnnamed45();
+    o.profilesLinked = buildUnnamed812();
+    o.schema = buildUnnamed813();
     o.selfLink = "foo";
     o.type = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
@@ -696,8 +696,8 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     checkCustomDataSourceParentLink(o.parentLink);
-    checkUnnamed44(o.profilesLinked);
-    checkUnnamed45(o.schema);
+    checkUnnamed812(o.profilesLinked);
+    checkUnnamed813(o.schema);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(
@@ -708,14 +708,14 @@
   buildCounterCustomDataSource--;
 }
 
-buildUnnamed46() {
+buildUnnamed814() {
   var o = new core.List<api.CustomDataSource>();
   o.add(buildCustomDataSource());
   o.add(buildCustomDataSource());
   return o;
 }
 
-checkUnnamed46(core.List<api.CustomDataSource> o) {
+checkUnnamed814(core.List<api.CustomDataSource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomDataSource(o[0]);
   checkCustomDataSource(o[1]);
@@ -726,7 +726,7 @@
   var o = new api.CustomDataSources();
   buildCounterCustomDataSources++;
   if (buildCounterCustomDataSources < 3) {
-    o.items = buildUnnamed46();
+    o.items = buildUnnamed814();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -742,7 +742,7 @@
 checkCustomDataSources(api.CustomDataSources o) {
   buildCounterCustomDataSources++;
   if (buildCounterCustomDataSources < 3) {
-    checkUnnamed46(o.items);
+    checkUnnamed814(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -818,14 +818,14 @@
   buildCounterCustomDimension--;
 }
 
-buildUnnamed47() {
+buildUnnamed815() {
   var o = new core.List<api.CustomDimension>();
   o.add(buildCustomDimension());
   o.add(buildCustomDimension());
   return o;
 }
 
-checkUnnamed47(core.List<api.CustomDimension> o) {
+checkUnnamed815(core.List<api.CustomDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomDimension(o[0]);
   checkCustomDimension(o[1]);
@@ -836,7 +836,7 @@
   var o = new api.CustomDimensions();
   buildCounterCustomDimensions++;
   if (buildCounterCustomDimensions < 3) {
-    o.items = buildUnnamed47();
+    o.items = buildUnnamed815();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -852,7 +852,7 @@
 checkCustomDimensions(api.CustomDimensions o) {
   buildCounterCustomDimensions++;
   if (buildCounterCustomDimensions < 3) {
-    checkUnnamed47(o.items);
+    checkUnnamed815(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -934,14 +934,14 @@
   buildCounterCustomMetric--;
 }
 
-buildUnnamed48() {
+buildUnnamed816() {
   var o = new core.List<api.CustomMetric>();
   o.add(buildCustomMetric());
   o.add(buildCustomMetric());
   return o;
 }
 
-checkUnnamed48(core.List<api.CustomMetric> o) {
+checkUnnamed816(core.List<api.CustomMetric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomMetric(o[0]);
   checkCustomMetric(o[1]);
@@ -952,7 +952,7 @@
   var o = new api.CustomMetrics();
   buildCounterCustomMetrics++;
   if (buildCounterCustomMetrics < 3) {
-    o.items = buildUnnamed48();
+    o.items = buildUnnamed816();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -968,7 +968,7 @@
 checkCustomMetrics(api.CustomMetrics o) {
   buildCounterCustomMetrics++;
   if (buildCounterCustomMetrics < 3) {
-    checkUnnamed48(o.items);
+    checkUnnamed816(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -980,14 +980,14 @@
   buildCounterCustomMetrics--;
 }
 
-buildUnnamed49() {
+buildUnnamed817() {
   var o = new core.List<api.AdWordsAccount>();
   o.add(buildAdWordsAccount());
   o.add(buildAdWordsAccount());
   return o;
 }
 
-checkUnnamed49(core.List<api.AdWordsAccount> o) {
+checkUnnamed817(core.List<api.AdWordsAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdWordsAccount(o[0]);
   checkAdWordsAccount(o[1]);
@@ -1012,14 +1012,14 @@
   buildCounterEntityAdWordsLinkEntity--;
 }
 
-buildUnnamed50() {
+buildUnnamed818() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed50(core.List<core.String> o) {
+checkUnnamed818(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1030,12 +1030,12 @@
   var o = new api.EntityAdWordsLink();
   buildCounterEntityAdWordsLink++;
   if (buildCounterEntityAdWordsLink < 3) {
-    o.adWordsAccounts = buildUnnamed49();
+    o.adWordsAccounts = buildUnnamed817();
     o.entity = buildEntityAdWordsLinkEntity();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.profileIds = buildUnnamed50();
+    o.profileIds = buildUnnamed818();
     o.selfLink = "foo";
   }
   buildCounterEntityAdWordsLink--;
@@ -1045,25 +1045,25 @@
 checkEntityAdWordsLink(api.EntityAdWordsLink o) {
   buildCounterEntityAdWordsLink++;
   if (buildCounterEntityAdWordsLink < 3) {
-    checkUnnamed49(o.adWordsAccounts);
+    checkUnnamed817(o.adWordsAccounts);
     checkEntityAdWordsLinkEntity(o.entity);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed50(o.profileIds);
+    checkUnnamed818(o.profileIds);
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
   buildCounterEntityAdWordsLink--;
 }
 
-buildUnnamed51() {
+buildUnnamed819() {
   var o = new core.List<api.EntityAdWordsLink>();
   o.add(buildEntityAdWordsLink());
   o.add(buildEntityAdWordsLink());
   return o;
 }
 
-checkUnnamed51(core.List<api.EntityAdWordsLink> o) {
+checkUnnamed819(core.List<api.EntityAdWordsLink> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityAdWordsLink(o[0]);
   checkEntityAdWordsLink(o[1]);
@@ -1074,7 +1074,7 @@
   var o = new api.EntityAdWordsLinks();
   buildCounterEntityAdWordsLinks++;
   if (buildCounterEntityAdWordsLinks < 3) {
-    o.items = buildUnnamed51();
+    o.items = buildUnnamed819();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -1089,7 +1089,7 @@
 checkEntityAdWordsLinks(api.EntityAdWordsLinks o) {
   buildCounterEntityAdWordsLinks++;
   if (buildCounterEntityAdWordsLinks < 3) {
-    checkUnnamed51(o.items);
+    checkUnnamed819(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -1123,27 +1123,27 @@
   buildCounterEntityUserLinkEntity--;
 }
 
-buildUnnamed52() {
+buildUnnamed820() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed52(core.List<core.String> o) {
+checkUnnamed820(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed53() {
+buildUnnamed821() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed53(core.List<core.String> o) {
+checkUnnamed821(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1154,8 +1154,8 @@
   var o = new api.EntityUserLinkPermissions();
   buildCounterEntityUserLinkPermissions++;
   if (buildCounterEntityUserLinkPermissions < 3) {
-    o.effective = buildUnnamed52();
-    o.local = buildUnnamed53();
+    o.effective = buildUnnamed820();
+    o.local = buildUnnamed821();
   }
   buildCounterEntityUserLinkPermissions--;
   return o;
@@ -1164,8 +1164,8 @@
 checkEntityUserLinkPermissions(api.EntityUserLinkPermissions o) {
   buildCounterEntityUserLinkPermissions++;
   if (buildCounterEntityUserLinkPermissions < 3) {
-    checkUnnamed52(o.effective);
-    checkUnnamed53(o.local);
+    checkUnnamed820(o.effective);
+    checkUnnamed821(o.local);
   }
   buildCounterEntityUserLinkPermissions--;
 }
@@ -1199,14 +1199,14 @@
   buildCounterEntityUserLink--;
 }
 
-buildUnnamed54() {
+buildUnnamed822() {
   var o = new core.List<api.EntityUserLink>();
   o.add(buildEntityUserLink());
   o.add(buildEntityUserLink());
   return o;
 }
 
-checkUnnamed54(core.List<api.EntityUserLink> o) {
+checkUnnamed822(core.List<api.EntityUserLink> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityUserLink(o[0]);
   checkEntityUserLink(o[1]);
@@ -1217,7 +1217,7 @@
   var o = new api.EntityUserLinks();
   buildCounterEntityUserLinks++;
   if (buildCounterEntityUserLinks < 3) {
-    o.items = buildUnnamed54();
+    o.items = buildUnnamed822();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -1232,7 +1232,7 @@
 checkEntityUserLinks(api.EntityUserLinks o) {
   buildCounterEntityUserLinks++;
   if (buildCounterEntityUserLinks < 3) {
-    checkUnnamed54(o.items);
+    checkUnnamed822(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -1291,14 +1291,14 @@
   buildCounterExperimentVariations--;
 }
 
-buildUnnamed55() {
+buildUnnamed823() {
   var o = new core.List<api.ExperimentVariations>();
   o.add(buildExperimentVariations());
   o.add(buildExperimentVariations());
   return o;
 }
 
-checkUnnamed55(core.List<api.ExperimentVariations> o) {
+checkUnnamed823(core.List<api.ExperimentVariations> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExperimentVariations(o[0]);
   checkExperimentVariations(o[1]);
@@ -1333,7 +1333,7 @@
     o.status = "foo";
     o.trafficCoverage = 42.0;
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
-    o.variations = buildUnnamed55();
+    o.variations = buildUnnamed823();
     o.webPropertyId = "foo";
     o.winnerConfidenceLevel = 42.0;
     o.winnerFound = true;
@@ -1373,7 +1373,7 @@
     unittest.expect(o.trafficCoverage, unittest.equals(42.0));
     unittest.expect(
         o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed55(o.variations);
+    checkUnnamed823(o.variations);
     unittest.expect(o.webPropertyId, unittest.equals('foo'));
     unittest.expect(o.winnerConfidenceLevel, unittest.equals(42.0));
     unittest.expect(o.winnerFound, unittest.isTrue);
@@ -1381,14 +1381,14 @@
   buildCounterExperiment--;
 }
 
-buildUnnamed56() {
+buildUnnamed824() {
   var o = new core.List<api.Experiment>();
   o.add(buildExperiment());
   o.add(buildExperiment());
   return o;
 }
 
-checkUnnamed56(core.List<api.Experiment> o) {
+checkUnnamed824(core.List<api.Experiment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExperiment(o[0]);
   checkExperiment(o[1]);
@@ -1399,7 +1399,7 @@
   var o = new api.Experiments();
   buildCounterExperiments++;
   if (buildCounterExperiments < 3) {
-    o.items = buildUnnamed56();
+    o.items = buildUnnamed824();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -1415,7 +1415,7 @@
 checkExperiments(api.Experiments o) {
   buildCounterExperiments++;
   if (buildCounterExperiments < 3) {
-    checkUnnamed56(o.items);
+    checkUnnamed824(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -1665,14 +1665,14 @@
   buildCounterFilterRef--;
 }
 
-buildUnnamed57() {
+buildUnnamed825() {
   var o = new core.List<api.Filter>();
   o.add(buildFilter());
   o.add(buildFilter());
   return o;
 }
 
-checkUnnamed57(core.List<api.Filter> o) {
+checkUnnamed825(core.List<api.Filter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilter(o[0]);
   checkFilter(o[1]);
@@ -1683,7 +1683,7 @@
   var o = new api.Filters();
   buildCounterFilters++;
   if (buildCounterFilters < 3) {
-    o.items = buildUnnamed57();
+    o.items = buildUnnamed825();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -1699,7 +1699,7 @@
 checkFilters(api.Filters o) {
   buildCounterFilters++;
   if (buildCounterFilters < 3) {
-    checkUnnamed57(o.items);
+    checkUnnamed825(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -1734,14 +1734,14 @@
   buildCounterGaDataColumnHeaders--;
 }
 
-buildUnnamed58() {
+buildUnnamed826() {
   var o = new core.List<api.GaDataColumnHeaders>();
   o.add(buildGaDataColumnHeaders());
   o.add(buildGaDataColumnHeaders());
   return o;
 }
 
-checkUnnamed58(core.List<api.GaDataColumnHeaders> o) {
+checkUnnamed826(core.List<api.GaDataColumnHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGaDataColumnHeaders(o[0]);
   checkGaDataColumnHeaders(o[1]);
@@ -1770,14 +1770,14 @@
   buildCounterGaDataDataTableCols--;
 }
 
-buildUnnamed59() {
+buildUnnamed827() {
   var o = new core.List<api.GaDataDataTableCols>();
   o.add(buildGaDataDataTableCols());
   o.add(buildGaDataDataTableCols());
   return o;
 }
 
-checkUnnamed59(core.List<api.GaDataDataTableCols> o) {
+checkUnnamed827(core.List<api.GaDataDataTableCols> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGaDataDataTableCols(o[0]);
   checkGaDataDataTableCols(o[1]);
@@ -1802,14 +1802,14 @@
   buildCounterGaDataDataTableRowsC--;
 }
 
-buildUnnamed60() {
+buildUnnamed828() {
   var o = new core.List<api.GaDataDataTableRowsC>();
   o.add(buildGaDataDataTableRowsC());
   o.add(buildGaDataDataTableRowsC());
   return o;
 }
 
-checkUnnamed60(core.List<api.GaDataDataTableRowsC> o) {
+checkUnnamed828(core.List<api.GaDataDataTableRowsC> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGaDataDataTableRowsC(o[0]);
   checkGaDataDataTableRowsC(o[1]);
@@ -1820,7 +1820,7 @@
   var o = new api.GaDataDataTableRows();
   buildCounterGaDataDataTableRows++;
   if (buildCounterGaDataDataTableRows < 3) {
-    o.c = buildUnnamed60();
+    o.c = buildUnnamed828();
   }
   buildCounterGaDataDataTableRows--;
   return o;
@@ -1829,19 +1829,19 @@
 checkGaDataDataTableRows(api.GaDataDataTableRows o) {
   buildCounterGaDataDataTableRows++;
   if (buildCounterGaDataDataTableRows < 3) {
-    checkUnnamed60(o.c);
+    checkUnnamed828(o.c);
   }
   buildCounterGaDataDataTableRows--;
 }
 
-buildUnnamed61() {
+buildUnnamed829() {
   var o = new core.List<api.GaDataDataTableRows>();
   o.add(buildGaDataDataTableRows());
   o.add(buildGaDataDataTableRows());
   return o;
 }
 
-checkUnnamed61(core.List<api.GaDataDataTableRows> o) {
+checkUnnamed829(core.List<api.GaDataDataTableRows> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGaDataDataTableRows(o[0]);
   checkGaDataDataTableRows(o[1]);
@@ -1852,8 +1852,8 @@
   var o = new api.GaDataDataTable();
   buildCounterGaDataDataTable++;
   if (buildCounterGaDataDataTable < 3) {
-    o.cols = buildUnnamed59();
-    o.rows = buildUnnamed61();
+    o.cols = buildUnnamed827();
+    o.rows = buildUnnamed829();
   }
   buildCounterGaDataDataTable--;
   return o;
@@ -1862,8 +1862,8 @@
 checkGaDataDataTable(api.GaDataDataTable o) {
   buildCounterGaDataDataTable++;
   if (buildCounterGaDataDataTable < 3) {
-    checkUnnamed59(o.cols);
-    checkUnnamed61(o.rows);
+    checkUnnamed827(o.cols);
+    checkUnnamed829(o.rows);
   }
   buildCounterGaDataDataTable--;
 }
@@ -1897,27 +1897,27 @@
   buildCounterGaDataProfileInfo--;
 }
 
-buildUnnamed62() {
+buildUnnamed830() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed62(core.List<core.String> o) {
+checkUnnamed830(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed63() {
+buildUnnamed831() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed63(core.List<core.String> o) {
+checkUnnamed831(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1933,10 +1933,10 @@
     o.filters = "foo";
     o.ids = "foo";
     o.max_results = 42;
-    o.metrics = buildUnnamed62();
+    o.metrics = buildUnnamed830();
     o.samplingLevel = "foo";
     o.segment = "foo";
-    o.sort = buildUnnamed63();
+    o.sort = buildUnnamed831();
     o.start_date = "foo";
     o.start_index = 42;
   }
@@ -1952,50 +1952,50 @@
     unittest.expect(o.filters, unittest.equals('foo'));
     unittest.expect(o.ids, unittest.equals('foo'));
     unittest.expect(o.max_results, unittest.equals(42));
-    checkUnnamed62(o.metrics);
+    checkUnnamed830(o.metrics);
     unittest.expect(o.samplingLevel, unittest.equals('foo'));
     unittest.expect(o.segment, unittest.equals('foo'));
-    checkUnnamed63(o.sort);
+    checkUnnamed831(o.sort);
     unittest.expect(o.start_date, unittest.equals('foo'));
     unittest.expect(o.start_index, unittest.equals(42));
   }
   buildCounterGaDataQuery--;
 }
 
-buildUnnamed64() {
+buildUnnamed832() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed64(core.List<core.String> o) {
+checkUnnamed832(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed65() {
+buildUnnamed833() {
   var o = new core.List<core.List<core.String>>();
-  o.add(buildUnnamed64());
-  o.add(buildUnnamed64());
+  o.add(buildUnnamed832());
+  o.add(buildUnnamed832());
   return o;
 }
 
-checkUnnamed65(core.List<core.List<core.String>> o) {
+checkUnnamed833(core.List<core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed64(o[0]);
-  checkUnnamed64(o[1]);
+  checkUnnamed832(o[0]);
+  checkUnnamed832(o[1]);
 }
 
-buildUnnamed66() {
+buildUnnamed834() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed66(core.Map<core.String, core.String> o) {
+checkUnnamed834(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -2006,7 +2006,7 @@
   var o = new api.GaData();
   buildCounterGaData++;
   if (buildCounterGaData < 3) {
-    o.columnHeaders = buildUnnamed58();
+    o.columnHeaders = buildUnnamed826();
     o.containsSampledData = true;
     o.dataLastRefreshed = "foo";
     o.dataTable = buildGaDataDataTable();
@@ -2017,12 +2017,12 @@
     o.previousLink = "foo";
     o.profileInfo = buildGaDataProfileInfo();
     o.query = buildGaDataQuery();
-    o.rows = buildUnnamed65();
+    o.rows = buildUnnamed833();
     o.sampleSize = "foo";
     o.sampleSpace = "foo";
     o.selfLink = "foo";
     o.totalResults = 42;
-    o.totalsForAllResults = buildUnnamed66();
+    o.totalsForAllResults = buildUnnamed834();
   }
   buildCounterGaData--;
   return o;
@@ -2031,7 +2031,7 @@
 checkGaData(api.GaData o) {
   buildCounterGaData++;
   if (buildCounterGaData < 3) {
-    checkUnnamed58(o.columnHeaders);
+    checkUnnamed826(o.columnHeaders);
     unittest.expect(o.containsSampledData, unittest.isTrue);
     unittest.expect(o.dataLastRefreshed, unittest.equals('foo'));
     checkGaDataDataTable(o.dataTable);
@@ -2042,12 +2042,12 @@
     unittest.expect(o.previousLink, unittest.equals('foo'));
     checkGaDataProfileInfo(o.profileInfo);
     checkGaDataQuery(o.query);
-    checkUnnamed65(o.rows);
+    checkUnnamed833(o.rows);
     unittest.expect(o.sampleSize, unittest.equals('foo'));
     unittest.expect(o.sampleSpace, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.totalResults, unittest.equals(42));
-    checkUnnamed66(o.totalsForAllResults);
+    checkUnnamed834(o.totalsForAllResults);
   }
   buildCounterGaData--;
 }
@@ -2079,14 +2079,14 @@
   buildCounterGoalEventDetailsEventConditions--;
 }
 
-buildUnnamed67() {
+buildUnnamed835() {
   var o = new core.List<api.GoalEventDetailsEventConditions>();
   o.add(buildGoalEventDetailsEventConditions());
   o.add(buildGoalEventDetailsEventConditions());
   return o;
 }
 
-checkUnnamed67(core.List<api.GoalEventDetailsEventConditions> o) {
+checkUnnamed835(core.List<api.GoalEventDetailsEventConditions> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoalEventDetailsEventConditions(o[0]);
   checkGoalEventDetailsEventConditions(o[1]);
@@ -2097,7 +2097,7 @@
   var o = new api.GoalEventDetails();
   buildCounterGoalEventDetails++;
   if (buildCounterGoalEventDetails < 3) {
-    o.eventConditions = buildUnnamed67();
+    o.eventConditions = buildUnnamed835();
     o.useEventValue = true;
   }
   buildCounterGoalEventDetails--;
@@ -2107,7 +2107,7 @@
 checkGoalEventDetails(api.GoalEventDetails o) {
   buildCounterGoalEventDetails++;
   if (buildCounterGoalEventDetails < 3) {
-    checkUnnamed67(o.eventConditions);
+    checkUnnamed835(o.eventConditions);
     unittest.expect(o.useEventValue, unittest.isTrue);
   }
   buildCounterGoalEventDetails--;
@@ -2157,14 +2157,14 @@
   buildCounterGoalUrlDestinationDetailsSteps--;
 }
 
-buildUnnamed68() {
+buildUnnamed836() {
   var o = new core.List<api.GoalUrlDestinationDetailsSteps>();
   o.add(buildGoalUrlDestinationDetailsSteps());
   o.add(buildGoalUrlDestinationDetailsSteps());
   return o;
 }
 
-checkUnnamed68(core.List<api.GoalUrlDestinationDetailsSteps> o) {
+checkUnnamed836(core.List<api.GoalUrlDestinationDetailsSteps> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoalUrlDestinationDetailsSteps(o[0]);
   checkGoalUrlDestinationDetailsSteps(o[1]);
@@ -2178,7 +2178,7 @@
     o.caseSensitive = true;
     o.firstStepRequired = true;
     o.matchType = "foo";
-    o.steps = buildUnnamed68();
+    o.steps = buildUnnamed836();
     o.url = "foo";
   }
   buildCounterGoalUrlDestinationDetails--;
@@ -2191,7 +2191,7 @@
     unittest.expect(o.caseSensitive, unittest.isTrue);
     unittest.expect(o.firstStepRequired, unittest.isTrue);
     unittest.expect(o.matchType, unittest.equals('foo'));
-    checkUnnamed68(o.steps);
+    checkUnnamed836(o.steps);
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterGoalUrlDestinationDetails--;
@@ -2294,14 +2294,14 @@
   buildCounterGoal--;
 }
 
-buildUnnamed69() {
+buildUnnamed837() {
   var o = new core.List<api.Goal>();
   o.add(buildGoal());
   o.add(buildGoal());
   return o;
 }
 
-checkUnnamed69(core.List<api.Goal> o) {
+checkUnnamed837(core.List<api.Goal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoal(o[0]);
   checkGoal(o[1]);
@@ -2312,7 +2312,7 @@
   var o = new api.Goals();
   buildCounterGoals++;
   if (buildCounterGoals < 3) {
-    o.items = buildUnnamed69();
+    o.items = buildUnnamed837();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -2328,7 +2328,7 @@
 checkGoals(api.Goals o) {
   buildCounterGoals++;
   if (buildCounterGoals < 3) {
-    checkUnnamed69(o.items);
+    checkUnnamed837(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -2427,14 +2427,14 @@
   buildCounterMcfDataColumnHeaders--;
 }
 
-buildUnnamed70() {
+buildUnnamed838() {
   var o = new core.List<api.McfDataColumnHeaders>();
   o.add(buildMcfDataColumnHeaders());
   o.add(buildMcfDataColumnHeaders());
   return o;
 }
 
-checkUnnamed70(core.List<api.McfDataColumnHeaders> o) {
+checkUnnamed838(core.List<api.McfDataColumnHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMcfDataColumnHeaders(o[0]);
   checkMcfDataColumnHeaders(o[1]);
@@ -2469,27 +2469,27 @@
   buildCounterMcfDataProfileInfo--;
 }
 
-buildUnnamed71() {
+buildUnnamed839() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed71(core.List<core.String> o) {
+checkUnnamed839(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed72() {
+buildUnnamed840() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed72(core.List<core.String> o) {
+checkUnnamed840(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2505,10 +2505,10 @@
     o.filters = "foo";
     o.ids = "foo";
     o.max_results = 42;
-    o.metrics = buildUnnamed71();
+    o.metrics = buildUnnamed839();
     o.samplingLevel = "foo";
     o.segment = "foo";
-    o.sort = buildUnnamed72();
+    o.sort = buildUnnamed840();
     o.start_date = "foo";
     o.start_index = 42;
   }
@@ -2524,10 +2524,10 @@
     unittest.expect(o.filters, unittest.equals('foo'));
     unittest.expect(o.ids, unittest.equals('foo'));
     unittest.expect(o.max_results, unittest.equals(42));
-    checkUnnamed71(o.metrics);
+    checkUnnamed839(o.metrics);
     unittest.expect(o.samplingLevel, unittest.equals('foo'));
     unittest.expect(o.segment, unittest.equals('foo'));
-    checkUnnamed72(o.sort);
+    checkUnnamed840(o.sort);
     unittest.expect(o.start_date, unittest.equals('foo'));
     unittest.expect(o.start_index, unittest.equals(42));
   }
@@ -2555,14 +2555,14 @@
   buildCounterMcfDataRowsConversionPathValue--;
 }
 
-buildUnnamed73() {
+buildUnnamed841() {
   var o = new core.List<api.McfDataRowsConversionPathValue>();
   o.add(buildMcfDataRowsConversionPathValue());
   o.add(buildMcfDataRowsConversionPathValue());
   return o;
 }
 
-checkUnnamed73(core.List<api.McfDataRowsConversionPathValue> o) {
+checkUnnamed841(core.List<api.McfDataRowsConversionPathValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMcfDataRowsConversionPathValue(o[0]);
   checkMcfDataRowsConversionPathValue(o[1]);
@@ -2573,7 +2573,7 @@
   var o = new api.McfDataRows();
   buildCounterMcfDataRows++;
   if (buildCounterMcfDataRows < 3) {
-    o.conversionPathValue = buildUnnamed73();
+    o.conversionPathValue = buildUnnamed841();
     o.primitiveValue = "foo";
   }
   buildCounterMcfDataRows--;
@@ -2583,46 +2583,46 @@
 checkMcfDataRows(api.McfDataRows o) {
   buildCounterMcfDataRows++;
   if (buildCounterMcfDataRows < 3) {
-    checkUnnamed73(o.conversionPathValue);
+    checkUnnamed841(o.conversionPathValue);
     unittest.expect(o.primitiveValue, unittest.equals('foo'));
   }
   buildCounterMcfDataRows--;
 }
 
-buildUnnamed74() {
+buildUnnamed842() {
   var o = new core.List<api.McfDataRows>();
   o.add(buildMcfDataRows());
   o.add(buildMcfDataRows());
   return o;
 }
 
-checkUnnamed74(core.List<api.McfDataRows> o) {
+checkUnnamed842(core.List<api.McfDataRows> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMcfDataRows(o[0]);
   checkMcfDataRows(o[1]);
 }
 
-buildUnnamed75() {
+buildUnnamed843() {
   var o = new core.List<core.List<api.McfDataRows>>();
-  o.add(buildUnnamed74());
-  o.add(buildUnnamed74());
+  o.add(buildUnnamed842());
+  o.add(buildUnnamed842());
   return o;
 }
 
-checkUnnamed75(core.List<core.List<api.McfDataRows>> o) {
+checkUnnamed843(core.List<core.List<api.McfDataRows>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed74(o[0]);
-  checkUnnamed74(o[1]);
+  checkUnnamed842(o[0]);
+  checkUnnamed842(o[1]);
 }
 
-buildUnnamed76() {
+buildUnnamed844() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed76(core.Map<core.String, core.String> o) {
+checkUnnamed844(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -2633,7 +2633,7 @@
   var o = new api.McfData();
   buildCounterMcfData++;
   if (buildCounterMcfData < 3) {
-    o.columnHeaders = buildUnnamed70();
+    o.columnHeaders = buildUnnamed838();
     o.containsSampledData = true;
     o.id = "foo";
     o.itemsPerPage = 42;
@@ -2642,12 +2642,12 @@
     o.previousLink = "foo";
     o.profileInfo = buildMcfDataProfileInfo();
     o.query = buildMcfDataQuery();
-    o.rows = buildUnnamed75();
+    o.rows = buildUnnamed843();
     o.sampleSize = "foo";
     o.sampleSpace = "foo";
     o.selfLink = "foo";
     o.totalResults = 42;
-    o.totalsForAllResults = buildUnnamed76();
+    o.totalsForAllResults = buildUnnamed844();
   }
   buildCounterMcfData--;
   return o;
@@ -2656,7 +2656,7 @@
 checkMcfData(api.McfData o) {
   buildCounterMcfData++;
   if (buildCounterMcfData < 3) {
-    checkUnnamed70(o.columnHeaders);
+    checkUnnamed838(o.columnHeaders);
     unittest.expect(o.containsSampledData, unittest.isTrue);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.itemsPerPage, unittest.equals(42));
@@ -2665,12 +2665,12 @@
     unittest.expect(o.previousLink, unittest.equals('foo'));
     checkMcfDataProfileInfo(o.profileInfo);
     checkMcfDataQuery(o.query);
-    checkUnnamed75(o.rows);
+    checkUnnamed843(o.rows);
     unittest.expect(o.sampleSize, unittest.equals('foo'));
     unittest.expect(o.sampleSpace, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.totalResults, unittest.equals(42));
-    checkUnnamed76(o.totalsForAllResults);
+    checkUnnamed844(o.totalsForAllResults);
   }
   buildCounterMcfData--;
 }
@@ -2717,14 +2717,14 @@
   buildCounterProfileParentLink--;
 }
 
-buildUnnamed77() {
+buildUnnamed845() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed77(core.List<core.String> o) {
+checkUnnamed845(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2735,7 +2735,7 @@
   var o = new api.ProfilePermissions();
   buildCounterProfilePermissions++;
   if (buildCounterProfilePermissions < 3) {
-    o.effective = buildUnnamed77();
+    o.effective = buildUnnamed845();
   }
   buildCounterProfilePermissions--;
   return o;
@@ -2744,7 +2744,7 @@
 checkProfilePermissions(api.ProfilePermissions o) {
   buildCounterProfilePermissions++;
   if (buildCounterProfilePermissions < 3) {
-    checkUnnamed77(o.effective);
+    checkUnnamed845(o.effective);
   }
   buildCounterProfilePermissions--;
 }
@@ -2849,14 +2849,14 @@
   buildCounterProfileFilterLink--;
 }
 
-buildUnnamed78() {
+buildUnnamed846() {
   var o = new core.List<api.ProfileFilterLink>();
   o.add(buildProfileFilterLink());
   o.add(buildProfileFilterLink());
   return o;
 }
 
-checkUnnamed78(core.List<api.ProfileFilterLink> o) {
+checkUnnamed846(core.List<api.ProfileFilterLink> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProfileFilterLink(o[0]);
   checkProfileFilterLink(o[1]);
@@ -2867,7 +2867,7 @@
   var o = new api.ProfileFilterLinks();
   buildCounterProfileFilterLinks++;
   if (buildCounterProfileFilterLinks < 3) {
-    o.items = buildUnnamed78();
+    o.items = buildUnnamed846();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -2883,7 +2883,7 @@
 checkProfileFilterLinks(api.ProfileFilterLinks o) {
   buildCounterProfileFilterLinks++;
   if (buildCounterProfileFilterLinks < 3) {
-    checkUnnamed78(o.items);
+    checkUnnamed846(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -2953,14 +2953,14 @@
   buildCounterProfileSummary--;
 }
 
-buildUnnamed79() {
+buildUnnamed847() {
   var o = new core.List<api.Profile>();
   o.add(buildProfile());
   o.add(buildProfile());
   return o;
 }
 
-checkUnnamed79(core.List<api.Profile> o) {
+checkUnnamed847(core.List<api.Profile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProfile(o[0]);
   checkProfile(o[1]);
@@ -2971,7 +2971,7 @@
   var o = new api.Profiles();
   buildCounterProfiles++;
   if (buildCounterProfiles < 3) {
-    o.items = buildUnnamed79();
+    o.items = buildUnnamed847();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -2987,7 +2987,7 @@
 checkProfiles(api.Profiles o) {
   buildCounterProfiles++;
   if (buildCounterProfiles < 3) {
-    checkUnnamed79(o.items);
+    checkUnnamed847(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -3022,14 +3022,14 @@
   buildCounterRealtimeDataColumnHeaders--;
 }
 
-buildUnnamed80() {
+buildUnnamed848() {
   var o = new core.List<api.RealtimeDataColumnHeaders>();
   o.add(buildRealtimeDataColumnHeaders());
   o.add(buildRealtimeDataColumnHeaders());
   return o;
 }
 
-checkUnnamed80(core.List<api.RealtimeDataColumnHeaders> o) {
+checkUnnamed848(core.List<api.RealtimeDataColumnHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRealtimeDataColumnHeaders(o[0]);
   checkRealtimeDataColumnHeaders(o[1]);
@@ -3064,27 +3064,27 @@
   buildCounterRealtimeDataProfileInfo--;
 }
 
-buildUnnamed81() {
+buildUnnamed849() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed81(core.List<core.String> o) {
+checkUnnamed849(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed82() {
+buildUnnamed850() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed82(core.List<core.String> o) {
+checkUnnamed850(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3099,8 +3099,8 @@
     o.filters = "foo";
     o.ids = "foo";
     o.max_results = 42;
-    o.metrics = buildUnnamed81();
-    o.sort = buildUnnamed82();
+    o.metrics = buildUnnamed849();
+    o.sort = buildUnnamed850();
   }
   buildCounterRealtimeDataQuery--;
   return o;
@@ -3113,46 +3113,46 @@
     unittest.expect(o.filters, unittest.equals('foo'));
     unittest.expect(o.ids, unittest.equals('foo'));
     unittest.expect(o.max_results, unittest.equals(42));
-    checkUnnamed81(o.metrics);
-    checkUnnamed82(o.sort);
+    checkUnnamed849(o.metrics);
+    checkUnnamed850(o.sort);
   }
   buildCounterRealtimeDataQuery--;
 }
 
-buildUnnamed83() {
+buildUnnamed851() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed83(core.List<core.String> o) {
+checkUnnamed851(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed84() {
+buildUnnamed852() {
   var o = new core.List<core.List<core.String>>();
-  o.add(buildUnnamed83());
-  o.add(buildUnnamed83());
+  o.add(buildUnnamed851());
+  o.add(buildUnnamed851());
   return o;
 }
 
-checkUnnamed84(core.List<core.List<core.String>> o) {
+checkUnnamed852(core.List<core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed83(o[0]);
-  checkUnnamed83(o[1]);
+  checkUnnamed851(o[0]);
+  checkUnnamed851(o[1]);
 }
 
-buildUnnamed85() {
+buildUnnamed853() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed85(core.Map<core.String, core.String> o) {
+checkUnnamed853(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -3163,15 +3163,15 @@
   var o = new api.RealtimeData();
   buildCounterRealtimeData++;
   if (buildCounterRealtimeData < 3) {
-    o.columnHeaders = buildUnnamed80();
+    o.columnHeaders = buildUnnamed848();
     o.id = "foo";
     o.kind = "foo";
     o.profileInfo = buildRealtimeDataProfileInfo();
     o.query = buildRealtimeDataQuery();
-    o.rows = buildUnnamed84();
+    o.rows = buildUnnamed852();
     o.selfLink = "foo";
     o.totalResults = 42;
-    o.totalsForAllResults = buildUnnamed85();
+    o.totalsForAllResults = buildUnnamed853();
   }
   buildCounterRealtimeData--;
   return o;
@@ -3180,15 +3180,15 @@
 checkRealtimeData(api.RealtimeData o) {
   buildCounterRealtimeData++;
   if (buildCounterRealtimeData < 3) {
-    checkUnnamed80(o.columnHeaders);
+    checkUnnamed848(o.columnHeaders);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkRealtimeDataProfileInfo(o.profileInfo);
     checkRealtimeDataQuery(o.query);
-    checkUnnamed84(o.rows);
+    checkUnnamed852(o.rows);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.totalResults, unittest.equals(42));
-    checkUnnamed85(o.totalsForAllResults);
+    checkUnnamed853(o.totalsForAllResults);
   }
   buildCounterRealtimeData--;
 }
@@ -3213,27 +3213,27 @@
   buildCounterRemarketingAudienceAudienceDefinition--;
 }
 
-buildUnnamed86() {
+buildUnnamed854() {
   var o = new core.List<api.LinkedForeignAccount>();
   o.add(buildLinkedForeignAccount());
   o.add(buildLinkedForeignAccount());
   return o;
 }
 
-checkUnnamed86(core.List<api.LinkedForeignAccount> o) {
+checkUnnamed854(core.List<api.LinkedForeignAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLinkedForeignAccount(o[0]);
   checkLinkedForeignAccount(o[1]);
 }
 
-buildUnnamed87() {
+buildUnnamed855() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed87(core.List<core.String> o) {
+checkUnnamed855(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3303,8 +3303,8 @@
     o.id = "foo";
     o.internalWebPropertyId = "foo";
     o.kind = "foo";
-    o.linkedAdAccounts = buildUnnamed86();
-    o.linkedViews = buildUnnamed87();
+    o.linkedAdAccounts = buildUnnamed854();
+    o.linkedViews = buildUnnamed855();
     o.name = "foo";
     o.stateBasedAudienceDefinition =
         buildRemarketingAudienceStateBasedAudienceDefinition();
@@ -3327,8 +3327,8 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.internalWebPropertyId, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed86(o.linkedAdAccounts);
-    checkUnnamed87(o.linkedViews);
+    checkUnnamed854(o.linkedAdAccounts);
+    checkUnnamed855(o.linkedViews);
     unittest.expect(o.name, unittest.equals('foo'));
     checkRemarketingAudienceStateBasedAudienceDefinition(
         o.stateBasedAudienceDefinition);
@@ -3339,14 +3339,14 @@
   buildCounterRemarketingAudience--;
 }
 
-buildUnnamed88() {
+buildUnnamed856() {
   var o = new core.List<api.RemarketingAudience>();
   o.add(buildRemarketingAudience());
   o.add(buildRemarketingAudience());
   return o;
 }
 
-checkUnnamed88(core.List<api.RemarketingAudience> o) {
+checkUnnamed856(core.List<api.RemarketingAudience> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRemarketingAudience(o[0]);
   checkRemarketingAudience(o[1]);
@@ -3357,7 +3357,7 @@
   var o = new api.RemarketingAudiences();
   buildCounterRemarketingAudiences++;
   if (buildCounterRemarketingAudiences < 3) {
-    o.items = buildUnnamed88();
+    o.items = buildUnnamed856();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -3373,7 +3373,7 @@
 checkRemarketingAudiences(api.RemarketingAudiences o) {
   buildCounterRemarketingAudiences++;
   if (buildCounterRemarketingAudiences < 3) {
-    checkUnnamed88(o.items);
+    checkUnnamed856(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -3422,14 +3422,14 @@
   buildCounterSegment--;
 }
 
-buildUnnamed89() {
+buildUnnamed857() {
   var o = new core.List<api.Segment>();
   o.add(buildSegment());
   o.add(buildSegment());
   return o;
 }
 
-checkUnnamed89(core.List<api.Segment> o) {
+checkUnnamed857(core.List<api.Segment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSegment(o[0]);
   checkSegment(o[1]);
@@ -3440,7 +3440,7 @@
   var o = new api.Segments();
   buildCounterSegments++;
   if (buildCounterSegments < 3) {
-    o.items = buildUnnamed89();
+    o.items = buildUnnamed857();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -3456,7 +3456,7 @@
 checkSegments(api.Segments o) {
   buildCounterSegments++;
   if (buildCounterSegments < 3) {
-    checkUnnamed89(o.items);
+    checkUnnamed857(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -3569,14 +3569,14 @@
   buildCounterUnsampledReport--;
 }
 
-buildUnnamed90() {
+buildUnnamed858() {
   var o = new core.List<api.UnsampledReport>();
   o.add(buildUnsampledReport());
   o.add(buildUnsampledReport());
   return o;
 }
 
-checkUnnamed90(core.List<api.UnsampledReport> o) {
+checkUnnamed858(core.List<api.UnsampledReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUnsampledReport(o[0]);
   checkUnsampledReport(o[1]);
@@ -3587,7 +3587,7 @@
   var o = new api.UnsampledReports();
   buildCounterUnsampledReports++;
   if (buildCounterUnsampledReports < 3) {
-    o.items = buildUnnamed90();
+    o.items = buildUnnamed858();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -3603,7 +3603,7 @@
 checkUnsampledReports(api.UnsampledReports o) {
   buildCounterUnsampledReports++;
   if (buildCounterUnsampledReports < 3) {
-    checkUnnamed90(o.items);
+    checkUnnamed858(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -3615,14 +3615,14 @@
   buildCounterUnsampledReports--;
 }
 
-buildUnnamed91() {
+buildUnnamed859() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed91(core.List<core.String> o) {
+checkUnnamed859(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3635,7 +3635,7 @@
   if (buildCounterUpload < 3) {
     o.accountId = "foo";
     o.customDataSourceId = "foo";
-    o.errors = buildUnnamed91();
+    o.errors = buildUnnamed859();
     o.id = "foo";
     o.kind = "foo";
     o.status = "foo";
@@ -3650,7 +3650,7 @@
   if (buildCounterUpload < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.customDataSourceId, unittest.equals('foo'));
-    checkUnnamed91(o.errors);
+    checkUnnamed859(o.errors);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
@@ -3660,14 +3660,14 @@
   buildCounterUpload--;
 }
 
-buildUnnamed92() {
+buildUnnamed860() {
   var o = new core.List<api.Upload>();
   o.add(buildUpload());
   o.add(buildUpload());
   return o;
 }
 
-checkUnnamed92(core.List<api.Upload> o) {
+checkUnnamed860(core.List<api.Upload> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUpload(o[0]);
   checkUpload(o[1]);
@@ -3678,7 +3678,7 @@
   var o = new api.Uploads();
   buildCounterUploads++;
   if (buildCounterUploads < 3) {
-    o.items = buildUnnamed92();
+    o.items = buildUnnamed860();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -3693,7 +3693,7 @@
 checkUploads(api.Uploads o) {
   buildCounterUploads++;
   if (buildCounterUploads < 3) {
-    checkUnnamed92(o.items);
+    checkUnnamed860(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -3756,14 +3756,14 @@
   buildCounterWebPropertyRef--;
 }
 
-buildUnnamed93() {
+buildUnnamed861() {
   var o = new core.List<api.ProfileSummary>();
   o.add(buildProfileSummary());
   o.add(buildProfileSummary());
   return o;
 }
 
-checkUnnamed93(core.List<api.ProfileSummary> o) {
+checkUnnamed861(core.List<api.ProfileSummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProfileSummary(o[0]);
   checkProfileSummary(o[1]);
@@ -3779,7 +3779,7 @@
     o.kind = "foo";
     o.level = "foo";
     o.name = "foo";
-    o.profiles = buildUnnamed93();
+    o.profiles = buildUnnamed861();
     o.starred = true;
     o.websiteUrl = "foo";
   }
@@ -3795,21 +3795,21 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.level, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed93(o.profiles);
+    checkUnnamed861(o.profiles);
     unittest.expect(o.starred, unittest.isTrue);
     unittest.expect(o.websiteUrl, unittest.equals('foo'));
   }
   buildCounterWebPropertySummary--;
 }
 
-buildUnnamed94() {
+buildUnnamed862() {
   var o = new core.List<api.Webproperty>();
   o.add(buildWebproperty());
   o.add(buildWebproperty());
   return o;
 }
 
-checkUnnamed94(core.List<api.Webproperty> o) {
+checkUnnamed862(core.List<api.Webproperty> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebproperty(o[0]);
   checkWebproperty(o[1]);
@@ -3820,7 +3820,7 @@
   var o = new api.Webproperties();
   buildCounterWebproperties++;
   if (buildCounterWebproperties < 3) {
-    o.items = buildUnnamed94();
+    o.items = buildUnnamed862();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextLink = "foo";
@@ -3836,7 +3836,7 @@
 checkWebproperties(api.Webproperties o) {
   buildCounterWebproperties++;
   if (buildCounterWebproperties < 3) {
-    checkUnnamed94(o.items);
+    checkUnnamed862(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
@@ -3890,14 +3890,14 @@
   buildCounterWebpropertyParentLink--;
 }
 
-buildUnnamed95() {
+buildUnnamed863() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed95(core.List<core.String> o) {
+checkUnnamed863(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3908,7 +3908,7 @@
   var o = new api.WebpropertyPermissions();
   buildCounterWebpropertyPermissions++;
   if (buildCounterWebpropertyPermissions < 3) {
-    o.effective = buildUnnamed95();
+    o.effective = buildUnnamed863();
   }
   buildCounterWebpropertyPermissions--;
   return o;
@@ -3917,7 +3917,7 @@
 checkWebpropertyPermissions(api.WebpropertyPermissions o) {
   buildCounterWebpropertyPermissions++;
   if (buildCounterWebpropertyPermissions < 3) {
-    checkUnnamed95(o.effective);
+    checkUnnamed863(o.effective);
   }
   buildCounterWebpropertyPermissions--;
 }
@@ -4920,7 +4920,7 @@
               sort: arg_sort,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GaData response) {
+          .then(unittest.expectAsync1(((response) {
         checkGaData(response);
       })));
     });
@@ -5009,7 +5009,7 @@
               sort: arg_sort,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.McfData response) {
+          .then(unittest.expectAsync1(((response) {
         checkMcfData(response);
       })));
     });
@@ -5085,7 +5085,7 @@
               max_results: arg_max_results,
               sort: arg_sort,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RealtimeData response) {
+          .then(unittest.expectAsync1(((response) {
         checkRealtimeData(response);
       })));
     });
@@ -5149,7 +5149,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountSummaries response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountSummaries(response);
       })));
     });
@@ -5283,7 +5283,7 @@
       }), true);
       res
           .insert(arg_request, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityUserLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityUserLink(response);
       })));
     });
@@ -5355,7 +5355,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityUserLinks response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityUserLinks(response);
       })));
     });
@@ -5426,7 +5426,7 @@
       }), true);
       res
           .update(arg_request, arg_accountId, arg_linkId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityUserLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityUserLink(response);
       })));
     });
@@ -5490,7 +5490,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Accounts response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccounts(response);
       })));
     });
@@ -5574,7 +5574,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomDataSources response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomDataSources(response);
       })));
     });
@@ -5654,7 +5654,7 @@
       res
           .get(arg_accountId, arg_webPropertyId, arg_customDimensionId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomDimension response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomDimension(response);
       })));
     });
@@ -5732,7 +5732,7 @@
       res
           .insert(arg_request, arg_accountId, arg_webPropertyId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomDimension response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomDimension(response);
       })));
     });
@@ -5814,7 +5814,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomDimensions response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomDimensions(response);
       })));
     });
@@ -5901,7 +5901,7 @@
               arg_customDimensionId,
               ignoreCustomDataSourceLinks: arg_ignoreCustomDataSourceLinks,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomDimension response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomDimension(response);
       })));
     });
@@ -5988,7 +5988,7 @@
               arg_customDimensionId,
               ignoreCustomDataSourceLinks: arg_ignoreCustomDataSourceLinks,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomDimension response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomDimension(response);
       })));
     });
@@ -6068,7 +6068,7 @@
       res
           .get(arg_accountId, arg_webPropertyId, arg_customMetricId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomMetric response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomMetric(response);
       })));
     });
@@ -6146,7 +6146,7 @@
       res
           .insert(arg_request, arg_accountId, arg_webPropertyId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomMetric response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomMetric(response);
       })));
     });
@@ -6228,7 +6228,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomMetrics response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomMetrics(response);
       })));
     });
@@ -6315,7 +6315,7 @@
               arg_request, arg_accountId, arg_webPropertyId, arg_customMetricId,
               ignoreCustomDataSourceLinks: arg_ignoreCustomDataSourceLinks,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomMetric response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomMetric(response);
       })));
     });
@@ -6402,7 +6402,7 @@
               arg_request, arg_accountId, arg_webPropertyId, arg_customMetricId,
               ignoreCustomDataSourceLinks: arg_ignoreCustomDataSourceLinks,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomMetric response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomMetric(response);
       })));
     });
@@ -6580,7 +6580,7 @@
           .get(
               arg_accountId, arg_webPropertyId, arg_profileId, arg_experimentId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Experiment response) {
+          .then(unittest.expectAsync1(((response) {
         checkExperiment(response);
       })));
     });
@@ -6668,7 +6668,7 @@
       res
           .insert(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Experiment response) {
+          .then(unittest.expectAsync1(((response) {
         checkExperiment(response);
       })));
     });
@@ -6760,7 +6760,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Experiments response) {
+          .then(unittest.expectAsync1(((response) {
         checkExperiments(response);
       })));
     });
@@ -6853,7 +6853,7 @@
           .patch(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               arg_experimentId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Experiment response) {
+          .then(unittest.expectAsync1(((response) {
         checkExperiment(response);
       })));
     });
@@ -6946,7 +6946,7 @@
           .update(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               arg_experimentId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Experiment response) {
+          .then(unittest.expectAsync1(((response) {
         checkExperiment(response);
       })));
     });
@@ -7015,7 +7015,7 @@
       }), true);
       res
           .delete(arg_accountId, arg_filterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Filter response) {
+          .then(unittest.expectAsync1(((response) {
         checkFilter(response);
       })));
     });
@@ -7082,7 +7082,7 @@
       }), true);
       res
           .get(arg_accountId, arg_filterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Filter response) {
+          .then(unittest.expectAsync1(((response) {
         checkFilter(response);
       })));
     });
@@ -7149,7 +7149,7 @@
       }), true);
       res
           .insert(arg_request, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Filter response) {
+          .then(unittest.expectAsync1(((response) {
         checkFilter(response);
       })));
     });
@@ -7221,7 +7221,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Filters response) {
+          .then(unittest.expectAsync1(((response) {
         checkFilters(response);
       })));
     });
@@ -7292,7 +7292,7 @@
       }), true);
       res
           .patch(arg_request, arg_accountId, arg_filterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Filter response) {
+          .then(unittest.expectAsync1(((response) {
         checkFilter(response);
       })));
     });
@@ -7364,7 +7364,7 @@
       res
           .update(arg_request, arg_accountId, arg_filterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Filter response) {
+          .then(unittest.expectAsync1(((response) {
         checkFilter(response);
       })));
     });
@@ -7454,7 +7454,7 @@
       res
           .get(arg_accountId, arg_webPropertyId, arg_profileId, arg_goalId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Goal response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoal(response);
       })));
     });
@@ -7542,7 +7542,7 @@
       res
           .insert(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Goal response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoal(response);
       })));
     });
@@ -7634,7 +7634,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Goals response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoals(response);
       })));
     });
@@ -7727,7 +7727,7 @@
           .patch(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               arg_goalId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Goal response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoal(response);
       })));
     });
@@ -7820,7 +7820,7 @@
           .update(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               arg_goalId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Goal response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoal(response);
       })));
     });
@@ -7996,7 +7996,7 @@
       res
           .get(arg_accountId, arg_webPropertyId, arg_profileId, arg_linkId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProfileFilterLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkProfileFilterLink(response);
       })));
     });
@@ -8084,7 +8084,7 @@
       res
           .insert(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProfileFilterLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkProfileFilterLink(response);
       })));
     });
@@ -8176,7 +8176,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProfileFilterLinks response) {
+          .then(unittest.expectAsync1(((response) {
         checkProfileFilterLinks(response);
       })));
     });
@@ -8269,7 +8269,7 @@
           .patch(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               arg_linkId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProfileFilterLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkProfileFilterLink(response);
       })));
     });
@@ -8362,7 +8362,7 @@
           .update(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               arg_linkId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProfileFilterLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkProfileFilterLink(response);
       })));
     });
@@ -8538,7 +8538,7 @@
       res
           .insert(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityUserLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityUserLink(response);
       })));
     });
@@ -8630,7 +8630,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityUserLinks response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityUserLinks(response);
       })));
     });
@@ -8723,7 +8723,7 @@
           .update(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               arg_linkId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityUserLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityUserLink(response);
       })));
     });
@@ -8879,7 +8879,7 @@
       res
           .get(arg_accountId, arg_webPropertyId, arg_profileId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Profile response) {
+          .then(unittest.expectAsync1(((response) {
         checkProfile(response);
       })));
     });
@@ -8957,7 +8957,7 @@
       res
           .insert(arg_request, arg_accountId, arg_webPropertyId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Profile response) {
+          .then(unittest.expectAsync1(((response) {
         checkProfile(response);
       })));
     });
@@ -9039,7 +9039,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Profiles response) {
+          .then(unittest.expectAsync1(((response) {
         checkProfiles(response);
       })));
     });
@@ -9121,7 +9121,7 @@
       res
           .patch(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Profile response) {
+          .then(unittest.expectAsync1(((response) {
         checkProfile(response);
       })));
     });
@@ -9203,7 +9203,7 @@
       res
           .update(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Profile response) {
+          .then(unittest.expectAsync1(((response) {
         checkProfile(response);
       })));
     });
@@ -9359,7 +9359,7 @@
       res
           .get(arg_accountId, arg_webPropertyId, arg_remarketingAudienceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingAudience response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingAudience(response);
       })));
     });
@@ -9437,7 +9437,7 @@
       res
           .insert(arg_request, arg_accountId, arg_webPropertyId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingAudience response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingAudience(response);
       })));
     });
@@ -9522,7 +9522,7 @@
               start_index: arg_start_index,
               type: arg_type,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingAudiences response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingAudiences(response);
       })));
     });
@@ -9605,7 +9605,7 @@
           .patch(arg_request, arg_accountId, arg_webPropertyId,
               arg_remarketingAudienceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingAudience response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingAudience(response);
       })));
     });
@@ -9688,7 +9688,7 @@
           .update(arg_request, arg_accountId, arg_webPropertyId,
               arg_remarketingAudienceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingAudience response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingAudience(response);
       })));
     });
@@ -9752,7 +9752,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Segments response) {
+          .then(unittest.expectAsync1(((response) {
         checkSegments(response);
       })));
     });
@@ -9930,7 +9930,7 @@
           .get(arg_accountId, arg_webPropertyId, arg_profileId,
               arg_unsampledReportId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UnsampledReport response) {
+          .then(unittest.expectAsync1(((response) {
         checkUnsampledReport(response);
       })));
     });
@@ -10018,7 +10018,7 @@
       res
           .insert(arg_request, arg_accountId, arg_webPropertyId, arg_profileId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UnsampledReport response) {
+          .then(unittest.expectAsync1(((response) {
         checkUnsampledReport(response);
       })));
     });
@@ -10110,7 +10110,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UnsampledReports response) {
+          .then(unittest.expectAsync1(((response) {
         checkUnsampledReports(response);
       })));
     });
@@ -10289,7 +10289,7 @@
           .get(arg_accountId, arg_webPropertyId, arg_customDataSourceId,
               arg_uploadId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Upload response) {
+          .then(unittest.expectAsync1(((response) {
         checkUpload(response);
       })));
     });
@@ -10381,7 +10381,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Uploads response) {
+          .then(unittest.expectAsync1(((response) {
         checkUploads(response);
       })));
     });
@@ -10468,7 +10468,7 @@
       res
           .uploadData(arg_accountId, arg_webPropertyId, arg_customDataSourceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Upload response) {
+          .then(unittest.expectAsync1(((response) {
         checkUpload(response);
       })));
     });
@@ -10627,7 +10627,7 @@
       res
           .get(arg_accountId, arg_webPropertyId, arg_webPropertyAdWordsLinkId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityAdWordsLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityAdWordsLink(response);
       })));
     });
@@ -10705,7 +10705,7 @@
       res
           .insert(arg_request, arg_accountId, arg_webPropertyId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityAdWordsLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityAdWordsLink(response);
       })));
     });
@@ -10787,7 +10787,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityAdWordsLinks response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityAdWordsLinks(response);
       })));
     });
@@ -10871,7 +10871,7 @@
           .patch(arg_request, arg_accountId, arg_webPropertyId,
               arg_webPropertyAdWordsLinkId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityAdWordsLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityAdWordsLink(response);
       })));
     });
@@ -10955,7 +10955,7 @@
           .update(arg_request, arg_accountId, arg_webPropertyId,
               arg_webPropertyAdWordsLinkId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityAdWordsLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityAdWordsLink(response);
       })));
     });
@@ -11024,7 +11024,7 @@
       }), true);
       res
           .get(arg_accountId, arg_webPropertyId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Webproperty response) {
+          .then(unittest.expectAsync1(((response) {
         checkWebproperty(response);
       })));
     });
@@ -11091,7 +11091,7 @@
       }), true);
       res
           .insert(arg_request, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Webproperty response) {
+          .then(unittest.expectAsync1(((response) {
         checkWebproperty(response);
       })));
     });
@@ -11163,7 +11163,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Webproperties response) {
+          .then(unittest.expectAsync1(((response) {
         checkWebproperties(response);
       })));
     });
@@ -11235,7 +11235,7 @@
       res
           .patch(arg_request, arg_accountId, arg_webPropertyId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Webproperty response) {
+          .then(unittest.expectAsync1(((response) {
         checkWebproperty(response);
       })));
     });
@@ -11307,7 +11307,7 @@
       res
           .update(arg_request, arg_accountId, arg_webPropertyId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Webproperty response) {
+          .then(unittest.expectAsync1(((response) {
         checkWebproperty(response);
       })));
     });
@@ -11463,7 +11463,7 @@
       res
           .insert(arg_request, arg_accountId, arg_webPropertyId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityUserLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityUserLink(response);
       })));
     });
@@ -11545,7 +11545,7 @@
               max_results: arg_max_results,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityUserLinks response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityUserLinks(response);
       })));
     });
@@ -11627,7 +11627,7 @@
       res
           .update(arg_request, arg_accountId, arg_webPropertyId, arg_linkId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntityUserLink response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntityUserLink(response);
       })));
     });
@@ -11692,7 +11692,7 @@
       }), true);
       res
           .list(arg_reportType, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Columns response) {
+          .then(unittest.expectAsync1(((response) {
         checkColumns(response);
       })));
     });
@@ -11750,7 +11750,7 @@
       }), true);
       res
           .createAccountTicket(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountTicket response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountTicket(response);
       })));
     });
@@ -11806,7 +11806,7 @@
       }), true);
       res
           .createAccountTree(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountTreeResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountTreeResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/analyticsreporting/v4_test.dart b/generated/googleapis/test/analyticsreporting/v4_test.dart
index 657bbfc..b1b2044 100644
--- a/generated/googleapis/test/analyticsreporting/v4_test.dart
+++ b/generated/googleapis/test/analyticsreporting/v4_test.dart
@@ -73,14 +73,14 @@
   buildCounterCohort--;
 }
 
-buildUnnamed1001() {
+buildUnnamed1947() {
   var o = new core.List<api.Cohort>();
   o.add(buildCohort());
   o.add(buildCohort());
   return o;
 }
 
-checkUnnamed1001(core.List<api.Cohort> o) {
+checkUnnamed1947(core.List<api.Cohort> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCohort(o[0]);
   checkCohort(o[1]);
@@ -91,7 +91,7 @@
   var o = new api.CohortGroup();
   buildCounterCohortGroup++;
   if (buildCounterCohortGroup < 3) {
-    o.cohorts = buildUnnamed1001();
+    o.cohorts = buildUnnamed1947();
     o.lifetimeValue = true;
   }
   buildCounterCohortGroup--;
@@ -101,20 +101,20 @@
 checkCohortGroup(api.CohortGroup o) {
   buildCounterCohortGroup++;
   if (buildCounterCohortGroup < 3) {
-    checkUnnamed1001(o.cohorts);
+    checkUnnamed1947(o.cohorts);
     unittest.expect(o.lifetimeValue, unittest.isTrue);
   }
   buildCounterCohortGroup--;
 }
 
-buildUnnamed1002() {
+buildUnnamed1948() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1002(core.List<core.String> o) {
+checkUnnamed1948(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -125,7 +125,7 @@
   var o = new api.ColumnHeader();
   buildCounterColumnHeader++;
   if (buildCounterColumnHeader < 3) {
-    o.dimensions = buildUnnamed1002();
+    o.dimensions = buildUnnamed1948();
     o.metricHeader = buildMetricHeader();
   }
   buildCounterColumnHeader--;
@@ -135,7 +135,7 @@
 checkColumnHeader(api.ColumnHeader o) {
   buildCounterColumnHeader++;
   if (buildCounterColumnHeader < 3) {
-    checkUnnamed1002(o.dimensions);
+    checkUnnamed1948(o.dimensions);
     checkMetricHeader(o.metricHeader);
   }
   buildCounterColumnHeader--;
@@ -162,27 +162,27 @@
   buildCounterDateRange--;
 }
 
-buildUnnamed1003() {
+buildUnnamed1949() {
   var o = new core.List<api.PivotValueRegion>();
   o.add(buildPivotValueRegion());
   o.add(buildPivotValueRegion());
   return o;
 }
 
-checkUnnamed1003(core.List<api.PivotValueRegion> o) {
+checkUnnamed1949(core.List<api.PivotValueRegion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPivotValueRegion(o[0]);
   checkPivotValueRegion(o[1]);
 }
 
-buildUnnamed1004() {
+buildUnnamed1950() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1004(core.List<core.String> o) {
+checkUnnamed1950(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -193,8 +193,8 @@
   var o = new api.DateRangeValues();
   buildCounterDateRangeValues++;
   if (buildCounterDateRangeValues < 3) {
-    o.pivotValueRegions = buildUnnamed1003();
-    o.values = buildUnnamed1004();
+    o.pivotValueRegions = buildUnnamed1949();
+    o.values = buildUnnamed1950();
   }
   buildCounterDateRangeValues--;
   return o;
@@ -203,20 +203,20 @@
 checkDateRangeValues(api.DateRangeValues o) {
   buildCounterDateRangeValues++;
   if (buildCounterDateRangeValues < 3) {
-    checkUnnamed1003(o.pivotValueRegions);
-    checkUnnamed1004(o.values);
+    checkUnnamed1949(o.pivotValueRegions);
+    checkUnnamed1950(o.values);
   }
   buildCounterDateRangeValues--;
 }
 
-buildUnnamed1005() {
+buildUnnamed1951() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1005(core.List<core.String> o) {
+checkUnnamed1951(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -227,7 +227,7 @@
   var o = new api.Dimension();
   buildCounterDimension++;
   if (buildCounterDimension < 3) {
-    o.histogramBuckets = buildUnnamed1005();
+    o.histogramBuckets = buildUnnamed1951();
     o.name = "foo";
   }
   buildCounterDimension--;
@@ -237,20 +237,20 @@
 checkDimension(api.Dimension o) {
   buildCounterDimension++;
   if (buildCounterDimension < 3) {
-    checkUnnamed1005(o.histogramBuckets);
+    checkUnnamed1951(o.histogramBuckets);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterDimension--;
 }
 
-buildUnnamed1006() {
+buildUnnamed1952() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1006(core.List<core.String> o) {
+checkUnnamed1952(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -263,7 +263,7 @@
   if (buildCounterDimensionFilter < 3) {
     o.caseSensitive = true;
     o.dimensionName = "foo";
-    o.expressions = buildUnnamed1006();
+    o.expressions = buildUnnamed1952();
     o.not = true;
     o.operator = "foo";
   }
@@ -276,21 +276,21 @@
   if (buildCounterDimensionFilter < 3) {
     unittest.expect(o.caseSensitive, unittest.isTrue);
     unittest.expect(o.dimensionName, unittest.equals('foo'));
-    checkUnnamed1006(o.expressions);
+    checkUnnamed1952(o.expressions);
     unittest.expect(o.not, unittest.isTrue);
     unittest.expect(o.operator, unittest.equals('foo'));
   }
   buildCounterDimensionFilter--;
 }
 
-buildUnnamed1007() {
+buildUnnamed1953() {
   var o = new core.List<api.DimensionFilter>();
   o.add(buildDimensionFilter());
   o.add(buildDimensionFilter());
   return o;
 }
 
-checkUnnamed1007(core.List<api.DimensionFilter> o) {
+checkUnnamed1953(core.List<api.DimensionFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionFilter(o[0]);
   checkDimensionFilter(o[1]);
@@ -301,7 +301,7 @@
   var o = new api.DimensionFilterClause();
   buildCounterDimensionFilterClause++;
   if (buildCounterDimensionFilterClause < 3) {
-    o.filters = buildUnnamed1007();
+    o.filters = buildUnnamed1953();
     o.operator = "foo";
   }
   buildCounterDimensionFilterClause--;
@@ -311,7 +311,7 @@
 checkDimensionFilterClause(api.DimensionFilterClause o) {
   buildCounterDimensionFilterClause++;
   if (buildCounterDimensionFilterClause < 3) {
-    checkUnnamed1007(o.filters);
+    checkUnnamed1953(o.filters);
     unittest.expect(o.operator, unittest.equals('foo'));
   }
   buildCounterDimensionFilterClause--;
@@ -340,14 +340,14 @@
   buildCounterDynamicSegment--;
 }
 
-buildUnnamed1008() {
+buildUnnamed1954() {
   var o = new core.List<api.ReportRequest>();
   o.add(buildReportRequest());
   o.add(buildReportRequest());
   return o;
 }
 
-checkUnnamed1008(core.List<api.ReportRequest> o) {
+checkUnnamed1954(core.List<api.ReportRequest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportRequest(o[0]);
   checkReportRequest(o[1]);
@@ -358,7 +358,7 @@
   var o = new api.GetReportsRequest();
   buildCounterGetReportsRequest++;
   if (buildCounterGetReportsRequest < 3) {
-    o.reportRequests = buildUnnamed1008();
+    o.reportRequests = buildUnnamed1954();
     o.useResourceQuotas = true;
   }
   buildCounterGetReportsRequest--;
@@ -368,20 +368,20 @@
 checkGetReportsRequest(api.GetReportsRequest o) {
   buildCounterGetReportsRequest++;
   if (buildCounterGetReportsRequest < 3) {
-    checkUnnamed1008(o.reportRequests);
+    checkUnnamed1954(o.reportRequests);
     unittest.expect(o.useResourceQuotas, unittest.isTrue);
   }
   buildCounterGetReportsRequest--;
 }
 
-buildUnnamed1009() {
+buildUnnamed1955() {
   var o = new core.List<api.Report>();
   o.add(buildReport());
   o.add(buildReport());
   return o;
 }
 
-checkUnnamed1009(core.List<api.Report> o) {
+checkUnnamed1955(core.List<api.Report> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReport(o[0]);
   checkReport(o[1]);
@@ -393,7 +393,7 @@
   buildCounterGetReportsResponse++;
   if (buildCounterGetReportsResponse < 3) {
     o.queryCost = 42;
-    o.reports = buildUnnamed1009();
+    o.reports = buildUnnamed1955();
     o.resourceQuotasRemaining = buildResourceQuotasRemaining();
   }
   buildCounterGetReportsResponse--;
@@ -404,7 +404,7 @@
   buildCounterGetReportsResponse++;
   if (buildCounterGetReportsResponse < 3) {
     unittest.expect(o.queryCost, unittest.equals(42));
-    checkUnnamed1009(o.reports);
+    checkUnnamed1955(o.reports);
     checkResourceQuotasRemaining(o.resourceQuotasRemaining);
   }
   buildCounterGetReportsResponse--;
@@ -458,14 +458,14 @@
   buildCounterMetricFilter--;
 }
 
-buildUnnamed1010() {
+buildUnnamed1956() {
   var o = new core.List<api.MetricFilter>();
   o.add(buildMetricFilter());
   o.add(buildMetricFilter());
   return o;
 }
 
-checkUnnamed1010(core.List<api.MetricFilter> o) {
+checkUnnamed1956(core.List<api.MetricFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricFilter(o[0]);
   checkMetricFilter(o[1]);
@@ -476,7 +476,7 @@
   var o = new api.MetricFilterClause();
   buildCounterMetricFilterClause++;
   if (buildCounterMetricFilterClause < 3) {
-    o.filters = buildUnnamed1010();
+    o.filters = buildUnnamed1956();
     o.operator = "foo";
   }
   buildCounterMetricFilterClause--;
@@ -486,33 +486,33 @@
 checkMetricFilterClause(api.MetricFilterClause o) {
   buildCounterMetricFilterClause++;
   if (buildCounterMetricFilterClause < 3) {
-    checkUnnamed1010(o.filters);
+    checkUnnamed1956(o.filters);
     unittest.expect(o.operator, unittest.equals('foo'));
   }
   buildCounterMetricFilterClause--;
 }
 
-buildUnnamed1011() {
+buildUnnamed1957() {
   var o = new core.List<api.MetricHeaderEntry>();
   o.add(buildMetricHeaderEntry());
   o.add(buildMetricHeaderEntry());
   return o;
 }
 
-checkUnnamed1011(core.List<api.MetricHeaderEntry> o) {
+checkUnnamed1957(core.List<api.MetricHeaderEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricHeaderEntry(o[0]);
   checkMetricHeaderEntry(o[1]);
 }
 
-buildUnnamed1012() {
+buildUnnamed1958() {
   var o = new core.List<api.PivotHeader>();
   o.add(buildPivotHeader());
   o.add(buildPivotHeader());
   return o;
 }
 
-checkUnnamed1012(core.List<api.PivotHeader> o) {
+checkUnnamed1958(core.List<api.PivotHeader> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPivotHeader(o[0]);
   checkPivotHeader(o[1]);
@@ -523,8 +523,8 @@
   var o = new api.MetricHeader();
   buildCounterMetricHeader++;
   if (buildCounterMetricHeader < 3) {
-    o.metricHeaderEntries = buildUnnamed1011();
-    o.pivotHeaders = buildUnnamed1012();
+    o.metricHeaderEntries = buildUnnamed1957();
+    o.pivotHeaders = buildUnnamed1958();
   }
   buildCounterMetricHeader--;
   return o;
@@ -533,8 +533,8 @@
 checkMetricHeader(api.MetricHeader o) {
   buildCounterMetricHeader++;
   if (buildCounterMetricHeader < 3) {
-    checkUnnamed1011(o.metricHeaderEntries);
-    checkUnnamed1012(o.pivotHeaders);
+    checkUnnamed1957(o.metricHeaderEntries);
+    checkUnnamed1958(o.pivotHeaders);
   }
   buildCounterMetricHeader--;
 }
@@ -560,14 +560,14 @@
   buildCounterMetricHeaderEntry--;
 }
 
-buildUnnamed1013() {
+buildUnnamed1959() {
   var o = new core.List<api.SegmentFilterClause>();
   o.add(buildSegmentFilterClause());
   o.add(buildSegmentFilterClause());
   return o;
 }
 
-checkUnnamed1013(core.List<api.SegmentFilterClause> o) {
+checkUnnamed1959(core.List<api.SegmentFilterClause> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSegmentFilterClause(o[0]);
   checkSegmentFilterClause(o[1]);
@@ -578,7 +578,7 @@
   var o = new api.OrFiltersForSegment();
   buildCounterOrFiltersForSegment++;
   if (buildCounterOrFiltersForSegment < 3) {
-    o.segmentFilterClauses = buildUnnamed1013();
+    o.segmentFilterClauses = buildUnnamed1959();
   }
   buildCounterOrFiltersForSegment--;
   return o;
@@ -587,7 +587,7 @@
 checkOrFiltersForSegment(api.OrFiltersForSegment o) {
   buildCounterOrFiltersForSegment++;
   if (buildCounterOrFiltersForSegment < 3) {
-    checkUnnamed1013(o.segmentFilterClauses);
+    checkUnnamed1959(o.segmentFilterClauses);
   }
   buildCounterOrFiltersForSegment--;
 }
@@ -615,40 +615,40 @@
   buildCounterOrderBy--;
 }
 
-buildUnnamed1014() {
+buildUnnamed1960() {
   var o = new core.List<api.DimensionFilterClause>();
   o.add(buildDimensionFilterClause());
   o.add(buildDimensionFilterClause());
   return o;
 }
 
-checkUnnamed1014(core.List<api.DimensionFilterClause> o) {
+checkUnnamed1960(core.List<api.DimensionFilterClause> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionFilterClause(o[0]);
   checkDimensionFilterClause(o[1]);
 }
 
-buildUnnamed1015() {
+buildUnnamed1961() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1015(core.List<api.Dimension> o) {
+checkUnnamed1961(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed1016() {
+buildUnnamed1962() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed1016(core.List<api.Metric> o) {
+checkUnnamed1962(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -659,10 +659,10 @@
   var o = new api.Pivot();
   buildCounterPivot++;
   if (buildCounterPivot < 3) {
-    o.dimensionFilterClauses = buildUnnamed1014();
-    o.dimensions = buildUnnamed1015();
+    o.dimensionFilterClauses = buildUnnamed1960();
+    o.dimensions = buildUnnamed1961();
     o.maxGroupCount = 42;
-    o.metrics = buildUnnamed1016();
+    o.metrics = buildUnnamed1962();
     o.startGroup = 42;
   }
   buildCounterPivot--;
@@ -672,23 +672,23 @@
 checkPivot(api.Pivot o) {
   buildCounterPivot++;
   if (buildCounterPivot < 3) {
-    checkUnnamed1014(o.dimensionFilterClauses);
-    checkUnnamed1015(o.dimensions);
+    checkUnnamed1960(o.dimensionFilterClauses);
+    checkUnnamed1961(o.dimensions);
     unittest.expect(o.maxGroupCount, unittest.equals(42));
-    checkUnnamed1016(o.metrics);
+    checkUnnamed1962(o.metrics);
     unittest.expect(o.startGroup, unittest.equals(42));
   }
   buildCounterPivot--;
 }
 
-buildUnnamed1017() {
+buildUnnamed1963() {
   var o = new core.List<api.PivotHeaderEntry>();
   o.add(buildPivotHeaderEntry());
   o.add(buildPivotHeaderEntry());
   return o;
 }
 
-checkUnnamed1017(core.List<api.PivotHeaderEntry> o) {
+checkUnnamed1963(core.List<api.PivotHeaderEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPivotHeaderEntry(o[0]);
   checkPivotHeaderEntry(o[1]);
@@ -699,7 +699,7 @@
   var o = new api.PivotHeader();
   buildCounterPivotHeader++;
   if (buildCounterPivotHeader < 3) {
-    o.pivotHeaderEntries = buildUnnamed1017();
+    o.pivotHeaderEntries = buildUnnamed1963();
     o.totalPivotGroupsCount = 42;
   }
   buildCounterPivotHeader--;
@@ -709,33 +709,33 @@
 checkPivotHeader(api.PivotHeader o) {
   buildCounterPivotHeader++;
   if (buildCounterPivotHeader < 3) {
-    checkUnnamed1017(o.pivotHeaderEntries);
+    checkUnnamed1963(o.pivotHeaderEntries);
     unittest.expect(o.totalPivotGroupsCount, unittest.equals(42));
   }
   buildCounterPivotHeader--;
 }
 
-buildUnnamed1018() {
+buildUnnamed1964() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1018(core.List<core.String> o) {
+checkUnnamed1964(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1019() {
+buildUnnamed1965() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1019(core.List<core.String> o) {
+checkUnnamed1965(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -746,8 +746,8 @@
   var o = new api.PivotHeaderEntry();
   buildCounterPivotHeaderEntry++;
   if (buildCounterPivotHeaderEntry < 3) {
-    o.dimensionNames = buildUnnamed1018();
-    o.dimensionValues = buildUnnamed1019();
+    o.dimensionNames = buildUnnamed1964();
+    o.dimensionValues = buildUnnamed1965();
     o.metric = buildMetricHeaderEntry();
   }
   buildCounterPivotHeaderEntry--;
@@ -757,21 +757,21 @@
 checkPivotHeaderEntry(api.PivotHeaderEntry o) {
   buildCounterPivotHeaderEntry++;
   if (buildCounterPivotHeaderEntry < 3) {
-    checkUnnamed1018(o.dimensionNames);
-    checkUnnamed1019(o.dimensionValues);
+    checkUnnamed1964(o.dimensionNames);
+    checkUnnamed1965(o.dimensionValues);
     checkMetricHeaderEntry(o.metric);
   }
   buildCounterPivotHeaderEntry--;
 }
 
-buildUnnamed1020() {
+buildUnnamed1966() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1020(core.List<core.String> o) {
+checkUnnamed1966(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -782,7 +782,7 @@
   var o = new api.PivotValueRegion();
   buildCounterPivotValueRegion++;
   if (buildCounterPivotValueRegion < 3) {
-    o.values = buildUnnamed1020();
+    o.values = buildUnnamed1966();
   }
   buildCounterPivotValueRegion--;
   return o;
@@ -791,7 +791,7 @@
 checkPivotValueRegion(api.PivotValueRegion o) {
   buildCounterPivotValueRegion++;
   if (buildCounterPivotValueRegion < 3) {
-    checkUnnamed1020(o.values);
+    checkUnnamed1966(o.values);
   }
   buildCounterPivotValueRegion--;
 }
@@ -819,79 +819,79 @@
   buildCounterReport--;
 }
 
-buildUnnamed1021() {
+buildUnnamed1967() {
   var o = new core.List<api.DateRangeValues>();
   o.add(buildDateRangeValues());
   o.add(buildDateRangeValues());
   return o;
 }
 
-checkUnnamed1021(core.List<api.DateRangeValues> o) {
+checkUnnamed1967(core.List<api.DateRangeValues> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDateRangeValues(o[0]);
   checkDateRangeValues(o[1]);
 }
 
-buildUnnamed1022() {
+buildUnnamed1968() {
   var o = new core.List<api.DateRangeValues>();
   o.add(buildDateRangeValues());
   o.add(buildDateRangeValues());
   return o;
 }
 
-checkUnnamed1022(core.List<api.DateRangeValues> o) {
+checkUnnamed1968(core.List<api.DateRangeValues> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDateRangeValues(o[0]);
   checkDateRangeValues(o[1]);
 }
 
-buildUnnamed1023() {
+buildUnnamed1969() {
   var o = new core.List<api.ReportRow>();
   o.add(buildReportRow());
   o.add(buildReportRow());
   return o;
 }
 
-checkUnnamed1023(core.List<api.ReportRow> o) {
+checkUnnamed1969(core.List<api.ReportRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportRow(o[0]);
   checkReportRow(o[1]);
 }
 
-buildUnnamed1024() {
+buildUnnamed1970() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1024(core.List<core.String> o) {
+checkUnnamed1970(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1025() {
+buildUnnamed1971() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1025(core.List<core.String> o) {
+checkUnnamed1971(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1026() {
+buildUnnamed1972() {
   var o = new core.List<api.DateRangeValues>();
   o.add(buildDateRangeValues());
   o.add(buildDateRangeValues());
   return o;
 }
 
-checkUnnamed1026(core.List<api.DateRangeValues> o) {
+checkUnnamed1972(core.List<api.DateRangeValues> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDateRangeValues(o[0]);
   checkDateRangeValues(o[1]);
@@ -904,13 +904,13 @@
   if (buildCounterReportData < 3) {
     o.dataLastRefreshed = "foo";
     o.isDataGolden = true;
-    o.maximums = buildUnnamed1021();
-    o.minimums = buildUnnamed1022();
+    o.maximums = buildUnnamed1967();
+    o.minimums = buildUnnamed1968();
     o.rowCount = 42;
-    o.rows = buildUnnamed1023();
-    o.samplesReadCounts = buildUnnamed1024();
-    o.samplingSpaceSizes = buildUnnamed1025();
-    o.totals = buildUnnamed1026();
+    o.rows = buildUnnamed1969();
+    o.samplesReadCounts = buildUnnamed1970();
+    o.samplingSpaceSizes = buildUnnamed1971();
+    o.totals = buildUnnamed1972();
   }
   buildCounterReportData--;
   return o;
@@ -921,116 +921,116 @@
   if (buildCounterReportData < 3) {
     unittest.expect(o.dataLastRefreshed, unittest.equals('foo'));
     unittest.expect(o.isDataGolden, unittest.isTrue);
-    checkUnnamed1021(o.maximums);
-    checkUnnamed1022(o.minimums);
+    checkUnnamed1967(o.maximums);
+    checkUnnamed1968(o.minimums);
     unittest.expect(o.rowCount, unittest.equals(42));
-    checkUnnamed1023(o.rows);
-    checkUnnamed1024(o.samplesReadCounts);
-    checkUnnamed1025(o.samplingSpaceSizes);
-    checkUnnamed1026(o.totals);
+    checkUnnamed1969(o.rows);
+    checkUnnamed1970(o.samplesReadCounts);
+    checkUnnamed1971(o.samplingSpaceSizes);
+    checkUnnamed1972(o.totals);
   }
   buildCounterReportData--;
 }
 
-buildUnnamed1027() {
+buildUnnamed1973() {
   var o = new core.List<api.DateRange>();
   o.add(buildDateRange());
   o.add(buildDateRange());
   return o;
 }
 
-checkUnnamed1027(core.List<api.DateRange> o) {
+checkUnnamed1973(core.List<api.DateRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDateRange(o[0]);
   checkDateRange(o[1]);
 }
 
-buildUnnamed1028() {
+buildUnnamed1974() {
   var o = new core.List<api.DimensionFilterClause>();
   o.add(buildDimensionFilterClause());
   o.add(buildDimensionFilterClause());
   return o;
 }
 
-checkUnnamed1028(core.List<api.DimensionFilterClause> o) {
+checkUnnamed1974(core.List<api.DimensionFilterClause> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionFilterClause(o[0]);
   checkDimensionFilterClause(o[1]);
 }
 
-buildUnnamed1029() {
+buildUnnamed1975() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1029(core.List<api.Dimension> o) {
+checkUnnamed1975(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed1030() {
+buildUnnamed1976() {
   var o = new core.List<api.MetricFilterClause>();
   o.add(buildMetricFilterClause());
   o.add(buildMetricFilterClause());
   return o;
 }
 
-checkUnnamed1030(core.List<api.MetricFilterClause> o) {
+checkUnnamed1976(core.List<api.MetricFilterClause> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricFilterClause(o[0]);
   checkMetricFilterClause(o[1]);
 }
 
-buildUnnamed1031() {
+buildUnnamed1977() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed1031(core.List<api.Metric> o) {
+checkUnnamed1977(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed1032() {
+buildUnnamed1978() {
   var o = new core.List<api.OrderBy>();
   o.add(buildOrderBy());
   o.add(buildOrderBy());
   return o;
 }
 
-checkUnnamed1032(core.List<api.OrderBy> o) {
+checkUnnamed1978(core.List<api.OrderBy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderBy(o[0]);
   checkOrderBy(o[1]);
 }
 
-buildUnnamed1033() {
+buildUnnamed1979() {
   var o = new core.List<api.Pivot>();
   o.add(buildPivot());
   o.add(buildPivot());
   return o;
 }
 
-checkUnnamed1033(core.List<api.Pivot> o) {
+checkUnnamed1979(core.List<api.Pivot> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPivot(o[0]);
   checkPivot(o[1]);
 }
 
-buildUnnamed1034() {
+buildUnnamed1980() {
   var o = new core.List<api.Segment>();
   o.add(buildSegment());
   o.add(buildSegment());
   return o;
 }
 
-checkUnnamed1034(core.List<api.Segment> o) {
+checkUnnamed1980(core.List<api.Segment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSegment(o[0]);
   checkSegment(o[1]);
@@ -1042,21 +1042,21 @@
   buildCounterReportRequest++;
   if (buildCounterReportRequest < 3) {
     o.cohortGroup = buildCohortGroup();
-    o.dateRanges = buildUnnamed1027();
-    o.dimensionFilterClauses = buildUnnamed1028();
-    o.dimensions = buildUnnamed1029();
+    o.dateRanges = buildUnnamed1973();
+    o.dimensionFilterClauses = buildUnnamed1974();
+    o.dimensions = buildUnnamed1975();
     o.filtersExpression = "foo";
     o.hideTotals = true;
     o.hideValueRanges = true;
     o.includeEmptyRows = true;
-    o.metricFilterClauses = buildUnnamed1030();
-    o.metrics = buildUnnamed1031();
-    o.orderBys = buildUnnamed1032();
+    o.metricFilterClauses = buildUnnamed1976();
+    o.metrics = buildUnnamed1977();
+    o.orderBys = buildUnnamed1978();
     o.pageSize = 42;
     o.pageToken = "foo";
-    o.pivots = buildUnnamed1033();
+    o.pivots = buildUnnamed1979();
     o.samplingLevel = "foo";
-    o.segments = buildUnnamed1034();
+    o.segments = buildUnnamed1980();
     o.viewId = "foo";
   }
   buildCounterReportRequest--;
@@ -1067,47 +1067,47 @@
   buildCounterReportRequest++;
   if (buildCounterReportRequest < 3) {
     checkCohortGroup(o.cohortGroup);
-    checkUnnamed1027(o.dateRanges);
-    checkUnnamed1028(o.dimensionFilterClauses);
-    checkUnnamed1029(o.dimensions);
+    checkUnnamed1973(o.dateRanges);
+    checkUnnamed1974(o.dimensionFilterClauses);
+    checkUnnamed1975(o.dimensions);
     unittest.expect(o.filtersExpression, unittest.equals('foo'));
     unittest.expect(o.hideTotals, unittest.isTrue);
     unittest.expect(o.hideValueRanges, unittest.isTrue);
     unittest.expect(o.includeEmptyRows, unittest.isTrue);
-    checkUnnamed1030(o.metricFilterClauses);
-    checkUnnamed1031(o.metrics);
-    checkUnnamed1032(o.orderBys);
+    checkUnnamed1976(o.metricFilterClauses);
+    checkUnnamed1977(o.metrics);
+    checkUnnamed1978(o.orderBys);
     unittest.expect(o.pageSize, unittest.equals(42));
     unittest.expect(o.pageToken, unittest.equals('foo'));
-    checkUnnamed1033(o.pivots);
+    checkUnnamed1979(o.pivots);
     unittest.expect(o.samplingLevel, unittest.equals('foo'));
-    checkUnnamed1034(o.segments);
+    checkUnnamed1980(o.segments);
     unittest.expect(o.viewId, unittest.equals('foo'));
   }
   buildCounterReportRequest--;
 }
 
-buildUnnamed1035() {
+buildUnnamed1981() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1035(core.List<core.String> o) {
+checkUnnamed1981(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1036() {
+buildUnnamed1982() {
   var o = new core.List<api.DateRangeValues>();
   o.add(buildDateRangeValues());
   o.add(buildDateRangeValues());
   return o;
 }
 
-checkUnnamed1036(core.List<api.DateRangeValues> o) {
+checkUnnamed1982(core.List<api.DateRangeValues> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDateRangeValues(o[0]);
   checkDateRangeValues(o[1]);
@@ -1118,8 +1118,8 @@
   var o = new api.ReportRow();
   buildCounterReportRow++;
   if (buildCounterReportRow < 3) {
-    o.dimensions = buildUnnamed1035();
-    o.metrics = buildUnnamed1036();
+    o.dimensions = buildUnnamed1981();
+    o.metrics = buildUnnamed1982();
   }
   buildCounterReportRow--;
   return o;
@@ -1128,8 +1128,8 @@
 checkReportRow(api.ReportRow o) {
   buildCounterReportRow++;
   if (buildCounterReportRow < 3) {
-    checkUnnamed1035(o.dimensions);
-    checkUnnamed1036(o.metrics);
+    checkUnnamed1981(o.dimensions);
+    checkUnnamed1982(o.metrics);
   }
   buildCounterReportRow--;
 }
@@ -1176,14 +1176,14 @@
   buildCounterSegment--;
 }
 
-buildUnnamed1037() {
+buildUnnamed1983() {
   var o = new core.List<api.SegmentFilter>();
   o.add(buildSegmentFilter());
   o.add(buildSegmentFilter());
   return o;
 }
 
-checkUnnamed1037(core.List<api.SegmentFilter> o) {
+checkUnnamed1983(core.List<api.SegmentFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSegmentFilter(o[0]);
   checkSegmentFilter(o[1]);
@@ -1194,7 +1194,7 @@
   var o = new api.SegmentDefinition();
   buildCounterSegmentDefinition++;
   if (buildCounterSegmentDefinition < 3) {
-    o.segmentFilters = buildUnnamed1037();
+    o.segmentFilters = buildUnnamed1983();
   }
   buildCounterSegmentDefinition--;
   return o;
@@ -1203,19 +1203,19 @@
 checkSegmentDefinition(api.SegmentDefinition o) {
   buildCounterSegmentDefinition++;
   if (buildCounterSegmentDefinition < 3) {
-    checkUnnamed1037(o.segmentFilters);
+    checkUnnamed1983(o.segmentFilters);
   }
   buildCounterSegmentDefinition--;
 }
 
-buildUnnamed1038() {
+buildUnnamed1984() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1038(core.List<core.String> o) {
+checkUnnamed1984(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1228,7 +1228,7 @@
   if (buildCounterSegmentDimensionFilter < 3) {
     o.caseSensitive = true;
     o.dimensionName = "foo";
-    o.expressions = buildUnnamed1038();
+    o.expressions = buildUnnamed1984();
     o.maxComparisonValue = "foo";
     o.minComparisonValue = "foo";
     o.operator = "foo";
@@ -1242,7 +1242,7 @@
   if (buildCounterSegmentDimensionFilter < 3) {
     unittest.expect(o.caseSensitive, unittest.isTrue);
     unittest.expect(o.dimensionName, unittest.equals('foo'));
-    checkUnnamed1038(o.expressions);
+    checkUnnamed1984(o.expressions);
     unittest.expect(o.maxComparisonValue, unittest.equals('foo'));
     unittest.expect(o.minComparisonValue, unittest.equals('foo'));
     unittest.expect(o.operator, unittest.equals('foo'));
@@ -1323,14 +1323,14 @@
   buildCounterSegmentMetricFilter--;
 }
 
-buildUnnamed1039() {
+buildUnnamed1985() {
   var o = new core.List<api.OrFiltersForSegment>();
   o.add(buildOrFiltersForSegment());
   o.add(buildOrFiltersForSegment());
   return o;
 }
 
-checkUnnamed1039(core.List<api.OrFiltersForSegment> o) {
+checkUnnamed1985(core.List<api.OrFiltersForSegment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrFiltersForSegment(o[0]);
   checkOrFiltersForSegment(o[1]);
@@ -1342,7 +1342,7 @@
   buildCounterSegmentSequenceStep++;
   if (buildCounterSegmentSequenceStep < 3) {
     o.matchType = "foo";
-    o.orFiltersForSegment = buildUnnamed1039();
+    o.orFiltersForSegment = buildUnnamed1985();
   }
   buildCounterSegmentSequenceStep--;
   return o;
@@ -1352,19 +1352,19 @@
   buildCounterSegmentSequenceStep++;
   if (buildCounterSegmentSequenceStep < 3) {
     unittest.expect(o.matchType, unittest.equals('foo'));
-    checkUnnamed1039(o.orFiltersForSegment);
+    checkUnnamed1985(o.orFiltersForSegment);
   }
   buildCounterSegmentSequenceStep--;
 }
 
-buildUnnamed1040() {
+buildUnnamed1986() {
   var o = new core.List<api.SegmentSequenceStep>();
   o.add(buildSegmentSequenceStep());
   o.add(buildSegmentSequenceStep());
   return o;
 }
 
-checkUnnamed1040(core.List<api.SegmentSequenceStep> o) {
+checkUnnamed1986(core.List<api.SegmentSequenceStep> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSegmentSequenceStep(o[0]);
   checkSegmentSequenceStep(o[1]);
@@ -1376,7 +1376,7 @@
   buildCounterSequenceSegment++;
   if (buildCounterSequenceSegment < 3) {
     o.firstStepShouldMatchFirstHit = true;
-    o.segmentSequenceSteps = buildUnnamed1040();
+    o.segmentSequenceSteps = buildUnnamed1986();
   }
   buildCounterSequenceSegment--;
   return o;
@@ -1386,19 +1386,19 @@
   buildCounterSequenceSegment++;
   if (buildCounterSequenceSegment < 3) {
     unittest.expect(o.firstStepShouldMatchFirstHit, unittest.isTrue);
-    checkUnnamed1040(o.segmentSequenceSteps);
+    checkUnnamed1986(o.segmentSequenceSteps);
   }
   buildCounterSequenceSegment--;
 }
 
-buildUnnamed1041() {
+buildUnnamed1987() {
   var o = new core.List<api.OrFiltersForSegment>();
   o.add(buildOrFiltersForSegment());
   o.add(buildOrFiltersForSegment());
   return o;
 }
 
-checkUnnamed1041(core.List<api.OrFiltersForSegment> o) {
+checkUnnamed1987(core.List<api.OrFiltersForSegment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrFiltersForSegment(o[0]);
   checkOrFiltersForSegment(o[1]);
@@ -1409,7 +1409,7 @@
   var o = new api.SimpleSegment();
   buildCounterSimpleSegment++;
   if (buildCounterSimpleSegment < 3) {
-    o.orFiltersForSegment = buildUnnamed1041();
+    o.orFiltersForSegment = buildUnnamed1987();
   }
   buildCounterSimpleSegment--;
   return o;
@@ -1418,7 +1418,7 @@
 checkSimpleSegment(api.SimpleSegment o) {
   buildCounterSimpleSegment++;
   if (buildCounterSimpleSegment < 3) {
-    checkUnnamed1041(o.orFiltersForSegment);
+    checkUnnamed1987(o.orFiltersForSegment);
   }
   buildCounterSimpleSegment--;
 }
@@ -1761,7 +1761,7 @@
       }), true);
       res
           .batchGet(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetReportsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetReportsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/androiddeviceprovisioning/v1_test.dart b/generated/googleapis/test/androiddeviceprovisioning/v1_test.dart
index 6317f72..8516afd 100644
--- a/generated/googleapis/test/androiddeviceprovisioning/v1_test.dart
+++ b/generated/googleapis/test/androiddeviceprovisioning/v1_test.dart
@@ -94,14 +94,14 @@
   buildCounterClaimDeviceResponse--;
 }
 
-buildUnnamed1310() {
+buildUnnamed1099() {
   var o = new core.List<api.PartnerClaim>();
   o.add(buildPartnerClaim());
   o.add(buildPartnerClaim());
   return o;
 }
 
-checkUnnamed1310(core.List<api.PartnerClaim> o) {
+checkUnnamed1099(core.List<api.PartnerClaim> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPartnerClaim(o[0]);
   checkPartnerClaim(o[1]);
@@ -112,7 +112,7 @@
   var o = new api.ClaimDevicesRequest();
   buildCounterClaimDevicesRequest++;
   if (buildCounterClaimDevicesRequest < 3) {
-    o.claims = buildUnnamed1310();
+    o.claims = buildUnnamed1099();
   }
   buildCounterClaimDevicesRequest--;
   return o;
@@ -121,32 +121,32 @@
 checkClaimDevicesRequest(api.ClaimDevicesRequest o) {
   buildCounterClaimDevicesRequest++;
   if (buildCounterClaimDevicesRequest < 3) {
-    checkUnnamed1310(o.claims);
+    checkUnnamed1099(o.claims);
   }
   buildCounterClaimDevicesRequest--;
 }
 
-buildUnnamed1311() {
+buildUnnamed1100() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1311(core.List<core.String> o) {
+checkUnnamed1100(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1312() {
+buildUnnamed1101() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1312(core.List<core.String> o) {
+checkUnnamed1101(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -157,11 +157,11 @@
   var o = new api.Company();
   buildCounterCompany++;
   if (buildCounterCompany < 3) {
-    o.adminEmails = buildUnnamed1311();
+    o.adminEmails = buildUnnamed1100();
     o.companyId = "foo";
     o.companyName = "foo";
     o.name = "foo";
-    o.ownerEmails = buildUnnamed1312();
+    o.ownerEmails = buildUnnamed1101();
   }
   buildCounterCompany--;
   return o;
@@ -170,11 +170,11 @@
 checkCompany(api.Company o) {
   buildCounterCompany++;
   if (buildCounterCompany < 3) {
-    checkUnnamed1311(o.adminEmails);
+    checkUnnamed1100(o.adminEmails);
     unittest.expect(o.companyId, unittest.equals('foo'));
     unittest.expect(o.companyName, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1312(o.ownerEmails);
+    checkUnnamed1101(o.ownerEmails);
   }
   buildCounterCompany--;
 }
@@ -257,14 +257,14 @@
   buildCounterCustomerApplyConfigurationRequest--;
 }
 
-buildUnnamed1313() {
+buildUnnamed1102() {
   var o = new core.List<api.Configuration>();
   o.add(buildConfiguration());
   o.add(buildConfiguration());
   return o;
 }
 
-checkUnnamed1313(core.List<api.Configuration> o) {
+checkUnnamed1102(core.List<api.Configuration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConfiguration(o[0]);
   checkConfiguration(o[1]);
@@ -275,7 +275,7 @@
   var o = new api.CustomerListConfigurationsResponse();
   buildCounterCustomerListConfigurationsResponse++;
   if (buildCounterCustomerListConfigurationsResponse < 3) {
-    o.configurations = buildUnnamed1313();
+    o.configurations = buildUnnamed1102();
   }
   buildCounterCustomerListConfigurationsResponse--;
   return o;
@@ -285,19 +285,19 @@
     api.CustomerListConfigurationsResponse o) {
   buildCounterCustomerListConfigurationsResponse++;
   if (buildCounterCustomerListConfigurationsResponse < 3) {
-    checkUnnamed1313(o.configurations);
+    checkUnnamed1102(o.configurations);
   }
   buildCounterCustomerListConfigurationsResponse--;
 }
 
-buildUnnamed1314() {
+buildUnnamed1103() {
   var o = new core.List<api.Company>();
   o.add(buildCompany());
   o.add(buildCompany());
   return o;
 }
 
-checkUnnamed1314(core.List<api.Company> o) {
+checkUnnamed1103(core.List<api.Company> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCompany(o[0]);
   checkCompany(o[1]);
@@ -308,7 +308,7 @@
   var o = new api.CustomerListCustomersResponse();
   buildCounterCustomerListCustomersResponse++;
   if (buildCounterCustomerListCustomersResponse < 3) {
-    o.customers = buildUnnamed1314();
+    o.customers = buildUnnamed1103();
     o.nextPageToken = "foo";
   }
   buildCounterCustomerListCustomersResponse--;
@@ -318,20 +318,20 @@
 checkCustomerListCustomersResponse(api.CustomerListCustomersResponse o) {
   buildCounterCustomerListCustomersResponse++;
   if (buildCounterCustomerListCustomersResponse < 3) {
-    checkUnnamed1314(o.customers);
+    checkUnnamed1103(o.customers);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCustomerListCustomersResponse--;
 }
 
-buildUnnamed1315() {
+buildUnnamed1104() {
   var o = new core.List<api.Device>();
   o.add(buildDevice());
   o.add(buildDevice());
   return o;
 }
 
-checkUnnamed1315(core.List<api.Device> o) {
+checkUnnamed1104(core.List<api.Device> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDevice(o[0]);
   checkDevice(o[1]);
@@ -342,7 +342,7 @@
   var o = new api.CustomerListDevicesResponse();
   buildCounterCustomerListDevicesResponse++;
   if (buildCounterCustomerListDevicesResponse < 3) {
-    o.devices = buildUnnamed1315();
+    o.devices = buildUnnamed1104();
     o.nextPageToken = "foo";
   }
   buildCounterCustomerListDevicesResponse--;
@@ -352,20 +352,20 @@
 checkCustomerListDevicesResponse(api.CustomerListDevicesResponse o) {
   buildCounterCustomerListDevicesResponse++;
   if (buildCounterCustomerListDevicesResponse < 3) {
-    checkUnnamed1315(o.devices);
+    checkUnnamed1104(o.devices);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCustomerListDevicesResponse--;
 }
 
-buildUnnamed1316() {
+buildUnnamed1105() {
   var o = new core.List<api.Dpc>();
   o.add(buildDpc());
   o.add(buildDpc());
   return o;
 }
 
-checkUnnamed1316(core.List<api.Dpc> o) {
+checkUnnamed1105(core.List<api.Dpc> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDpc(o[0]);
   checkDpc(o[1]);
@@ -376,7 +376,7 @@
   var o = new api.CustomerListDpcsResponse();
   buildCounterCustomerListDpcsResponse++;
   if (buildCounterCustomerListDpcsResponse < 3) {
-    o.dpcs = buildUnnamed1316();
+    o.dpcs = buildUnnamed1105();
   }
   buildCounterCustomerListDpcsResponse--;
   return o;
@@ -385,7 +385,7 @@
 checkCustomerListDpcsResponse(api.CustomerListDpcsResponse o) {
   buildCounterCustomerListDpcsResponse++;
   if (buildCounterCustomerListDpcsResponse < 3) {
-    checkUnnamed1316(o.dpcs);
+    checkUnnamed1105(o.dpcs);
   }
   buildCounterCustomerListDpcsResponse--;
 }
@@ -429,14 +429,14 @@
   buildCounterCustomerUnclaimDeviceRequest--;
 }
 
-buildUnnamed1317() {
+buildUnnamed1106() {
   var o = new core.List<api.DeviceClaim>();
   o.add(buildDeviceClaim());
   o.add(buildDeviceClaim());
   return o;
 }
 
-checkUnnamed1317(core.List<api.DeviceClaim> o) {
+checkUnnamed1106(core.List<api.DeviceClaim> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeviceClaim(o[0]);
   checkDeviceClaim(o[1]);
@@ -447,7 +447,7 @@
   var o = new api.Device();
   buildCounterDevice++;
   if (buildCounterDevice < 3) {
-    o.claims = buildUnnamed1317();
+    o.claims = buildUnnamed1106();
     o.configuration = "foo";
     o.deviceId = "foo";
     o.deviceIdentifier = buildDeviceIdentifier();
@@ -461,7 +461,7 @@
 checkDevice(api.Device o) {
   buildCounterDevice++;
   if (buildCounterDevice < 3) {
-    checkUnnamed1317(o.claims);
+    checkUnnamed1106(o.claims);
     unittest.expect(o.configuration, unittest.equals('foo'));
     unittest.expect(o.deviceId, unittest.equals('foo'));
     checkDeviceIdentifier(o.deviceIdentifier);
@@ -517,14 +517,14 @@
   buildCounterDeviceIdentifier--;
 }
 
-buildUnnamed1318() {
+buildUnnamed1107() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1318(core.Map<core.String, core.String> o) {
+checkUnnamed1107(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -535,7 +535,7 @@
   var o = new api.DeviceMetadata();
   buildCounterDeviceMetadata++;
   if (buildCounterDeviceMetadata < 3) {
-    o.entries = buildUnnamed1318();
+    o.entries = buildUnnamed1107();
   }
   buildCounterDeviceMetadata--;
   return o;
@@ -544,7 +544,7 @@
 checkDeviceMetadata(api.DeviceMetadata o) {
   buildCounterDeviceMetadata++;
   if (buildCounterDeviceMetadata < 3) {
-    checkUnnamed1318(o.entries);
+    checkUnnamed1107(o.entries);
   }
   buildCounterDeviceMetadata--;
 }
@@ -594,14 +594,14 @@
   buildCounterDevicesLongRunningOperationMetadata--;
 }
 
-buildUnnamed1319() {
+buildUnnamed1108() {
   var o = new core.List<api.OperationPerDevice>();
   o.add(buildOperationPerDevice());
   o.add(buildOperationPerDevice());
   return o;
 }
 
-checkUnnamed1319(core.List<api.OperationPerDevice> o) {
+checkUnnamed1108(core.List<api.OperationPerDevice> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationPerDevice(o[0]);
   checkOperationPerDevice(o[1]);
@@ -612,7 +612,7 @@
   var o = new api.DevicesLongRunningOperationResponse();
   buildCounterDevicesLongRunningOperationResponse++;
   if (buildCounterDevicesLongRunningOperationResponse < 3) {
-    o.perDeviceStatus = buildUnnamed1319();
+    o.perDeviceStatus = buildUnnamed1108();
     o.successCount = 42;
   }
   buildCounterDevicesLongRunningOperationResponse--;
@@ -623,7 +623,7 @@
     api.DevicesLongRunningOperationResponse o) {
   buildCounterDevicesLongRunningOperationResponse++;
   if (buildCounterDevicesLongRunningOperationResponse < 3) {
-    checkUnnamed1319(o.perDeviceStatus);
+    checkUnnamed1108(o.perDeviceStatus);
     unittest.expect(o.successCount, unittest.equals(42));
   }
   buildCounterDevicesLongRunningOperationResponse--;
@@ -691,14 +691,14 @@
   buildCounterFindDevicesByDeviceIdentifierRequest--;
 }
 
-buildUnnamed1320() {
+buildUnnamed1109() {
   var o = new core.List<api.Device>();
   o.add(buildDevice());
   o.add(buildDevice());
   return o;
 }
 
-checkUnnamed1320(core.List<api.Device> o) {
+checkUnnamed1109(core.List<api.Device> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDevice(o[0]);
   checkDevice(o[1]);
@@ -709,7 +709,7 @@
   var o = new api.FindDevicesByDeviceIdentifierResponse();
   buildCounterFindDevicesByDeviceIdentifierResponse++;
   if (buildCounterFindDevicesByDeviceIdentifierResponse < 3) {
-    o.devices = buildUnnamed1320();
+    o.devices = buildUnnamed1109();
     o.nextPageToken = "foo";
   }
   buildCounterFindDevicesByDeviceIdentifierResponse--;
@@ -720,20 +720,20 @@
     api.FindDevicesByDeviceIdentifierResponse o) {
   buildCounterFindDevicesByDeviceIdentifierResponse++;
   if (buildCounterFindDevicesByDeviceIdentifierResponse < 3) {
-    checkUnnamed1320(o.devices);
+    checkUnnamed1109(o.devices);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterFindDevicesByDeviceIdentifierResponse--;
 }
 
-buildUnnamed1321() {
+buildUnnamed1110() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1321(core.List<core.String> o) {
+checkUnnamed1110(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -744,7 +744,7 @@
   var o = new api.FindDevicesByOwnerRequest();
   buildCounterFindDevicesByOwnerRequest++;
   if (buildCounterFindDevicesByOwnerRequest < 3) {
-    o.customerId = buildUnnamed1321();
+    o.customerId = buildUnnamed1110();
     o.limit = "foo";
     o.pageToken = "foo";
     o.sectionType = "foo";
@@ -756,7 +756,7 @@
 checkFindDevicesByOwnerRequest(api.FindDevicesByOwnerRequest o) {
   buildCounterFindDevicesByOwnerRequest++;
   if (buildCounterFindDevicesByOwnerRequest < 3) {
-    checkUnnamed1321(o.customerId);
+    checkUnnamed1110(o.customerId);
     unittest.expect(o.limit, unittest.equals('foo'));
     unittest.expect(o.pageToken, unittest.equals('foo'));
     unittest.expect(o.sectionType, unittest.equals('foo'));
@@ -764,14 +764,14 @@
   buildCounterFindDevicesByOwnerRequest--;
 }
 
-buildUnnamed1322() {
+buildUnnamed1111() {
   var o = new core.List<api.Device>();
   o.add(buildDevice());
   o.add(buildDevice());
   return o;
 }
 
-checkUnnamed1322(core.List<api.Device> o) {
+checkUnnamed1111(core.List<api.Device> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDevice(o[0]);
   checkDevice(o[1]);
@@ -782,7 +782,7 @@
   var o = new api.FindDevicesByOwnerResponse();
   buildCounterFindDevicesByOwnerResponse++;
   if (buildCounterFindDevicesByOwnerResponse < 3) {
-    o.devices = buildUnnamed1322();
+    o.devices = buildUnnamed1111();
     o.nextPageToken = "foo";
   }
   buildCounterFindDevicesByOwnerResponse--;
@@ -792,20 +792,20 @@
 checkFindDevicesByOwnerResponse(api.FindDevicesByOwnerResponse o) {
   buildCounterFindDevicesByOwnerResponse++;
   if (buildCounterFindDevicesByOwnerResponse < 3) {
-    checkUnnamed1322(o.devices);
+    checkUnnamed1111(o.devices);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterFindDevicesByOwnerResponse--;
 }
 
-buildUnnamed1323() {
+buildUnnamed1112() {
   var o = new core.List<api.Company>();
   o.add(buildCompany());
   o.add(buildCompany());
   return o;
 }
 
-checkUnnamed1323(core.List<api.Company> o) {
+checkUnnamed1112(core.List<api.Company> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCompany(o[0]);
   checkCompany(o[1]);
@@ -816,7 +816,7 @@
   var o = new api.ListCustomersResponse();
   buildCounterListCustomersResponse++;
   if (buildCounterListCustomersResponse < 3) {
-    o.customers = buildUnnamed1323();
+    o.customers = buildUnnamed1112();
   }
   buildCounterListCustomersResponse--;
   return o;
@@ -825,12 +825,12 @@
 checkListCustomersResponse(api.ListCustomersResponse o) {
   buildCounterListCustomersResponse++;
   if (buildCounterListCustomersResponse < 3) {
-    checkUnnamed1323(o.customers);
+    checkUnnamed1112(o.customers);
   }
   buildCounterListCustomersResponse--;
 }
 
-buildUnnamed1324() {
+buildUnnamed1113() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -845,7 +845,7 @@
   return o;
 }
 
-checkUnnamed1324(core.Map<core.String, core.Object> o) {
+checkUnnamed1113(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -859,7 +859,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1325() {
+buildUnnamed1114() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -874,7 +874,7 @@
   return o;
 }
 
-checkUnnamed1325(core.Map<core.String, core.Object> o) {
+checkUnnamed1114(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -895,9 +895,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed1324();
+    o.metadata = buildUnnamed1113();
     o.name = "foo";
-    o.response = buildUnnamed1325();
+    o.response = buildUnnamed1114();
   }
   buildCounterOperation--;
   return o;
@@ -908,9 +908,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed1324(o.metadata);
+    checkUnnamed1113(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1325(o.response);
+    checkUnnamed1114(o.response);
   }
   buildCounterOperation--;
 }
@@ -1013,7 +1013,7 @@
   buildCounterPerDeviceStatusInBatch--;
 }
 
-buildUnnamed1326() {
+buildUnnamed1115() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1028,7 +1028,7 @@
   return o;
 }
 
-checkUnnamed1326(core.Map<core.String, core.Object> o) {
+checkUnnamed1115(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1042,17 +1042,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1327() {
+buildUnnamed1116() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed1326());
-  o.add(buildUnnamed1326());
+  o.add(buildUnnamed1115());
+  o.add(buildUnnamed1115());
   return o;
 }
 
-checkUnnamed1327(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1116(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1326(o[0]);
-  checkUnnamed1326(o[1]);
+  checkUnnamed1115(o[0]);
+  checkUnnamed1115(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1061,7 +1061,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed1327();
+    o.details = buildUnnamed1116();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1072,7 +1072,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed1327(o.details);
+    checkUnnamed1116(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -1101,14 +1101,14 @@
   buildCounterUnclaimDeviceRequest--;
 }
 
-buildUnnamed1328() {
+buildUnnamed1117() {
   var o = new core.List<api.PartnerUnclaim>();
   o.add(buildPartnerUnclaim());
   o.add(buildPartnerUnclaim());
   return o;
 }
 
-checkUnnamed1328(core.List<api.PartnerUnclaim> o) {
+checkUnnamed1117(core.List<api.PartnerUnclaim> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPartnerUnclaim(o[0]);
   checkPartnerUnclaim(o[1]);
@@ -1119,7 +1119,7 @@
   var o = new api.UnclaimDevicesRequest();
   buildCounterUnclaimDevicesRequest++;
   if (buildCounterUnclaimDevicesRequest < 3) {
-    o.unclaims = buildUnnamed1328();
+    o.unclaims = buildUnnamed1117();
   }
   buildCounterUnclaimDevicesRequest--;
   return o;
@@ -1128,19 +1128,19 @@
 checkUnclaimDevicesRequest(api.UnclaimDevicesRequest o) {
   buildCounterUnclaimDevicesRequest++;
   if (buildCounterUnclaimDevicesRequest < 3) {
-    checkUnnamed1328(o.unclaims);
+    checkUnnamed1117(o.unclaims);
   }
   buildCounterUnclaimDevicesRequest--;
 }
 
-buildUnnamed1329() {
+buildUnnamed1118() {
   var o = new core.List<api.UpdateMetadataArguments>();
   o.add(buildUpdateMetadataArguments());
   o.add(buildUpdateMetadataArguments());
   return o;
 }
 
-checkUnnamed1329(core.List<api.UpdateMetadataArguments> o) {
+checkUnnamed1118(core.List<api.UpdateMetadataArguments> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUpdateMetadataArguments(o[0]);
   checkUpdateMetadataArguments(o[1]);
@@ -1151,7 +1151,7 @@
   var o = new api.UpdateDeviceMetadataInBatchRequest();
   buildCounterUpdateDeviceMetadataInBatchRequest++;
   if (buildCounterUpdateDeviceMetadataInBatchRequest < 3) {
-    o.updates = buildUnnamed1329();
+    o.updates = buildUnnamed1118();
   }
   buildCounterUpdateDeviceMetadataInBatchRequest--;
   return o;
@@ -1161,7 +1161,7 @@
     api.UpdateDeviceMetadataInBatchRequest o) {
   buildCounterUpdateDeviceMetadataInBatchRequest++;
   if (buildCounterUpdateDeviceMetadataInBatchRequest < 3) {
-    checkUnnamed1329(o.updates);
+    checkUnnamed1118(o.updates);
   }
   buildCounterUpdateDeviceMetadataInBatchRequest--;
 }
@@ -1570,8 +1570,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.CustomerListCustomersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomerListCustomersResponse(response);
       })));
     });
@@ -1629,7 +1628,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Configuration response) {
+          .then(unittest.expectAsync1(((response) {
         checkConfiguration(response);
       })));
     });
@@ -1681,7 +1680,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1733,7 +1732,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Configuration response) {
+          .then(unittest.expectAsync1(((response) {
         checkConfiguration(response);
       })));
     });
@@ -1784,8 +1783,9 @@
             convert.JSON.encode(buildCustomerListConfigurationsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_parent, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.CustomerListConfigurationsResponse response) {
+      res
+          .list(arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkCustomerListConfigurationsResponse(response);
       })));
     });
@@ -1845,7 +1845,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Configuration response) {
+          .then(unittest.expectAsync1(((response) {
         checkConfiguration(response);
       })));
     });
@@ -1903,7 +1903,7 @@
       }), true);
       res
           .applyConfiguration(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1955,7 +1955,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Device response) {
+          .then(unittest.expectAsync1(((response) {
         checkDevice(response);
       })));
     });
@@ -2016,8 +2016,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.CustomerListDevicesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomerListDevicesResponse(response);
       })));
     });
@@ -2073,7 +2072,7 @@
       }), true);
       res
           .removeConfiguration(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2129,7 +2128,7 @@
       }), true);
       res
           .unclaim(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2183,7 +2182,7 @@
       }), true);
       res
           .list(arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomerListDpcsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomerListDpcsResponse(response);
       })));
     });
@@ -2237,7 +2236,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2295,7 +2294,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Company response) {
+          .then(unittest.expectAsync1(((response) {
         checkCompany(response);
       })));
     });
@@ -2347,7 +2346,7 @@
       }), true);
       res
           .list(arg_partnerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListCustomersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCustomersResponse(response);
       })));
     });
@@ -2405,7 +2404,7 @@
       }), true);
       res
           .claim(arg_request, arg_partnerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ClaimDeviceResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkClaimDeviceResponse(response);
       })));
     });
@@ -2461,7 +2460,7 @@
       }), true);
       res
           .claimAsync(arg_request, arg_partnerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2518,8 +2517,7 @@
       }), true);
       res
           .findByIdentifier(arg_request, arg_partnerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.FindDevicesByDeviceIdentifierResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFindDevicesByDeviceIdentifierResponse(response);
       })));
     });
@@ -2573,8 +2571,9 @@
         var resp = convert.JSON.encode(buildFindDevicesByOwnerResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.findByOwner(arg_request, arg_partnerId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.FindDevicesByOwnerResponse response) {
+      res
+          .findByOwner(arg_request, arg_partnerId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkFindDevicesByOwnerResponse(response);
       })));
     });
@@ -2626,7 +2625,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Device response) {
+          .then(unittest.expectAsync1(((response) {
         checkDevice(response);
       })));
     });
@@ -2684,7 +2683,7 @@
       res
           .metadata(arg_request, arg_metadataOwnerId, arg_deviceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DeviceMetadata response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeviceMetadata(response);
       })));
     });
@@ -2740,7 +2739,7 @@
       }), true);
       res
           .unclaim(arg_request, arg_partnerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2796,7 +2795,7 @@
       }), true);
       res
           .unclaimAsync(arg_request, arg_partnerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2852,7 +2851,7 @@
       }), true);
       res
           .updateMetadataAsync(arg_request, arg_partnerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
diff --git a/generated/googleapis/test/androidenterprise/v1_test.dart b/generated/googleapis/test/androidenterprise/v1_test.dart
index f03651a..3b4cdc8 100644
--- a/generated/googleapis/test/androidenterprise/v1_test.dart
+++ b/generated/googleapis/test/androidenterprise/v1_test.dart
@@ -90,14 +90,14 @@
   buildCounterAdministratorWebToken--;
 }
 
-buildUnnamed2492() {
+buildUnnamed1689() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2492(core.List<core.String> o) {
+checkUnnamed1689(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -110,7 +110,7 @@
   if (buildCounterAdministratorWebTokenSpec < 3) {
     o.kind = "foo";
     o.parent = "foo";
-    o.permission = buildUnnamed2492();
+    o.permission = buildUnnamed1689();
   }
   buildCounterAdministratorWebTokenSpec--;
   return o;
@@ -121,7 +121,7 @@
   if (buildCounterAdministratorWebTokenSpec < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.parent, unittest.equals('foo'));
-    checkUnnamed2492(o.permission);
+    checkUnnamed1689(o.permission);
   }
   buildCounterAdministratorWebTokenSpec--;
 }
@@ -147,14 +147,14 @@
   buildCounterAndroidDevicePolicyConfig--;
 }
 
-buildUnnamed2493() {
+buildUnnamed1690() {
   var o = new core.List<api.AppRestrictionsSchemaRestriction>();
   o.add(buildAppRestrictionsSchemaRestriction());
   o.add(buildAppRestrictionsSchemaRestriction());
   return o;
 }
 
-checkUnnamed2493(core.List<api.AppRestrictionsSchemaRestriction> o) {
+checkUnnamed1690(core.List<api.AppRestrictionsSchemaRestriction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAppRestrictionsSchemaRestriction(o[0]);
   checkAppRestrictionsSchemaRestriction(o[1]);
@@ -166,7 +166,7 @@
   buildCounterAppRestrictionsSchema++;
   if (buildCounterAppRestrictionsSchema < 3) {
     o.kind = "foo";
-    o.restrictions = buildUnnamed2493();
+    o.restrictions = buildUnnamed1690();
   }
   buildCounterAppRestrictionsSchema--;
   return o;
@@ -176,7 +176,7 @@
   buildCounterAppRestrictionsSchema++;
   if (buildCounterAppRestrictionsSchema < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2493(o.restrictions);
+    checkUnnamed1690(o.restrictions);
   }
   buildCounterAppRestrictionsSchema--;
 }
@@ -200,40 +200,40 @@
   buildCounterAppRestrictionsSchemaChangeEvent--;
 }
 
-buildUnnamed2494() {
+buildUnnamed1691() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2494(core.List<core.String> o) {
+checkUnnamed1691(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2495() {
+buildUnnamed1692() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2495(core.List<core.String> o) {
+checkUnnamed1692(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2496() {
+buildUnnamed1693() {
   var o = new core.List<api.AppRestrictionsSchemaRestriction>();
   o.add(buildAppRestrictionsSchemaRestriction());
   o.add(buildAppRestrictionsSchemaRestriction());
   return o;
 }
 
-checkUnnamed2496(core.List<api.AppRestrictionsSchemaRestriction> o) {
+checkUnnamed1693(core.List<api.AppRestrictionsSchemaRestriction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAppRestrictionsSchemaRestriction(o[0]);
   checkAppRestrictionsSchemaRestriction(o[1]);
@@ -246,10 +246,10 @@
   if (buildCounterAppRestrictionsSchemaRestriction < 3) {
     o.defaultValue = buildAppRestrictionsSchemaRestrictionRestrictionValue();
     o.description = "foo";
-    o.entry = buildUnnamed2494();
-    o.entryValue = buildUnnamed2495();
+    o.entry = buildUnnamed1691();
+    o.entryValue = buildUnnamed1692();
     o.key = "foo";
-    o.nestedRestriction = buildUnnamed2496();
+    o.nestedRestriction = buildUnnamed1693();
     o.restrictionType = "foo";
     o.title = "foo";
   }
@@ -262,24 +262,24 @@
   if (buildCounterAppRestrictionsSchemaRestriction < 3) {
     checkAppRestrictionsSchemaRestrictionRestrictionValue(o.defaultValue);
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed2494(o.entry);
-    checkUnnamed2495(o.entryValue);
+    checkUnnamed1691(o.entry);
+    checkUnnamed1692(o.entryValue);
     unittest.expect(o.key, unittest.equals('foo'));
-    checkUnnamed2496(o.nestedRestriction);
+    checkUnnamed1693(o.nestedRestriction);
     unittest.expect(o.restrictionType, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterAppRestrictionsSchemaRestriction--;
 }
 
-buildUnnamed2497() {
+buildUnnamed1694() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2497(core.List<core.String> o) {
+checkUnnamed1694(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -293,7 +293,7 @@
     o.type = "foo";
     o.valueBool = true;
     o.valueInteger = 42;
-    o.valueMultiselect = buildUnnamed2497();
+    o.valueMultiselect = buildUnnamed1694();
     o.valueString = "foo";
   }
   buildCounterAppRestrictionsSchemaRestrictionRestrictionValue--;
@@ -307,7 +307,7 @@
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.valueBool, unittest.isTrue);
     unittest.expect(o.valueInteger, unittest.equals(42));
-    checkUnnamed2497(o.valueMultiselect);
+    checkUnnamed1694(o.valueMultiselect);
     unittest.expect(o.valueString, unittest.equals('foo'));
   }
   buildCounterAppRestrictionsSchemaRestrictionRestrictionValue--;
@@ -397,14 +397,14 @@
   buildCounterAuthenticationToken--;
 }
 
-buildUnnamed2498() {
+buildUnnamed1695() {
   var o = new core.List<api.VariableSet>();
   o.add(buildVariableSet());
   o.add(buildVariableSet());
   return o;
 }
 
-checkUnnamed2498(core.List<api.VariableSet> o) {
+checkUnnamed1695(core.List<api.VariableSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariableSet(o[0]);
   checkVariableSet(o[1]);
@@ -417,7 +417,7 @@
   if (buildCounterConfigurationVariables < 3) {
     o.kind = "foo";
     o.mcmId = "foo";
-    o.variableSet = buildUnnamed2498();
+    o.variableSet = buildUnnamed1695();
   }
   buildCounterConfigurationVariables--;
   return o;
@@ -428,7 +428,7 @@
   if (buildCounterConfigurationVariables < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.mcmId, unittest.equals('foo'));
-    checkUnnamed2498(o.variableSet);
+    checkUnnamed1695(o.variableSet);
   }
   buildCounterConfigurationVariables--;
 }
@@ -479,14 +479,14 @@
   buildCounterDeviceState--;
 }
 
-buildUnnamed2499() {
+buildUnnamed1696() {
   var o = new core.List<api.Device>();
   o.add(buildDevice());
   o.add(buildDevice());
   return o;
 }
 
-checkUnnamed2499(core.List<api.Device> o) {
+checkUnnamed1696(core.List<api.Device> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDevice(o[0]);
   checkDevice(o[1]);
@@ -497,7 +497,7 @@
   var o = new api.DevicesListResponse();
   buildCounterDevicesListResponse++;
   if (buildCounterDevicesListResponse < 3) {
-    o.device = buildUnnamed2499();
+    o.device = buildUnnamed1696();
     o.kind = "foo";
   }
   buildCounterDevicesListResponse--;
@@ -507,20 +507,20 @@
 checkDevicesListResponse(api.DevicesListResponse o) {
   buildCounterDevicesListResponse++;
   if (buildCounterDevicesListResponse < 3) {
-    checkUnnamed2499(o.device);
+    checkUnnamed1696(o.device);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDevicesListResponse--;
 }
 
-buildUnnamed2500() {
+buildUnnamed1697() {
   var o = new core.List<api.Administrator>();
   o.add(buildAdministrator());
   o.add(buildAdministrator());
   return o;
 }
 
-checkUnnamed2500(core.List<api.Administrator> o) {
+checkUnnamed1697(core.List<api.Administrator> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdministrator(o[0]);
   checkAdministrator(o[1]);
@@ -531,7 +531,7 @@
   var o = new api.Enterprise();
   buildCounterEnterprise++;
   if (buildCounterEnterprise < 3) {
-    o.administrator = buildUnnamed2500();
+    o.administrator = buildUnnamed1697();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
@@ -544,7 +544,7 @@
 checkEnterprise(api.Enterprise o) {
   buildCounterEnterprise++;
   if (buildCounterEnterprise < 3) {
-    checkUnnamed2500(o.administrator);
+    checkUnnamed1697(o.administrator);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -574,14 +574,14 @@
   buildCounterEnterpriseAccount--;
 }
 
-buildUnnamed2501() {
+buildUnnamed1698() {
   var o = new core.List<api.Enterprise>();
   o.add(buildEnterprise());
   o.add(buildEnterprise());
   return o;
 }
 
-checkUnnamed2501(core.List<api.Enterprise> o) {
+checkUnnamed1698(core.List<api.Enterprise> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnterprise(o[0]);
   checkEnterprise(o[1]);
@@ -592,7 +592,7 @@
   var o = new api.EnterprisesListResponse();
   buildCounterEnterprisesListResponse++;
   if (buildCounterEnterprisesListResponse < 3) {
-    o.enterprise = buildUnnamed2501();
+    o.enterprise = buildUnnamed1698();
     o.kind = "foo";
   }
   buildCounterEnterprisesListResponse--;
@@ -602,7 +602,7 @@
 checkEnterprisesListResponse(api.EnterprisesListResponse o) {
   buildCounterEnterprisesListResponse++;
   if (buildCounterEnterprisesListResponse < 3) {
-    checkUnnamed2501(o.enterprise);
+    checkUnnamed1698(o.enterprise);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterEnterprisesListResponse--;
@@ -653,14 +653,14 @@
   buildCounterEntitlement--;
 }
 
-buildUnnamed2502() {
+buildUnnamed1699() {
   var o = new core.List<api.Entitlement>();
   o.add(buildEntitlement());
   o.add(buildEntitlement());
   return o;
 }
 
-checkUnnamed2502(core.List<api.Entitlement> o) {
+checkUnnamed1699(core.List<api.Entitlement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntitlement(o[0]);
   checkEntitlement(o[1]);
@@ -671,7 +671,7 @@
   var o = new api.EntitlementsListResponse();
   buildCounterEntitlementsListResponse++;
   if (buildCounterEntitlementsListResponse < 3) {
-    o.entitlement = buildUnnamed2502();
+    o.entitlement = buildUnnamed1699();
     o.kind = "foo";
   }
   buildCounterEntitlementsListResponse--;
@@ -681,7 +681,7 @@
 checkEntitlementsListResponse(api.EntitlementsListResponse o) {
   buildCounterEntitlementsListResponse++;
   if (buildCounterEntitlementsListResponse < 3) {
-    checkUnnamed2502(o.entitlement);
+    checkUnnamed1699(o.entitlement);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterEntitlementsListResponse--;
@@ -718,14 +718,14 @@
   buildCounterGroupLicense--;
 }
 
-buildUnnamed2503() {
+buildUnnamed1700() {
   var o = new core.List<api.User>();
   o.add(buildUser());
   o.add(buildUser());
   return o;
 }
 
-checkUnnamed2503(core.List<api.User> o) {
+checkUnnamed1700(core.List<api.User> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUser(o[0]);
   checkUser(o[1]);
@@ -737,7 +737,7 @@
   buildCounterGroupLicenseUsersListResponse++;
   if (buildCounterGroupLicenseUsersListResponse < 3) {
     o.kind = "foo";
-    o.user = buildUnnamed2503();
+    o.user = buildUnnamed1700();
   }
   buildCounterGroupLicenseUsersListResponse--;
   return o;
@@ -747,19 +747,19 @@
   buildCounterGroupLicenseUsersListResponse++;
   if (buildCounterGroupLicenseUsersListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2503(o.user);
+    checkUnnamed1700(o.user);
   }
   buildCounterGroupLicenseUsersListResponse--;
 }
 
-buildUnnamed2504() {
+buildUnnamed1701() {
   var o = new core.List<api.GroupLicense>();
   o.add(buildGroupLicense());
   o.add(buildGroupLicense());
   return o;
 }
 
-checkUnnamed2504(core.List<api.GroupLicense> o) {
+checkUnnamed1701(core.List<api.GroupLicense> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGroupLicense(o[0]);
   checkGroupLicense(o[1]);
@@ -770,7 +770,7 @@
   var o = new api.GroupLicensesListResponse();
   buildCounterGroupLicensesListResponse++;
   if (buildCounterGroupLicensesListResponse < 3) {
-    o.groupLicense = buildUnnamed2504();
+    o.groupLicense = buildUnnamed1701();
     o.kind = "foo";
   }
   buildCounterGroupLicensesListResponse--;
@@ -780,7 +780,7 @@
 checkGroupLicensesListResponse(api.GroupLicensesListResponse o) {
   buildCounterGroupLicensesListResponse++;
   if (buildCounterGroupLicensesListResponse < 3) {
-    checkUnnamed2504(o.groupLicense);
+    checkUnnamed1701(o.groupLicense);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterGroupLicensesListResponse--;
@@ -838,14 +838,14 @@
   buildCounterInstallFailureEvent--;
 }
 
-buildUnnamed2505() {
+buildUnnamed1702() {
   var o = new core.List<api.Install>();
   o.add(buildInstall());
   o.add(buildInstall());
   return o;
 }
 
-checkUnnamed2505(core.List<api.Install> o) {
+checkUnnamed1702(core.List<api.Install> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstall(o[0]);
   checkInstall(o[1]);
@@ -856,7 +856,7 @@
   var o = new api.InstallsListResponse();
   buildCounterInstallsListResponse++;
   if (buildCounterInstallsListResponse < 3) {
-    o.install = buildUnnamed2505();
+    o.install = buildUnnamed1702();
     o.kind = "foo";
   }
   buildCounterInstallsListResponse--;
@@ -866,7 +866,7 @@
 checkInstallsListResponse(api.InstallsListResponse o) {
   buildCounterInstallsListResponse++;
   if (buildCounterInstallsListResponse < 3) {
-    checkUnnamed2505(o.install);
+    checkUnnamed1702(o.install);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterInstallsListResponse--;
@@ -893,14 +893,14 @@
   buildCounterLocalizedText--;
 }
 
-buildUnnamed2506() {
+buildUnnamed1703() {
   var o = new core.List<api.ManagedProperty>();
   o.add(buildManagedProperty());
   o.add(buildManagedProperty());
   return o;
 }
 
-checkUnnamed2506(core.List<api.ManagedProperty> o) {
+checkUnnamed1703(core.List<api.ManagedProperty> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedProperty(o[0]);
   checkManagedProperty(o[1]);
@@ -913,7 +913,7 @@
   if (buildCounterManagedConfiguration < 3) {
     o.configurationVariables = buildConfigurationVariables();
     o.kind = "foo";
-    o.managedProperty = buildUnnamed2506();
+    o.managedProperty = buildUnnamed1703();
     o.productId = "foo";
   }
   buildCounterManagedConfiguration--;
@@ -925,20 +925,20 @@
   if (buildCounterManagedConfiguration < 3) {
     checkConfigurationVariables(o.configurationVariables);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2506(o.managedProperty);
+    checkUnnamed1703(o.managedProperty);
     unittest.expect(o.productId, unittest.equals('foo'));
   }
   buildCounterManagedConfiguration--;
 }
 
-buildUnnamed2507() {
+buildUnnamed1704() {
   var o = new core.List<api.ManagedConfiguration>();
   o.add(buildManagedConfiguration());
   o.add(buildManagedConfiguration());
   return o;
 }
 
-checkUnnamed2507(core.List<api.ManagedConfiguration> o) {
+checkUnnamed1704(core.List<api.ManagedConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedConfiguration(o[0]);
   checkManagedConfiguration(o[1]);
@@ -950,7 +950,7 @@
   buildCounterManagedConfigurationsForDeviceListResponse++;
   if (buildCounterManagedConfigurationsForDeviceListResponse < 3) {
     o.kind = "foo";
-    o.managedConfigurationForDevice = buildUnnamed2507();
+    o.managedConfigurationForDevice = buildUnnamed1704();
   }
   buildCounterManagedConfigurationsForDeviceListResponse--;
   return o;
@@ -961,19 +961,19 @@
   buildCounterManagedConfigurationsForDeviceListResponse++;
   if (buildCounterManagedConfigurationsForDeviceListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2507(o.managedConfigurationForDevice);
+    checkUnnamed1704(o.managedConfigurationForDevice);
   }
   buildCounterManagedConfigurationsForDeviceListResponse--;
 }
 
-buildUnnamed2508() {
+buildUnnamed1705() {
   var o = new core.List<api.ManagedConfiguration>();
   o.add(buildManagedConfiguration());
   o.add(buildManagedConfiguration());
   return o;
 }
 
-checkUnnamed2508(core.List<api.ManagedConfiguration> o) {
+checkUnnamed1705(core.List<api.ManagedConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedConfiguration(o[0]);
   checkManagedConfiguration(o[1]);
@@ -985,7 +985,7 @@
   buildCounterManagedConfigurationsForUserListResponse++;
   if (buildCounterManagedConfigurationsForUserListResponse < 3) {
     o.kind = "foo";
-    o.managedConfigurationForUser = buildUnnamed2508();
+    o.managedConfigurationForUser = buildUnnamed1705();
   }
   buildCounterManagedConfigurationsForUserListResponse--;
   return o;
@@ -996,19 +996,19 @@
   buildCounterManagedConfigurationsForUserListResponse++;
   if (buildCounterManagedConfigurationsForUserListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2508(o.managedConfigurationForUser);
+    checkUnnamed1705(o.managedConfigurationForUser);
   }
   buildCounterManagedConfigurationsForUserListResponse--;
 }
 
-buildUnnamed2509() {
+buildUnnamed1706() {
   var o = new core.List<api.ManagedProperty>();
   o.add(buildManagedProperty());
   o.add(buildManagedProperty());
   return o;
 }
 
-checkUnnamed2509(core.List<api.ManagedProperty> o) {
+checkUnnamed1706(core.List<api.ManagedProperty> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedProperty(o[0]);
   checkManagedProperty(o[1]);
@@ -1021,7 +1021,7 @@
   if (buildCounterManagedConfigurationsSettings < 3) {
     o.kind = "foo";
     o.lastUpdatedTimestampMillis = "foo";
-    o.managedProperty = buildUnnamed2509();
+    o.managedProperty = buildUnnamed1706();
     o.mcmId = "foo";
     o.name = "foo";
   }
@@ -1034,21 +1034,21 @@
   if (buildCounterManagedConfigurationsSettings < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastUpdatedTimestampMillis, unittest.equals('foo'));
-    checkUnnamed2509(o.managedProperty);
+    checkUnnamed1706(o.managedProperty);
     unittest.expect(o.mcmId, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterManagedConfigurationsSettings--;
 }
 
-buildUnnamed2510() {
+buildUnnamed1707() {
   var o = new core.List<api.ManagedConfigurationsSettings>();
   o.add(buildManagedConfigurationsSettings());
   o.add(buildManagedConfigurationsSettings());
   return o;
 }
 
-checkUnnamed2510(core.List<api.ManagedConfigurationsSettings> o) {
+checkUnnamed1707(core.List<api.ManagedConfigurationsSettings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedConfigurationsSettings(o[0]);
   checkManagedConfigurationsSettings(o[1]);
@@ -1060,7 +1060,7 @@
   buildCounterManagedConfigurationsSettingsListResponse++;
   if (buildCounterManagedConfigurationsSettingsListResponse < 3) {
     o.kind = "foo";
-    o.managedConfigurationsSettings = buildUnnamed2510();
+    o.managedConfigurationsSettings = buildUnnamed1707();
   }
   buildCounterManagedConfigurationsSettingsListResponse--;
   return o;
@@ -1071,32 +1071,32 @@
   buildCounterManagedConfigurationsSettingsListResponse++;
   if (buildCounterManagedConfigurationsSettingsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2510(o.managedConfigurationsSettings);
+    checkUnnamed1707(o.managedConfigurationsSettings);
   }
   buildCounterManagedConfigurationsSettingsListResponse--;
 }
 
-buildUnnamed2511() {
+buildUnnamed1708() {
   var o = new core.List<api.ManagedPropertyBundle>();
   o.add(buildManagedPropertyBundle());
   o.add(buildManagedPropertyBundle());
   return o;
 }
 
-checkUnnamed2511(core.List<api.ManagedPropertyBundle> o) {
+checkUnnamed1708(core.List<api.ManagedPropertyBundle> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedPropertyBundle(o[0]);
   checkManagedPropertyBundle(o[1]);
 }
 
-buildUnnamed2512() {
+buildUnnamed1709() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2512(core.List<core.String> o) {
+checkUnnamed1709(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1110,10 +1110,10 @@
     o.key = "foo";
     o.valueBool = true;
     o.valueBundle = buildManagedPropertyBundle();
-    o.valueBundleArray = buildUnnamed2511();
+    o.valueBundleArray = buildUnnamed1708();
     o.valueInteger = 42;
     o.valueString = "foo";
-    o.valueStringArray = buildUnnamed2512();
+    o.valueStringArray = buildUnnamed1709();
   }
   buildCounterManagedProperty--;
   return o;
@@ -1125,22 +1125,22 @@
     unittest.expect(o.key, unittest.equals('foo'));
     unittest.expect(o.valueBool, unittest.isTrue);
     checkManagedPropertyBundle(o.valueBundle);
-    checkUnnamed2511(o.valueBundleArray);
+    checkUnnamed1708(o.valueBundleArray);
     unittest.expect(o.valueInteger, unittest.equals(42));
     unittest.expect(o.valueString, unittest.equals('foo'));
-    checkUnnamed2512(o.valueStringArray);
+    checkUnnamed1709(o.valueStringArray);
   }
   buildCounterManagedProperty--;
 }
 
-buildUnnamed2513() {
+buildUnnamed1710() {
   var o = new core.List<api.ManagedProperty>();
   o.add(buildManagedProperty());
   o.add(buildManagedProperty());
   return o;
 }
 
-checkUnnamed2513(core.List<api.ManagedProperty> o) {
+checkUnnamed1710(core.List<api.ManagedProperty> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedProperty(o[0]);
   checkManagedProperty(o[1]);
@@ -1151,7 +1151,7 @@
   var o = new api.ManagedPropertyBundle();
   buildCounterManagedPropertyBundle++;
   if (buildCounterManagedPropertyBundle < 3) {
-    o.managedProperty = buildUnnamed2513();
+    o.managedProperty = buildUnnamed1710();
   }
   buildCounterManagedPropertyBundle--;
   return o;
@@ -1160,7 +1160,7 @@
 checkManagedPropertyBundle(api.ManagedPropertyBundle o) {
   buildCounterManagedPropertyBundle++;
   if (buildCounterManagedPropertyBundle < 3) {
-    checkUnnamed2513(o.managedProperty);
+    checkUnnamed1710(o.managedProperty);
   }
   buildCounterManagedPropertyBundle--;
 }
@@ -1190,27 +1190,27 @@
   buildCounterNewDeviceEvent--;
 }
 
-buildUnnamed2514() {
+buildUnnamed1711() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2514(core.List<core.String> o) {
+checkUnnamed1711(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2515() {
+buildUnnamed1712() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2515(core.List<core.String> o) {
+checkUnnamed1712(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1221,9 +1221,9 @@
   var o = new api.NewPermissionsEvent();
   buildCounterNewPermissionsEvent++;
   if (buildCounterNewPermissionsEvent < 3) {
-    o.approvedPermissions = buildUnnamed2514();
+    o.approvedPermissions = buildUnnamed1711();
     o.productId = "foo";
-    o.requestedPermissions = buildUnnamed2515();
+    o.requestedPermissions = buildUnnamed1712();
   }
   buildCounterNewPermissionsEvent--;
   return o;
@@ -1232,9 +1232,9 @@
 checkNewPermissionsEvent(api.NewPermissionsEvent o) {
   buildCounterNewPermissionsEvent++;
   if (buildCounterNewPermissionsEvent < 3) {
-    checkUnnamed2514(o.approvedPermissions);
+    checkUnnamed1711(o.approvedPermissions);
     unittest.expect(o.productId, unittest.equals('foo'));
-    checkUnnamed2515(o.requestedPermissions);
+    checkUnnamed1712(o.requestedPermissions);
   }
   buildCounterNewPermissionsEvent--;
 }
@@ -1277,14 +1277,14 @@
   buildCounterNotification--;
 }
 
-buildUnnamed2516() {
+buildUnnamed1713() {
   var o = new core.List<api.Notification>();
   o.add(buildNotification());
   o.add(buildNotification());
   return o;
 }
 
-checkUnnamed2516(core.List<api.Notification> o) {
+checkUnnamed1713(core.List<api.Notification> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNotification(o[0]);
   checkNotification(o[1]);
@@ -1296,7 +1296,7 @@
   buildCounterNotificationSet++;
   if (buildCounterNotificationSet < 3) {
     o.kind = "foo";
-    o.notification = buildUnnamed2516();
+    o.notification = buildUnnamed1713();
     o.notificationSetId = "foo";
   }
   buildCounterNotificationSet--;
@@ -1307,7 +1307,7 @@
   buildCounterNotificationSet++;
   if (buildCounterNotificationSet < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2516(o.notification);
+    checkUnnamed1713(o.notification);
     unittest.expect(o.notificationSetId, unittest.equals('foo'));
   }
   buildCounterNotificationSet--;
@@ -1361,14 +1361,14 @@
   buildCounterPermission--;
 }
 
-buildUnnamed2517() {
+buildUnnamed1714() {
   var o = new core.List<api.ProductPolicy>();
   o.add(buildProductPolicy());
   o.add(buildProductPolicy());
   return o;
 }
 
-checkUnnamed2517(core.List<api.ProductPolicy> o) {
+checkUnnamed1714(core.List<api.ProductPolicy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductPolicy(o[0]);
   checkProductPolicy(o[1]);
@@ -1380,7 +1380,7 @@
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
     o.productAvailabilityPolicy = "foo";
-    o.productPolicy = buildUnnamed2517();
+    o.productPolicy = buildUnnamed1714();
   }
   buildCounterPolicy--;
   return o;
@@ -1390,71 +1390,71 @@
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
     unittest.expect(o.productAvailabilityPolicy, unittest.equals('foo'));
-    checkUnnamed2517(o.productPolicy);
+    checkUnnamed1714(o.productPolicy);
   }
   buildCounterPolicy--;
 }
 
-buildUnnamed2518() {
+buildUnnamed1715() {
   var o = new core.List<api.AppVersion>();
   o.add(buildAppVersion());
   o.add(buildAppVersion());
   return o;
 }
 
-checkUnnamed2518(core.List<api.AppVersion> o) {
+checkUnnamed1715(core.List<api.AppVersion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAppVersion(o[0]);
   checkAppVersion(o[1]);
 }
 
-buildUnnamed2519() {
+buildUnnamed1716() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2519(core.List<core.String> o) {
+checkUnnamed1716(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2520() {
+buildUnnamed1717() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2520(core.List<core.String> o) {
+checkUnnamed1717(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2521() {
+buildUnnamed1718() {
   var o = new core.List<api.ProductPermission>();
   o.add(buildProductPermission());
   o.add(buildProductPermission());
   return o;
 }
 
-checkUnnamed2521(core.List<api.ProductPermission> o) {
+checkUnnamed1718(core.List<api.ProductPermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductPermission(o[0]);
   checkProductPermission(o[1]);
 }
 
-buildUnnamed2522() {
+buildUnnamed1719() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2522(core.List<core.String> o) {
+checkUnnamed1719(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1465,10 +1465,10 @@
   var o = new api.Product();
   buildCounterProduct++;
   if (buildCounterProduct < 3) {
-    o.appVersion = buildUnnamed2518();
+    o.appVersion = buildUnnamed1715();
     o.authorName = "foo";
-    o.availableCountries = buildUnnamed2519();
-    o.availableTracks = buildUnnamed2520();
+    o.availableCountries = buildUnnamed1716();
+    o.availableTracks = buildUnnamed1717();
     o.category = "foo";
     o.contentRating = "foo";
     o.description = "foo";
@@ -1478,12 +1478,12 @@
     o.kind = "foo";
     o.lastUpdatedTimestampMillis = "foo";
     o.minAndroidSdkVersion = 42;
-    o.permissions = buildUnnamed2521();
+    o.permissions = buildUnnamed1718();
     o.productId = "foo";
     o.productPricing = "foo";
     o.recentChanges = "foo";
     o.requiresContainerApp = true;
-    o.screenshotUrls = buildUnnamed2522();
+    o.screenshotUrls = buildUnnamed1719();
     o.signingCertificate = buildProductSigningCertificate();
     o.smallIconUrl = "foo";
     o.title = "foo";
@@ -1496,10 +1496,10 @@
 checkProduct(api.Product o) {
   buildCounterProduct++;
   if (buildCounterProduct < 3) {
-    checkUnnamed2518(o.appVersion);
+    checkUnnamed1715(o.appVersion);
     unittest.expect(o.authorName, unittest.equals('foo'));
-    checkUnnamed2519(o.availableCountries);
-    checkUnnamed2520(o.availableTracks);
+    checkUnnamed1716(o.availableCountries);
+    checkUnnamed1717(o.availableTracks);
     unittest.expect(o.category, unittest.equals('foo'));
     unittest.expect(o.contentRating, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
@@ -1509,12 +1509,12 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastUpdatedTimestampMillis, unittest.equals('foo'));
     unittest.expect(o.minAndroidSdkVersion, unittest.equals(42));
-    checkUnnamed2521(o.permissions);
+    checkUnnamed1718(o.permissions);
     unittest.expect(o.productId, unittest.equals('foo'));
     unittest.expect(o.productPricing, unittest.equals('foo'));
     unittest.expect(o.recentChanges, unittest.equals('foo'));
     unittest.expect(o.requiresContainerApp, unittest.isTrue);
-    checkUnnamed2522(o.screenshotUrls);
+    checkUnnamed1719(o.screenshotUrls);
     checkProductSigningCertificate(o.signingCertificate);
     unittest.expect(o.smallIconUrl, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
@@ -1586,14 +1586,14 @@
   buildCounterProductPermission--;
 }
 
-buildUnnamed2523() {
+buildUnnamed1720() {
   var o = new core.List<api.ProductPermission>();
   o.add(buildProductPermission());
   o.add(buildProductPermission());
   return o;
 }
 
-checkUnnamed2523(core.List<api.ProductPermission> o) {
+checkUnnamed1720(core.List<api.ProductPermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductPermission(o[0]);
   checkProductPermission(o[1]);
@@ -1605,7 +1605,7 @@
   buildCounterProductPermissions++;
   if (buildCounterProductPermissions < 3) {
     o.kind = "foo";
-    o.permission = buildUnnamed2523();
+    o.permission = buildUnnamed1720();
     o.productId = "foo";
   }
   buildCounterProductPermissions--;
@@ -1616,20 +1616,20 @@
   buildCounterProductPermissions++;
   if (buildCounterProductPermissions < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2523(o.permission);
+    checkUnnamed1720(o.permission);
     unittest.expect(o.productId, unittest.equals('foo'));
   }
   buildCounterProductPermissions--;
 }
 
-buildUnnamed2524() {
+buildUnnamed1721() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2524(core.List<core.String> o) {
+checkUnnamed1721(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1641,7 +1641,7 @@
   buildCounterProductPolicy++;
   if (buildCounterProductPolicy < 3) {
     o.productId = "foo";
-    o.tracks = buildUnnamed2524();
+    o.tracks = buildUnnamed1721();
   }
   buildCounterProductPolicy--;
   return o;
@@ -1651,32 +1651,32 @@
   buildCounterProductPolicy++;
   if (buildCounterProductPolicy < 3) {
     unittest.expect(o.productId, unittest.equals('foo'));
-    checkUnnamed2524(o.tracks);
+    checkUnnamed1721(o.tracks);
   }
   buildCounterProductPolicy--;
 }
 
-buildUnnamed2525() {
+buildUnnamed1722() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2525(core.List<core.String> o) {
+checkUnnamed1722(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2526() {
+buildUnnamed1723() {
   var o = new core.List<api.ProductVisibility>();
   o.add(buildProductVisibility());
   o.add(buildProductVisibility());
   return o;
 }
 
-checkUnnamed2526(core.List<api.ProductVisibility> o) {
+checkUnnamed1723(core.List<api.ProductVisibility> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductVisibility(o[0]);
   checkProductVisibility(o[1]);
@@ -1688,9 +1688,9 @@
   buildCounterProductSet++;
   if (buildCounterProductSet < 3) {
     o.kind = "foo";
-    o.productId = buildUnnamed2525();
+    o.productId = buildUnnamed1722();
     o.productSetBehavior = "foo";
-    o.productVisibility = buildUnnamed2526();
+    o.productVisibility = buildUnnamed1723();
   }
   buildCounterProductSet--;
   return o;
@@ -1700,9 +1700,9 @@
   buildCounterProductSet++;
   if (buildCounterProductSet < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2525(o.productId);
+    checkUnnamed1722(o.productId);
     unittest.expect(o.productSetBehavior, unittest.equals('foo'));
-    checkUnnamed2526(o.productVisibility);
+    checkUnnamed1723(o.productVisibility);
   }
   buildCounterProductSet--;
 }
@@ -1728,14 +1728,14 @@
   buildCounterProductSigningCertificate--;
 }
 
-buildUnnamed2527() {
+buildUnnamed1724() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2527(core.List<core.String> o) {
+checkUnnamed1724(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1747,7 +1747,7 @@
   buildCounterProductVisibility++;
   if (buildCounterProductVisibility < 3) {
     o.productId = "foo";
-    o.tracks = buildUnnamed2527();
+    o.tracks = buildUnnamed1724();
   }
   buildCounterProductVisibility--;
   return o;
@@ -1757,7 +1757,7 @@
   buildCounterProductVisibility++;
   if (buildCounterProductVisibility < 3) {
     unittest.expect(o.productId, unittest.equals('foo'));
-    checkUnnamed2527(o.tracks);
+    checkUnnamed1724(o.tracks);
   }
   buildCounterProductVisibility--;
 }
@@ -1803,14 +1803,14 @@
   buildCounterProductsGenerateApprovalUrlResponse--;
 }
 
-buildUnnamed2528() {
+buildUnnamed1725() {
   var o = new core.List<api.Product>();
   o.add(buildProduct());
   o.add(buildProduct());
   return o;
 }
 
-checkUnnamed2528(core.List<api.Product> o) {
+checkUnnamed1725(core.List<api.Product> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProduct(o[0]);
   checkProduct(o[1]);
@@ -1823,7 +1823,7 @@
   if (buildCounterProductsListResponse < 3) {
     o.kind = "foo";
     o.pageInfo = buildPageInfo();
-    o.product = buildUnnamed2528();
+    o.product = buildUnnamed1725();
     o.tokenPagination = buildTokenPagination();
   }
   buildCounterProductsListResponse--;
@@ -1835,7 +1835,7 @@
   if (buildCounterProductsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
-    checkUnnamed2528(o.product);
+    checkUnnamed1725(o.product);
     checkTokenPagination(o.tokenPagination);
   }
   buildCounterProductsListResponse--;
@@ -1891,14 +1891,14 @@
   buildCounterServiceAccountKey--;
 }
 
-buildUnnamed2529() {
+buildUnnamed1726() {
   var o = new core.List<api.ServiceAccountKey>();
   o.add(buildServiceAccountKey());
   o.add(buildServiceAccountKey());
   return o;
 }
 
-checkUnnamed2529(core.List<api.ServiceAccountKey> o) {
+checkUnnamed1726(core.List<api.ServiceAccountKey> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServiceAccountKey(o[0]);
   checkServiceAccountKey(o[1]);
@@ -1909,7 +1909,7 @@
   var o = new api.ServiceAccountKeysListResponse();
   buildCounterServiceAccountKeysListResponse++;
   if (buildCounterServiceAccountKeysListResponse < 3) {
-    o.serviceAccountKey = buildUnnamed2529();
+    o.serviceAccountKey = buildUnnamed1726();
   }
   buildCounterServiceAccountKeysListResponse--;
   return o;
@@ -1918,7 +1918,7 @@
 checkServiceAccountKeysListResponse(api.ServiceAccountKeysListResponse o) {
   buildCounterServiceAccountKeysListResponse++;
   if (buildCounterServiceAccountKeysListResponse < 3) {
-    checkUnnamed2529(o.serviceAccountKey);
+    checkUnnamed1726(o.serviceAccountKey);
   }
   buildCounterServiceAccountKeysListResponse--;
 }
@@ -1946,27 +1946,27 @@
   buildCounterSignupInfo--;
 }
 
-buildUnnamed2530() {
+buildUnnamed1727() {
   var o = new core.List<api.LocalizedText>();
   o.add(buildLocalizedText());
   o.add(buildLocalizedText());
   return o;
 }
 
-checkUnnamed2530(core.List<api.LocalizedText> o) {
+checkUnnamed1727(core.List<api.LocalizedText> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocalizedText(o[0]);
   checkLocalizedText(o[1]);
 }
 
-buildUnnamed2531() {
+buildUnnamed1728() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2531(core.List<core.String> o) {
+checkUnnamed1728(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1979,9 +1979,9 @@
   if (buildCounterStoreCluster < 3) {
     o.id = "foo";
     o.kind = "foo";
-    o.name = buildUnnamed2530();
+    o.name = buildUnnamed1727();
     o.orderInPage = "foo";
-    o.productId = buildUnnamed2531();
+    o.productId = buildUnnamed1728();
   }
   buildCounterStoreCluster--;
   return o;
@@ -1992,9 +1992,9 @@
   if (buildCounterStoreCluster < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2530(o.name);
+    checkUnnamed1727(o.name);
     unittest.expect(o.orderInPage, unittest.equals('foo'));
-    checkUnnamed2531(o.productId);
+    checkUnnamed1728(o.productId);
   }
   buildCounterStoreCluster--;
 }
@@ -2022,14 +2022,14 @@
   buildCounterStoreLayout--;
 }
 
-buildUnnamed2532() {
+buildUnnamed1729() {
   var o = new core.List<api.StoreCluster>();
   o.add(buildStoreCluster());
   o.add(buildStoreCluster());
   return o;
 }
 
-checkUnnamed2532(core.List<api.StoreCluster> o) {
+checkUnnamed1729(core.List<api.StoreCluster> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStoreCluster(o[0]);
   checkStoreCluster(o[1]);
@@ -2040,7 +2040,7 @@
   var o = new api.StoreLayoutClustersListResponse();
   buildCounterStoreLayoutClustersListResponse++;
   if (buildCounterStoreLayoutClustersListResponse < 3) {
-    o.cluster = buildUnnamed2532();
+    o.cluster = buildUnnamed1729();
     o.kind = "foo";
   }
   buildCounterStoreLayoutClustersListResponse--;
@@ -2050,20 +2050,20 @@
 checkStoreLayoutClustersListResponse(api.StoreLayoutClustersListResponse o) {
   buildCounterStoreLayoutClustersListResponse++;
   if (buildCounterStoreLayoutClustersListResponse < 3) {
-    checkUnnamed2532(o.cluster);
+    checkUnnamed1729(o.cluster);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterStoreLayoutClustersListResponse--;
 }
 
-buildUnnamed2533() {
+buildUnnamed1730() {
   var o = new core.List<api.StorePage>();
   o.add(buildStorePage());
   o.add(buildStorePage());
   return o;
 }
 
-checkUnnamed2533(core.List<api.StorePage> o) {
+checkUnnamed1730(core.List<api.StorePage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStorePage(o[0]);
   checkStorePage(o[1]);
@@ -2075,7 +2075,7 @@
   buildCounterStoreLayoutPagesListResponse++;
   if (buildCounterStoreLayoutPagesListResponse < 3) {
     o.kind = "foo";
-    o.page = buildUnnamed2533();
+    o.page = buildUnnamed1730();
   }
   buildCounterStoreLayoutPagesListResponse--;
   return o;
@@ -2085,32 +2085,32 @@
   buildCounterStoreLayoutPagesListResponse++;
   if (buildCounterStoreLayoutPagesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2533(o.page);
+    checkUnnamed1730(o.page);
   }
   buildCounterStoreLayoutPagesListResponse--;
 }
 
-buildUnnamed2534() {
+buildUnnamed1731() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2534(core.List<core.String> o) {
+checkUnnamed1731(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2535() {
+buildUnnamed1732() {
   var o = new core.List<api.LocalizedText>();
   o.add(buildLocalizedText());
   o.add(buildLocalizedText());
   return o;
 }
 
-checkUnnamed2535(core.List<api.LocalizedText> o) {
+checkUnnamed1732(core.List<api.LocalizedText> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocalizedText(o[0]);
   checkLocalizedText(o[1]);
@@ -2123,8 +2123,8 @@
   if (buildCounterStorePage < 3) {
     o.id = "foo";
     o.kind = "foo";
-    o.link = buildUnnamed2534();
-    o.name = buildUnnamed2535();
+    o.link = buildUnnamed1731();
+    o.name = buildUnnamed1732();
   }
   buildCounterStorePage--;
   return o;
@@ -2135,8 +2135,8 @@
   if (buildCounterStorePage < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2534(o.link);
-    checkUnnamed2535(o.name);
+    checkUnnamed1731(o.link);
+    checkUnnamed1732(o.name);
   }
   buildCounterStorePage--;
 }
@@ -2216,14 +2216,14 @@
   buildCounterUserToken--;
 }
 
-buildUnnamed2536() {
+buildUnnamed1733() {
   var o = new core.List<api.User>();
   o.add(buildUser());
   o.add(buildUser());
   return o;
 }
 
-checkUnnamed2536(core.List<api.User> o) {
+checkUnnamed1733(core.List<api.User> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUser(o[0]);
   checkUser(o[1]);
@@ -2235,7 +2235,7 @@
   buildCounterUsersListResponse++;
   if (buildCounterUsersListResponse < 3) {
     o.kind = "foo";
-    o.user = buildUnnamed2536();
+    o.user = buildUnnamed1733();
   }
   buildCounterUsersListResponse--;
   return o;
@@ -2245,7 +2245,7 @@
   buildCounterUsersListResponse++;
   if (buildCounterUsersListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2536(o.user);
+    checkUnnamed1733(o.user);
   }
   buildCounterUsersListResponse--;
 }
@@ -2905,7 +2905,7 @@
       }), true);
       res
           .get(arg_enterpriseId, arg_userId, arg_deviceId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Device response) {
+          .then(unittest.expectAsync1(((response) {
         checkDevice(response);
       })));
     });
@@ -2988,7 +2988,7 @@
       res
           .getState(arg_enterpriseId, arg_userId, arg_deviceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DeviceState response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeviceState(response);
       })));
     });
@@ -3060,7 +3060,7 @@
       }), true);
       res
           .list(arg_enterpriseId, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DevicesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDevicesListResponse(response);
       })));
     });
@@ -3144,7 +3144,7 @@
       res
           .patch(arg_request, arg_enterpriseId, arg_userId, arg_deviceId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Device response) {
+          .then(unittest.expectAsync1(((response) {
         checkDevice(response);
       })));
     });
@@ -3231,7 +3231,7 @@
       res
           .setState(arg_request, arg_enterpriseId, arg_userId, arg_deviceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DeviceState response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeviceState(response);
       })));
     });
@@ -3315,7 +3315,7 @@
       res
           .update(arg_request, arg_enterpriseId, arg_userId, arg_deviceId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Device response) {
+          .then(unittest.expectAsync1(((response) {
         checkDevice(response);
       })));
     });
@@ -3434,7 +3434,7 @@
               completionToken: arg_completionToken,
               enterpriseToken: arg_enterpriseToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Enterprise response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnterprise(response);
       })));
     });
@@ -3501,7 +3501,7 @@
       }), true);
       res
           .createWebToken(arg_request, arg_enterpriseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdministratorWebToken response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdministratorWebToken(response);
       })));
     });
@@ -3615,7 +3615,7 @@
       }), true);
       res
           .enroll(arg_request, arg_token, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Enterprise response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnterprise(response);
       })));
     });
@@ -3671,7 +3671,7 @@
       }), true);
       res
           .generateSignupUrl(callbackUrl: arg_callbackUrl, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SignupInfo response) {
+          .then(unittest.expectAsync1(((response) {
         checkSignupInfo(response);
       })));
     });
@@ -3728,7 +3728,7 @@
       }), true);
       res
           .get(arg_enterpriseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Enterprise response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnterprise(response);
       })));
     });
@@ -3791,8 +3791,7 @@
       }), true);
       res
           .getAndroidDevicePolicyConfig(arg_enterpriseId, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.AndroidDevicePolicyConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkAndroidDevicePolicyConfig(response);
       })));
     });
@@ -3859,7 +3858,7 @@
       res
           .getServiceAccount(arg_enterpriseId,
               keyType: arg_keyType, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ServiceAccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkServiceAccount(response);
       })));
     });
@@ -3922,7 +3921,7 @@
       }), true);
       res
           .getStoreLayout(arg_enterpriseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StoreLayout response) {
+          .then(unittest.expectAsync1(((response) {
         checkStoreLayout(response);
       })));
     });
@@ -3981,7 +3980,7 @@
       }), true);
       res
           .insert(arg_request, arg_token, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Enterprise response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnterprise(response);
       })));
     });
@@ -4036,7 +4035,7 @@
       }), true);
       res
           .list(arg_domain, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EnterprisesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnterprisesListResponse(response);
       })));
     });
@@ -4093,7 +4092,7 @@
       res
           .pullNotificationSet(
               requestMode: arg_requestMode, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.NotificationSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkNotificationSet(response);
       })));
     });
@@ -4155,9 +4154,9 @@
             .encode(buildEnterprisesSendTestPushNotificationResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.sendTestPushNotification(arg_enterpriseId, $fields: arg_$fields).then(
-          unittest.expectAsync1(
-              ((api.EnterprisesSendTestPushNotificationResponse response) {
+      res
+          .sendTestPushNotification(arg_enterpriseId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkEnterprisesSendTestPushNotificationResponse(response);
       })));
     });
@@ -4224,7 +4223,7 @@
       }), true);
       res
           .setAccount(arg_request, arg_enterpriseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EnterpriseAccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnterpriseAccount(response);
       })));
     });
@@ -4292,8 +4291,7 @@
       res
           .setAndroidDevicePolicyConfig(arg_request, arg_enterpriseId,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.AndroidDevicePolicyConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkAndroidDevicePolicyConfig(response);
       })));
     });
@@ -4360,7 +4358,7 @@
       }), true);
       res
           .setStoreLayout(arg_request, arg_enterpriseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StoreLayout response) {
+          .then(unittest.expectAsync1(((response) {
         checkStoreLayout(response);
       })));
     });
@@ -4577,7 +4575,7 @@
       res
           .get(arg_enterpriseId, arg_userId, arg_entitlementId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Entitlement response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntitlement(response);
       })));
     });
@@ -4650,7 +4648,7 @@
       }), true);
       res
           .list(arg_enterpriseId, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntitlementsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntitlementsListResponse(response);
       })));
     });
@@ -4735,7 +4733,7 @@
       res
           .patch(arg_request, arg_enterpriseId, arg_userId, arg_entitlementId,
               install: arg_install, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Entitlement response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntitlement(response);
       })));
     });
@@ -4820,7 +4818,7 @@
       res
           .update(arg_request, arg_enterpriseId, arg_userId, arg_entitlementId,
               install: arg_install, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Entitlement response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntitlement(response);
       })));
     });
@@ -4889,7 +4887,7 @@
       }), true);
       res
           .get(arg_enterpriseId, arg_groupLicenseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GroupLicense response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroupLicense(response);
       })));
     });
@@ -4950,8 +4948,9 @@
         var resp = convert.JSON.encode(buildGroupLicensesListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_enterpriseId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GroupLicensesListResponse response) {
+      res
+          .list(arg_enterpriseId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGroupLicensesListResponse(response);
       })));
     });
@@ -5024,8 +5023,9 @@
         var resp = convert.JSON.encode(buildGroupLicenseUsersListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_enterpriseId, arg_groupLicenseId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GroupLicenseUsersListResponse response) {
+      res
+          .list(arg_enterpriseId, arg_groupLicenseId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGroupLicenseUsersListResponse(response);
       })));
     });
@@ -5199,7 +5199,7 @@
       res
           .get(arg_enterpriseId, arg_userId, arg_deviceId, arg_installId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Install response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstall(response);
       })));
     });
@@ -5282,7 +5282,7 @@
       res
           .list(arg_enterpriseId, arg_userId, arg_deviceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstallsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstallsListResponse(response);
       })));
     });
@@ -5374,7 +5374,7 @@
           .patch(arg_request, arg_enterpriseId, arg_userId, arg_deviceId,
               arg_installId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Install response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstall(response);
       })));
     });
@@ -5466,7 +5466,7 @@
           .update(arg_request, arg_enterpriseId, arg_userId, arg_deviceId,
               arg_installId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Install response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstall(response);
       })));
     });
@@ -5646,7 +5646,7 @@
           .get(arg_enterpriseId, arg_userId, arg_deviceId,
               arg_managedConfigurationForDeviceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedConfiguration(response);
       })));
     });
@@ -5731,8 +5731,7 @@
       res
           .list(arg_enterpriseId, arg_userId, arg_deviceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ManagedConfigurationsForDeviceListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedConfigurationsForDeviceListResponse(response);
       })));
     });
@@ -5826,7 +5825,7 @@
           .patch(arg_request, arg_enterpriseId, arg_userId, arg_deviceId,
               arg_managedConfigurationForDeviceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedConfiguration(response);
       })));
     });
@@ -5920,7 +5919,7 @@
           .update(arg_request, arg_enterpriseId, arg_userId, arg_deviceId,
               arg_managedConfigurationForDeviceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedConfiguration(response);
       })));
     });
@@ -6079,7 +6078,7 @@
       res
           .get(arg_enterpriseId, arg_userId, arg_managedConfigurationForUserId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedConfiguration(response);
       })));
     });
@@ -6151,9 +6150,9 @@
             .encode(buildManagedConfigurationsForUserListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_enterpriseId, arg_userId, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.ManagedConfigurationsForUserListResponse response) {
+      res
+          .list(arg_enterpriseId, arg_userId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkManagedConfigurationsForUserListResponse(response);
       })));
     });
@@ -6237,7 +6236,7 @@
           .patch(arg_request, arg_enterpriseId, arg_userId,
               arg_managedConfigurationForUserId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedConfiguration(response);
       })));
     });
@@ -6321,7 +6320,7 @@
           .update(arg_request, arg_enterpriseId, arg_userId,
               arg_managedConfigurationForUserId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedConfiguration(response);
       })));
     });
@@ -6395,9 +6394,9 @@
             .encode(buildManagedConfigurationsSettingsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_enterpriseId, arg_productId, $fields: arg_$fields).then(
-          unittest.expectAsync1(
-              ((api.ManagedConfigurationsSettingsListResponse response) {
+      res
+          .list(arg_enterpriseId, arg_productId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkManagedConfigurationsSettingsListResponse(response);
       })));
     });
@@ -6459,7 +6458,7 @@
       }), true);
       res
           .get(arg_permissionId, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Permission response) {
+          .then(unittest.expectAsync1(((response) {
         checkPermission(response);
       })));
     });
@@ -6613,8 +6612,7 @@
       res
           .generateApprovalUrl(arg_enterpriseId, arg_productId,
               languageCode: arg_languageCode, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ProductsGenerateApprovalUrlResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkProductsGenerateApprovalUrlResponse(response);
       })));
     });
@@ -6684,7 +6682,7 @@
       res
           .get(arg_enterpriseId, arg_productId,
               language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Product response) {
+          .then(unittest.expectAsync1(((response) {
         checkProduct(response);
       })));
     });
@@ -6760,7 +6758,7 @@
       res
           .getAppRestrictionsSchema(arg_enterpriseId, arg_productId,
               language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AppRestrictionsSchema response) {
+          .then(unittest.expectAsync1(((response) {
         checkAppRestrictionsSchema(response);
       })));
     });
@@ -6832,7 +6830,7 @@
       }), true);
       res
           .getPermissions(arg_enterpriseId, arg_productId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProductPermissions response) {
+          .then(unittest.expectAsync1(((response) {
         checkProductPermissions(response);
       })));
     });
@@ -6913,7 +6911,7 @@
               query: arg_query,
               token: arg_token,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProductsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkProductsListResponse(response);
       })));
     });
@@ -7117,7 +7115,7 @@
       }), true);
       res
           .insert(arg_request, arg_enterpriseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ServiceAccountKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkServiceAccountKey(response);
       })));
     });
@@ -7178,8 +7176,9 @@
         var resp = convert.JSON.encode(buildServiceAccountKeysListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_enterpriseId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ServiceAccountKeysListResponse response) {
+      res
+          .list(arg_enterpriseId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkServiceAccountKeysListResponse(response);
       })));
     });
@@ -7335,7 +7334,7 @@
       res
           .get(arg_enterpriseId, arg_pageId, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StoreCluster response) {
+          .then(unittest.expectAsync1(((response) {
         checkStoreCluster(response);
       })));
     });
@@ -7413,7 +7412,7 @@
       res
           .insert(arg_request, arg_enterpriseId, arg_pageId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StoreCluster response) {
+          .then(unittest.expectAsync1(((response) {
         checkStoreCluster(response);
       })));
     });
@@ -7484,8 +7483,9 @@
         var resp = convert.JSON.encode(buildStoreLayoutClustersListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_enterpriseId, arg_pageId, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.StoreLayoutClustersListResponse response) {
+      res
+          .list(arg_enterpriseId, arg_pageId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkStoreLayoutClustersListResponse(response);
       })));
     });
@@ -7567,7 +7567,7 @@
       res
           .patch(arg_request, arg_enterpriseId, arg_pageId, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StoreCluster response) {
+          .then(unittest.expectAsync1(((response) {
         checkStoreCluster(response);
       })));
     });
@@ -7649,7 +7649,7 @@
       res
           .update(arg_request, arg_enterpriseId, arg_pageId, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StoreCluster response) {
+          .then(unittest.expectAsync1(((response) {
         checkStoreCluster(response);
       })));
     });
@@ -7783,7 +7783,7 @@
       }), true);
       res
           .get(arg_enterpriseId, arg_pageId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StorePage response) {
+          .then(unittest.expectAsync1(((response) {
         checkStorePage(response);
       })));
     });
@@ -7850,7 +7850,7 @@
       }), true);
       res
           .insert(arg_request, arg_enterpriseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StorePage response) {
+          .then(unittest.expectAsync1(((response) {
         checkStorePage(response);
       })));
     });
@@ -7911,8 +7911,9 @@
         var resp = convert.JSON.encode(buildStoreLayoutPagesListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_enterpriseId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.StoreLayoutPagesListResponse response) {
+      res
+          .list(arg_enterpriseId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkStoreLayoutPagesListResponse(response);
       })));
     });
@@ -7984,7 +7985,7 @@
       res
           .patch(arg_request, arg_enterpriseId, arg_pageId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StorePage response) {
+          .then(unittest.expectAsync1(((response) {
         checkStorePage(response);
       })));
     });
@@ -8056,7 +8057,7 @@
       res
           .update(arg_request, arg_enterpriseId, arg_pageId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StorePage response) {
+          .then(unittest.expectAsync1(((response) {
         checkStorePage(response);
       })));
     });
@@ -8195,7 +8196,7 @@
       res
           .generateAuthenticationToken(arg_enterpriseId, arg_userId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AuthenticationToken response) {
+          .then(unittest.expectAsync1(((response) {
         checkAuthenticationToken(response);
       })));
     });
@@ -8267,7 +8268,7 @@
       }), true);
       res
           .generateToken(arg_enterpriseId, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserToken response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserToken(response);
       })));
     });
@@ -8333,7 +8334,7 @@
       }), true);
       res
           .get(arg_enterpriseId, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.User response) {
+          .then(unittest.expectAsync1(((response) {
         checkUser(response);
       })));
     });
@@ -8406,7 +8407,7 @@
       res
           .getAvailableProductSet(arg_enterpriseId, arg_userId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProductSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkProductSet(response);
       })));
     });
@@ -8472,7 +8473,7 @@
       }), true);
       res
           .insert(arg_request, arg_enterpriseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.User response) {
+          .then(unittest.expectAsync1(((response) {
         checkUser(response);
       })));
     });
@@ -8536,7 +8537,7 @@
       }), true);
       res
           .list(arg_enterpriseId, arg_email, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UsersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkUsersListResponse(response);
       })));
     });
@@ -8607,7 +8608,7 @@
       res
           .patch(arg_request, arg_enterpriseId, arg_userId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.User response) {
+          .then(unittest.expectAsync1(((response) {
         checkUser(response);
       })));
     });
@@ -8825,7 +8826,7 @@
       res
           .setAvailableProductSet(arg_request, arg_enterpriseId, arg_userId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProductSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkProductSet(response);
       })));
     });
@@ -8896,7 +8897,7 @@
       res
           .update(arg_request, arg_enterpriseId, arg_userId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.User response) {
+          .then(unittest.expectAsync1(((response) {
         checkUser(response);
       })));
     });
diff --git a/generated/googleapis/test/androidmanagement/v1_test.dart b/generated/googleapis/test/androidmanagement/v1_test.dart
index 9185a37..939ccd0 100644
--- a/generated/googleapis/test/androidmanagement/v1_test.dart
+++ b/generated/googleapis/test/androidmanagement/v1_test.dart
@@ -90,27 +90,27 @@
   buildCounterApiLevelCondition--;
 }
 
-buildUnnamed2201() {
+buildUnnamed2513() {
   var o = new core.List<api.ManagedProperty>();
   o.add(buildManagedProperty());
   o.add(buildManagedProperty());
   return o;
 }
 
-checkUnnamed2201(core.List<api.ManagedProperty> o) {
+checkUnnamed2513(core.List<api.ManagedProperty> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedProperty(o[0]);
   checkManagedProperty(o[1]);
 }
 
-buildUnnamed2202() {
+buildUnnamed2514() {
   var o = new core.List<api.ApplicationPermission>();
   o.add(buildApplicationPermission());
   o.add(buildApplicationPermission());
   return o;
 }
 
-checkUnnamed2202(core.List<api.ApplicationPermission> o) {
+checkUnnamed2514(core.List<api.ApplicationPermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApplicationPermission(o[0]);
   checkApplicationPermission(o[1]);
@@ -121,9 +121,9 @@
   var o = new api.Application();
   buildCounterApplication++;
   if (buildCounterApplication < 3) {
-    o.managedProperties = buildUnnamed2201();
+    o.managedProperties = buildUnnamed2513();
     o.name = "foo";
-    o.permissions = buildUnnamed2202();
+    o.permissions = buildUnnamed2514();
     o.title = "foo";
   }
   buildCounterApplication--;
@@ -133,9 +133,9 @@
 checkApplication(api.Application o) {
   buildCounterApplication++;
   if (buildCounterApplication < 3) {
-    checkUnnamed2201(o.managedProperties);
+    checkUnnamed2513(o.managedProperties);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2202(o.permissions);
+    checkUnnamed2514(o.permissions);
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterApplication--;
@@ -164,20 +164,20 @@
   buildCounterApplicationPermission--;
 }
 
-buildUnnamed2203() {
+buildUnnamed2515() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2203(core.List<core.String> o) {
+checkUnnamed2515(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2204() {
+buildUnnamed2516() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -192,7 +192,7 @@
   return o;
 }
 
-checkUnnamed2204(core.Map<core.String, core.Object> o) {
+checkUnnamed2516(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -206,14 +206,14 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2205() {
+buildUnnamed2517() {
   var o = new core.List<api.PermissionGrant>();
   o.add(buildPermissionGrant());
   o.add(buildPermissionGrant());
   return o;
 }
 
-checkUnnamed2205(core.List<api.PermissionGrant> o) {
+checkUnnamed2517(core.List<api.PermissionGrant> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermissionGrant(o[0]);
   checkPermissionGrant(o[1]);
@@ -225,13 +225,13 @@
   buildCounterApplicationPolicy++;
   if (buildCounterApplicationPolicy < 3) {
     o.defaultPermissionPolicy = "foo";
-    o.delegatedScopes = buildUnnamed2203();
+    o.delegatedScopes = buildUnnamed2515();
     o.installType = "foo";
     o.lockTaskAllowed = true;
-    o.managedConfiguration = buildUnnamed2204();
+    o.managedConfiguration = buildUnnamed2516();
     o.minimumVersionCode = 42;
     o.packageName = "foo";
-    o.permissionGrants = buildUnnamed2205();
+    o.permissionGrants = buildUnnamed2517();
   }
   buildCounterApplicationPolicy--;
   return o;
@@ -241,25 +241,25 @@
   buildCounterApplicationPolicy++;
   if (buildCounterApplicationPolicy < 3) {
     unittest.expect(o.defaultPermissionPolicy, unittest.equals('foo'));
-    checkUnnamed2203(o.delegatedScopes);
+    checkUnnamed2515(o.delegatedScopes);
     unittest.expect(o.installType, unittest.equals('foo'));
     unittest.expect(o.lockTaskAllowed, unittest.isTrue);
-    checkUnnamed2204(o.managedConfiguration);
+    checkUnnamed2516(o.managedConfiguration);
     unittest.expect(o.minimumVersionCode, unittest.equals(42));
     unittest.expect(o.packageName, unittest.equals('foo'));
-    checkUnnamed2205(o.permissionGrants);
+    checkUnnamed2517(o.permissionGrants);
   }
   buildCounterApplicationPolicy--;
 }
 
-buildUnnamed2206() {
+buildUnnamed2518() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2206(core.List<core.String> o) {
+checkUnnamed2518(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -273,7 +273,7 @@
     o.createTime = "foo";
     o.duration = "foo";
     o.newPassword = "foo";
-    o.resetPasswordFlags = buildUnnamed2206();
+    o.resetPasswordFlags = buildUnnamed2518();
     o.type = "foo";
   }
   buildCounterCommand--;
@@ -286,7 +286,7 @@
     unittest.expect(o.createTime, unittest.equals('foo'));
     unittest.expect(o.duration, unittest.equals('foo'));
     unittest.expect(o.newPassword, unittest.equals('foo'));
-    checkUnnamed2206(o.resetPasswordFlags);
+    checkUnnamed2518(o.resetPasswordFlags);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterCommand--;
@@ -315,79 +315,79 @@
   buildCounterComplianceRule--;
 }
 
-buildUnnamed2207() {
+buildUnnamed2519() {
   var o = new core.List<api.Display>();
   o.add(buildDisplay());
   o.add(buildDisplay());
   return o;
 }
 
-checkUnnamed2207(core.List<api.Display> o) {
+checkUnnamed2519(core.List<api.Display> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisplay(o[0]);
   checkDisplay(o[1]);
 }
 
-buildUnnamed2208() {
+buildUnnamed2520() {
   var o = new core.List<api.HardwareStatus>();
   o.add(buildHardwareStatus());
   o.add(buildHardwareStatus());
   return o;
 }
 
-checkUnnamed2208(core.List<api.HardwareStatus> o) {
+checkUnnamed2520(core.List<api.HardwareStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHardwareStatus(o[0]);
   checkHardwareStatus(o[1]);
 }
 
-buildUnnamed2209() {
+buildUnnamed2521() {
   var o = new core.List<api.MemoryEvent>();
   o.add(buildMemoryEvent());
   o.add(buildMemoryEvent());
   return o;
 }
 
-checkUnnamed2209(core.List<api.MemoryEvent> o) {
+checkUnnamed2521(core.List<api.MemoryEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMemoryEvent(o[0]);
   checkMemoryEvent(o[1]);
 }
 
-buildUnnamed2210() {
+buildUnnamed2522() {
   var o = new core.List<api.NonComplianceDetail>();
   o.add(buildNonComplianceDetail());
   o.add(buildNonComplianceDetail());
   return o;
 }
 
-checkUnnamed2210(core.List<api.NonComplianceDetail> o) {
+checkUnnamed2522(core.List<api.NonComplianceDetail> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNonComplianceDetail(o[0]);
   checkNonComplianceDetail(o[1]);
 }
 
-buildUnnamed2211() {
+buildUnnamed2523() {
   var o = new core.List<api.PowerManagementEvent>();
   o.add(buildPowerManagementEvent());
   o.add(buildPowerManagementEvent());
   return o;
 }
 
-checkUnnamed2211(core.List<api.PowerManagementEvent> o) {
+checkUnnamed2523(core.List<api.PowerManagementEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPowerManagementEvent(o[0]);
   checkPowerManagementEvent(o[1]);
 }
 
-buildUnnamed2212() {
+buildUnnamed2524() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2212(core.List<core.String> o) {
+checkUnnamed2524(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -404,24 +404,24 @@
     o.appliedState = "foo";
     o.deviceSettings = buildDeviceSettings();
     o.disabledReason = buildUserFacingMessage();
-    o.displays = buildUnnamed2207();
+    o.displays = buildUnnamed2519();
     o.enrollmentTime = "foo";
     o.enrollmentTokenData = "foo";
     o.enrollmentTokenName = "foo";
     o.hardwareInfo = buildHardwareInfo();
-    o.hardwareStatusSamples = buildUnnamed2208();
+    o.hardwareStatusSamples = buildUnnamed2520();
     o.lastPolicyComplianceReportTime = "foo";
     o.lastPolicySyncTime = "foo";
     o.lastStatusReportTime = "foo";
-    o.memoryEvents = buildUnnamed2209();
+    o.memoryEvents = buildUnnamed2521();
     o.memoryInfo = buildMemoryInfo();
     o.name = "foo";
     o.networkInfo = buildNetworkInfo();
-    o.nonComplianceDetails = buildUnnamed2210();
+    o.nonComplianceDetails = buildUnnamed2522();
     o.policyCompliant = true;
     o.policyName = "foo";
-    o.powerManagementEvents = buildUnnamed2211();
-    o.previousDeviceNames = buildUnnamed2212();
+    o.powerManagementEvents = buildUnnamed2523();
+    o.previousDeviceNames = buildUnnamed2524();
     o.softwareInfo = buildSoftwareInfo();
     o.state = "foo";
     o.userName = "foo";
@@ -439,24 +439,24 @@
     unittest.expect(o.appliedState, unittest.equals('foo'));
     checkDeviceSettings(o.deviceSettings);
     checkUserFacingMessage(o.disabledReason);
-    checkUnnamed2207(o.displays);
+    checkUnnamed2519(o.displays);
     unittest.expect(o.enrollmentTime, unittest.equals('foo'));
     unittest.expect(o.enrollmentTokenData, unittest.equals('foo'));
     unittest.expect(o.enrollmentTokenName, unittest.equals('foo'));
     checkHardwareInfo(o.hardwareInfo);
-    checkUnnamed2208(o.hardwareStatusSamples);
+    checkUnnamed2520(o.hardwareStatusSamples);
     unittest.expect(o.lastPolicyComplianceReportTime, unittest.equals('foo'));
     unittest.expect(o.lastPolicySyncTime, unittest.equals('foo'));
     unittest.expect(o.lastStatusReportTime, unittest.equals('foo'));
-    checkUnnamed2209(o.memoryEvents);
+    checkUnnamed2521(o.memoryEvents);
     checkMemoryInfo(o.memoryInfo);
     unittest.expect(o.name, unittest.equals('foo'));
     checkNetworkInfo(o.networkInfo);
-    checkUnnamed2210(o.nonComplianceDetails);
+    checkUnnamed2522(o.nonComplianceDetails);
     unittest.expect(o.policyCompliant, unittest.isTrue);
     unittest.expect(o.policyName, unittest.equals('foo'));
-    checkUnnamed2211(o.powerManagementEvents);
-    checkUnnamed2212(o.previousDeviceNames);
+    checkUnnamed2523(o.powerManagementEvents);
+    checkUnnamed2524(o.previousDeviceNames);
     checkSoftwareInfo(o.softwareInfo);
     unittest.expect(o.state, unittest.equals('foo'));
     unittest.expect(o.userName, unittest.equals('foo'));
@@ -572,14 +572,14 @@
   buildCounterEnrollmentToken--;
 }
 
-buildUnnamed2213() {
+buildUnnamed2525() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2213(core.List<core.String> o) {
+checkUnnamed2525(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -591,7 +591,7 @@
   buildCounterEnterprise++;
   if (buildCounterEnterprise < 3) {
     o.appAutoApprovalEnabled = true;
-    o.enabledNotificationTypes = buildUnnamed2213();
+    o.enabledNotificationTypes = buildUnnamed2525();
     o.enterpriseDisplayName = "foo";
     o.logo = buildExternalData();
     o.name = "foo";
@@ -606,7 +606,7 @@
   buildCounterEnterprise++;
   if (buildCounterEnterprise < 3) {
     unittest.expect(o.appAutoApprovalEnabled, unittest.isTrue);
-    checkUnnamed2213(o.enabledNotificationTypes);
+    checkUnnamed2525(o.enabledNotificationTypes);
     unittest.expect(o.enterpriseDisplayName, unittest.equals('foo'));
     checkExternalData(o.logo);
     unittest.expect(o.name, unittest.equals('foo'));
@@ -637,105 +637,105 @@
   buildCounterExternalData--;
 }
 
-buildUnnamed2214() {
+buildUnnamed2526() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2214(core.List<core.double> o) {
+checkUnnamed2526(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2215() {
+buildUnnamed2527() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2215(core.List<core.double> o) {
+checkUnnamed2527(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2216() {
+buildUnnamed2528() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2216(core.List<core.double> o) {
+checkUnnamed2528(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2217() {
+buildUnnamed2529() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2217(core.List<core.double> o) {
+checkUnnamed2529(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2218() {
+buildUnnamed2530() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2218(core.List<core.double> o) {
+checkUnnamed2530(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2219() {
+buildUnnamed2531() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2219(core.List<core.double> o) {
+checkUnnamed2531(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2220() {
+buildUnnamed2532() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2220(core.List<core.double> o) {
+checkUnnamed2532(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2221() {
+buildUnnamed2533() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2221(core.List<core.double> o) {
+checkUnnamed2533(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -746,20 +746,20 @@
   var o = new api.HardwareInfo();
   buildCounterHardwareInfo++;
   if (buildCounterHardwareInfo < 3) {
-    o.batteryShutdownTemperatures = buildUnnamed2214();
-    o.batteryThrottlingTemperatures = buildUnnamed2215();
+    o.batteryShutdownTemperatures = buildUnnamed2526();
+    o.batteryThrottlingTemperatures = buildUnnamed2527();
     o.brand = "foo";
-    o.cpuShutdownTemperatures = buildUnnamed2216();
-    o.cpuThrottlingTemperatures = buildUnnamed2217();
+    o.cpuShutdownTemperatures = buildUnnamed2528();
+    o.cpuThrottlingTemperatures = buildUnnamed2529();
     o.deviceBasebandVersion = "foo";
-    o.gpuShutdownTemperatures = buildUnnamed2218();
-    o.gpuThrottlingTemperatures = buildUnnamed2219();
+    o.gpuShutdownTemperatures = buildUnnamed2530();
+    o.gpuThrottlingTemperatures = buildUnnamed2531();
     o.hardware = "foo";
     o.manufacturer = "foo";
     o.model = "foo";
     o.serialNumber = "foo";
-    o.skinShutdownTemperatures = buildUnnamed2220();
-    o.skinThrottlingTemperatures = buildUnnamed2221();
+    o.skinShutdownTemperatures = buildUnnamed2532();
+    o.skinThrottlingTemperatures = buildUnnamed2533();
   }
   buildCounterHardwareInfo--;
   return o;
@@ -768,97 +768,97 @@
 checkHardwareInfo(api.HardwareInfo o) {
   buildCounterHardwareInfo++;
   if (buildCounterHardwareInfo < 3) {
-    checkUnnamed2214(o.batteryShutdownTemperatures);
-    checkUnnamed2215(o.batteryThrottlingTemperatures);
+    checkUnnamed2526(o.batteryShutdownTemperatures);
+    checkUnnamed2527(o.batteryThrottlingTemperatures);
     unittest.expect(o.brand, unittest.equals('foo'));
-    checkUnnamed2216(o.cpuShutdownTemperatures);
-    checkUnnamed2217(o.cpuThrottlingTemperatures);
+    checkUnnamed2528(o.cpuShutdownTemperatures);
+    checkUnnamed2529(o.cpuThrottlingTemperatures);
     unittest.expect(o.deviceBasebandVersion, unittest.equals('foo'));
-    checkUnnamed2218(o.gpuShutdownTemperatures);
-    checkUnnamed2219(o.gpuThrottlingTemperatures);
+    checkUnnamed2530(o.gpuShutdownTemperatures);
+    checkUnnamed2531(o.gpuThrottlingTemperatures);
     unittest.expect(o.hardware, unittest.equals('foo'));
     unittest.expect(o.manufacturer, unittest.equals('foo'));
     unittest.expect(o.model, unittest.equals('foo'));
     unittest.expect(o.serialNumber, unittest.equals('foo'));
-    checkUnnamed2220(o.skinShutdownTemperatures);
-    checkUnnamed2221(o.skinThrottlingTemperatures);
+    checkUnnamed2532(o.skinShutdownTemperatures);
+    checkUnnamed2533(o.skinThrottlingTemperatures);
   }
   buildCounterHardwareInfo--;
 }
 
-buildUnnamed2222() {
+buildUnnamed2534() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2222(core.List<core.double> o) {
+checkUnnamed2534(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2223() {
+buildUnnamed2535() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2223(core.List<core.double> o) {
+checkUnnamed2535(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2224() {
+buildUnnamed2536() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2224(core.List<core.double> o) {
+checkUnnamed2536(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2225() {
+buildUnnamed2537() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2225(core.List<core.double> o) {
+checkUnnamed2537(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2226() {
+buildUnnamed2538() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2226(core.List<core.double> o) {
+checkUnnamed2538(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2227() {
+buildUnnamed2539() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2227(core.List<core.double> o) {
+checkUnnamed2539(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -869,13 +869,13 @@
   var o = new api.HardwareStatus();
   buildCounterHardwareStatus++;
   if (buildCounterHardwareStatus < 3) {
-    o.batteryTemperatures = buildUnnamed2222();
-    o.cpuTemperatures = buildUnnamed2223();
-    o.cpuUsages = buildUnnamed2224();
+    o.batteryTemperatures = buildUnnamed2534();
+    o.cpuTemperatures = buildUnnamed2535();
+    o.cpuUsages = buildUnnamed2536();
     o.createTime = "foo";
-    o.fanSpeeds = buildUnnamed2225();
-    o.gpuTemperatures = buildUnnamed2226();
-    o.skinTemperatures = buildUnnamed2227();
+    o.fanSpeeds = buildUnnamed2537();
+    o.gpuTemperatures = buildUnnamed2538();
+    o.skinTemperatures = buildUnnamed2539();
   }
   buildCounterHardwareStatus--;
   return o;
@@ -884,25 +884,25 @@
 checkHardwareStatus(api.HardwareStatus o) {
   buildCounterHardwareStatus++;
   if (buildCounterHardwareStatus < 3) {
-    checkUnnamed2222(o.batteryTemperatures);
-    checkUnnamed2223(o.cpuTemperatures);
-    checkUnnamed2224(o.cpuUsages);
+    checkUnnamed2534(o.batteryTemperatures);
+    checkUnnamed2535(o.cpuTemperatures);
+    checkUnnamed2536(o.cpuUsages);
     unittest.expect(o.createTime, unittest.equals('foo'));
-    checkUnnamed2225(o.fanSpeeds);
-    checkUnnamed2226(o.gpuTemperatures);
-    checkUnnamed2227(o.skinTemperatures);
+    checkUnnamed2537(o.fanSpeeds);
+    checkUnnamed2538(o.gpuTemperatures);
+    checkUnnamed2539(o.skinTemperatures);
   }
   buildCounterHardwareStatus--;
 }
 
-buildUnnamed2228() {
+buildUnnamed2540() {
   var o = new core.List<api.Device>();
   o.add(buildDevice());
   o.add(buildDevice());
   return o;
 }
 
-checkUnnamed2228(core.List<api.Device> o) {
+checkUnnamed2540(core.List<api.Device> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDevice(o[0]);
   checkDevice(o[1]);
@@ -913,7 +913,7 @@
   var o = new api.ListDevicesResponse();
   buildCounterListDevicesResponse++;
   if (buildCounterListDevicesResponse < 3) {
-    o.devices = buildUnnamed2228();
+    o.devices = buildUnnamed2540();
     o.nextPageToken = "foo";
   }
   buildCounterListDevicesResponse--;
@@ -923,20 +923,20 @@
 checkListDevicesResponse(api.ListDevicesResponse o) {
   buildCounterListDevicesResponse++;
   if (buildCounterListDevicesResponse < 3) {
-    checkUnnamed2228(o.devices);
+    checkUnnamed2540(o.devices);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDevicesResponse--;
 }
 
-buildUnnamed2229() {
+buildUnnamed2541() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed2229(core.List<api.Operation> o) {
+checkUnnamed2541(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -948,7 +948,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed2229();
+    o.operations = buildUnnamed2541();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -958,19 +958,19 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2229(o.operations);
+    checkUnnamed2541(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed2230() {
+buildUnnamed2542() {
   var o = new core.List<api.Policy>();
   o.add(buildPolicy());
   o.add(buildPolicy());
   return o;
 }
 
-checkUnnamed2230(core.List<api.Policy> o) {
+checkUnnamed2542(core.List<api.Policy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPolicy(o[0]);
   checkPolicy(o[1]);
@@ -982,7 +982,7 @@
   buildCounterListPoliciesResponse++;
   if (buildCounterListPoliciesResponse < 3) {
     o.nextPageToken = "foo";
-    o.policies = buildUnnamed2230();
+    o.policies = buildUnnamed2542();
   }
   buildCounterListPoliciesResponse--;
   return o;
@@ -992,32 +992,32 @@
   buildCounterListPoliciesResponse++;
   if (buildCounterListPoliciesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2230(o.policies);
+    checkUnnamed2542(o.policies);
   }
   buildCounterListPoliciesResponse--;
 }
 
-buildUnnamed2231() {
+buildUnnamed2543() {
   var o = new core.List<api.ManagedPropertyEntry>();
   o.add(buildManagedPropertyEntry());
   o.add(buildManagedPropertyEntry());
   return o;
 }
 
-checkUnnamed2231(core.List<api.ManagedPropertyEntry> o) {
+checkUnnamed2543(core.List<api.ManagedPropertyEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedPropertyEntry(o[0]);
   checkManagedPropertyEntry(o[1]);
 }
 
-buildUnnamed2232() {
+buildUnnamed2544() {
   var o = new core.List<api.ManagedProperty>();
   o.add(buildManagedProperty());
   o.add(buildManagedProperty());
   return o;
 }
 
-checkUnnamed2232(core.List<api.ManagedProperty> o) {
+checkUnnamed2544(core.List<api.ManagedProperty> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedProperty(o[0]);
   checkManagedProperty(o[1]);
@@ -1034,9 +1034,9 @@
       'string': 'foo'
     };
     o.description = "foo";
-    o.entries = buildUnnamed2231();
+    o.entries = buildUnnamed2543();
     o.key = "foo";
-    o.nestedProperties = buildUnnamed2232();
+    o.nestedProperties = buildUnnamed2544();
     o.title = "foo";
     o.type = "foo";
   }
@@ -1053,9 +1053,9 @@
     unittest.expect(casted3["bool"], unittest.equals(true));
     unittest.expect(casted3["string"], unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed2231(o.entries);
+    checkUnnamed2543(o.entries);
     unittest.expect(o.key, unittest.equals('foo'));
-    checkUnnamed2232(o.nestedProperties);
+    checkUnnamed2544(o.nestedProperties);
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
@@ -1212,7 +1212,7 @@
   buildCounterNonComplianceDetailCondition--;
 }
 
-buildUnnamed2233() {
+buildUnnamed2545() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1227,7 +1227,7 @@
   return o;
 }
 
-checkUnnamed2233(core.Map<core.String, core.Object> o) {
+checkUnnamed2545(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1241,7 +1241,7 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2234() {
+buildUnnamed2546() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1256,7 +1256,7 @@
   return o;
 }
 
-checkUnnamed2234(core.Map<core.String, core.Object> o) {
+checkUnnamed2546(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -1277,9 +1277,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed2233();
+    o.metadata = buildUnnamed2545();
     o.name = "foo";
-    o.response = buildUnnamed2234();
+    o.response = buildUnnamed2546();
   }
   buildCounterOperation--;
   return o;
@@ -1290,21 +1290,21 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed2233(o.metadata);
+    checkUnnamed2545(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2234(o.response);
+    checkUnnamed2546(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed2235() {
+buildUnnamed2547() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2235(core.List<core.String> o) {
+checkUnnamed2547(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1315,7 +1315,7 @@
   var o = new api.PackageNameList();
   buildCounterPackageNameList++;
   if (buildCounterPackageNameList < 3) {
-    o.packageNames = buildUnnamed2235();
+    o.packageNames = buildUnnamed2547();
   }
   buildCounterPackageNameList--;
   return o;
@@ -1324,7 +1324,7 @@
 checkPackageNameList(api.PackageNameList o) {
   buildCounterPackageNameList++;
   if (buildCounterPackageNameList < 3) {
-    checkUnnamed2235(o.packageNames);
+    checkUnnamed2547(o.packageNames);
   }
   buildCounterPackageNameList--;
 }
@@ -1389,27 +1389,27 @@
   buildCounterPermissionGrant--;
 }
 
-buildUnnamed2236() {
+buildUnnamed2548() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2236(core.List<core.String> o) {
+checkUnnamed2548(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2237() {
+buildUnnamed2549() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2237(core.List<core.String> o) {
+checkUnnamed2549(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1420,8 +1420,8 @@
   var o = new api.PersistentPreferredActivity();
   buildCounterPersistentPreferredActivity++;
   if (buildCounterPersistentPreferredActivity < 3) {
-    o.actions = buildUnnamed2236();
-    o.categories = buildUnnamed2237();
+    o.actions = buildUnnamed2548();
+    o.categories = buildUnnamed2549();
     o.receiverActivity = "foo";
   }
   buildCounterPersistentPreferredActivity--;
@@ -1431,92 +1431,92 @@
 checkPersistentPreferredActivity(api.PersistentPreferredActivity o) {
   buildCounterPersistentPreferredActivity++;
   if (buildCounterPersistentPreferredActivity < 3) {
-    checkUnnamed2236(o.actions);
-    checkUnnamed2237(o.categories);
+    checkUnnamed2548(o.actions);
+    checkUnnamed2549(o.categories);
     unittest.expect(o.receiverActivity, unittest.equals('foo'));
   }
   buildCounterPersistentPreferredActivity--;
 }
 
-buildUnnamed2238() {
+buildUnnamed2550() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2238(core.List<core.String> o) {
+checkUnnamed2550(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2239() {
+buildUnnamed2551() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2239(core.List<core.String> o) {
+checkUnnamed2551(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2240() {
+buildUnnamed2552() {
   var o = new core.List<api.ApplicationPolicy>();
   o.add(buildApplicationPolicy());
   o.add(buildApplicationPolicy());
   return o;
 }
 
-checkUnnamed2240(core.List<api.ApplicationPolicy> o) {
+checkUnnamed2552(core.List<api.ApplicationPolicy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApplicationPolicy(o[0]);
   checkApplicationPolicy(o[1]);
 }
 
-buildUnnamed2241() {
+buildUnnamed2553() {
   var o = new core.List<api.ComplianceRule>();
   o.add(buildComplianceRule());
   o.add(buildComplianceRule());
   return o;
 }
 
-checkUnnamed2241(core.List<api.ComplianceRule> o) {
+checkUnnamed2553(core.List<api.ComplianceRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComplianceRule(o[0]);
   checkComplianceRule(o[1]);
 }
 
-buildUnnamed2242() {
+buildUnnamed2554() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2242(core.List<core.String> o) {
+checkUnnamed2554(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2243() {
+buildUnnamed2555() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2243(core.List<core.String> o) {
+checkUnnamed2555(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2244() {
+buildUnnamed2556() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1531,7 +1531,7 @@
   return o;
 }
 
-checkUnnamed2244(core.Map<core.String, core.Object> o) {
+checkUnnamed2556(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted9 = (o["x"]) as core.Map;
   unittest.expect(casted9, unittest.hasLength(3));
@@ -1545,27 +1545,27 @@
   unittest.expect(casted10["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2245() {
+buildUnnamed2557() {
   var o = new core.List<api.PersistentPreferredActivity>();
   o.add(buildPersistentPreferredActivity());
   o.add(buildPersistentPreferredActivity());
   return o;
 }
 
-checkUnnamed2245(core.List<api.PersistentPreferredActivity> o) {
+checkUnnamed2557(core.List<api.PersistentPreferredActivity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersistentPreferredActivity(o[0]);
   checkPersistentPreferredActivity(o[1]);
 }
 
-buildUnnamed2246() {
+buildUnnamed2558() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2246(core.List<core.String> o) {
+checkUnnamed2558(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1576,12 +1576,12 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.accountTypesWithManagementDisabled = buildUnnamed2238();
+    o.accountTypesWithManagementDisabled = buildUnnamed2550();
     o.addUserDisabled = true;
     o.adjustVolumeDisabled = true;
     o.alwaysOnVpnPackage = buildAlwaysOnVpnPackage();
-    o.androidDevicePolicyTracks = buildUnnamed2239();
-    o.applications = buildUnnamed2240();
+    o.androidDevicePolicyTracks = buildUnnamed2551();
+    o.applications = buildUnnamed2552();
     o.autoTimeRequired = true;
     o.blockApplicationsEnabled = true;
     o.bluetoothConfigDisabled = true;
@@ -1589,7 +1589,7 @@
     o.bluetoothDisabled = true;
     o.cameraDisabled = true;
     o.cellBroadcastsConfigDisabled = true;
-    o.complianceRules = buildUnnamed2241();
+    o.complianceRules = buildUnnamed2553();
     o.createWindowsDisabled = true;
     o.credentialsConfigDisabled = true;
     o.dataRoamingDisabled = true;
@@ -1597,12 +1597,12 @@
     o.defaultPermissionPolicy = "foo";
     o.ensureVerifyAppsEnabled = true;
     o.factoryResetDisabled = true;
-    o.frpAdminEmails = buildUnnamed2242();
+    o.frpAdminEmails = buildUnnamed2554();
     o.funDisabled = true;
     o.installAppsDisabled = true;
     o.installUnknownSourcesAllowed = true;
     o.keyguardDisabled = true;
-    o.keyguardDisabledFeatures = buildUnnamed2243();
+    o.keyguardDisabledFeatures = buildUnnamed2555();
     o.kioskCustomLauncherEnabled = true;
     o.longSupportMessage = buildUserFacingMessage();
     o.maximumTimeToLock = "foo";
@@ -1612,12 +1612,12 @@
     o.name = "foo";
     o.networkEscapeHatchEnabled = true;
     o.networkResetDisabled = true;
-    o.openNetworkConfiguration = buildUnnamed2244();
+    o.openNetworkConfiguration = buildUnnamed2556();
     o.outgoingBeamDisabled = true;
     o.outgoingCallsDisabled = true;
     o.passwordRequirements = buildPasswordRequirements();
     o.permittedInputMethods = buildPackageNameList();
-    o.persistentPreferredActivities = buildUnnamed2245();
+    o.persistentPreferredActivities = buildUnnamed2557();
     o.recommendedGlobalProxy = buildProxyInfo();
     o.removeUserDisabled = true;
     o.safeBootDisabled = true;
@@ -1628,7 +1628,7 @@
     o.smsDisabled = true;
     o.statusBarDisabled = true;
     o.statusReportingSettings = buildStatusReportingSettings();
-    o.stayOnPluggedModes = buildUnnamed2246();
+    o.stayOnPluggedModes = buildUnnamed2558();
     o.systemUpdate = buildSystemUpdate();
     o.tetheringConfigDisabled = true;
     o.uninstallAppsDisabled = true;
@@ -1646,12 +1646,12 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed2238(o.accountTypesWithManagementDisabled);
+    checkUnnamed2550(o.accountTypesWithManagementDisabled);
     unittest.expect(o.addUserDisabled, unittest.isTrue);
     unittest.expect(o.adjustVolumeDisabled, unittest.isTrue);
     checkAlwaysOnVpnPackage(o.alwaysOnVpnPackage);
-    checkUnnamed2239(o.androidDevicePolicyTracks);
-    checkUnnamed2240(o.applications);
+    checkUnnamed2551(o.androidDevicePolicyTracks);
+    checkUnnamed2552(o.applications);
     unittest.expect(o.autoTimeRequired, unittest.isTrue);
     unittest.expect(o.blockApplicationsEnabled, unittest.isTrue);
     unittest.expect(o.bluetoothConfigDisabled, unittest.isTrue);
@@ -1659,7 +1659,7 @@
     unittest.expect(o.bluetoothDisabled, unittest.isTrue);
     unittest.expect(o.cameraDisabled, unittest.isTrue);
     unittest.expect(o.cellBroadcastsConfigDisabled, unittest.isTrue);
-    checkUnnamed2241(o.complianceRules);
+    checkUnnamed2553(o.complianceRules);
     unittest.expect(o.createWindowsDisabled, unittest.isTrue);
     unittest.expect(o.credentialsConfigDisabled, unittest.isTrue);
     unittest.expect(o.dataRoamingDisabled, unittest.isTrue);
@@ -1667,12 +1667,12 @@
     unittest.expect(o.defaultPermissionPolicy, unittest.equals('foo'));
     unittest.expect(o.ensureVerifyAppsEnabled, unittest.isTrue);
     unittest.expect(o.factoryResetDisabled, unittest.isTrue);
-    checkUnnamed2242(o.frpAdminEmails);
+    checkUnnamed2554(o.frpAdminEmails);
     unittest.expect(o.funDisabled, unittest.isTrue);
     unittest.expect(o.installAppsDisabled, unittest.isTrue);
     unittest.expect(o.installUnknownSourcesAllowed, unittest.isTrue);
     unittest.expect(o.keyguardDisabled, unittest.isTrue);
-    checkUnnamed2243(o.keyguardDisabledFeatures);
+    checkUnnamed2555(o.keyguardDisabledFeatures);
     unittest.expect(o.kioskCustomLauncherEnabled, unittest.isTrue);
     checkUserFacingMessage(o.longSupportMessage);
     unittest.expect(o.maximumTimeToLock, unittest.equals('foo'));
@@ -1682,12 +1682,12 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.networkEscapeHatchEnabled, unittest.isTrue);
     unittest.expect(o.networkResetDisabled, unittest.isTrue);
-    checkUnnamed2244(o.openNetworkConfiguration);
+    checkUnnamed2556(o.openNetworkConfiguration);
     unittest.expect(o.outgoingBeamDisabled, unittest.isTrue);
     unittest.expect(o.outgoingCallsDisabled, unittest.isTrue);
     checkPasswordRequirements(o.passwordRequirements);
     checkPackageNameList(o.permittedInputMethods);
-    checkUnnamed2245(o.persistentPreferredActivities);
+    checkUnnamed2557(o.persistentPreferredActivities);
     checkProxyInfo(o.recommendedGlobalProxy);
     unittest.expect(o.removeUserDisabled, unittest.isTrue);
     unittest.expect(o.safeBootDisabled, unittest.isTrue);
@@ -1698,7 +1698,7 @@
     unittest.expect(o.smsDisabled, unittest.isTrue);
     unittest.expect(o.statusBarDisabled, unittest.isTrue);
     checkStatusReportingSettings(o.statusReportingSettings);
-    checkUnnamed2246(o.stayOnPluggedModes);
+    checkUnnamed2558(o.stayOnPluggedModes);
     checkSystemUpdate(o.systemUpdate);
     unittest.expect(o.tetheringConfigDisabled, unittest.isTrue);
     unittest.expect(o.uninstallAppsDisabled, unittest.isTrue);
@@ -1735,14 +1735,14 @@
   buildCounterPowerManagementEvent--;
 }
 
-buildUnnamed2247() {
+buildUnnamed2559() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2247(core.List<core.String> o) {
+checkUnnamed2559(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1753,7 +1753,7 @@
   var o = new api.ProxyInfo();
   buildCounterProxyInfo++;
   if (buildCounterProxyInfo < 3) {
-    o.excludedHosts = buildUnnamed2247();
+    o.excludedHosts = buildUnnamed2559();
     o.host = "foo";
     o.pacUri = "foo";
     o.port = 42;
@@ -1765,7 +1765,7 @@
 checkProxyInfo(api.ProxyInfo o) {
   buildCounterProxyInfo++;
   if (buildCounterProxyInfo < 3) {
-    checkUnnamed2247(o.excludedHosts);
+    checkUnnamed2559(o.excludedHosts);
     unittest.expect(o.host, unittest.equals('foo'));
     unittest.expect(o.pacUri, unittest.equals('foo'));
     unittest.expect(o.port, unittest.equals(42));
@@ -1829,7 +1829,7 @@
   buildCounterSoftwareInfo--;
 }
 
-buildUnnamed2248() {
+buildUnnamed2560() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1844,7 +1844,7 @@
   return o;
 }
 
-checkUnnamed2248(core.Map<core.String, core.Object> o) {
+checkUnnamed2560(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted11 = (o["x"]) as core.Map;
   unittest.expect(casted11, unittest.hasLength(3));
@@ -1858,17 +1858,17 @@
   unittest.expect(casted12["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2249() {
+buildUnnamed2561() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2248());
-  o.add(buildUnnamed2248());
+  o.add(buildUnnamed2560());
+  o.add(buildUnnamed2560());
   return o;
 }
 
-checkUnnamed2249(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed2561(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2248(o[0]);
-  checkUnnamed2248(o[1]);
+  checkUnnamed2560(o[0]);
+  checkUnnamed2560(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1877,7 +1877,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed2249();
+    o.details = buildUnnamed2561();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1888,7 +1888,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed2249(o.details);
+    checkUnnamed2561(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -1948,14 +1948,14 @@
   buildCounterSystemUpdate--;
 }
 
-buildUnnamed2250() {
+buildUnnamed2562() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2250(core.Map<core.String, core.String> o) {
+checkUnnamed2562(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1967,7 +1967,7 @@
   buildCounterUserFacingMessage++;
   if (buildCounterUserFacingMessage < 3) {
     o.defaultMessage = "foo";
-    o.localizedMessages = buildUnnamed2250();
+    o.localizedMessages = buildUnnamed2562();
   }
   buildCounterUserFacingMessage--;
   return o;
@@ -1977,19 +1977,19 @@
   buildCounterUserFacingMessage++;
   if (buildCounterUserFacingMessage < 3) {
     unittest.expect(o.defaultMessage, unittest.equals('foo'));
-    checkUnnamed2250(o.localizedMessages);
+    checkUnnamed2562(o.localizedMessages);
   }
   buildCounterUserFacingMessage--;
 }
 
-buildUnnamed2251() {
+buildUnnamed2563() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2251(core.List<core.String> o) {
+checkUnnamed2563(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2002,7 +2002,7 @@
   if (buildCounterWebToken < 3) {
     o.name = "foo";
     o.parentFrameUrl = "foo";
-    o.permissions = buildUnnamed2251();
+    o.permissions = buildUnnamed2563();
     o.value = "foo";
   }
   buildCounterWebToken--;
@@ -2014,7 +2014,7 @@
   if (buildCounterWebToken < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.parentFrameUrl, unittest.equals('foo'));
-    checkUnnamed2251(o.permissions);
+    checkUnnamed2563(o.permissions);
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterWebToken--;
@@ -2412,7 +2412,7 @@
               enterpriseToken: arg_enterpriseToken,
               projectId: arg_projectId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Enterprise response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnterprise(response);
       })));
     });
@@ -2464,7 +2464,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Enterprise response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnterprise(response);
       })));
     });
@@ -2524,7 +2524,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Enterprise response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnterprise(response);
       })));
     });
@@ -2581,7 +2581,7 @@
       }), true);
       res
           .get(arg_name, languageCode: arg_languageCode, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Application response) {
+          .then(unittest.expectAsync1(((response) {
         checkApplication(response);
       })));
     });
@@ -2635,7 +2635,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2687,7 +2687,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Device response) {
+          .then(unittest.expectAsync1(((response) {
         checkDevice(response);
       })));
     });
@@ -2743,7 +2743,7 @@
       }), true);
       res
           .issueCommand(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2804,7 +2804,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDevicesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDevicesResponse(response);
       })));
     });
@@ -2864,7 +2864,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Device response) {
+          .then(unittest.expectAsync1(((response) {
         checkDevice(response);
       })));
     });
@@ -2918,7 +2918,7 @@
       }), true);
       res
           .cancel(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2970,7 +2970,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3022,7 +3022,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3086,7 +3086,7 @@
               filter: arg_filter,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -3144,7 +3144,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EnrollmentToken response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnrollmentToken(response);
       })));
     });
@@ -3196,7 +3196,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3250,7 +3250,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3302,7 +3302,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -3363,7 +3363,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListPoliciesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListPoliciesResponse(response);
       })));
     });
@@ -3423,7 +3423,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -3481,7 +3481,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WebToken response) {
+          .then(unittest.expectAsync1(((response) {
         checkWebToken(response);
       })));
     });
@@ -3542,7 +3542,7 @@
               callbackUrl: arg_callbackUrl,
               projectId: arg_projectId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SignupUrl response) {
+          .then(unittest.expectAsync1(((response) {
         checkSignupUrl(response);
       })));
     });
diff --git a/generated/googleapis/test/androidpublisher/v2_test.dart b/generated/googleapis/test/androidpublisher/v2_test.dart
index a24fd58..1f8976e 100644
--- a/generated/googleapis/test/androidpublisher/v2_test.dart
+++ b/generated/googleapis/test/androidpublisher/v2_test.dart
@@ -113,14 +113,14 @@
   buildCounterApkListing--;
 }
 
-buildUnnamed1821() {
+buildUnnamed1414() {
   var o = new core.List<api.ApkListing>();
   o.add(buildApkListing());
   o.add(buildApkListing());
   return o;
 }
 
-checkUnnamed1821(core.List<api.ApkListing> o) {
+checkUnnamed1414(core.List<api.ApkListing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApkListing(o[0]);
   checkApkListing(o[1]);
@@ -132,7 +132,7 @@
   buildCounterApkListingsListResponse++;
   if (buildCounterApkListingsListResponse < 3) {
     o.kind = "foo";
-    o.listings = buildUnnamed1821();
+    o.listings = buildUnnamed1414();
   }
   buildCounterApkListingsListResponse--;
   return o;
@@ -142,7 +142,7 @@
   buildCounterApkListingsListResponse++;
   if (buildCounterApkListingsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1821(o.listings);
+    checkUnnamed1414(o.listings);
   }
   buildCounterApkListingsListResponse--;
 }
@@ -185,14 +185,14 @@
   buildCounterApksAddExternallyHostedResponse--;
 }
 
-buildUnnamed1822() {
+buildUnnamed1415() {
   var o = new core.List<api.Apk>();
   o.add(buildApk());
   o.add(buildApk());
   return o;
 }
 
-checkUnnamed1822(core.List<api.Apk> o) {
+checkUnnamed1415(core.List<api.Apk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApk(o[0]);
   checkApk(o[1]);
@@ -203,7 +203,7 @@
   var o = new api.ApksListResponse();
   buildCounterApksListResponse++;
   if (buildCounterApksListResponse < 3) {
-    o.apks = buildUnnamed1822();
+    o.apks = buildUnnamed1415();
     o.kind = "foo";
   }
   buildCounterApksListResponse--;
@@ -213,7 +213,7 @@
 checkApksListResponse(api.ApksListResponse o) {
   buildCounterApksListResponse++;
   if (buildCounterApksListResponse < 3) {
-    checkUnnamed1822(o.apks);
+    checkUnnamed1415(o.apks);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterApksListResponse--;
@@ -409,14 +409,14 @@
   buildCounterEntitlement--;
 }
 
-buildUnnamed1823() {
+buildUnnamed1416() {
   var o = new core.List<api.Entitlement>();
   o.add(buildEntitlement());
   o.add(buildEntitlement());
   return o;
 }
 
-checkUnnamed1823(core.List<api.Entitlement> o) {
+checkUnnamed1416(core.List<api.Entitlement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntitlement(o[0]);
   checkEntitlement(o[1]);
@@ -428,7 +428,7 @@
   buildCounterEntitlementsListResponse++;
   if (buildCounterEntitlementsListResponse < 3) {
     o.pageInfo = buildPageInfo();
-    o.resources = buildUnnamed1823();
+    o.resources = buildUnnamed1416();
     o.tokenPagination = buildTokenPagination();
   }
   buildCounterEntitlementsListResponse--;
@@ -439,7 +439,7 @@
   buildCounterEntitlementsListResponse++;
   if (buildCounterEntitlementsListResponse < 3) {
     checkPageInfo(o.pageInfo);
-    checkUnnamed1823(o.resources);
+    checkUnnamed1416(o.resources);
     checkTokenPagination(o.tokenPagination);
   }
   buildCounterEntitlementsListResponse--;
@@ -485,53 +485,53 @@
   buildCounterExpansionFilesUploadResponse--;
 }
 
-buildUnnamed1824() {
+buildUnnamed1417() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1824(core.List<core.String> o) {
+checkUnnamed1417(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1825() {
+buildUnnamed1418() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1825(core.List<core.String> o) {
+checkUnnamed1418(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1826() {
+buildUnnamed1419() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1826(core.List<core.String> o) {
+checkUnnamed1419(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1827() {
+buildUnnamed1420() {
   var o = new core.List<api.ExternallyHostedApkUsesPermission>();
   o.add(buildExternallyHostedApkUsesPermission());
   o.add(buildExternallyHostedApkUsesPermission());
   return o;
 }
 
-checkUnnamed1827(core.List<api.ExternallyHostedApkUsesPermission> o) {
+checkUnnamed1420(core.List<api.ExternallyHostedApkUsesPermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExternallyHostedApkUsesPermission(o[0]);
   checkExternallyHostedApkUsesPermission(o[1]);
@@ -543,7 +543,7 @@
   buildCounterExternallyHostedApk++;
   if (buildCounterExternallyHostedApk < 3) {
     o.applicationLabel = "foo";
-    o.certificateBase64s = buildUnnamed1824();
+    o.certificateBase64s = buildUnnamed1417();
     o.externallyHostedUrl = "foo";
     o.fileSha1Base64 = "foo";
     o.fileSha256Base64 = "foo";
@@ -551,10 +551,10 @@
     o.iconBase64 = "foo";
     o.maximumSdk = 42;
     o.minimumSdk = 42;
-    o.nativeCodes = buildUnnamed1825();
+    o.nativeCodes = buildUnnamed1418();
     o.packageName = "foo";
-    o.usesFeatures = buildUnnamed1826();
-    o.usesPermissions = buildUnnamed1827();
+    o.usesFeatures = buildUnnamed1419();
+    o.usesPermissions = buildUnnamed1420();
     o.versionCode = 42;
     o.versionName = "foo";
   }
@@ -566,7 +566,7 @@
   buildCounterExternallyHostedApk++;
   if (buildCounterExternallyHostedApk < 3) {
     unittest.expect(o.applicationLabel, unittest.equals('foo'));
-    checkUnnamed1824(o.certificateBase64s);
+    checkUnnamed1417(o.certificateBase64s);
     unittest.expect(o.externallyHostedUrl, unittest.equals('foo'));
     unittest.expect(o.fileSha1Base64, unittest.equals('foo'));
     unittest.expect(o.fileSha256Base64, unittest.equals('foo'));
@@ -574,10 +574,10 @@
     unittest.expect(o.iconBase64, unittest.equals('foo'));
     unittest.expect(o.maximumSdk, unittest.equals(42));
     unittest.expect(o.minimumSdk, unittest.equals(42));
-    checkUnnamed1825(o.nativeCodes);
+    checkUnnamed1418(o.nativeCodes);
     unittest.expect(o.packageName, unittest.equals('foo'));
-    checkUnnamed1826(o.usesFeatures);
-    checkUnnamed1827(o.usesPermissions);
+    checkUnnamed1419(o.usesFeatures);
+    checkUnnamed1420(o.usesPermissions);
     unittest.expect(o.versionCode, unittest.equals(42));
     unittest.expect(o.versionName, unittest.equals('foo'));
   }
@@ -629,14 +629,14 @@
   buildCounterImage--;
 }
 
-buildUnnamed1828() {
+buildUnnamed1421() {
   var o = new core.List<api.Image>();
   o.add(buildImage());
   o.add(buildImage());
   return o;
 }
 
-checkUnnamed1828(core.List<api.Image> o) {
+checkUnnamed1421(core.List<api.Image> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImage(o[0]);
   checkImage(o[1]);
@@ -647,7 +647,7 @@
   var o = new api.ImagesDeleteAllResponse();
   buildCounterImagesDeleteAllResponse++;
   if (buildCounterImagesDeleteAllResponse < 3) {
-    o.deleted = buildUnnamed1828();
+    o.deleted = buildUnnamed1421();
   }
   buildCounterImagesDeleteAllResponse--;
   return o;
@@ -656,19 +656,19 @@
 checkImagesDeleteAllResponse(api.ImagesDeleteAllResponse o) {
   buildCounterImagesDeleteAllResponse++;
   if (buildCounterImagesDeleteAllResponse < 3) {
-    checkUnnamed1828(o.deleted);
+    checkUnnamed1421(o.deleted);
   }
   buildCounterImagesDeleteAllResponse--;
 }
 
-buildUnnamed1829() {
+buildUnnamed1422() {
   var o = new core.List<api.Image>();
   o.add(buildImage());
   o.add(buildImage());
   return o;
 }
 
-checkUnnamed1829(core.List<api.Image> o) {
+checkUnnamed1422(core.List<api.Image> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImage(o[0]);
   checkImage(o[1]);
@@ -679,7 +679,7 @@
   var o = new api.ImagesListResponse();
   buildCounterImagesListResponse++;
   if (buildCounterImagesListResponse < 3) {
-    o.images = buildUnnamed1829();
+    o.images = buildUnnamed1422();
   }
   buildCounterImagesListResponse--;
   return o;
@@ -688,7 +688,7 @@
 checkImagesListResponse(api.ImagesListResponse o) {
   buildCounterImagesListResponse++;
   if (buildCounterImagesListResponse < 3) {
-    checkUnnamed1829(o.images);
+    checkUnnamed1422(o.images);
   }
   buildCounterImagesListResponse--;
 }
@@ -712,27 +712,27 @@
   buildCounterImagesUploadResponse--;
 }
 
-buildUnnamed1830() {
+buildUnnamed1423() {
   var o = new core.Map<core.String, api.InAppProductListing>();
   o["x"] = buildInAppProductListing();
   o["y"] = buildInAppProductListing();
   return o;
 }
 
-checkUnnamed1830(core.Map<core.String, api.InAppProductListing> o) {
+checkUnnamed1423(core.Map<core.String, api.InAppProductListing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInAppProductListing(o["x"]);
   checkInAppProductListing(o["y"]);
 }
 
-buildUnnamed1831() {
+buildUnnamed1424() {
   var o = new core.Map<core.String, api.Price>();
   o["x"] = buildPrice();
   o["y"] = buildPrice();
   return o;
 }
 
-checkUnnamed1831(core.Map<core.String, api.Price> o) {
+checkUnnamed1424(core.Map<core.String, api.Price> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPrice(o["x"]);
   checkPrice(o["y"]);
@@ -745,9 +745,9 @@
   if (buildCounterInAppProduct < 3) {
     o.defaultLanguage = "foo";
     o.defaultPrice = buildPrice();
-    o.listings = buildUnnamed1830();
+    o.listings = buildUnnamed1423();
     o.packageName = "foo";
-    o.prices = buildUnnamed1831();
+    o.prices = buildUnnamed1424();
     o.purchaseType = "foo";
     o.season = buildSeason();
     o.sku = "foo";
@@ -764,9 +764,9 @@
   if (buildCounterInAppProduct < 3) {
     unittest.expect(o.defaultLanguage, unittest.equals('foo'));
     checkPrice(o.defaultPrice);
-    checkUnnamed1830(o.listings);
+    checkUnnamed1423(o.listings);
     unittest.expect(o.packageName, unittest.equals('foo'));
-    checkUnnamed1831(o.prices);
+    checkUnnamed1424(o.prices);
     unittest.expect(o.purchaseType, unittest.equals('foo'));
     checkSeason(o.season);
     unittest.expect(o.sku, unittest.equals('foo'));
@@ -798,14 +798,14 @@
   buildCounterInAppProductListing--;
 }
 
-buildUnnamed1832() {
+buildUnnamed1425() {
   var o = new core.List<api.InAppProduct>();
   o.add(buildInAppProduct());
   o.add(buildInAppProduct());
   return o;
 }
 
-checkUnnamed1832(core.List<api.InAppProduct> o) {
+checkUnnamed1425(core.List<api.InAppProduct> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInAppProduct(o[0]);
   checkInAppProduct(o[1]);
@@ -816,7 +816,7 @@
   var o = new api.InappproductsListResponse();
   buildCounterInappproductsListResponse++;
   if (buildCounterInappproductsListResponse < 3) {
-    o.inappproduct = buildUnnamed1832();
+    o.inappproduct = buildUnnamed1425();
     o.kind = "foo";
     o.pageInfo = buildPageInfo();
     o.tokenPagination = buildTokenPagination();
@@ -828,7 +828,7 @@
 checkInappproductsListResponse(api.InappproductsListResponse o) {
   buildCounterInappproductsListResponse++;
   if (buildCounterInappproductsListResponse < 3) {
-    checkUnnamed1832(o.inappproduct);
+    checkUnnamed1425(o.inappproduct);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
     checkTokenPagination(o.tokenPagination);
@@ -863,14 +863,14 @@
   buildCounterListing--;
 }
 
-buildUnnamed1833() {
+buildUnnamed1426() {
   var o = new core.List<api.Listing>();
   o.add(buildListing());
   o.add(buildListing());
   return o;
 }
 
-checkUnnamed1833(core.List<api.Listing> o) {
+checkUnnamed1426(core.List<api.Listing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkListing(o[0]);
   checkListing(o[1]);
@@ -882,7 +882,7 @@
   buildCounterListingsListResponse++;
   if (buildCounterListingsListResponse < 3) {
     o.kind = "foo";
-    o.listings = buildUnnamed1833();
+    o.listings = buildUnnamed1426();
   }
   buildCounterListingsListResponse--;
   return o;
@@ -892,7 +892,7 @@
   buildCounterListingsListResponse++;
   if (buildCounterListingsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1833(o.listings);
+    checkUnnamed1426(o.listings);
   }
   buildCounterListingsListResponse--;
 }
@@ -1014,14 +1014,14 @@
   buildCounterProrate--;
 }
 
-buildUnnamed1834() {
+buildUnnamed1427() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed1834(core.List<api.Comment> o) {
+checkUnnamed1427(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -1033,7 +1033,7 @@
   buildCounterReview++;
   if (buildCounterReview < 3) {
     o.authorName = "foo";
-    o.comments = buildUnnamed1834();
+    o.comments = buildUnnamed1427();
     o.reviewId = "foo";
   }
   buildCounterReview--;
@@ -1044,7 +1044,7 @@
   buildCounterReview++;
   if (buildCounterReview < 3) {
     unittest.expect(o.authorName, unittest.equals('foo'));
-    checkUnnamed1834(o.comments);
+    checkUnnamed1427(o.comments);
     unittest.expect(o.reviewId, unittest.equals('foo'));
   }
   buildCounterReview--;
@@ -1071,14 +1071,14 @@
   buildCounterReviewReplyResult--;
 }
 
-buildUnnamed1835() {
+buildUnnamed1428() {
   var o = new core.List<api.Review>();
   o.add(buildReview());
   o.add(buildReview());
   return o;
 }
 
-checkUnnamed1835(core.List<api.Review> o) {
+checkUnnamed1428(core.List<api.Review> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReview(o[0]);
   checkReview(o[1]);
@@ -1090,7 +1090,7 @@
   buildCounterReviewsListResponse++;
   if (buildCounterReviewsListResponse < 3) {
     o.pageInfo = buildPageInfo();
-    o.reviews = buildUnnamed1835();
+    o.reviews = buildUnnamed1428();
     o.tokenPagination = buildTokenPagination();
   }
   buildCounterReviewsListResponse--;
@@ -1101,7 +1101,7 @@
   buildCounterReviewsListResponse++;
   if (buildCounterReviewsListResponse < 3) {
     checkPageInfo(o.pageInfo);
-    checkUnnamed1835(o.reviews);
+    checkUnnamed1428(o.reviews);
     checkTokenPagination(o.tokenPagination);
   }
   buildCounterReviewsListResponse--;
@@ -1145,14 +1145,14 @@
   buildCounterReviewsReplyResponse--;
 }
 
-buildUnnamed1836() {
+buildUnnamed1429() {
   var o = new core.List<api.Prorate>();
   o.add(buildProrate());
   o.add(buildProrate());
   return o;
 }
 
-checkUnnamed1836(core.List<api.Prorate> o) {
+checkUnnamed1429(core.List<api.Prorate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProrate(o[0]);
   checkProrate(o[1]);
@@ -1164,7 +1164,7 @@
   buildCounterSeason++;
   if (buildCounterSeason < 3) {
     o.end = buildMonthDay();
-    o.prorations = buildUnnamed1836();
+    o.prorations = buildUnnamed1429();
     o.start = buildMonthDay();
   }
   buildCounterSeason--;
@@ -1175,7 +1175,7 @@
   buildCounterSeason++;
   if (buildCounterSeason < 3) {
     checkMonthDay(o.end);
-    checkUnnamed1836(o.prorations);
+    checkUnnamed1429(o.prorations);
     checkMonthDay(o.start);
   }
   buildCounterSeason--;
@@ -1287,27 +1287,27 @@
   buildCounterSubscriptionPurchasesDeferResponse--;
 }
 
-buildUnnamed1837() {
+buildUnnamed1430() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1837(core.List<core.String> o) {
+checkUnnamed1430(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1838() {
+buildUnnamed1431() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1838(core.List<core.String> o) {
+checkUnnamed1431(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1318,8 +1318,8 @@
   var o = new api.Testers();
   buildCounterTesters++;
   if (buildCounterTesters < 3) {
-    o.googleGroups = buildUnnamed1837();
-    o.googlePlusCommunities = buildUnnamed1838();
+    o.googleGroups = buildUnnamed1430();
+    o.googlePlusCommunities = buildUnnamed1431();
   }
   buildCounterTesters--;
   return o;
@@ -1328,8 +1328,8 @@
 checkTesters(api.Testers o) {
   buildCounterTesters++;
   if (buildCounterTesters < 3) {
-    checkUnnamed1837(o.googleGroups);
-    checkUnnamed1838(o.googlePlusCommunities);
+    checkUnnamed1430(o.googleGroups);
+    checkUnnamed1431(o.googlePlusCommunities);
   }
   buildCounterTesters--;
 }
@@ -1376,14 +1376,14 @@
   buildCounterTokenPagination--;
 }
 
-buildUnnamed1839() {
+buildUnnamed1432() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1839(core.List<core.int> o) {
+checkUnnamed1432(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -1396,7 +1396,7 @@
   if (buildCounterTrack < 3) {
     o.track = "foo";
     o.userFraction = 42.0;
-    o.versionCodes = buildUnnamed1839();
+    o.versionCodes = buildUnnamed1432();
   }
   buildCounterTrack--;
   return o;
@@ -1407,19 +1407,19 @@
   if (buildCounterTrack < 3) {
     unittest.expect(o.track, unittest.equals('foo'));
     unittest.expect(o.userFraction, unittest.equals(42.0));
-    checkUnnamed1839(o.versionCodes);
+    checkUnnamed1432(o.versionCodes);
   }
   buildCounterTrack--;
 }
 
-buildUnnamed1840() {
+buildUnnamed1433() {
   var o = new core.List<api.Track>();
   o.add(buildTrack());
   o.add(buildTrack());
   return o;
 }
 
-checkUnnamed1840(core.List<api.Track> o) {
+checkUnnamed1433(core.List<api.Track> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrack(o[0]);
   checkTrack(o[1]);
@@ -1431,7 +1431,7 @@
   buildCounterTracksListResponse++;
   if (buildCounterTracksListResponse < 3) {
     o.kind = "foo";
-    o.tracks = buildUnnamed1840();
+    o.tracks = buildUnnamed1433();
   }
   buildCounterTracksListResponse--;
   return o;
@@ -1441,7 +1441,7 @@
   buildCounterTracksListResponse++;
   if (buildCounterTracksListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1840(o.tracks);
+    checkUnnamed1433(o.tracks);
   }
   buildCounterTracksListResponse--;
 }
@@ -1512,14 +1512,14 @@
   buildCounterVoidedPurchase--;
 }
 
-buildUnnamed1841() {
+buildUnnamed1434() {
   var o = new core.List<api.VoidedPurchase>();
   o.add(buildVoidedPurchase());
   o.add(buildVoidedPurchase());
   return o;
 }
 
-checkUnnamed1841(core.List<api.VoidedPurchase> o) {
+checkUnnamed1434(core.List<api.VoidedPurchase> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVoidedPurchase(o[0]);
   checkVoidedPurchase(o[1]);
@@ -1532,7 +1532,7 @@
   if (buildCounterVoidedPurchasesListResponse < 3) {
     o.pageInfo = buildPageInfo();
     o.tokenPagination = buildTokenPagination();
-    o.voidedPurchases = buildUnnamed1841();
+    o.voidedPurchases = buildUnnamed1434();
   }
   buildCounterVoidedPurchasesListResponse--;
   return o;
@@ -1543,7 +1543,7 @@
   if (buildCounterVoidedPurchasesListResponse < 3) {
     checkPageInfo(o.pageInfo);
     checkTokenPagination(o.tokenPagination);
-    checkUnnamed1841(o.voidedPurchases);
+    checkUnnamed1434(o.voidedPurchases);
   }
   buildCounterVoidedPurchasesListResponse--;
 }
@@ -2009,7 +2009,7 @@
       }), true);
       res
           .commit(arg_packageName, arg_editId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AppEdit response) {
+          .then(unittest.expectAsync1(((response) {
         checkAppEdit(response);
       })));
     });
@@ -2103,7 +2103,7 @@
       }), true);
       res
           .get(arg_packageName, arg_editId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AppEdit response) {
+          .then(unittest.expectAsync1(((response) {
         checkAppEdit(response);
       })));
     });
@@ -2154,7 +2154,7 @@
       }), true);
       res
           .insert(arg_request, arg_packageName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AppEdit response) {
+          .then(unittest.expectAsync1(((response) {
         checkAppEdit(response);
       })));
     });
@@ -2202,7 +2202,7 @@
       }), true);
       res
           .validate(arg_packageName, arg_editId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AppEdit response) {
+          .then(unittest.expectAsync1(((response) {
         checkAppEdit(response);
       })));
     });
@@ -2355,7 +2355,7 @@
       res
           .get(arg_packageName, arg_editId, arg_apkVersionCode, arg_language,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ApkListing response) {
+          .then(unittest.expectAsync1(((response) {
         checkApkListing(response);
       })));
     });
@@ -2406,7 +2406,7 @@
       res
           .list(arg_packageName, arg_editId, arg_apkVersionCode,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ApkListingsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkApkListingsListResponse(response);
       })));
     });
@@ -2463,7 +2463,7 @@
           .patch(arg_request, arg_packageName, arg_editId, arg_apkVersionCode,
               arg_language,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ApkListing response) {
+          .then(unittest.expectAsync1(((response) {
         checkApkListing(response);
       })));
     });
@@ -2520,7 +2520,7 @@
           .update(arg_request, arg_packageName, arg_editId, arg_apkVersionCode,
               arg_language,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ApkListing response) {
+          .then(unittest.expectAsync1(((response) {
         checkApkListing(response);
       })));
     });
@@ -2576,8 +2576,7 @@
       res
           .addexternallyhosted(arg_request, arg_packageName, arg_editId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ApksAddExternallyHostedResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkApksAddExternallyHostedResponse(response);
       })));
     });
@@ -2626,7 +2625,7 @@
       }), true);
       res
           .list(arg_packageName, arg_editId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ApksListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkApksListResponse(response);
       })));
     });
@@ -2678,7 +2677,7 @@
       }), true);
       res
           .upload(arg_packageName, arg_editId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Apk response) {
+          .then(unittest.expectAsync1(((response) {
         checkApk(response);
       })));
     });
@@ -2734,9 +2733,9 @@
       }), true);
       res
           .upload(arg_packageName, arg_editId, arg_apkVersionCode,
-              arg_deobfuscationFileType, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.DeobfuscationFilesUploadResponse response) {
+              arg_deobfuscationFileType,
+              $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkDeobfuscationFilesUploadResponse(response);
       })));
     });
@@ -2787,7 +2786,7 @@
       }), true);
       res
           .get(arg_packageName, arg_editId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AppDetails response) {
+          .then(unittest.expectAsync1(((response) {
         checkAppDetails(response);
       })));
     });
@@ -2840,7 +2839,7 @@
       }), true);
       res
           .patch(arg_request, arg_packageName, arg_editId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AppDetails response) {
+          .then(unittest.expectAsync1(((response) {
         checkAppDetails(response);
       })));
     });
@@ -2894,7 +2893,7 @@
       res
           .update(arg_request, arg_packageName, arg_editId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AppDetails response) {
+          .then(unittest.expectAsync1(((response) {
         checkAppDetails(response);
       })));
     });
@@ -2949,7 +2948,7 @@
           .get(arg_packageName, arg_editId, arg_apkVersionCode,
               arg_expansionFileType,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ExpansionFile response) {
+          .then(unittest.expectAsync1(((response) {
         checkExpansionFile(response);
       })));
     });
@@ -3006,7 +3005,7 @@
           .patch(arg_request, arg_packageName, arg_editId, arg_apkVersionCode,
               arg_expansionFileType,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ExpansionFile response) {
+          .then(unittest.expectAsync1(((response) {
         checkExpansionFile(response);
       })));
     });
@@ -3063,7 +3062,7 @@
           .update(arg_request, arg_packageName, arg_editId, arg_apkVersionCode,
               arg_expansionFileType,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ExpansionFile response) {
+          .then(unittest.expectAsync1(((response) {
         checkExpansionFile(response);
       })));
     });
@@ -3117,9 +3116,9 @@
       }), true);
       res
           .upload(arg_packageName, arg_editId, arg_apkVersionCode,
-              arg_expansionFileType, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ExpansionFilesUploadResponse response) {
+              arg_expansionFileType,
+              $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkExpansionFilesUploadResponse(response);
       })));
     });
@@ -3225,7 +3224,7 @@
       res
           .deleteall(arg_packageName, arg_editId, arg_language, arg_imageType,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ImagesDeleteAllResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkImagesDeleteAllResponse(response);
       })));
     });
@@ -3277,7 +3276,7 @@
       res
           .list(arg_packageName, arg_editId, arg_language, arg_imageType,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ImagesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkImagesListResponse(response);
       })));
     });
@@ -3332,7 +3331,7 @@
       res
           .upload(arg_packageName, arg_editId, arg_language, arg_imageType,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ImagesUploadResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkImagesUploadResponse(response);
       })));
     });
@@ -3480,7 +3479,7 @@
       }), true);
       res
           .get(arg_packageName, arg_editId, arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Listing response) {
+          .then(unittest.expectAsync1(((response) {
         checkListing(response);
       })));
     });
@@ -3529,7 +3528,7 @@
       }), true);
       res
           .list(arg_packageName, arg_editId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListingsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListingsListResponse(response);
       })));
     });
@@ -3584,7 +3583,7 @@
       res
           .patch(arg_request, arg_packageName, arg_editId, arg_language,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Listing response) {
+          .then(unittest.expectAsync1(((response) {
         checkListing(response);
       })));
     });
@@ -3639,7 +3638,7 @@
       res
           .update(arg_request, arg_packageName, arg_editId, arg_language,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Listing response) {
+          .then(unittest.expectAsync1(((response) {
         checkListing(response);
       })));
     });
@@ -3691,7 +3690,7 @@
       }), true);
       res
           .get(arg_packageName, arg_editId, arg_track, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Testers response) {
+          .then(unittest.expectAsync1(((response) {
         checkTesters(response);
       })));
     });
@@ -3746,7 +3745,7 @@
       res
           .patch(arg_request, arg_packageName, arg_editId, arg_track,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Testers response) {
+          .then(unittest.expectAsync1(((response) {
         checkTesters(response);
       })));
     });
@@ -3801,7 +3800,7 @@
       res
           .update(arg_request, arg_packageName, arg_editId, arg_track,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Testers response) {
+          .then(unittest.expectAsync1(((response) {
         checkTesters(response);
       })));
     });
@@ -3853,7 +3852,7 @@
       }), true);
       res
           .get(arg_packageName, arg_editId, arg_track, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Track response) {
+          .then(unittest.expectAsync1(((response) {
         checkTrack(response);
       })));
     });
@@ -3902,7 +3901,7 @@
       }), true);
       res
           .list(arg_packageName, arg_editId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TracksListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTracksListResponse(response);
       })));
     });
@@ -3957,7 +3956,7 @@
       res
           .patch(arg_request, arg_packageName, arg_editId, arg_track,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Track response) {
+          .then(unittest.expectAsync1(((response) {
         checkTrack(response);
       })));
     });
@@ -4012,7 +4011,7 @@
       res
           .update(arg_request, arg_packageName, arg_editId, arg_track,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Track response) {
+          .then(unittest.expectAsync1(((response) {
         checkTrack(response);
       })));
     });
@@ -4078,7 +4077,7 @@
               startIndex: arg_startIndex,
               token: arg_token,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EntitlementsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkEntitlementsListResponse(response);
       })));
     });
@@ -4176,7 +4175,7 @@
       }), true);
       res
           .get(arg_packageName, arg_sku, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InAppProduct response) {
+          .then(unittest.expectAsync1(((response) {
         checkInAppProduct(response);
       })));
     });
@@ -4233,7 +4232,7 @@
           .insert(arg_request, arg_packageName,
               autoConvertMissingPrices: arg_autoConvertMissingPrices,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InAppProduct response) {
+          .then(unittest.expectAsync1(((response) {
         checkInAppProduct(response);
       })));
     });
@@ -4293,8 +4292,7 @@
               startIndex: arg_startIndex,
               token: arg_token,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.InappproductsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInappproductsListResponse(response);
       })));
     });
@@ -4352,7 +4350,7 @@
           .patch(arg_request, arg_packageName, arg_sku,
               autoConvertMissingPrices: arg_autoConvertMissingPrices,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InAppProduct response) {
+          .then(unittest.expectAsync1(((response) {
         checkInAppProduct(response);
       })));
     });
@@ -4410,7 +4408,7 @@
           .update(arg_request, arg_packageName, arg_sku,
               autoConvertMissingPrices: arg_autoConvertMissingPrices,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InAppProduct response) {
+          .then(unittest.expectAsync1(((response) {
         checkInAppProduct(response);
       })));
     });
@@ -4462,7 +4460,7 @@
       }), true);
       res
           .get(arg_packageName, arg_productId, arg_token, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProductPurchase response) {
+          .then(unittest.expectAsync1(((response) {
         checkProductPurchase(response);
       })));
     });
@@ -4569,8 +4567,7 @@
       res
           .defer(arg_request, arg_packageName, arg_subscriptionId, arg_token,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.SubscriptionPurchasesDeferResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscriptionPurchasesDeferResponse(response);
       })));
     });
@@ -4621,7 +4618,7 @@
       res
           .get(arg_packageName, arg_subscriptionId, arg_token,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SubscriptionPurchase response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscriptionPurchase(response);
       })));
     });
@@ -4789,8 +4786,7 @@
               startTime: arg_startTime,
               token: arg_token,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.VoidedPurchasesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkVoidedPurchasesListResponse(response);
       })));
     });
@@ -4845,7 +4841,7 @@
           .get(arg_packageName, arg_reviewId,
               translationLanguage: arg_translationLanguage,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Review response) {
+          .then(unittest.expectAsync1(((response) {
         checkReview(response);
       })));
     });
@@ -4908,7 +4904,7 @@
               token: arg_token,
               translationLanguage: arg_translationLanguage,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReviewsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkReviewsListResponse(response);
       })));
     });
@@ -4961,7 +4957,7 @@
       res
           .reply(arg_request, arg_packageName, arg_reviewId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReviewsReplyResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkReviewsReplyResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/appengine/v1_test.dart b/generated/googleapis/test/appengine/v1_test.dart
index f707379..1845d07 100644
--- a/generated/googleapis/test/appengine/v1_test.dart
+++ b/generated/googleapis/test/appengine/v1_test.dart
@@ -96,14 +96,14 @@
   buildCounterApiEndpointHandler--;
 }
 
-buildUnnamed3066() {
+buildUnnamed1256() {
   var o = new core.List<api.UrlDispatchRule>();
   o.add(buildUrlDispatchRule());
   o.add(buildUrlDispatchRule());
   return o;
 }
 
-checkUnnamed3066(core.List<api.UrlDispatchRule> o) {
+checkUnnamed1256(core.List<api.UrlDispatchRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlDispatchRule(o[0]);
   checkUrlDispatchRule(o[1]);
@@ -119,7 +119,7 @@
     o.defaultBucket = "foo";
     o.defaultCookieExpiration = "foo";
     o.defaultHostname = "foo";
-    o.dispatchRules = buildUnnamed3066();
+    o.dispatchRules = buildUnnamed1256();
     o.featureSettings = buildFeatureSettings();
     o.gcrDomain = "foo";
     o.iap = buildIdentityAwareProxy();
@@ -140,7 +140,7 @@
     unittest.expect(o.defaultBucket, unittest.equals('foo'));
     unittest.expect(o.defaultCookieExpiration, unittest.equals('foo'));
     unittest.expect(o.defaultHostname, unittest.equals('foo'));
-    checkUnnamed3066(o.dispatchRules);
+    checkUnnamed1256(o.dispatchRules);
     checkFeatureSettings(o.featureSettings);
     unittest.expect(o.gcrDomain, unittest.equals('foo'));
     checkIdentityAwareProxy(o.iap);
@@ -152,27 +152,27 @@
   buildCounterApplication--;
 }
 
-buildUnnamed3067() {
+buildUnnamed1257() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3067(core.List<core.String> o) {
+checkUnnamed1257(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3068() {
+buildUnnamed1258() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3068(core.List<core.String> o) {
+checkUnnamed1258(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -186,11 +186,11 @@
     o.certificateRawData = buildCertificateRawData();
     o.displayName = "foo";
     o.domainMappingsCount = 42;
-    o.domainNames = buildUnnamed3067();
+    o.domainNames = buildUnnamed1257();
     o.expireTime = "foo";
     o.id = "foo";
     o.name = "foo";
-    o.visibleDomainMappings = buildUnnamed3068();
+    o.visibleDomainMappings = buildUnnamed1258();
   }
   buildCounterAuthorizedCertificate--;
   return o;
@@ -202,11 +202,11 @@
     checkCertificateRawData(o.certificateRawData);
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.domainMappingsCount, unittest.equals(42));
-    checkUnnamed3067(o.domainNames);
+    checkUnnamed1257(o.domainNames);
     unittest.expect(o.expireTime, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3068(o.visibleDomainMappings);
+    checkUnnamed1258(o.visibleDomainMappings);
   }
   buildCounterAuthorizedCertificate--;
 }
@@ -296,14 +296,14 @@
   buildCounterBasicScaling--;
 }
 
-buildUnnamed3069() {
+buildUnnamed1259() {
   var o = new core.List<api.FirewallRule>();
   o.add(buildFirewallRule());
   o.add(buildFirewallRule());
   return o;
 }
 
-checkUnnamed3069(core.List<api.FirewallRule> o) {
+checkUnnamed1259(core.List<api.FirewallRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFirewallRule(o[0]);
   checkFirewallRule(o[1]);
@@ -314,7 +314,7 @@
   var o = new api.BatchUpdateIngressRulesRequest();
   buildCounterBatchUpdateIngressRulesRequest++;
   if (buildCounterBatchUpdateIngressRulesRequest < 3) {
-    o.ingressRules = buildUnnamed3069();
+    o.ingressRules = buildUnnamed1259();
   }
   buildCounterBatchUpdateIngressRulesRequest--;
   return o;
@@ -323,19 +323,19 @@
 checkBatchUpdateIngressRulesRequest(api.BatchUpdateIngressRulesRequest o) {
   buildCounterBatchUpdateIngressRulesRequest++;
   if (buildCounterBatchUpdateIngressRulesRequest < 3) {
-    checkUnnamed3069(o.ingressRules);
+    checkUnnamed1259(o.ingressRules);
   }
   buildCounterBatchUpdateIngressRulesRequest--;
 }
 
-buildUnnamed3070() {
+buildUnnamed1260() {
   var o = new core.List<api.FirewallRule>();
   o.add(buildFirewallRule());
   o.add(buildFirewallRule());
   return o;
 }
 
-checkUnnamed3070(core.List<api.FirewallRule> o) {
+checkUnnamed1260(core.List<api.FirewallRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFirewallRule(o[0]);
   checkFirewallRule(o[1]);
@@ -346,7 +346,7 @@
   var o = new api.BatchUpdateIngressRulesResponse();
   buildCounterBatchUpdateIngressRulesResponse++;
   if (buildCounterBatchUpdateIngressRulesResponse < 3) {
-    o.ingressRules = buildUnnamed3070();
+    o.ingressRules = buildUnnamed1260();
   }
   buildCounterBatchUpdateIngressRulesResponse--;
   return o;
@@ -355,7 +355,7 @@
 checkBatchUpdateIngressRulesResponse(api.BatchUpdateIngressRulesResponse o) {
   buildCounterBatchUpdateIngressRulesResponse++;
   if (buildCounterBatchUpdateIngressRulesResponse < 3) {
-    checkUnnamed3070(o.ingressRules);
+    checkUnnamed1260(o.ingressRules);
   }
   buildCounterBatchUpdateIngressRulesResponse--;
 }
@@ -478,14 +478,14 @@
   buildCounterDebugInstanceRequest--;
 }
 
-buildUnnamed3071() {
+buildUnnamed1261() {
   var o = new core.Map<core.String, api.FileInfo>();
   o["x"] = buildFileInfo();
   o["y"] = buildFileInfo();
   return o;
 }
 
-checkUnnamed3071(core.Map<core.String, api.FileInfo> o) {
+checkUnnamed1261(core.Map<core.String, api.FileInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFileInfo(o["x"]);
   checkFileInfo(o["y"]);
@@ -497,7 +497,7 @@
   buildCounterDeployment++;
   if (buildCounterDeployment < 3) {
     o.container = buildContainerInfo();
-    o.files = buildUnnamed3071();
+    o.files = buildUnnamed1261();
     o.zip = buildZipInfo();
   }
   buildCounterDeployment--;
@@ -508,7 +508,7 @@
   buildCounterDeployment++;
   if (buildCounterDeployment < 3) {
     checkContainerInfo(o.container);
-    checkUnnamed3071(o.files);
+    checkUnnamed1261(o.files);
     checkZipInfo(o.zip);
   }
   buildCounterDeployment--;
@@ -539,14 +539,14 @@
   buildCounterDiskUtilization--;
 }
 
-buildUnnamed3072() {
+buildUnnamed1262() {
   var o = new core.List<api.ResourceRecord>();
   o.add(buildResourceRecord());
   o.add(buildResourceRecord());
   return o;
 }
 
-checkUnnamed3072(core.List<api.ResourceRecord> o) {
+checkUnnamed1262(core.List<api.ResourceRecord> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceRecord(o[0]);
   checkResourceRecord(o[1]);
@@ -559,7 +559,7 @@
   if (buildCounterDomainMapping < 3) {
     o.id = "foo";
     o.name = "foo";
-    o.resourceRecords = buildUnnamed3072();
+    o.resourceRecords = buildUnnamed1262();
     o.sslSettings = buildSslSettings();
   }
   buildCounterDomainMapping--;
@@ -571,7 +571,7 @@
   if (buildCounterDomainMapping < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3072(o.resourceRecords);
+    checkUnnamed1262(o.resourceRecords);
     checkSslSettings(o.sslSettings);
   }
   buildCounterDomainMapping--;
@@ -829,14 +829,14 @@
   buildCounterLibrary--;
 }
 
-buildUnnamed3073() {
+buildUnnamed1263() {
   var o = new core.List<api.AuthorizedCertificate>();
   o.add(buildAuthorizedCertificate());
   o.add(buildAuthorizedCertificate());
   return o;
 }
 
-checkUnnamed3073(core.List<api.AuthorizedCertificate> o) {
+checkUnnamed1263(core.List<api.AuthorizedCertificate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthorizedCertificate(o[0]);
   checkAuthorizedCertificate(o[1]);
@@ -847,7 +847,7 @@
   var o = new api.ListAuthorizedCertificatesResponse();
   buildCounterListAuthorizedCertificatesResponse++;
   if (buildCounterListAuthorizedCertificatesResponse < 3) {
-    o.certificates = buildUnnamed3073();
+    o.certificates = buildUnnamed1263();
     o.nextPageToken = "foo";
   }
   buildCounterListAuthorizedCertificatesResponse--;
@@ -858,20 +858,20 @@
     api.ListAuthorizedCertificatesResponse o) {
   buildCounterListAuthorizedCertificatesResponse++;
   if (buildCounterListAuthorizedCertificatesResponse < 3) {
-    checkUnnamed3073(o.certificates);
+    checkUnnamed1263(o.certificates);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListAuthorizedCertificatesResponse--;
 }
 
-buildUnnamed3074() {
+buildUnnamed1264() {
   var o = new core.List<api.AuthorizedDomain>();
   o.add(buildAuthorizedDomain());
   o.add(buildAuthorizedDomain());
   return o;
 }
 
-checkUnnamed3074(core.List<api.AuthorizedDomain> o) {
+checkUnnamed1264(core.List<api.AuthorizedDomain> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthorizedDomain(o[0]);
   checkAuthorizedDomain(o[1]);
@@ -882,7 +882,7 @@
   var o = new api.ListAuthorizedDomainsResponse();
   buildCounterListAuthorizedDomainsResponse++;
   if (buildCounterListAuthorizedDomainsResponse < 3) {
-    o.domains = buildUnnamed3074();
+    o.domains = buildUnnamed1264();
     o.nextPageToken = "foo";
   }
   buildCounterListAuthorizedDomainsResponse--;
@@ -892,20 +892,20 @@
 checkListAuthorizedDomainsResponse(api.ListAuthorizedDomainsResponse o) {
   buildCounterListAuthorizedDomainsResponse++;
   if (buildCounterListAuthorizedDomainsResponse < 3) {
-    checkUnnamed3074(o.domains);
+    checkUnnamed1264(o.domains);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListAuthorizedDomainsResponse--;
 }
 
-buildUnnamed3075() {
+buildUnnamed1265() {
   var o = new core.List<api.DomainMapping>();
   o.add(buildDomainMapping());
   o.add(buildDomainMapping());
   return o;
 }
 
-checkUnnamed3075(core.List<api.DomainMapping> o) {
+checkUnnamed1265(core.List<api.DomainMapping> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDomainMapping(o[0]);
   checkDomainMapping(o[1]);
@@ -916,7 +916,7 @@
   var o = new api.ListDomainMappingsResponse();
   buildCounterListDomainMappingsResponse++;
   if (buildCounterListDomainMappingsResponse < 3) {
-    o.domainMappings = buildUnnamed3075();
+    o.domainMappings = buildUnnamed1265();
     o.nextPageToken = "foo";
   }
   buildCounterListDomainMappingsResponse--;
@@ -926,20 +926,20 @@
 checkListDomainMappingsResponse(api.ListDomainMappingsResponse o) {
   buildCounterListDomainMappingsResponse++;
   if (buildCounterListDomainMappingsResponse < 3) {
-    checkUnnamed3075(o.domainMappings);
+    checkUnnamed1265(o.domainMappings);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDomainMappingsResponse--;
 }
 
-buildUnnamed3076() {
+buildUnnamed1266() {
   var o = new core.List<api.FirewallRule>();
   o.add(buildFirewallRule());
   o.add(buildFirewallRule());
   return o;
 }
 
-checkUnnamed3076(core.List<api.FirewallRule> o) {
+checkUnnamed1266(core.List<api.FirewallRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFirewallRule(o[0]);
   checkFirewallRule(o[1]);
@@ -950,7 +950,7 @@
   var o = new api.ListIngressRulesResponse();
   buildCounterListIngressRulesResponse++;
   if (buildCounterListIngressRulesResponse < 3) {
-    o.ingressRules = buildUnnamed3076();
+    o.ingressRules = buildUnnamed1266();
     o.nextPageToken = "foo";
   }
   buildCounterListIngressRulesResponse--;
@@ -960,20 +960,20 @@
 checkListIngressRulesResponse(api.ListIngressRulesResponse o) {
   buildCounterListIngressRulesResponse++;
   if (buildCounterListIngressRulesResponse < 3) {
-    checkUnnamed3076(o.ingressRules);
+    checkUnnamed1266(o.ingressRules);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListIngressRulesResponse--;
 }
 
-buildUnnamed3077() {
+buildUnnamed1267() {
   var o = new core.List<api.Instance>();
   o.add(buildInstance());
   o.add(buildInstance());
   return o;
 }
 
-checkUnnamed3077(core.List<api.Instance> o) {
+checkUnnamed1267(core.List<api.Instance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstance(o[0]);
   checkInstance(o[1]);
@@ -984,7 +984,7 @@
   var o = new api.ListInstancesResponse();
   buildCounterListInstancesResponse++;
   if (buildCounterListInstancesResponse < 3) {
-    o.instances = buildUnnamed3077();
+    o.instances = buildUnnamed1267();
     o.nextPageToken = "foo";
   }
   buildCounterListInstancesResponse--;
@@ -994,20 +994,20 @@
 checkListInstancesResponse(api.ListInstancesResponse o) {
   buildCounterListInstancesResponse++;
   if (buildCounterListInstancesResponse < 3) {
-    checkUnnamed3077(o.instances);
+    checkUnnamed1267(o.instances);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListInstancesResponse--;
 }
 
-buildUnnamed3078() {
+buildUnnamed1268() {
   var o = new core.List<api.Location>();
   o.add(buildLocation());
   o.add(buildLocation());
   return o;
 }
 
-checkUnnamed3078(core.List<api.Location> o) {
+checkUnnamed1268(core.List<api.Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocation(o[0]);
   checkLocation(o[1]);
@@ -1018,7 +1018,7 @@
   var o = new api.ListLocationsResponse();
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    o.locations = buildUnnamed3078();
+    o.locations = buildUnnamed1268();
     o.nextPageToken = "foo";
   }
   buildCounterListLocationsResponse--;
@@ -1028,20 +1028,20 @@
 checkListLocationsResponse(api.ListLocationsResponse o) {
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    checkUnnamed3078(o.locations);
+    checkUnnamed1268(o.locations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLocationsResponse--;
 }
 
-buildUnnamed3079() {
+buildUnnamed1269() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed3079(core.List<api.Operation> o) {
+checkUnnamed1269(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -1053,7 +1053,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed3079();
+    o.operations = buildUnnamed1269();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -1063,19 +1063,19 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3079(o.operations);
+    checkUnnamed1269(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed3080() {
+buildUnnamed1270() {
   var o = new core.List<api.Service>();
   o.add(buildService());
   o.add(buildService());
   return o;
 }
 
-checkUnnamed3080(core.List<api.Service> o) {
+checkUnnamed1270(core.List<api.Service> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkService(o[0]);
   checkService(o[1]);
@@ -1087,7 +1087,7 @@
   buildCounterListServicesResponse++;
   if (buildCounterListServicesResponse < 3) {
     o.nextPageToken = "foo";
-    o.services = buildUnnamed3080();
+    o.services = buildUnnamed1270();
   }
   buildCounterListServicesResponse--;
   return o;
@@ -1097,19 +1097,19 @@
   buildCounterListServicesResponse++;
   if (buildCounterListServicesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3080(o.services);
+    checkUnnamed1270(o.services);
   }
   buildCounterListServicesResponse--;
 }
 
-buildUnnamed3081() {
+buildUnnamed1271() {
   var o = new core.List<api.Version>();
   o.add(buildVersion());
   o.add(buildVersion());
   return o;
 }
 
-checkUnnamed3081(core.List<api.Version> o) {
+checkUnnamed1271(core.List<api.Version> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVersion(o[0]);
   checkVersion(o[1]);
@@ -1121,7 +1121,7 @@
   buildCounterListVersionsResponse++;
   if (buildCounterListVersionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.versions = buildUnnamed3081();
+    o.versions = buildUnnamed1271();
   }
   buildCounterListVersionsResponse--;
   return o;
@@ -1131,7 +1131,7 @@
   buildCounterListVersionsResponse++;
   if (buildCounterListVersionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3081(o.versions);
+    checkUnnamed1271(o.versions);
   }
   buildCounterListVersionsResponse--;
 }
@@ -1167,20 +1167,20 @@
   buildCounterLivenessCheck--;
 }
 
-buildUnnamed3082() {
+buildUnnamed1272() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3082(core.Map<core.String, core.String> o) {
+checkUnnamed1272(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed3083() {
+buildUnnamed1273() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1195,7 +1195,7 @@
   return o;
 }
 
-checkUnnamed3083(core.Map<core.String, core.Object> o) {
+checkUnnamed1273(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1214,9 +1214,9 @@
   var o = new api.Location();
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    o.labels = buildUnnamed3082();
+    o.labels = buildUnnamed1272();
     o.locationId = "foo";
-    o.metadata = buildUnnamed3083();
+    o.metadata = buildUnnamed1273();
     o.name = "foo";
   }
   buildCounterLocation--;
@@ -1226,9 +1226,9 @@
 checkLocation(api.Location o) {
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    checkUnnamed3082(o.labels);
+    checkUnnamed1272(o.labels);
     unittest.expect(o.locationId, unittest.equals('foo'));
-    checkUnnamed3083(o.metadata);
+    checkUnnamed1273(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLocation--;
@@ -1274,14 +1274,14 @@
   buildCounterManualScaling--;
 }
 
-buildUnnamed3084() {
+buildUnnamed1274() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3084(core.List<core.String> o) {
+checkUnnamed1274(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1292,7 +1292,7 @@
   var o = new api.Network();
   buildCounterNetwork++;
   if (buildCounterNetwork < 3) {
-    o.forwardedPorts = buildUnnamed3084();
+    o.forwardedPorts = buildUnnamed1274();
     o.instanceTag = "foo";
     o.name = "foo";
     o.subnetworkName = "foo";
@@ -1304,7 +1304,7 @@
 checkNetwork(api.Network o) {
   buildCounterNetwork++;
   if (buildCounterNetwork < 3) {
-    checkUnnamed3084(o.forwardedPorts);
+    checkUnnamed1274(o.forwardedPorts);
     unittest.expect(o.instanceTag, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.subnetworkName, unittest.equals('foo'));
@@ -1337,7 +1337,7 @@
   buildCounterNetworkUtilization--;
 }
 
-buildUnnamed3085() {
+buildUnnamed1275() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1352,7 +1352,7 @@
   return o;
 }
 
-checkUnnamed3085(core.Map<core.String, core.Object> o) {
+checkUnnamed1275(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -1366,7 +1366,7 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3086() {
+buildUnnamed1276() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1381,7 +1381,7 @@
   return o;
 }
 
-checkUnnamed3086(core.Map<core.String, core.Object> o) {
+checkUnnamed1276(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1402,9 +1402,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed3085();
+    o.metadata = buildUnnamed1275();
     o.name = "foo";
-    o.response = buildUnnamed3086();
+    o.response = buildUnnamed1276();
   }
   buildCounterOperation--;
   return o;
@@ -1415,9 +1415,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed3085(o.metadata);
+    checkUnnamed1275(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3086(o.response);
+    checkUnnamed1276(o.response);
   }
   buildCounterOperation--;
 }
@@ -1451,14 +1451,14 @@
   buildCounterOperationMetadata--;
 }
 
-buildUnnamed3087() {
+buildUnnamed1277() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3087(core.List<core.String> o) {
+checkUnnamed1277(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1475,7 +1475,7 @@
     o.method = "foo";
     o.target = "foo";
     o.user = "foo";
-    o.warning = buildUnnamed3087();
+    o.warning = buildUnnamed1277();
   }
   buildCounterOperationMetadataV1--;
   return o;
@@ -1490,19 +1490,19 @@
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed3087(o.warning);
+    checkUnnamed1277(o.warning);
   }
   buildCounterOperationMetadataV1--;
 }
 
-buildUnnamed3088() {
+buildUnnamed1278() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3088(core.List<core.String> o) {
+checkUnnamed1278(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1520,7 +1520,7 @@
     o.method = "foo";
     o.target = "foo";
     o.user = "foo";
-    o.warning = buildUnnamed3088();
+    o.warning = buildUnnamed1278();
   }
   buildCounterOperationMetadataV1Alpha--;
   return o;
@@ -1536,19 +1536,19 @@
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed3088(o.warning);
+    checkUnnamed1278(o.warning);
   }
   buildCounterOperationMetadataV1Alpha--;
 }
 
-buildUnnamed3089() {
+buildUnnamed1279() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3089(core.List<core.String> o) {
+checkUnnamed1279(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1566,7 +1566,7 @@
     o.method = "foo";
     o.target = "foo";
     o.user = "foo";
-    o.warning = buildUnnamed3089();
+    o.warning = buildUnnamed1279();
   }
   buildCounterOperationMetadataV1Beta--;
   return o;
@@ -1582,7 +1582,7 @@
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed3089(o.warning);
+    checkUnnamed1279(o.warning);
   }
   buildCounterOperationMetadataV1Beta--;
 }
@@ -1704,14 +1704,14 @@
   buildCounterResourceRecord--;
 }
 
-buildUnnamed3090() {
+buildUnnamed1280() {
   var o = new core.List<api.Volume>();
   o.add(buildVolume());
   o.add(buildVolume());
   return o;
 }
 
-checkUnnamed3090(core.List<api.Volume> o) {
+checkUnnamed1280(core.List<api.Volume> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolume(o[0]);
   checkVolume(o[1]);
@@ -1725,7 +1725,7 @@
     o.cpu = 42.0;
     o.diskGb = 42.0;
     o.memoryGb = 42.0;
-    o.volumes = buildUnnamed3090();
+    o.volumes = buildUnnamed1280();
   }
   buildCounterResources--;
   return o;
@@ -1737,7 +1737,7 @@
     unittest.expect(o.cpu, unittest.equals(42.0));
     unittest.expect(o.diskGb, unittest.equals(42.0));
     unittest.expect(o.memoryGb, unittest.equals(42.0));
-    checkUnnamed3090(o.volumes);
+    checkUnnamed1280(o.volumes);
   }
   buildCounterResources--;
 }
@@ -1828,14 +1828,14 @@
   buildCounterStandardSchedulerSettings--;
 }
 
-buildUnnamed3091() {
+buildUnnamed1281() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3091(core.Map<core.String, core.String> o) {
+checkUnnamed1281(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1848,7 +1848,7 @@
   if (buildCounterStaticFilesHandler < 3) {
     o.applicationReadable = true;
     o.expiration = "foo";
-    o.httpHeaders = buildUnnamed3091();
+    o.httpHeaders = buildUnnamed1281();
     o.mimeType = "foo";
     o.path = "foo";
     o.requireMatchingFile = true;
@@ -1863,7 +1863,7 @@
   if (buildCounterStaticFilesHandler < 3) {
     unittest.expect(o.applicationReadable, unittest.isTrue);
     unittest.expect(o.expiration, unittest.equals('foo'));
-    checkUnnamed3091(o.httpHeaders);
+    checkUnnamed1281(o.httpHeaders);
     unittest.expect(o.mimeType, unittest.equals('foo'));
     unittest.expect(o.path, unittest.equals('foo'));
     unittest.expect(o.requireMatchingFile, unittest.isTrue);
@@ -1872,7 +1872,7 @@
   buildCounterStaticFilesHandler--;
 }
 
-buildUnnamed3092() {
+buildUnnamed1282() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1887,7 +1887,7 @@
   return o;
 }
 
-checkUnnamed3092(core.Map<core.String, core.Object> o) {
+checkUnnamed1282(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -1901,17 +1901,17 @@
   unittest.expect(casted8["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3093() {
+buildUnnamed1283() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3092());
-  o.add(buildUnnamed3092());
+  o.add(buildUnnamed1282());
+  o.add(buildUnnamed1282());
   return o;
 }
 
-checkUnnamed3093(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1283(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3092(o[0]);
-  checkUnnamed3092(o[1]);
+  checkUnnamed1282(o[0]);
+  checkUnnamed1282(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1920,7 +1920,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed3093();
+    o.details = buildUnnamed1283();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1931,20 +1931,20 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed3093(o.details);
+    checkUnnamed1283(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed3094() {
+buildUnnamed1284() {
   var o = new core.Map<core.String, core.double>();
   o["x"] = 42.0;
   o["y"] = 42.0;
   return o;
 }
 
-checkUnnamed3094(core.Map<core.String, core.double> o) {
+checkUnnamed1284(core.Map<core.String, core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals(42.0));
   unittest.expect(o["y"], unittest.equals(42.0));
@@ -1955,7 +1955,7 @@
   var o = new api.TrafficSplit();
   buildCounterTrafficSplit++;
   if (buildCounterTrafficSplit < 3) {
-    o.allocations = buildUnnamed3094();
+    o.allocations = buildUnnamed1284();
     o.shardBy = "foo";
   }
   buildCounterTrafficSplit--;
@@ -1965,7 +1965,7 @@
 checkTrafficSplit(api.TrafficSplit o) {
   buildCounterTrafficSplit++;
   if (buildCounterTrafficSplit < 3) {
-    checkUnnamed3094(o.allocations);
+    checkUnnamed1284(o.allocations);
     unittest.expect(o.shardBy, unittest.equals('foo'));
   }
   buildCounterTrafficSplit--;
@@ -2027,92 +2027,92 @@
   buildCounterUrlMap--;
 }
 
-buildUnnamed3095() {
+buildUnnamed1285() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3095(core.Map<core.String, core.String> o) {
+checkUnnamed1285(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed3096() {
+buildUnnamed1286() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3096(core.Map<core.String, core.String> o) {
+checkUnnamed1286(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed3097() {
+buildUnnamed1287() {
   var o = new core.List<api.ErrorHandler>();
   o.add(buildErrorHandler());
   o.add(buildErrorHandler());
   return o;
 }
 
-checkUnnamed3097(core.List<api.ErrorHandler> o) {
+checkUnnamed1287(core.List<api.ErrorHandler> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorHandler(o[0]);
   checkErrorHandler(o[1]);
 }
 
-buildUnnamed3098() {
+buildUnnamed1288() {
   var o = new core.List<api.UrlMap>();
   o.add(buildUrlMap());
   o.add(buildUrlMap());
   return o;
 }
 
-checkUnnamed3098(core.List<api.UrlMap> o) {
+checkUnnamed1288(core.List<api.UrlMap> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlMap(o[0]);
   checkUrlMap(o[1]);
 }
 
-buildUnnamed3099() {
+buildUnnamed1289() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3099(core.List<core.String> o) {
+checkUnnamed1289(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3100() {
+buildUnnamed1290() {
   var o = new core.List<api.Library>();
   o.add(buildLibrary());
   o.add(buildLibrary());
   return o;
 }
 
-checkUnnamed3100(core.List<api.Library> o) {
+checkUnnamed1290(core.List<api.Library> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLibrary(o[0]);
   checkLibrary(o[1]);
 }
 
-buildUnnamed3101() {
+buildUnnamed1291() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3101(core.List<core.String> o) {
+checkUnnamed1291(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2126,7 +2126,7 @@
     o.apiConfig = buildApiConfigHandler();
     o.automaticScaling = buildAutomaticScaling();
     o.basicScaling = buildBasicScaling();
-    o.betaSettings = buildUnnamed3095();
+    o.betaSettings = buildUnnamed1285();
     o.createTime = "foo";
     o.createdBy = "foo";
     o.defaultExpiration = "foo";
@@ -2134,14 +2134,14 @@
     o.diskUsageBytes = "foo";
     o.endpointsApiService = buildEndpointsApiService();
     o.env = "foo";
-    o.envVariables = buildUnnamed3096();
-    o.errorHandlers = buildUnnamed3097();
-    o.handlers = buildUnnamed3098();
+    o.envVariables = buildUnnamed1286();
+    o.errorHandlers = buildUnnamed1287();
+    o.handlers = buildUnnamed1288();
     o.healthCheck = buildHealthCheck();
     o.id = "foo";
-    o.inboundServices = buildUnnamed3099();
+    o.inboundServices = buildUnnamed1289();
     o.instanceClass = "foo";
-    o.libraries = buildUnnamed3100();
+    o.libraries = buildUnnamed1290();
     o.livenessCheck = buildLivenessCheck();
     o.manualScaling = buildManualScaling();
     o.name = "foo";
@@ -2156,7 +2156,7 @@
     o.threadsafe = true;
     o.versionUrl = "foo";
     o.vm = true;
-    o.zones = buildUnnamed3101();
+    o.zones = buildUnnamed1291();
   }
   buildCounterVersion--;
   return o;
@@ -2168,7 +2168,7 @@
     checkApiConfigHandler(o.apiConfig);
     checkAutomaticScaling(o.automaticScaling);
     checkBasicScaling(o.basicScaling);
-    checkUnnamed3095(o.betaSettings);
+    checkUnnamed1285(o.betaSettings);
     unittest.expect(o.createTime, unittest.equals('foo'));
     unittest.expect(o.createdBy, unittest.equals('foo'));
     unittest.expect(o.defaultExpiration, unittest.equals('foo'));
@@ -2176,14 +2176,14 @@
     unittest.expect(o.diskUsageBytes, unittest.equals('foo'));
     checkEndpointsApiService(o.endpointsApiService);
     unittest.expect(o.env, unittest.equals('foo'));
-    checkUnnamed3096(o.envVariables);
-    checkUnnamed3097(o.errorHandlers);
-    checkUnnamed3098(o.handlers);
+    checkUnnamed1286(o.envVariables);
+    checkUnnamed1287(o.errorHandlers);
+    checkUnnamed1288(o.handlers);
     checkHealthCheck(o.healthCheck);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed3099(o.inboundServices);
+    checkUnnamed1289(o.inboundServices);
     unittest.expect(o.instanceClass, unittest.equals('foo'));
-    checkUnnamed3100(o.libraries);
+    checkUnnamed1290(o.libraries);
     checkLivenessCheck(o.livenessCheck);
     checkManualScaling(o.manualScaling);
     unittest.expect(o.name, unittest.equals('foo'));
@@ -2198,7 +2198,7 @@
     unittest.expect(o.threadsafe, unittest.isTrue);
     unittest.expect(o.versionUrl, unittest.equals('foo'));
     unittest.expect(o.vm, unittest.isTrue);
-    checkUnnamed3101(o.zones);
+    checkUnnamed1291(o.zones);
   }
   buildCounterVersion--;
 }
@@ -2825,7 +2825,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2878,7 +2878,7 @@
       }), true);
       res
           .get(arg_appsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Application response) {
+          .then(unittest.expectAsync1(((response) {
         checkApplication(response);
       })));
     });
@@ -2939,7 +2939,7 @@
       res
           .patch(arg_request, arg_appsId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3002,7 +3002,7 @@
       }), true);
       res
           .repair(arg_request, arg_appsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3068,7 +3068,7 @@
       }), true);
       res
           .create(arg_request, arg_appsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AuthorizedCertificate response) {
+          .then(unittest.expectAsync1(((response) {
         checkAuthorizedCertificate(response);
       })));
     });
@@ -3134,7 +3134,7 @@
       res
           .delete(arg_appsId, arg_authorizedCertificatesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3202,7 +3202,7 @@
       res
           .get(arg_appsId, arg_authorizedCertificatesId,
               view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AuthorizedCertificate response) {
+          .then(unittest.expectAsync1(((response) {
         checkAuthorizedCertificate(response);
       })));
     });
@@ -3275,8 +3275,7 @@
               pageSize: arg_pageSize,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListAuthorizedCertificatesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListAuthorizedCertificatesResponse(response);
       })));
     });
@@ -3349,7 +3348,7 @@
       res
           .patch(arg_request, arg_appsId, arg_authorizedCertificatesId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AuthorizedCertificate response) {
+          .then(unittest.expectAsync1(((response) {
         checkAuthorizedCertificate(response);
       })));
     });
@@ -3420,8 +3419,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListAuthorizedDomainsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListAuthorizedDomainsResponse(response);
       })));
     });
@@ -3491,7 +3489,7 @@
       res
           .create(arg_request, arg_appsId,
               overrideStrategy: arg_overrideStrategy, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3555,7 +3553,7 @@
       }), true);
       res
           .delete(arg_appsId, arg_domainMappingsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3619,7 +3617,7 @@
       }), true);
       res
           .get(arg_appsId, arg_domainMappingsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DomainMapping response) {
+          .then(unittest.expectAsync1(((response) {
         checkDomainMapping(response);
       })));
     });
@@ -3688,8 +3686,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListDomainMappingsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDomainMappingsResponse(response);
       })));
     });
@@ -3761,7 +3758,7 @@
       res
           .patch(arg_request, arg_appsId, arg_domainMappingsId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3825,9 +3822,9 @@
         var resp = convert.JSON.encode(buildBatchUpdateIngressRulesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchUpdate(arg_request, arg_appsId, $fields: arg_$fields).then(
-          unittest
-              .expectAsync1(((api.BatchUpdateIngressRulesResponse response) {
+      res
+          .batchUpdate(arg_request, arg_appsId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkBatchUpdateIngressRulesResponse(response);
       })));
     });
@@ -3891,7 +3888,7 @@
       }), true);
       res
           .create(arg_request, arg_appsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FirewallRule response) {
+          .then(unittest.expectAsync1(((response) {
         checkFirewallRule(response);
       })));
     });
@@ -3955,7 +3952,7 @@
       }), true);
       res
           .delete(arg_appsId, arg_ingressRulesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4019,7 +4016,7 @@
       }), true);
       res
           .get(arg_appsId, arg_ingressRulesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FirewallRule response) {
+          .then(unittest.expectAsync1(((response) {
         checkFirewallRule(response);
       })));
     });
@@ -4092,7 +4089,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListIngressRulesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListIngressRulesResponse(response);
       })));
     });
@@ -4164,7 +4161,7 @@
       res
           .patch(arg_request, arg_appsId, arg_ingressRulesId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FirewallRule response) {
+          .then(unittest.expectAsync1(((response) {
         checkFirewallRule(response);
       })));
     });
@@ -4230,7 +4227,7 @@
       }), true);
       res
           .get(arg_appsId, arg_locationsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Location response) {
+          .then(unittest.expectAsync1(((response) {
         checkLocation(response);
       })));
     });
@@ -4302,7 +4299,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLocationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLocationsResponse(response);
       })));
     });
@@ -4368,7 +4365,7 @@
       }), true);
       res
           .get(arg_appsId, arg_operationsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4440,7 +4437,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -4506,7 +4503,7 @@
       }), true);
       res
           .delete(arg_appsId, arg_servicesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4570,7 +4567,7 @@
       }), true);
       res
           .get(arg_appsId, arg_servicesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Service response) {
+          .then(unittest.expectAsync1(((response) {
         checkService(response);
       })));
     });
@@ -4639,7 +4636,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListServicesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListServicesResponse(response);
       })));
     });
@@ -4716,7 +4713,7 @@
               migrateTraffic: arg_migrateTraffic,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4792,7 +4789,7 @@
       }), true);
       res
           .create(arg_request, arg_appsId, arg_servicesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4867,7 +4864,7 @@
       res
           .delete(arg_appsId, arg_servicesId, arg_versionsId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4944,7 +4941,7 @@
       res
           .get(arg_appsId, arg_servicesId, arg_versionsId,
               view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Version response) {
+          .then(unittest.expectAsync1(((response) {
         checkVersion(response);
       })));
     });
@@ -5026,7 +5023,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListVersionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListVersionsResponse(response);
       })));
     });
@@ -5108,7 +5105,7 @@
       res
           .patch(arg_request, arg_appsId, arg_servicesId, arg_versionsId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5206,7 +5203,7 @@
           .debug(arg_request, arg_appsId, arg_servicesId, arg_versionsId,
               arg_instancesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5291,7 +5288,7 @@
       res
           .delete(arg_appsId, arg_servicesId, arg_versionsId, arg_instancesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5376,7 +5373,7 @@
       res
           .get(arg_appsId, arg_servicesId, arg_versionsId, arg_instancesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Instance response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstance(response);
       })));
     });
@@ -5465,7 +5462,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListInstancesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListInstancesResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/appsactivity/v1_test.dart b/generated/googleapis/test/appsactivity/v1_test.dart
index e541208..f89905f 100644
--- a/generated/googleapis/test/appsactivity/v1_test.dart
+++ b/generated/googleapis/test/appsactivity/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed989() {
+buildUnnamed1091() {
   var o = new core.List<api.Event>();
   o.add(buildEvent());
   o.add(buildEvent());
   return o;
 }
 
-checkUnnamed989(core.List<api.Event> o) {
+checkUnnamed1091(core.List<api.Event> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEvent(o[0]);
   checkEvent(o[1]);
@@ -69,7 +69,7 @@
   buildCounterActivity++;
   if (buildCounterActivity < 3) {
     o.combinedEvent = buildEvent();
-    o.singleEvents = buildUnnamed989();
+    o.singleEvents = buildUnnamed1091();
   }
   buildCounterActivity--;
   return o;
@@ -79,32 +79,32 @@
   buildCounterActivity++;
   if (buildCounterActivity < 3) {
     checkEvent(o.combinedEvent);
-    checkUnnamed989(o.singleEvents);
+    checkUnnamed1091(o.singleEvents);
   }
   buildCounterActivity--;
 }
 
-buildUnnamed990() {
+buildUnnamed1092() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed990(core.List<core.String> o) {
+checkUnnamed1092(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed991() {
+buildUnnamed1093() {
   var o = new core.List<api.PermissionChange>();
   o.add(buildPermissionChange());
   o.add(buildPermissionChange());
   return o;
 }
 
-checkUnnamed991(core.List<api.PermissionChange> o) {
+checkUnnamed1093(core.List<api.PermissionChange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermissionChange(o[0]);
   checkPermissionChange(o[1]);
@@ -115,11 +115,11 @@
   var o = new api.Event();
   buildCounterEvent++;
   if (buildCounterEvent < 3) {
-    o.additionalEventTypes = buildUnnamed990();
+    o.additionalEventTypes = buildUnnamed1092();
     o.eventTimeMillis = "foo";
     o.fromUserDeletion = true;
     o.move = buildMove();
-    o.permissionChanges = buildUnnamed991();
+    o.permissionChanges = buildUnnamed1093();
     o.primaryEventType = "foo";
     o.rename = buildRename();
     o.target = buildTarget();
@@ -132,11 +132,11 @@
 checkEvent(api.Event o) {
   buildCounterEvent++;
   if (buildCounterEvent < 3) {
-    checkUnnamed990(o.additionalEventTypes);
+    checkUnnamed1092(o.additionalEventTypes);
     unittest.expect(o.eventTimeMillis, unittest.equals('foo'));
     unittest.expect(o.fromUserDeletion, unittest.isTrue);
     checkMove(o.move);
-    checkUnnamed991(o.permissionChanges);
+    checkUnnamed1093(o.permissionChanges);
     unittest.expect(o.primaryEventType, unittest.equals('foo'));
     checkRename(o.rename);
     checkTarget(o.target);
@@ -145,14 +145,14 @@
   buildCounterEvent--;
 }
 
-buildUnnamed992() {
+buildUnnamed1094() {
   var o = new core.List<api.Activity>();
   o.add(buildActivity());
   o.add(buildActivity());
   return o;
 }
 
-checkUnnamed992(core.List<api.Activity> o) {
+checkUnnamed1094(core.List<api.Activity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivity(o[0]);
   checkActivity(o[1]);
@@ -163,7 +163,7 @@
   var o = new api.ListActivitiesResponse();
   buildCounterListActivitiesResponse++;
   if (buildCounterListActivitiesResponse < 3) {
-    o.activities = buildUnnamed992();
+    o.activities = buildUnnamed1094();
     o.nextPageToken = "foo";
   }
   buildCounterListActivitiesResponse--;
@@ -173,33 +173,33 @@
 checkListActivitiesResponse(api.ListActivitiesResponse o) {
   buildCounterListActivitiesResponse++;
   if (buildCounterListActivitiesResponse < 3) {
-    checkUnnamed992(o.activities);
+    checkUnnamed1094(o.activities);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListActivitiesResponse--;
 }
 
-buildUnnamed993() {
+buildUnnamed1095() {
   var o = new core.List<api.Parent>();
   o.add(buildParent());
   o.add(buildParent());
   return o;
 }
 
-checkUnnamed993(core.List<api.Parent> o) {
+checkUnnamed1095(core.List<api.Parent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParent(o[0]);
   checkParent(o[1]);
 }
 
-buildUnnamed994() {
+buildUnnamed1096() {
   var o = new core.List<api.Parent>();
   o.add(buildParent());
   o.add(buildParent());
   return o;
 }
 
-checkUnnamed994(core.List<api.Parent> o) {
+checkUnnamed1096(core.List<api.Parent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParent(o[0]);
   checkParent(o[1]);
@@ -210,8 +210,8 @@
   var o = new api.Move();
   buildCounterMove++;
   if (buildCounterMove < 3) {
-    o.addedParents = buildUnnamed993();
-    o.removedParents = buildUnnamed994();
+    o.addedParents = buildUnnamed1095();
+    o.removedParents = buildUnnamed1096();
   }
   buildCounterMove--;
   return o;
@@ -220,8 +220,8 @@
 checkMove(api.Move o) {
   buildCounterMove++;
   if (buildCounterMove < 3) {
-    checkUnnamed993(o.addedParents);
-    checkUnnamed994(o.removedParents);
+    checkUnnamed1095(o.addedParents);
+    checkUnnamed1096(o.removedParents);
   }
   buildCounterMove--;
 }
@@ -278,27 +278,27 @@
   buildCounterPermission--;
 }
 
-buildUnnamed995() {
+buildUnnamed1097() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed995(core.List<api.Permission> o) {
+checkUnnamed1097(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
 }
 
-buildUnnamed996() {
+buildUnnamed1098() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed996(core.List<api.Permission> o) {
+checkUnnamed1098(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
@@ -309,8 +309,8 @@
   var o = new api.PermissionChange();
   buildCounterPermissionChange++;
   if (buildCounterPermissionChange < 3) {
-    o.addedPermissions = buildUnnamed995();
-    o.removedPermissions = buildUnnamed996();
+    o.addedPermissions = buildUnnamed1097();
+    o.removedPermissions = buildUnnamed1098();
   }
   buildCounterPermissionChange--;
   return o;
@@ -319,8 +319,8 @@
 checkPermissionChange(api.PermissionChange o) {
   buildCounterPermissionChange++;
   if (buildCounterPermissionChange < 3) {
-    checkUnnamed995(o.addedPermissions);
-    checkUnnamed996(o.removedPermissions);
+    checkUnnamed1097(o.addedPermissions);
+    checkUnnamed1098(o.removedPermissions);
   }
   buildCounterPermissionChange--;
 }
@@ -579,7 +579,7 @@
               source: arg_source,
               userId: arg_userId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListActivitiesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListActivitiesResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/appstate/v1_test.dart b/generated/googleapis/test/appstate/v1_test.dart
index 728ac8f..8a6755e 100644
--- a/generated/googleapis/test/appstate/v1_test.dart
+++ b/generated/googleapis/test/appstate/v1_test.dart
@@ -75,14 +75,14 @@
   buildCounterGetResponse--;
 }
 
-buildUnnamed2619() {
+buildUnnamed3499() {
   var o = new core.List<api.GetResponse>();
   o.add(buildGetResponse());
   o.add(buildGetResponse());
   return o;
 }
 
-checkUnnamed2619(core.List<api.GetResponse> o) {
+checkUnnamed3499(core.List<api.GetResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGetResponse(o[0]);
   checkGetResponse(o[1]);
@@ -93,7 +93,7 @@
   var o = new api.ListResponse();
   buildCounterListResponse++;
   if (buildCounterListResponse < 3) {
-    o.items = buildUnnamed2619();
+    o.items = buildUnnamed3499();
     o.kind = "foo";
     o.maximumKeyCount = 42;
   }
@@ -104,7 +104,7 @@
 checkListResponse(api.ListResponse o) {
   buildCounterListResponse++;
   if (buildCounterListResponse < 3) {
-    checkUnnamed2619(o.items);
+    checkUnnamed3499(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.maximumKeyCount, unittest.equals(42));
   }
@@ -250,7 +250,7 @@
       res
           .clear(arg_stateKey,
               currentDataVersion: arg_currentDataVersion, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WriteResult response) {
+          .then(unittest.expectAsync1(((response) {
         checkWriteResult(response);
       })));
     });
@@ -360,7 +360,7 @@
       }), true);
       res
           .get(arg_stateKey, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetResponse(response);
       })));
     });
@@ -415,7 +415,7 @@
       }), true);
       res
           .list(includeData: arg_includeData, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListResponse(response);
       })));
     });
@@ -480,7 +480,7 @@
           .update(arg_request, arg_stateKey,
               currentStateVersion: arg_currentStateVersion,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WriteResult response) {
+          .then(unittest.expectAsync1(((response) {
         checkWriteResult(response);
       })));
     });
diff --git a/generated/googleapis/test/bigquery/v2_test.dart b/generated/googleapis/test/bigquery/v2_test.dart
index 2444a5e..2c567ff 100644
--- a/generated/googleapis/test/bigquery/v2_test.dart
+++ b/generated/googleapis/test/bigquery/v2_test.dart
@@ -79,14 +79,14 @@
   buildCounterBigtableColumn--;
 }
 
-buildUnnamed1371() {
+buildUnnamed2465() {
   var o = new core.List<api.BigtableColumn>();
   o.add(buildBigtableColumn());
   o.add(buildBigtableColumn());
   return o;
 }
 
-checkUnnamed1371(core.List<api.BigtableColumn> o) {
+checkUnnamed2465(core.List<api.BigtableColumn> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBigtableColumn(o[0]);
   checkBigtableColumn(o[1]);
@@ -97,7 +97,7 @@
   var o = new api.BigtableColumnFamily();
   buildCounterBigtableColumnFamily++;
   if (buildCounterBigtableColumnFamily < 3) {
-    o.columns = buildUnnamed1371();
+    o.columns = buildUnnamed2465();
     o.encoding = "foo";
     o.familyId = "foo";
     o.onlyReadLatest = true;
@@ -110,7 +110,7 @@
 checkBigtableColumnFamily(api.BigtableColumnFamily o) {
   buildCounterBigtableColumnFamily++;
   if (buildCounterBigtableColumnFamily < 3) {
-    checkUnnamed1371(o.columns);
+    checkUnnamed2465(o.columns);
     unittest.expect(o.encoding, unittest.equals('foo'));
     unittest.expect(o.familyId, unittest.equals('foo'));
     unittest.expect(o.onlyReadLatest, unittest.isTrue);
@@ -119,14 +119,14 @@
   buildCounterBigtableColumnFamily--;
 }
 
-buildUnnamed1372() {
+buildUnnamed2466() {
   var o = new core.List<api.BigtableColumnFamily>();
   o.add(buildBigtableColumnFamily());
   o.add(buildBigtableColumnFamily());
   return o;
 }
 
-checkUnnamed1372(core.List<api.BigtableColumnFamily> o) {
+checkUnnamed2466(core.List<api.BigtableColumnFamily> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBigtableColumnFamily(o[0]);
   checkBigtableColumnFamily(o[1]);
@@ -137,7 +137,7 @@
   var o = new api.BigtableOptions();
   buildCounterBigtableOptions++;
   if (buildCounterBigtableOptions < 3) {
-    o.columnFamilies = buildUnnamed1372();
+    o.columnFamilies = buildUnnamed2466();
     o.ignoreUnspecifiedColumnFamilies = true;
     o.readRowkeyAsString = true;
   }
@@ -148,7 +148,7 @@
 checkBigtableOptions(api.BigtableOptions o) {
   buildCounterBigtableOptions++;
   if (buildCounterBigtableOptions < 3) {
-    checkUnnamed1372(o.columnFamilies);
+    checkUnnamed2466(o.columnFamilies);
     unittest.expect(o.ignoreUnspecifiedColumnFamilies, unittest.isTrue);
     unittest.expect(o.readRowkeyAsString, unittest.isTrue);
   }
@@ -213,27 +213,27 @@
   buildCounterDatasetAccess--;
 }
 
-buildUnnamed1373() {
+buildUnnamed2467() {
   var o = new core.List<api.DatasetAccess>();
   o.add(buildDatasetAccess());
   o.add(buildDatasetAccess());
   return o;
 }
 
-checkUnnamed1373(core.List<api.DatasetAccess> o) {
+checkUnnamed2467(core.List<api.DatasetAccess> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatasetAccess(o[0]);
   checkDatasetAccess(o[1]);
 }
 
-buildUnnamed1374() {
+buildUnnamed2468() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1374(core.Map<core.String, core.String> o) {
+checkUnnamed2468(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -244,7 +244,7 @@
   var o = new api.Dataset();
   buildCounterDataset++;
   if (buildCounterDataset < 3) {
-    o.access = buildUnnamed1373();
+    o.access = buildUnnamed2467();
     o.creationTime = "foo";
     o.datasetReference = buildDatasetReference();
     o.defaultTableExpirationMs = "foo";
@@ -253,7 +253,7 @@
     o.friendlyName = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed1374();
+    o.labels = buildUnnamed2468();
     o.lastModifiedTime = "foo";
     o.location = "foo";
     o.selfLink = "foo";
@@ -265,7 +265,7 @@
 checkDataset(api.Dataset o) {
   buildCounterDataset++;
   if (buildCounterDataset < 3) {
-    checkUnnamed1373(o.access);
+    checkUnnamed2467(o.access);
     unittest.expect(o.creationTime, unittest.equals('foo'));
     checkDatasetReference(o.datasetReference);
     unittest.expect(o.defaultTableExpirationMs, unittest.equals('foo'));
@@ -274,7 +274,7 @@
     unittest.expect(o.friendlyName, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1374(o.labels);
+    checkUnnamed2468(o.labels);
     unittest.expect(o.lastModifiedTime, unittest.equals('foo'));
     unittest.expect(o.location, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -282,14 +282,14 @@
   buildCounterDataset--;
 }
 
-buildUnnamed1375() {
+buildUnnamed2469() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1375(core.Map<core.String, core.String> o) {
+checkUnnamed2469(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -304,7 +304,7 @@
     o.friendlyName = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed1375();
+    o.labels = buildUnnamed2469();
     o.location = "foo";
   }
   buildCounterDatasetListDatasets--;
@@ -318,20 +318,20 @@
     unittest.expect(o.friendlyName, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1375(o.labels);
+    checkUnnamed2469(o.labels);
     unittest.expect(o.location, unittest.equals('foo'));
   }
   buildCounterDatasetListDatasets--;
 }
 
-buildUnnamed1376() {
+buildUnnamed2470() {
   var o = new core.List<api.DatasetListDatasets>();
   o.add(buildDatasetListDatasets());
   o.add(buildDatasetListDatasets());
   return o;
 }
 
-checkUnnamed1376(core.List<api.DatasetListDatasets> o) {
+checkUnnamed2470(core.List<api.DatasetListDatasets> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatasetListDatasets(o[0]);
   checkDatasetListDatasets(o[1]);
@@ -342,7 +342,7 @@
   var o = new api.DatasetList();
   buildCounterDatasetList++;
   if (buildCounterDatasetList < 3) {
-    o.datasets = buildUnnamed1376();
+    o.datasets = buildUnnamed2470();
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
@@ -354,7 +354,7 @@
 checkDatasetList(api.DatasetList o) {
   buildCounterDatasetList++;
   if (buildCounterDatasetList < 3) {
-    checkUnnamed1376(o.datasets);
+    checkUnnamed2470(o.datasets);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -448,27 +448,27 @@
   buildCounterErrorProto--;
 }
 
-buildUnnamed1377() {
+buildUnnamed2471() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1377(core.List<core.String> o) {
+checkUnnamed2471(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1378() {
+buildUnnamed2472() {
   var o = new core.List<api.ExplainQueryStep>();
   o.add(buildExplainQueryStep());
   o.add(buildExplainQueryStep());
   return o;
 }
 
-checkUnnamed1378(core.List<api.ExplainQueryStep> o) {
+checkUnnamed2472(core.List<api.ExplainQueryStep> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExplainQueryStep(o[0]);
   checkExplainQueryStep(o[1]);
@@ -486,7 +486,7 @@
     o.computeRatioMax = 42.0;
     o.endMs = "foo";
     o.id = "foo";
-    o.inputStages = buildUnnamed1377();
+    o.inputStages = buildUnnamed2471();
     o.name = "foo";
     o.parallelInputs = "foo";
     o.readMsAvg = "foo";
@@ -499,7 +499,7 @@
     o.shuffleOutputBytesSpilled = "foo";
     o.startMs = "foo";
     o.status = "foo";
-    o.steps = buildUnnamed1378();
+    o.steps = buildUnnamed2472();
     o.waitMsAvg = "foo";
     o.waitMsMax = "foo";
     o.waitRatioAvg = 42.0;
@@ -523,7 +523,7 @@
     unittest.expect(o.computeRatioMax, unittest.equals(42.0));
     unittest.expect(o.endMs, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1377(o.inputStages);
+    checkUnnamed2471(o.inputStages);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.parallelInputs, unittest.equals('foo'));
     unittest.expect(o.readMsAvg, unittest.equals('foo'));
@@ -536,7 +536,7 @@
     unittest.expect(o.shuffleOutputBytesSpilled, unittest.equals('foo'));
     unittest.expect(o.startMs, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
-    checkUnnamed1378(o.steps);
+    checkUnnamed2472(o.steps);
     unittest.expect(o.waitMsAvg, unittest.equals('foo'));
     unittest.expect(o.waitMsMax, unittest.equals('foo'));
     unittest.expect(o.waitRatioAvg, unittest.equals(42.0));
@@ -549,14 +549,14 @@
   buildCounterExplainQueryStage--;
 }
 
-buildUnnamed1379() {
+buildUnnamed2473() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1379(core.List<core.String> o) {
+checkUnnamed2473(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -568,7 +568,7 @@
   buildCounterExplainQueryStep++;
   if (buildCounterExplainQueryStep < 3) {
     o.kind = "foo";
-    o.substeps = buildUnnamed1379();
+    o.substeps = buildUnnamed2473();
   }
   buildCounterExplainQueryStep--;
   return o;
@@ -578,19 +578,19 @@
   buildCounterExplainQueryStep++;
   if (buildCounterExplainQueryStep < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1379(o.substeps);
+    checkUnnamed2473(o.substeps);
   }
   buildCounterExplainQueryStep--;
 }
 
-buildUnnamed1380() {
+buildUnnamed2474() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1380(core.List<core.String> o) {
+checkUnnamed2474(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -610,7 +610,7 @@
     o.maxBadRecords = 42;
     o.schema = buildTableSchema();
     o.sourceFormat = "foo";
-    o.sourceUris = buildUnnamed1380();
+    o.sourceUris = buildUnnamed2474();
   }
   buildCounterExternalDataConfiguration--;
   return o;
@@ -628,32 +628,32 @@
     unittest.expect(o.maxBadRecords, unittest.equals(42));
     checkTableSchema(o.schema);
     unittest.expect(o.sourceFormat, unittest.equals('foo'));
-    checkUnnamed1380(o.sourceUris);
+    checkUnnamed2474(o.sourceUris);
   }
   buildCounterExternalDataConfiguration--;
 }
 
-buildUnnamed1381() {
+buildUnnamed2475() {
   var o = new core.List<api.ErrorProto>();
   o.add(buildErrorProto());
   o.add(buildErrorProto());
   return o;
 }
 
-checkUnnamed1381(core.List<api.ErrorProto> o) {
+checkUnnamed2475(core.List<api.ErrorProto> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorProto(o[0]);
   checkErrorProto(o[1]);
 }
 
-buildUnnamed1382() {
+buildUnnamed2476() {
   var o = new core.List<api.TableRow>();
   o.add(buildTableRow());
   o.add(buildTableRow());
   return o;
 }
 
-checkUnnamed1382(core.List<api.TableRow> o) {
+checkUnnamed2476(core.List<api.TableRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableRow(o[0]);
   checkTableRow(o[1]);
@@ -665,14 +665,14 @@
   buildCounterGetQueryResultsResponse++;
   if (buildCounterGetQueryResultsResponse < 3) {
     o.cacheHit = true;
-    o.errors = buildUnnamed1381();
+    o.errors = buildUnnamed2475();
     o.etag = "foo";
     o.jobComplete = true;
     o.jobReference = buildJobReference();
     o.kind = "foo";
     o.numDmlAffectedRows = "foo";
     o.pageToken = "foo";
-    o.rows = buildUnnamed1382();
+    o.rows = buildUnnamed2476();
     o.schema = buildTableSchema();
     o.totalBytesProcessed = "foo";
     o.totalRows = "foo";
@@ -685,14 +685,14 @@
   buildCounterGetQueryResultsResponse++;
   if (buildCounterGetQueryResultsResponse < 3) {
     unittest.expect(o.cacheHit, unittest.isTrue);
-    checkUnnamed1381(o.errors);
+    checkUnnamed2475(o.errors);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.jobComplete, unittest.isTrue);
     checkJobReference(o.jobReference);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.numDmlAffectedRows, unittest.equals('foo'));
     unittest.expect(o.pageToken, unittest.equals('foo'));
-    checkUnnamed1382(o.rows);
+    checkUnnamed2476(o.rows);
     checkTableSchema(o.schema);
     unittest.expect(o.totalBytesProcessed, unittest.equals('foo'));
     unittest.expect(o.totalRows, unittest.equals('foo'));
@@ -796,14 +796,14 @@
   buildCounterJobCancelResponse--;
 }
 
-buildUnnamed1383() {
+buildUnnamed2477() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1383(core.Map<core.String, core.String> o) {
+checkUnnamed2477(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -818,7 +818,7 @@
     o.dryRun = true;
     o.extract = buildJobConfigurationExtract();
     o.jobTimeoutMs = "foo";
-    o.labels = buildUnnamed1383();
+    o.labels = buildUnnamed2477();
     o.load = buildJobConfigurationLoad();
     o.query = buildJobConfigurationQuery();
   }
@@ -833,21 +833,21 @@
     unittest.expect(o.dryRun, unittest.isTrue);
     checkJobConfigurationExtract(o.extract);
     unittest.expect(o.jobTimeoutMs, unittest.equals('foo'));
-    checkUnnamed1383(o.labels);
+    checkUnnamed2477(o.labels);
     checkJobConfigurationLoad(o.load);
     checkJobConfigurationQuery(o.query);
   }
   buildCounterJobConfiguration--;
 }
 
-buildUnnamed1384() {
+buildUnnamed2478() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1384(core.List<core.String> o) {
+checkUnnamed2478(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -861,7 +861,7 @@
     o.compression = "foo";
     o.destinationFormat = "foo";
     o.destinationUri = "foo";
-    o.destinationUris = buildUnnamed1384();
+    o.destinationUris = buildUnnamed2478();
     o.fieldDelimiter = "foo";
     o.printHeader = true;
     o.sourceTable = buildTableReference();
@@ -876,7 +876,7 @@
     unittest.expect(o.compression, unittest.equals('foo'));
     unittest.expect(o.destinationFormat, unittest.equals('foo'));
     unittest.expect(o.destinationUri, unittest.equals('foo'));
-    checkUnnamed1384(o.destinationUris);
+    checkUnnamed2478(o.destinationUris);
     unittest.expect(o.fieldDelimiter, unittest.equals('foo'));
     unittest.expect(o.printHeader, unittest.isTrue);
     checkTableReference(o.sourceTable);
@@ -884,40 +884,40 @@
   buildCounterJobConfigurationExtract--;
 }
 
-buildUnnamed1385() {
+buildUnnamed2479() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1385(core.List<core.String> o) {
+checkUnnamed2479(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1386() {
+buildUnnamed2480() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1386(core.List<core.String> o) {
+checkUnnamed2480(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1387() {
+buildUnnamed2481() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1387(core.List<core.String> o) {
+checkUnnamed2481(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -940,15 +940,15 @@
     o.ignoreUnknownValues = true;
     o.maxBadRecords = 42;
     o.nullMarker = "foo";
-    o.projectionFields = buildUnnamed1385();
+    o.projectionFields = buildUnnamed2479();
     o.quote = "foo";
     o.schema = buildTableSchema();
     o.schemaInline = "foo";
     o.schemaInlineFormat = "foo";
-    o.schemaUpdateOptions = buildUnnamed1386();
+    o.schemaUpdateOptions = buildUnnamed2480();
     o.skipLeadingRows = 42;
     o.sourceFormat = "foo";
-    o.sourceUris = buildUnnamed1387();
+    o.sourceUris = buildUnnamed2481();
     o.timePartitioning = buildTimePartitioning();
     o.writeDisposition = "foo";
   }
@@ -971,68 +971,68 @@
     unittest.expect(o.ignoreUnknownValues, unittest.isTrue);
     unittest.expect(o.maxBadRecords, unittest.equals(42));
     unittest.expect(o.nullMarker, unittest.equals('foo'));
-    checkUnnamed1385(o.projectionFields);
+    checkUnnamed2479(o.projectionFields);
     unittest.expect(o.quote, unittest.equals('foo'));
     checkTableSchema(o.schema);
     unittest.expect(o.schemaInline, unittest.equals('foo'));
     unittest.expect(o.schemaInlineFormat, unittest.equals('foo'));
-    checkUnnamed1386(o.schemaUpdateOptions);
+    checkUnnamed2480(o.schemaUpdateOptions);
     unittest.expect(o.skipLeadingRows, unittest.equals(42));
     unittest.expect(o.sourceFormat, unittest.equals('foo'));
-    checkUnnamed1387(o.sourceUris);
+    checkUnnamed2481(o.sourceUris);
     checkTimePartitioning(o.timePartitioning);
     unittest.expect(o.writeDisposition, unittest.equals('foo'));
   }
   buildCounterJobConfigurationLoad--;
 }
 
-buildUnnamed1388() {
+buildUnnamed2482() {
   var o = new core.List<api.QueryParameter>();
   o.add(buildQueryParameter());
   o.add(buildQueryParameter());
   return o;
 }
 
-checkUnnamed1388(core.List<api.QueryParameter> o) {
+checkUnnamed2482(core.List<api.QueryParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQueryParameter(o[0]);
   checkQueryParameter(o[1]);
 }
 
-buildUnnamed1389() {
+buildUnnamed2483() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1389(core.List<core.String> o) {
+checkUnnamed2483(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1390() {
+buildUnnamed2484() {
   var o = new core.Map<core.String, api.ExternalDataConfiguration>();
   o["x"] = buildExternalDataConfiguration();
   o["y"] = buildExternalDataConfiguration();
   return o;
 }
 
-checkUnnamed1390(core.Map<core.String, api.ExternalDataConfiguration> o) {
+checkUnnamed2484(core.Map<core.String, api.ExternalDataConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExternalDataConfiguration(o["x"]);
   checkExternalDataConfiguration(o["y"]);
 }
 
-buildUnnamed1391() {
+buildUnnamed2485() {
   var o = new core.List<api.UserDefinedFunctionResource>();
   o.add(buildUserDefinedFunctionResource());
   o.add(buildUserDefinedFunctionResource());
   return o;
 }
 
-checkUnnamed1391(core.List<api.UserDefinedFunctionResource> o) {
+checkUnnamed2485(core.List<api.UserDefinedFunctionResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserDefinedFunctionResource(o[0]);
   checkUserDefinedFunctionResource(o[1]);
@@ -1055,13 +1055,13 @@
     o.preserveNulls = true;
     o.priority = "foo";
     o.query = "foo";
-    o.queryParameters = buildUnnamed1388();
-    o.schemaUpdateOptions = buildUnnamed1389();
-    o.tableDefinitions = buildUnnamed1390();
+    o.queryParameters = buildUnnamed2482();
+    o.schemaUpdateOptions = buildUnnamed2483();
+    o.tableDefinitions = buildUnnamed2484();
     o.timePartitioning = buildTimePartitioning();
     o.useLegacySql = true;
     o.useQueryCache = true;
-    o.userDefinedFunctionResources = buildUnnamed1391();
+    o.userDefinedFunctionResources = buildUnnamed2485();
     o.writeDisposition = "foo";
   }
   buildCounterJobConfigurationQuery--;
@@ -1083,26 +1083,26 @@
     unittest.expect(o.preserveNulls, unittest.isTrue);
     unittest.expect(o.priority, unittest.equals('foo'));
     unittest.expect(o.query, unittest.equals('foo'));
-    checkUnnamed1388(o.queryParameters);
-    checkUnnamed1389(o.schemaUpdateOptions);
-    checkUnnamed1390(o.tableDefinitions);
+    checkUnnamed2482(o.queryParameters);
+    checkUnnamed2483(o.schemaUpdateOptions);
+    checkUnnamed2484(o.tableDefinitions);
     checkTimePartitioning(o.timePartitioning);
     unittest.expect(o.useLegacySql, unittest.isTrue);
     unittest.expect(o.useQueryCache, unittest.isTrue);
-    checkUnnamed1391(o.userDefinedFunctionResources);
+    checkUnnamed2485(o.userDefinedFunctionResources);
     unittest.expect(o.writeDisposition, unittest.equals('foo'));
   }
   buildCounterJobConfigurationQuery--;
 }
 
-buildUnnamed1392() {
+buildUnnamed2486() {
   var o = new core.List<api.TableReference>();
   o.add(buildTableReference());
   o.add(buildTableReference());
   return o;
 }
 
-checkUnnamed1392(core.List<api.TableReference> o) {
+checkUnnamed2486(core.List<api.TableReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableReference(o[0]);
   checkTableReference(o[1]);
@@ -1117,7 +1117,7 @@
     o.destinationEncryptionConfiguration = buildEncryptionConfiguration();
     o.destinationTable = buildTableReference();
     o.sourceTable = buildTableReference();
-    o.sourceTables = buildUnnamed1392();
+    o.sourceTables = buildUnnamed2486();
     o.writeDisposition = "foo";
   }
   buildCounterJobConfigurationTableCopy--;
@@ -1131,7 +1131,7 @@
     checkEncryptionConfiguration(o.destinationEncryptionConfiguration);
     checkTableReference(o.destinationTable);
     checkTableReference(o.sourceTable);
-    checkUnnamed1392(o.sourceTables);
+    checkUnnamed2486(o.sourceTables);
     unittest.expect(o.writeDisposition, unittest.equals('foo'));
   }
   buildCounterJobConfigurationTableCopy--;
@@ -1172,14 +1172,14 @@
   buildCounterJobListJobs--;
 }
 
-buildUnnamed1393() {
+buildUnnamed2487() {
   var o = new core.List<api.JobListJobs>();
   o.add(buildJobListJobs());
   o.add(buildJobListJobs());
   return o;
 }
 
-checkUnnamed1393(core.List<api.JobListJobs> o) {
+checkUnnamed2487(core.List<api.JobListJobs> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJobListJobs(o[0]);
   checkJobListJobs(o[1]);
@@ -1191,7 +1191,7 @@
   buildCounterJobList++;
   if (buildCounterJobList < 3) {
     o.etag = "foo";
-    o.jobs = buildUnnamed1393();
+    o.jobs = buildUnnamed2487();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1203,7 +1203,7 @@
   buildCounterJobList++;
   if (buildCounterJobList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1393(o.jobs);
+    checkUnnamed2487(o.jobs);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1266,53 +1266,53 @@
   buildCounterJobStatistics--;
 }
 
-buildUnnamed1394() {
+buildUnnamed2488() {
   var o = new core.List<api.ExplainQueryStage>();
   o.add(buildExplainQueryStage());
   o.add(buildExplainQueryStage());
   return o;
 }
 
-checkUnnamed1394(core.List<api.ExplainQueryStage> o) {
+checkUnnamed2488(core.List<api.ExplainQueryStage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExplainQueryStage(o[0]);
   checkExplainQueryStage(o[1]);
 }
 
-buildUnnamed1395() {
+buildUnnamed2489() {
   var o = new core.List<api.TableReference>();
   o.add(buildTableReference());
   o.add(buildTableReference());
   return o;
 }
 
-checkUnnamed1395(core.List<api.TableReference> o) {
+checkUnnamed2489(core.List<api.TableReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableReference(o[0]);
   checkTableReference(o[1]);
 }
 
-buildUnnamed1396() {
+buildUnnamed2490() {
   var o = new core.List<api.QueryTimelineSample>();
   o.add(buildQueryTimelineSample());
   o.add(buildQueryTimelineSample());
   return o;
 }
 
-checkUnnamed1396(core.List<api.QueryTimelineSample> o) {
+checkUnnamed2490(core.List<api.QueryTimelineSample> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQueryTimelineSample(o[0]);
   checkQueryTimelineSample(o[1]);
 }
 
-buildUnnamed1397() {
+buildUnnamed2491() {
   var o = new core.List<api.QueryParameter>();
   o.add(buildQueryParameter());
   o.add(buildQueryParameter());
   return o;
 }
 
-checkUnnamed1397(core.List<api.QueryParameter> o) {
+checkUnnamed2491(core.List<api.QueryParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQueryParameter(o[0]);
   checkQueryParameter(o[1]);
@@ -1329,15 +1329,15 @@
     o.ddlTargetTable = buildTableReference();
     o.estimatedBytesProcessed = "foo";
     o.numDmlAffectedRows = "foo";
-    o.queryPlan = buildUnnamed1394();
-    o.referencedTables = buildUnnamed1395();
+    o.queryPlan = buildUnnamed2488();
+    o.referencedTables = buildUnnamed2489();
     o.schema = buildTableSchema();
     o.statementType = "foo";
-    o.timeline = buildUnnamed1396();
+    o.timeline = buildUnnamed2490();
     o.totalBytesBilled = "foo";
     o.totalBytesProcessed = "foo";
     o.totalSlotMs = "foo";
-    o.undeclaredQueryParameters = buildUnnamed1397();
+    o.undeclaredQueryParameters = buildUnnamed2491();
   }
   buildCounterJobStatistics2--;
   return o;
@@ -1352,15 +1352,15 @@
     checkTableReference(o.ddlTargetTable);
     unittest.expect(o.estimatedBytesProcessed, unittest.equals('foo'));
     unittest.expect(o.numDmlAffectedRows, unittest.equals('foo'));
-    checkUnnamed1394(o.queryPlan);
-    checkUnnamed1395(o.referencedTables);
+    checkUnnamed2488(o.queryPlan);
+    checkUnnamed2489(o.referencedTables);
     checkTableSchema(o.schema);
     unittest.expect(o.statementType, unittest.equals('foo'));
-    checkUnnamed1396(o.timeline);
+    checkUnnamed2490(o.timeline);
     unittest.expect(o.totalBytesBilled, unittest.equals('foo'));
     unittest.expect(o.totalBytesProcessed, unittest.equals('foo'));
     unittest.expect(o.totalSlotMs, unittest.equals('foo'));
-    checkUnnamed1397(o.undeclaredQueryParameters);
+    checkUnnamed2491(o.undeclaredQueryParameters);
   }
   buildCounterJobStatistics2--;
 }
@@ -1392,14 +1392,14 @@
   buildCounterJobStatistics3--;
 }
 
-buildUnnamed1398() {
+buildUnnamed2492() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1398(core.List<core.String> o) {
+checkUnnamed2492(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1410,7 +1410,7 @@
   var o = new api.JobStatistics4();
   buildCounterJobStatistics4++;
   if (buildCounterJobStatistics4 < 3) {
-    o.destinationUriFileCounts = buildUnnamed1398();
+    o.destinationUriFileCounts = buildUnnamed2492();
   }
   buildCounterJobStatistics4--;
   return o;
@@ -1419,19 +1419,19 @@
 checkJobStatistics4(api.JobStatistics4 o) {
   buildCounterJobStatistics4++;
   if (buildCounterJobStatistics4 < 3) {
-    checkUnnamed1398(o.destinationUriFileCounts);
+    checkUnnamed2492(o.destinationUriFileCounts);
   }
   buildCounterJobStatistics4--;
 }
 
-buildUnnamed1399() {
+buildUnnamed2493() {
   var o = new core.List<api.ErrorProto>();
   o.add(buildErrorProto());
   o.add(buildErrorProto());
   return o;
 }
 
-checkUnnamed1399(core.List<api.ErrorProto> o) {
+checkUnnamed2493(core.List<api.ErrorProto> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorProto(o[0]);
   checkErrorProto(o[1]);
@@ -1443,7 +1443,7 @@
   buildCounterJobStatus++;
   if (buildCounterJobStatus < 3) {
     o.errorResult = buildErrorProto();
-    o.errors = buildUnnamed1399();
+    o.errors = buildUnnamed2493();
     o.state = "foo";
   }
   buildCounterJobStatus--;
@@ -1454,7 +1454,7 @@
   buildCounterJobStatus++;
   if (buildCounterJobStatus < 3) {
     checkErrorProto(o.errorResult);
-    checkUnnamed1399(o.errors);
+    checkUnnamed2493(o.errors);
     unittest.expect(o.state, unittest.equals('foo'));
   }
   buildCounterJobStatus--;
@@ -1516,14 +1516,14 @@
   buildCounterProjectListProjects--;
 }
 
-buildUnnamed1400() {
+buildUnnamed2494() {
   var o = new core.List<api.ProjectListProjects>();
   o.add(buildProjectListProjects());
   o.add(buildProjectListProjects());
   return o;
 }
 
-checkUnnamed1400(core.List<api.ProjectListProjects> o) {
+checkUnnamed2494(core.List<api.ProjectListProjects> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProjectListProjects(o[0]);
   checkProjectListProjects(o[1]);
@@ -1537,7 +1537,7 @@
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.projects = buildUnnamed1400();
+    o.projects = buildUnnamed2494();
     o.totalItems = 42;
   }
   buildCounterProjectList--;
@@ -1550,7 +1550,7 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1400(o.projects);
+    checkUnnamed2494(o.projects);
     unittest.expect(o.totalItems, unittest.equals(42));
   }
   buildCounterProjectList--;
@@ -1621,14 +1621,14 @@
   buildCounterQueryParameterTypeStructTypes--;
 }
 
-buildUnnamed1401() {
+buildUnnamed2495() {
   var o = new core.List<api.QueryParameterTypeStructTypes>();
   o.add(buildQueryParameterTypeStructTypes());
   o.add(buildQueryParameterTypeStructTypes());
   return o;
 }
 
-checkUnnamed1401(core.List<api.QueryParameterTypeStructTypes> o) {
+checkUnnamed2495(core.List<api.QueryParameterTypeStructTypes> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQueryParameterTypeStructTypes(o[0]);
   checkQueryParameterTypeStructTypes(o[1]);
@@ -1640,7 +1640,7 @@
   buildCounterQueryParameterType++;
   if (buildCounterQueryParameterType < 3) {
     o.arrayType = buildQueryParameterType();
-    o.structTypes = buildUnnamed1401();
+    o.structTypes = buildUnnamed2495();
     o.type = "foo";
   }
   buildCounterQueryParameterType--;
@@ -1651,33 +1651,33 @@
   buildCounterQueryParameterType++;
   if (buildCounterQueryParameterType < 3) {
     checkQueryParameterType(o.arrayType);
-    checkUnnamed1401(o.structTypes);
+    checkUnnamed2495(o.structTypes);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterQueryParameterType--;
 }
 
-buildUnnamed1402() {
+buildUnnamed2496() {
   var o = new core.List<api.QueryParameterValue>();
   o.add(buildQueryParameterValue());
   o.add(buildQueryParameterValue());
   return o;
 }
 
-checkUnnamed1402(core.List<api.QueryParameterValue> o) {
+checkUnnamed2496(core.List<api.QueryParameterValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQueryParameterValue(o[0]);
   checkQueryParameterValue(o[1]);
 }
 
-buildUnnamed1403() {
+buildUnnamed2497() {
   var o = new core.Map<core.String, api.QueryParameterValue>();
   o["x"] = buildQueryParameterValue();
   o["y"] = buildQueryParameterValue();
   return o;
 }
 
-checkUnnamed1403(core.Map<core.String, api.QueryParameterValue> o) {
+checkUnnamed2497(core.Map<core.String, api.QueryParameterValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQueryParameterValue(o["x"]);
   checkQueryParameterValue(o["y"]);
@@ -1688,8 +1688,8 @@
   var o = new api.QueryParameterValue();
   buildCounterQueryParameterValue++;
   if (buildCounterQueryParameterValue < 3) {
-    o.arrayValues = buildUnnamed1402();
-    o.structValues = buildUnnamed1403();
+    o.arrayValues = buildUnnamed2496();
+    o.structValues = buildUnnamed2497();
     o.value = "foo";
   }
   buildCounterQueryParameterValue--;
@@ -1699,21 +1699,21 @@
 checkQueryParameterValue(api.QueryParameterValue o) {
   buildCounterQueryParameterValue++;
   if (buildCounterQueryParameterValue < 3) {
-    checkUnnamed1402(o.arrayValues);
-    checkUnnamed1403(o.structValues);
+    checkUnnamed2496(o.arrayValues);
+    checkUnnamed2497(o.structValues);
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterQueryParameterValue--;
 }
 
-buildUnnamed1404() {
+buildUnnamed2498() {
   var o = new core.List<api.QueryParameter>();
   o.add(buildQueryParameter());
   o.add(buildQueryParameter());
   return o;
 }
 
-checkUnnamed1404(core.List<api.QueryParameter> o) {
+checkUnnamed2498(core.List<api.QueryParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQueryParameter(o[0]);
   checkQueryParameter(o[1]);
@@ -1732,7 +1732,7 @@
     o.parameterMode = "foo";
     o.preserveNulls = true;
     o.query = "foo";
-    o.queryParameters = buildUnnamed1404();
+    o.queryParameters = buildUnnamed2498();
     o.timeoutMs = 42;
     o.useLegacySql = true;
     o.useQueryCache = true;
@@ -1752,7 +1752,7 @@
     unittest.expect(o.parameterMode, unittest.equals('foo'));
     unittest.expect(o.preserveNulls, unittest.isTrue);
     unittest.expect(o.query, unittest.equals('foo'));
-    checkUnnamed1404(o.queryParameters);
+    checkUnnamed2498(o.queryParameters);
     unittest.expect(o.timeoutMs, unittest.equals(42));
     unittest.expect(o.useLegacySql, unittest.isTrue);
     unittest.expect(o.useQueryCache, unittest.isTrue);
@@ -1760,27 +1760,27 @@
   buildCounterQueryRequest--;
 }
 
-buildUnnamed1405() {
+buildUnnamed2499() {
   var o = new core.List<api.ErrorProto>();
   o.add(buildErrorProto());
   o.add(buildErrorProto());
   return o;
 }
 
-checkUnnamed1405(core.List<api.ErrorProto> o) {
+checkUnnamed2499(core.List<api.ErrorProto> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorProto(o[0]);
   checkErrorProto(o[1]);
 }
 
-buildUnnamed1406() {
+buildUnnamed2500() {
   var o = new core.List<api.TableRow>();
   o.add(buildTableRow());
   o.add(buildTableRow());
   return o;
 }
 
-checkUnnamed1406(core.List<api.TableRow> o) {
+checkUnnamed2500(core.List<api.TableRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableRow(o[0]);
   checkTableRow(o[1]);
@@ -1792,13 +1792,13 @@
   buildCounterQueryResponse++;
   if (buildCounterQueryResponse < 3) {
     o.cacheHit = true;
-    o.errors = buildUnnamed1405();
+    o.errors = buildUnnamed2499();
     o.jobComplete = true;
     o.jobReference = buildJobReference();
     o.kind = "foo";
     o.numDmlAffectedRows = "foo";
     o.pageToken = "foo";
-    o.rows = buildUnnamed1406();
+    o.rows = buildUnnamed2500();
     o.schema = buildTableSchema();
     o.totalBytesProcessed = "foo";
     o.totalRows = "foo";
@@ -1811,13 +1811,13 @@
   buildCounterQueryResponse++;
   if (buildCounterQueryResponse < 3) {
     unittest.expect(o.cacheHit, unittest.isTrue);
-    checkUnnamed1405(o.errors);
+    checkUnnamed2499(o.errors);
     unittest.expect(o.jobComplete, unittest.isTrue);
     checkJobReference(o.jobReference);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.numDmlAffectedRows, unittest.equals('foo'));
     unittest.expect(o.pageToken, unittest.equals('foo'));
-    checkUnnamed1406(o.rows);
+    checkUnnamed2500(o.rows);
     checkTableSchema(o.schema);
     unittest.expect(o.totalBytesProcessed, unittest.equals('foo'));
     unittest.expect(o.totalRows, unittest.equals('foo'));
@@ -1875,14 +1875,14 @@
   buildCounterStreamingbuffer--;
 }
 
-buildUnnamed1407() {
+buildUnnamed2501() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1407(core.Map<core.String, core.String> o) {
+checkUnnamed2501(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1902,7 +1902,7 @@
     o.friendlyName = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed1407();
+    o.labels = buildUnnamed2501();
     o.lastModifiedTime = "foo";
     o.location = "foo";
     o.numBytes = "foo";
@@ -1932,7 +1932,7 @@
     unittest.expect(o.friendlyName, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1407(o.labels);
+    checkUnnamed2501(o.labels);
     unittest.expect(o.lastModifiedTime, unittest.equals('foo'));
     unittest.expect(o.location, unittest.equals('foo'));
     unittest.expect(o.numBytes, unittest.equals('foo'));
@@ -1997,14 +1997,14 @@
   buildCounterTableDataInsertAllRequestRows--;
 }
 
-buildUnnamed1408() {
+buildUnnamed2502() {
   var o = new core.List<api.TableDataInsertAllRequestRows>();
   o.add(buildTableDataInsertAllRequestRows());
   o.add(buildTableDataInsertAllRequestRows());
   return o;
 }
 
-checkUnnamed1408(core.List<api.TableDataInsertAllRequestRows> o) {
+checkUnnamed2502(core.List<api.TableDataInsertAllRequestRows> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableDataInsertAllRequestRows(o[0]);
   checkTableDataInsertAllRequestRows(o[1]);
@@ -2017,7 +2017,7 @@
   if (buildCounterTableDataInsertAllRequest < 3) {
     o.ignoreUnknownValues = true;
     o.kind = "foo";
-    o.rows = buildUnnamed1408();
+    o.rows = buildUnnamed2502();
     o.skipInvalidRows = true;
     o.templateSuffix = "foo";
   }
@@ -2030,21 +2030,21 @@
   if (buildCounterTableDataInsertAllRequest < 3) {
     unittest.expect(o.ignoreUnknownValues, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1408(o.rows);
+    checkUnnamed2502(o.rows);
     unittest.expect(o.skipInvalidRows, unittest.isTrue);
     unittest.expect(o.templateSuffix, unittest.equals('foo'));
   }
   buildCounterTableDataInsertAllRequest--;
 }
 
-buildUnnamed1409() {
+buildUnnamed2503() {
   var o = new core.List<api.ErrorProto>();
   o.add(buildErrorProto());
   o.add(buildErrorProto());
   return o;
 }
 
-checkUnnamed1409(core.List<api.ErrorProto> o) {
+checkUnnamed2503(core.List<api.ErrorProto> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorProto(o[0]);
   checkErrorProto(o[1]);
@@ -2055,7 +2055,7 @@
   var o = new api.TableDataInsertAllResponseInsertErrors();
   buildCounterTableDataInsertAllResponseInsertErrors++;
   if (buildCounterTableDataInsertAllResponseInsertErrors < 3) {
-    o.errors = buildUnnamed1409();
+    o.errors = buildUnnamed2503();
     o.index = 42;
   }
   buildCounterTableDataInsertAllResponseInsertErrors--;
@@ -2066,20 +2066,20 @@
     api.TableDataInsertAllResponseInsertErrors o) {
   buildCounterTableDataInsertAllResponseInsertErrors++;
   if (buildCounterTableDataInsertAllResponseInsertErrors < 3) {
-    checkUnnamed1409(o.errors);
+    checkUnnamed2503(o.errors);
     unittest.expect(o.index, unittest.equals(42));
   }
   buildCounterTableDataInsertAllResponseInsertErrors--;
 }
 
-buildUnnamed1410() {
+buildUnnamed2504() {
   var o = new core.List<api.TableDataInsertAllResponseInsertErrors>();
   o.add(buildTableDataInsertAllResponseInsertErrors());
   o.add(buildTableDataInsertAllResponseInsertErrors());
   return o;
 }
 
-checkUnnamed1410(core.List<api.TableDataInsertAllResponseInsertErrors> o) {
+checkUnnamed2504(core.List<api.TableDataInsertAllResponseInsertErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableDataInsertAllResponseInsertErrors(o[0]);
   checkTableDataInsertAllResponseInsertErrors(o[1]);
@@ -2090,7 +2090,7 @@
   var o = new api.TableDataInsertAllResponse();
   buildCounterTableDataInsertAllResponse++;
   if (buildCounterTableDataInsertAllResponse < 3) {
-    o.insertErrors = buildUnnamed1410();
+    o.insertErrors = buildUnnamed2504();
     o.kind = "foo";
   }
   buildCounterTableDataInsertAllResponse--;
@@ -2100,20 +2100,20 @@
 checkTableDataInsertAllResponse(api.TableDataInsertAllResponse o) {
   buildCounterTableDataInsertAllResponse++;
   if (buildCounterTableDataInsertAllResponse < 3) {
-    checkUnnamed1410(o.insertErrors);
+    checkUnnamed2504(o.insertErrors);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTableDataInsertAllResponse--;
 }
 
-buildUnnamed1411() {
+buildUnnamed2505() {
   var o = new core.List<api.TableRow>();
   o.add(buildTableRow());
   o.add(buildTableRow());
   return o;
 }
 
-checkUnnamed1411(core.List<api.TableRow> o) {
+checkUnnamed2505(core.List<api.TableRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableRow(o[0]);
   checkTableRow(o[1]);
@@ -2127,7 +2127,7 @@
     o.etag = "foo";
     o.kind = "foo";
     o.pageToken = "foo";
-    o.rows = buildUnnamed1411();
+    o.rows = buildUnnamed2505();
     o.totalRows = "foo";
   }
   buildCounterTableDataList--;
@@ -2140,20 +2140,20 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.pageToken, unittest.equals('foo'));
-    checkUnnamed1411(o.rows);
+    checkUnnamed2505(o.rows);
     unittest.expect(o.totalRows, unittest.equals('foo'));
   }
   buildCounterTableDataList--;
 }
 
-buildUnnamed1412() {
+buildUnnamed2506() {
   var o = new core.List<api.TableFieldSchema>();
   o.add(buildTableFieldSchema());
   o.add(buildTableFieldSchema());
   return o;
 }
 
-checkUnnamed1412(core.List<api.TableFieldSchema> o) {
+checkUnnamed2506(core.List<api.TableFieldSchema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableFieldSchema(o[0]);
   checkTableFieldSchema(o[1]);
@@ -2165,7 +2165,7 @@
   buildCounterTableFieldSchema++;
   if (buildCounterTableFieldSchema < 3) {
     o.description = "foo";
-    o.fields = buildUnnamed1412();
+    o.fields = buildUnnamed2506();
     o.mode = "foo";
     o.name = "foo";
     o.type = "foo";
@@ -2178,7 +2178,7 @@
   buildCounterTableFieldSchema++;
   if (buildCounterTableFieldSchema < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed1412(o.fields);
+    checkUnnamed2506(o.fields);
     unittest.expect(o.mode, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -2186,14 +2186,14 @@
   buildCounterTableFieldSchema--;
 }
 
-buildUnnamed1413() {
+buildUnnamed2507() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1413(core.Map<core.String, core.String> o) {
+checkUnnamed2507(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -2228,7 +2228,7 @@
     o.friendlyName = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed1413();
+    o.labels = buildUnnamed2507();
     o.tableReference = buildTableReference();
     o.timePartitioning = buildTimePartitioning();
     o.type = "foo";
@@ -2246,7 +2246,7 @@
     unittest.expect(o.friendlyName, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1413(o.labels);
+    checkUnnamed2507(o.labels);
     checkTableReference(o.tableReference);
     checkTimePartitioning(o.timePartitioning);
     unittest.expect(o.type, unittest.equals('foo'));
@@ -2255,14 +2255,14 @@
   buildCounterTableListTables--;
 }
 
-buildUnnamed1414() {
+buildUnnamed2508() {
   var o = new core.List<api.TableListTables>();
   o.add(buildTableListTables());
   o.add(buildTableListTables());
   return o;
 }
 
-checkUnnamed1414(core.List<api.TableListTables> o) {
+checkUnnamed2508(core.List<api.TableListTables> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableListTables(o[0]);
   checkTableListTables(o[1]);
@@ -2276,7 +2276,7 @@
     o.etag = "foo";
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.tables = buildUnnamed1414();
+    o.tables = buildUnnamed2508();
     o.totalItems = 42;
   }
   buildCounterTableList--;
@@ -2289,7 +2289,7 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1414(o.tables);
+    checkUnnamed2508(o.tables);
     unittest.expect(o.totalItems, unittest.equals(42));
   }
   buildCounterTableList--;
@@ -2318,14 +2318,14 @@
   buildCounterTableReference--;
 }
 
-buildUnnamed1415() {
+buildUnnamed2509() {
   var o = new core.List<api.TableCell>();
   o.add(buildTableCell());
   o.add(buildTableCell());
   return o;
 }
 
-checkUnnamed1415(core.List<api.TableCell> o) {
+checkUnnamed2509(core.List<api.TableCell> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableCell(o[0]);
   checkTableCell(o[1]);
@@ -2336,7 +2336,7 @@
   var o = new api.TableRow();
   buildCounterTableRow++;
   if (buildCounterTableRow < 3) {
-    o.f = buildUnnamed1415();
+    o.f = buildUnnamed2509();
   }
   buildCounterTableRow--;
   return o;
@@ -2345,19 +2345,19 @@
 checkTableRow(api.TableRow o) {
   buildCounterTableRow++;
   if (buildCounterTableRow < 3) {
-    checkUnnamed1415(o.f);
+    checkUnnamed2509(o.f);
   }
   buildCounterTableRow--;
 }
 
-buildUnnamed1416() {
+buildUnnamed2510() {
   var o = new core.List<api.TableFieldSchema>();
   o.add(buildTableFieldSchema());
   o.add(buildTableFieldSchema());
   return o;
 }
 
-checkUnnamed1416(core.List<api.TableFieldSchema> o) {
+checkUnnamed2510(core.List<api.TableFieldSchema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableFieldSchema(o[0]);
   checkTableFieldSchema(o[1]);
@@ -2368,7 +2368,7 @@
   var o = new api.TableSchema();
   buildCounterTableSchema++;
   if (buildCounterTableSchema < 3) {
-    o.fields = buildUnnamed1416();
+    o.fields = buildUnnamed2510();
   }
   buildCounterTableSchema--;
   return o;
@@ -2377,7 +2377,7 @@
 checkTableSchema(api.TableSchema o) {
   buildCounterTableSchema++;
   if (buildCounterTableSchema < 3) {
-    checkUnnamed1416(o.fields);
+    checkUnnamed2510(o.fields);
   }
   buildCounterTableSchema--;
 }
@@ -2428,14 +2428,14 @@
   buildCounterUserDefinedFunctionResource--;
 }
 
-buildUnnamed1417() {
+buildUnnamed2511() {
   var o = new core.List<api.UserDefinedFunctionResource>();
   o.add(buildUserDefinedFunctionResource());
   o.add(buildUserDefinedFunctionResource());
   return o;
 }
 
-checkUnnamed1417(core.List<api.UserDefinedFunctionResource> o) {
+checkUnnamed2511(core.List<api.UserDefinedFunctionResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserDefinedFunctionResource(o[0]);
   checkUserDefinedFunctionResource(o[1]);
@@ -2448,7 +2448,7 @@
   if (buildCounterViewDefinition < 3) {
     o.query = "foo";
     o.useLegacySql = true;
-    o.userDefinedFunctionResources = buildUnnamed1417();
+    o.userDefinedFunctionResources = buildUnnamed2511();
   }
   buildCounterViewDefinition--;
   return o;
@@ -2459,19 +2459,19 @@
   if (buildCounterViewDefinition < 3) {
     unittest.expect(o.query, unittest.equals('foo'));
     unittest.expect(o.useLegacySql, unittest.isTrue);
-    checkUnnamed1417(o.userDefinedFunctionResources);
+    checkUnnamed2511(o.userDefinedFunctionResources);
   }
   buildCounterViewDefinition--;
 }
 
-buildUnnamed1418() {
+buildUnnamed2512() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1418(core.List<core.String> o) {
+checkUnnamed2512(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3105,7 +3105,7 @@
       }), true);
       res
           .get(arg_projectId, arg_datasetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Dataset response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataset(response);
       })));
     });
@@ -3171,7 +3171,7 @@
       }), true);
       res
           .insert(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Dataset response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataset(response);
       })));
     });
@@ -3248,7 +3248,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DatasetList response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatasetList(response);
       })));
     });
@@ -3319,7 +3319,7 @@
       res
           .patch(arg_request, arg_projectId, arg_datasetId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Dataset response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataset(response);
       })));
     });
@@ -3390,7 +3390,7 @@
       res
           .update(arg_request, arg_projectId, arg_datasetId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Dataset response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataset(response);
       })));
     });
@@ -3468,7 +3468,7 @@
       res
           .cancel(arg_projectId, arg_jobId,
               location: arg_location, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.JobCancelResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkJobCancelResponse(response);
       })));
     });
@@ -3538,7 +3538,7 @@
       res
           .get(arg_projectId, arg_jobId,
               location: arg_location, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -3625,7 +3625,7 @@
               startIndex: arg_startIndex,
               timeoutMs: arg_timeoutMs,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetQueryResultsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetQueryResultsResponse(response);
       })));
     });
@@ -3694,7 +3694,7 @@
       }), true);
       res
           .insert(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -3707,7 +3707,7 @@
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_projection = "foo";
-      var arg_stateFilter = buildUnnamed1418();
+      var arg_stateFilter = buildUnnamed2512();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3777,7 +3777,7 @@
               projection: arg_projection,
               stateFilter: arg_stateFilter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.JobList response) {
+          .then(unittest.expectAsync1(((response) {
         checkJobList(response);
       })));
     });
@@ -3843,7 +3843,7 @@
       }), true);
       res
           .query(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.QueryResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkQueryResponse(response);
       })));
     });
@@ -3905,8 +3905,9 @@
         var resp = convert.JSON.encode(buildGetServiceAccountResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getServiceAccount(arg_projectId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GetServiceAccountResponse response) {
+      res
+          .getServiceAccount(arg_projectId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGetServiceAccountResponse(response);
       })));
     });
@@ -3967,7 +3968,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProjectList response) {
+          .then(unittest.expectAsync1(((response) {
         checkProjectList(response);
       })));
     });
@@ -4056,8 +4057,7 @@
       res
           .insertAll(arg_request, arg_projectId, arg_datasetId, arg_tableId,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TableDataInsertAllResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTableDataInsertAllResponse(response);
       })));
     });
@@ -4156,7 +4156,7 @@
               selectedFields: arg_selectedFields,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TableDataList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTableDataList(response);
       })));
     });
@@ -4313,7 +4313,7 @@
       res
           .get(arg_projectId, arg_datasetId, arg_tableId,
               selectedFields: arg_selectedFields, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -4390,7 +4390,7 @@
       res
           .insert(arg_request, arg_projectId, arg_datasetId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -4471,7 +4471,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TableList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTableList(response);
       })));
     });
@@ -4552,7 +4552,7 @@
       res
           .patch(arg_request, arg_projectId, arg_datasetId, arg_tableId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -4633,7 +4633,7 @@
       res
           .update(arg_request, arg_projectId, arg_datasetId, arg_tableId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
diff --git a/generated/googleapis/test/bigquerydatatransfer/v1_test.dart b/generated/googleapis/test/bigquerydatatransfer/v1_test.dart
index 52f8945..c22eef9 100644
--- a/generated/googleapis/test/bigquerydatatransfer/v1_test.dart
+++ b/generated/googleapis/test/bigquerydatatransfer/v1_test.dart
@@ -84,27 +84,27 @@
   buildCounterCheckValidCredsResponse--;
 }
 
-buildUnnamed1182() {
+buildUnnamed905() {
   var o = new core.List<api.DataSourceParameter>();
   o.add(buildDataSourceParameter());
   o.add(buildDataSourceParameter());
   return o;
 }
 
-checkUnnamed1182(core.List<api.DataSourceParameter> o) {
+checkUnnamed905(core.List<api.DataSourceParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataSourceParameter(o[0]);
   checkDataSourceParameter(o[1]);
 }
 
-buildUnnamed1183() {
+buildUnnamed906() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1183(core.List<core.String> o) {
+checkUnnamed906(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -127,8 +127,8 @@
     o.manualRunsDisabled = true;
     o.minimumScheduleInterval = "foo";
     o.name = "foo";
-    o.parameters = buildUnnamed1182();
-    o.scopes = buildUnnamed1183();
+    o.parameters = buildUnnamed905();
+    o.scopes = buildUnnamed906();
     o.supportsCustomSchedule = true;
     o.supportsMultipleTransfers = true;
     o.transferType = "foo";
@@ -153,8 +153,8 @@
     unittest.expect(o.manualRunsDisabled, unittest.isTrue);
     unittest.expect(o.minimumScheduleInterval, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1182(o.parameters);
-    checkUnnamed1183(o.scopes);
+    checkUnnamed905(o.parameters);
+    checkUnnamed906(o.scopes);
     unittest.expect(o.supportsCustomSchedule, unittest.isTrue);
     unittest.expect(o.supportsMultipleTransfers, unittest.isTrue);
     unittest.expect(o.transferType, unittest.equals('foo'));
@@ -163,27 +163,27 @@
   buildCounterDataSource--;
 }
 
-buildUnnamed1184() {
+buildUnnamed907() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1184(core.List<core.String> o) {
+checkUnnamed907(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1185() {
+buildUnnamed908() {
   var o = new core.List<api.DataSourceParameter>();
   o.add(buildDataSourceParameter());
   o.add(buildDataSourceParameter());
   return o;
 }
 
-checkUnnamed1185(core.List<api.DataSourceParameter> o) {
+checkUnnamed908(core.List<api.DataSourceParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataSourceParameter(o[0]);
   checkDataSourceParameter(o[1]);
@@ -194,10 +194,10 @@
   var o = new api.DataSourceParameter();
   buildCounterDataSourceParameter++;
   if (buildCounterDataSourceParameter < 3) {
-    o.allowedValues = buildUnnamed1184();
+    o.allowedValues = buildUnnamed907();
     o.description = "foo";
     o.displayName = "foo";
-    o.fields = buildUnnamed1185();
+    o.fields = buildUnnamed908();
     o.immutable = true;
     o.maxValue = 42.0;
     o.minValue = 42.0;
@@ -217,10 +217,10 @@
 checkDataSourceParameter(api.DataSourceParameter o) {
   buildCounterDataSourceParameter++;
   if (buildCounterDataSourceParameter < 3) {
-    checkUnnamed1184(o.allowedValues);
+    checkUnnamed907(o.allowedValues);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed1185(o.fields);
+    checkUnnamed908(o.fields);
     unittest.expect(o.immutable, unittest.isTrue);
     unittest.expect(o.maxValue, unittest.equals(42.0));
     unittest.expect(o.minValue, unittest.equals(42.0));
@@ -251,14 +251,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed1186() {
+buildUnnamed909() {
   var o = new core.List<api.DataSource>();
   o.add(buildDataSource());
   o.add(buildDataSource());
   return o;
 }
 
-checkUnnamed1186(core.List<api.DataSource> o) {
+checkUnnamed909(core.List<api.DataSource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataSource(o[0]);
   checkDataSource(o[1]);
@@ -269,7 +269,7 @@
   var o = new api.ListDataSourcesResponse();
   buildCounterListDataSourcesResponse++;
   if (buildCounterListDataSourcesResponse < 3) {
-    o.dataSources = buildUnnamed1186();
+    o.dataSources = buildUnnamed909();
     o.nextPageToken = "foo";
   }
   buildCounterListDataSourcesResponse--;
@@ -279,20 +279,20 @@
 checkListDataSourcesResponse(api.ListDataSourcesResponse o) {
   buildCounterListDataSourcesResponse++;
   if (buildCounterListDataSourcesResponse < 3) {
-    checkUnnamed1186(o.dataSources);
+    checkUnnamed909(o.dataSources);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDataSourcesResponse--;
 }
 
-buildUnnamed1187() {
+buildUnnamed910() {
   var o = new core.List<api.Location>();
   o.add(buildLocation());
   o.add(buildLocation());
   return o;
 }
 
-checkUnnamed1187(core.List<api.Location> o) {
+checkUnnamed910(core.List<api.Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocation(o[0]);
   checkLocation(o[1]);
@@ -303,7 +303,7 @@
   var o = new api.ListLocationsResponse();
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    o.locations = buildUnnamed1187();
+    o.locations = buildUnnamed910();
     o.nextPageToken = "foo";
   }
   buildCounterListLocationsResponse--;
@@ -313,20 +313,20 @@
 checkListLocationsResponse(api.ListLocationsResponse o) {
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    checkUnnamed1187(o.locations);
+    checkUnnamed910(o.locations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLocationsResponse--;
 }
 
-buildUnnamed1188() {
+buildUnnamed911() {
   var o = new core.List<api.TransferConfig>();
   o.add(buildTransferConfig());
   o.add(buildTransferConfig());
   return o;
 }
 
-checkUnnamed1188(core.List<api.TransferConfig> o) {
+checkUnnamed911(core.List<api.TransferConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTransferConfig(o[0]);
   checkTransferConfig(o[1]);
@@ -338,7 +338,7 @@
   buildCounterListTransferConfigsResponse++;
   if (buildCounterListTransferConfigsResponse < 3) {
     o.nextPageToken = "foo";
-    o.transferConfigs = buildUnnamed1188();
+    o.transferConfigs = buildUnnamed911();
   }
   buildCounterListTransferConfigsResponse--;
   return o;
@@ -348,19 +348,19 @@
   buildCounterListTransferConfigsResponse++;
   if (buildCounterListTransferConfigsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1188(o.transferConfigs);
+    checkUnnamed911(o.transferConfigs);
   }
   buildCounterListTransferConfigsResponse--;
 }
 
-buildUnnamed1189() {
+buildUnnamed912() {
   var o = new core.List<api.TransferMessage>();
   o.add(buildTransferMessage());
   o.add(buildTransferMessage());
   return o;
 }
 
-checkUnnamed1189(core.List<api.TransferMessage> o) {
+checkUnnamed912(core.List<api.TransferMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTransferMessage(o[0]);
   checkTransferMessage(o[1]);
@@ -372,7 +372,7 @@
   buildCounterListTransferLogsResponse++;
   if (buildCounterListTransferLogsResponse < 3) {
     o.nextPageToken = "foo";
-    o.transferMessages = buildUnnamed1189();
+    o.transferMessages = buildUnnamed912();
   }
   buildCounterListTransferLogsResponse--;
   return o;
@@ -382,19 +382,19 @@
   buildCounterListTransferLogsResponse++;
   if (buildCounterListTransferLogsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1189(o.transferMessages);
+    checkUnnamed912(o.transferMessages);
   }
   buildCounterListTransferLogsResponse--;
 }
 
-buildUnnamed1190() {
+buildUnnamed913() {
   var o = new core.List<api.TransferRun>();
   o.add(buildTransferRun());
   o.add(buildTransferRun());
   return o;
 }
 
-checkUnnamed1190(core.List<api.TransferRun> o) {
+checkUnnamed913(core.List<api.TransferRun> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTransferRun(o[0]);
   checkTransferRun(o[1]);
@@ -406,7 +406,7 @@
   buildCounterListTransferRunsResponse++;
   if (buildCounterListTransferRunsResponse < 3) {
     o.nextPageToken = "foo";
-    o.transferRuns = buildUnnamed1190();
+    o.transferRuns = buildUnnamed913();
   }
   buildCounterListTransferRunsResponse--;
   return o;
@@ -416,25 +416,25 @@
   buildCounterListTransferRunsResponse++;
   if (buildCounterListTransferRunsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1190(o.transferRuns);
+    checkUnnamed913(o.transferRuns);
   }
   buildCounterListTransferRunsResponse--;
 }
 
-buildUnnamed1191() {
+buildUnnamed914() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1191(core.Map<core.String, core.String> o) {
+checkUnnamed914(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1192() {
+buildUnnamed915() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -449,7 +449,7 @@
   return o;
 }
 
-checkUnnamed1192(core.Map<core.String, core.Object> o) {
+checkUnnamed915(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -468,9 +468,9 @@
   var o = new api.Location();
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    o.labels = buildUnnamed1191();
+    o.labels = buildUnnamed914();
     o.locationId = "foo";
-    o.metadata = buildUnnamed1192();
+    o.metadata = buildUnnamed915();
     o.name = "foo";
   }
   buildCounterLocation--;
@@ -480,9 +480,9 @@
 checkLocation(api.Location o) {
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    checkUnnamed1191(o.labels);
+    checkUnnamed914(o.labels);
     unittest.expect(o.locationId, unittest.equals('foo'));
-    checkUnnamed1192(o.metadata);
+    checkUnnamed915(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLocation--;
@@ -509,14 +509,14 @@
   buildCounterScheduleTransferRunsRequest--;
 }
 
-buildUnnamed1193() {
+buildUnnamed916() {
   var o = new core.List<api.TransferRun>();
   o.add(buildTransferRun());
   o.add(buildTransferRun());
   return o;
 }
 
-checkUnnamed1193(core.List<api.TransferRun> o) {
+checkUnnamed916(core.List<api.TransferRun> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTransferRun(o[0]);
   checkTransferRun(o[1]);
@@ -527,7 +527,7 @@
   var o = new api.ScheduleTransferRunsResponse();
   buildCounterScheduleTransferRunsResponse++;
   if (buildCounterScheduleTransferRunsResponse < 3) {
-    o.runs = buildUnnamed1193();
+    o.runs = buildUnnamed916();
   }
   buildCounterScheduleTransferRunsResponse--;
   return o;
@@ -536,12 +536,12 @@
 checkScheduleTransferRunsResponse(api.ScheduleTransferRunsResponse o) {
   buildCounterScheduleTransferRunsResponse++;
   if (buildCounterScheduleTransferRunsResponse < 3) {
-    checkUnnamed1193(o.runs);
+    checkUnnamed916(o.runs);
   }
   buildCounterScheduleTransferRunsResponse--;
 }
 
-buildUnnamed1194() {
+buildUnnamed917() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -556,7 +556,7 @@
   return o;
 }
 
-checkUnnamed1194(core.Map<core.String, core.Object> o) {
+checkUnnamed917(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -570,17 +570,17 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1195() {
+buildUnnamed918() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed1194());
-  o.add(buildUnnamed1194());
+  o.add(buildUnnamed917());
+  o.add(buildUnnamed917());
   return o;
 }
 
-checkUnnamed1195(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed918(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1194(o[0]);
-  checkUnnamed1194(o[1]);
+  checkUnnamed917(o[0]);
+  checkUnnamed917(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -589,7 +589,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed1195();
+    o.details = buildUnnamed918();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -600,13 +600,13 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed1195(o.details);
+    checkUnnamed918(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed1196() {
+buildUnnamed919() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -621,7 +621,7 @@
   return o;
 }
 
-checkUnnamed1196(core.Map<core.String, core.Object> o) {
+checkUnnamed919(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -648,7 +648,7 @@
     o.displayName = "foo";
     o.name = "foo";
     o.nextRunTime = "foo";
-    o.params = buildUnnamed1196();
+    o.params = buildUnnamed919();
     o.schedule = "foo";
     o.state = "foo";
     o.updateTime = "foo";
@@ -669,7 +669,7 @@
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.nextRunTime, unittest.equals('foo'));
-    checkUnnamed1196(o.params);
+    checkUnnamed919(o.params);
     unittest.expect(o.schedule, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
     unittest.expect(o.updateTime, unittest.equals('foo'));
@@ -701,7 +701,7 @@
   buildCounterTransferMessage--;
 }
 
-buildUnnamed1197() {
+buildUnnamed920() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -716,7 +716,7 @@
   return o;
 }
 
-checkUnnamed1197(core.Map<core.String, core.Object> o) {
+checkUnnamed920(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -740,7 +740,7 @@
     o.endTime = "foo";
     o.errorStatus = buildStatus();
     o.name = "foo";
-    o.params = buildUnnamed1197();
+    o.params = buildUnnamed920();
     o.runTime = "foo";
     o.schedule = "foo";
     o.scheduleTime = "foo";
@@ -761,7 +761,7 @@
     unittest.expect(o.endTime, unittest.equals('foo'));
     checkStatus(o.errorStatus);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1197(o.params);
+    checkUnnamed920(o.params);
     unittest.expect(o.runTime, unittest.equals('foo'));
     unittest.expect(o.schedule, unittest.equals('foo'));
     unittest.expect(o.scheduleTime, unittest.equals('foo'));
@@ -773,79 +773,79 @@
   buildCounterTransferRun--;
 }
 
-buildUnnamed1198() {
+buildUnnamed921() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1198(core.List<core.String> o) {
+checkUnnamed921(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1199() {
+buildUnnamed922() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1199(core.List<core.String> o) {
+checkUnnamed922(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1200() {
+buildUnnamed923() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1200(core.List<core.String> o) {
+checkUnnamed923(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1201() {
+buildUnnamed924() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1201(core.List<core.String> o) {
+checkUnnamed924(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1202() {
+buildUnnamed925() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1202(core.List<core.String> o) {
+checkUnnamed925(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1203() {
+buildUnnamed926() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1203(core.List<core.String> o) {
+checkUnnamed926(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1040,7 +1040,7 @@
       }), true);
       res
           .checkValidCreds(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CheckValidCredsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCheckValidCredsResponse(response);
       })));
     });
@@ -1092,7 +1092,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DataSource response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataSource(response);
       })));
     });
@@ -1153,7 +1153,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDataSourcesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDataSourcesResponse(response);
       })));
     });
@@ -1207,7 +1207,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Location response) {
+          .then(unittest.expectAsync1(((response) {
         checkLocation(response);
       })));
     });
@@ -1271,7 +1271,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLocationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLocationsResponse(response);
       })));
     });
@@ -1329,7 +1329,7 @@
       }), true);
       res
           .checkValidCreds(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CheckValidCredsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCheckValidCredsResponse(response);
       })));
     });
@@ -1381,7 +1381,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DataSource response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataSource(response);
       })));
     });
@@ -1442,7 +1442,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDataSourcesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDataSourcesResponse(response);
       })));
     });
@@ -1507,7 +1507,7 @@
       res
           .create(arg_request, arg_parent,
               authorizationCode: arg_authorizationCode, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TransferConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkTransferConfig(response);
       })));
     });
@@ -1562,7 +1562,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1617,7 +1617,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TransferConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkTransferConfig(response);
       })));
     });
@@ -1632,7 +1632,7 @@
       var arg_parent = "foo";
       var arg_pageToken = "foo";
       var arg_pageSize = 42;
-      var arg_dataSourceIds = buildUnnamed1198();
+      var arg_dataSourceIds = buildUnnamed921();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1685,8 +1685,7 @@
               pageSize: arg_pageSize,
               dataSourceIds: arg_dataSourceIds,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListTransferConfigsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTransferConfigsResponse(response);
       })));
     });
@@ -1754,7 +1753,7 @@
               authorizationCode: arg_authorizationCode,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TransferConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkTransferConfig(response);
       })));
     });
@@ -1811,8 +1810,9 @@
         var resp = convert.JSON.encode(buildScheduleTransferRunsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.scheduleRuns(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ScheduleTransferRunsResponse response) {
+      res
+          .scheduleRuns(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkScheduleTransferRunsResponse(response);
       })));
     });
@@ -1871,7 +1871,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1927,7 +1927,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TransferRun response) {
+          .then(unittest.expectAsync1(((response) {
         checkTransferRun(response);
       })));
     });
@@ -1942,7 +1942,7 @@
               .runs;
       var arg_parent = "foo";
       var arg_pageToken = "foo";
-      var arg_states = buildUnnamed1199();
+      var arg_states = buildUnnamed922();
       var arg_pageSize = 42;
       var arg_runAttempt = "foo";
       var arg_$fields = "foo";
@@ -1999,7 +1999,7 @@
               pageSize: arg_pageSize,
               runAttempt: arg_runAttempt,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTransferRunsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTransferRunsResponse(response);
       })));
     });
@@ -2020,7 +2020,7 @@
       var arg_parent = "foo";
       var arg_pageToken = "foo";
       var arg_pageSize = 42;
-      var arg_messageTypes = buildUnnamed1200();
+      var arg_messageTypes = buildUnnamed923();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2073,7 +2073,7 @@
               pageSize: arg_pageSize,
               messageTypes: arg_messageTypes,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTransferLogsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTransferLogsResponse(response);
       })));
     });
@@ -2135,7 +2135,7 @@
       res
           .create(arg_request, arg_parent,
               authorizationCode: arg_authorizationCode, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TransferConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkTransferConfig(response);
       })));
     });
@@ -2187,7 +2187,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2239,7 +2239,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TransferConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkTransferConfig(response);
       })));
     });
@@ -2251,7 +2251,7 @@
       var arg_parent = "foo";
       var arg_pageToken = "foo";
       var arg_pageSize = 42;
-      var arg_dataSourceIds = buildUnnamed1201();
+      var arg_dataSourceIds = buildUnnamed924();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2304,8 +2304,7 @@
               pageSize: arg_pageSize,
               dataSourceIds: arg_dataSourceIds,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListTransferConfigsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTransferConfigsResponse(response);
       })));
     });
@@ -2370,7 +2369,7 @@
               updateMask: arg_updateMask,
               authorizationCode: arg_authorizationCode,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TransferConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkTransferConfig(response);
       })));
     });
@@ -2424,8 +2423,9 @@
         var resp = convert.JSON.encode(buildScheduleTransferRunsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.scheduleRuns(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ScheduleTransferRunsResponse response) {
+      res
+          .scheduleRuns(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkScheduleTransferRunsResponse(response);
       })));
     });
@@ -2479,7 +2479,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2531,7 +2531,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TransferRun response) {
+          .then(unittest.expectAsync1(((response) {
         checkTransferRun(response);
       })));
     });
@@ -2542,7 +2542,7 @@
           new api.BigquerydatatransferApi(mock).projects.transferConfigs.runs;
       var arg_parent = "foo";
       var arg_pageToken = "foo";
-      var arg_states = buildUnnamed1202();
+      var arg_states = buildUnnamed925();
       var arg_pageSize = 42;
       var arg_runAttempt = "foo";
       var arg_$fields = "foo";
@@ -2599,7 +2599,7 @@
               pageSize: arg_pageSize,
               runAttempt: arg_runAttempt,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTransferRunsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTransferRunsResponse(response);
       })));
     });
@@ -2618,7 +2618,7 @@
       var arg_parent = "foo";
       var arg_pageToken = "foo";
       var arg_pageSize = 42;
-      var arg_messageTypes = buildUnnamed1203();
+      var arg_messageTypes = buildUnnamed926();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2671,7 +2671,7 @@
               pageSize: arg_pageSize,
               messageTypes: arg_messageTypes,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTransferLogsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTransferLogsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/blogger/v3_test.dart b/generated/googleapis/test/blogger/v3_test.dart
index eb8293b..98e4fad 100644
--- a/generated/googleapis/test/blogger/v3_test.dart
+++ b/generated/googleapis/test/blogger/v3_test.dart
@@ -94,14 +94,14 @@
   buildCounterBlogPages--;
 }
 
-buildUnnamed1078() {
+buildUnnamed204() {
   var o = new core.List<api.Post>();
   o.add(buildPost());
   o.add(buildPost());
   return o;
 }
 
-checkUnnamed1078(core.List<api.Post> o) {
+checkUnnamed204(core.List<api.Post> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPost(o[0]);
   checkPost(o[1]);
@@ -112,7 +112,7 @@
   var o = new api.BlogPosts();
   buildCounterBlogPosts++;
   if (buildCounterBlogPosts < 3) {
-    o.items = buildUnnamed1078();
+    o.items = buildUnnamed204();
     o.selfLink = "foo";
     o.totalItems = 42;
   }
@@ -123,7 +123,7 @@
 checkBlogPosts(api.BlogPosts o) {
   buildCounterBlogPosts++;
   if (buildCounterBlogPosts < 3) {
-    checkUnnamed1078(o.items);
+    checkUnnamed204(o.items);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
   }
@@ -175,27 +175,27 @@
   buildCounterBlog--;
 }
 
-buildUnnamed1079() {
+buildUnnamed205() {
   var o = new core.List<api.BlogUserInfo>();
   o.add(buildBlogUserInfo());
   o.add(buildBlogUserInfo());
   return o;
 }
 
-checkUnnamed1079(core.List<api.BlogUserInfo> o) {
+checkUnnamed205(core.List<api.BlogUserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBlogUserInfo(o[0]);
   checkBlogUserInfo(o[1]);
 }
 
-buildUnnamed1080() {
+buildUnnamed206() {
   var o = new core.List<api.Blog>();
   o.add(buildBlog());
   o.add(buildBlog());
   return o;
 }
 
-checkUnnamed1080(core.List<api.Blog> o) {
+checkUnnamed206(core.List<api.Blog> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBlog(o[0]);
   checkBlog(o[1]);
@@ -206,8 +206,8 @@
   var o = new api.BlogList();
   buildCounterBlogList++;
   if (buildCounterBlogList < 3) {
-    o.blogUserInfos = buildUnnamed1079();
-    o.items = buildUnnamed1080();
+    o.blogUserInfos = buildUnnamed205();
+    o.items = buildUnnamed206();
     o.kind = "foo";
   }
   buildCounterBlogList--;
@@ -217,8 +217,8 @@
 checkBlogList(api.BlogList o) {
   buildCounterBlogList++;
   if (buildCounterBlogList < 3) {
-    checkUnnamed1079(o.blogUserInfos);
-    checkUnnamed1080(o.items);
+    checkUnnamed205(o.blogUserInfos);
+    checkUnnamed206(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBlogList--;
@@ -418,14 +418,14 @@
   buildCounterComment--;
 }
 
-buildUnnamed1081() {
+buildUnnamed207() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed1081(core.List<api.Comment> o) {
+checkUnnamed207(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -437,7 +437,7 @@
   buildCounterCommentList++;
   if (buildCounterCommentList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1081();
+    o.items = buildUnnamed207();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.prevPageToken = "foo";
@@ -450,7 +450,7 @@
   buildCounterCommentList++;
   if (buildCounterCommentList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1081(o.items);
+    checkUnnamed207(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.prevPageToken, unittest.equals('foo'));
@@ -564,14 +564,14 @@
   buildCounterPage--;
 }
 
-buildUnnamed1082() {
+buildUnnamed208() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed1082(core.List<api.Page> o) {
+checkUnnamed208(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
@@ -583,7 +583,7 @@
   buildCounterPageList++;
   if (buildCounterPageList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1082();
+    o.items = buildUnnamed208();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -595,7 +595,7 @@
   buildCounterPageList++;
   if (buildCounterPageList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1082(o.items);
+    checkUnnamed208(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -623,14 +623,14 @@
   buildCounterPageviewsCounts--;
 }
 
-buildUnnamed1083() {
+buildUnnamed209() {
   var o = new core.List<api.PageviewsCounts>();
   o.add(buildPageviewsCounts());
   o.add(buildPageviewsCounts());
   return o;
 }
 
-checkUnnamed1083(core.List<api.PageviewsCounts> o) {
+checkUnnamed209(core.List<api.PageviewsCounts> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPageviewsCounts(o[0]);
   checkPageviewsCounts(o[1]);
@@ -642,7 +642,7 @@
   buildCounterPageviews++;
   if (buildCounterPageviews < 3) {
     o.blogId = "foo";
-    o.counts = buildUnnamed1083();
+    o.counts = buildUnnamed209();
     o.kind = "foo";
   }
   buildCounterPageviews--;
@@ -653,7 +653,7 @@
   buildCounterPageviews++;
   if (buildCounterPageviews < 3) {
     unittest.expect(o.blogId, unittest.equals('foo'));
-    checkUnnamed1083(o.counts);
+    checkUnnamed209(o.counts);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterPageviews--;
@@ -741,27 +741,27 @@
   buildCounterPostImages--;
 }
 
-buildUnnamed1084() {
+buildUnnamed210() {
   var o = new core.List<api.PostImages>();
   o.add(buildPostImages());
   o.add(buildPostImages());
   return o;
 }
 
-checkUnnamed1084(core.List<api.PostImages> o) {
+checkUnnamed210(core.List<api.PostImages> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPostImages(o[0]);
   checkPostImages(o[1]);
 }
 
-buildUnnamed1085() {
+buildUnnamed211() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1085(core.List<core.String> o) {
+checkUnnamed211(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -792,14 +792,14 @@
   buildCounterPostLocation--;
 }
 
-buildUnnamed1086() {
+buildUnnamed212() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed1086(core.List<api.Comment> o) {
+checkUnnamed212(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -810,7 +810,7 @@
   var o = new api.PostReplies();
   buildCounterPostReplies++;
   if (buildCounterPostReplies < 3) {
-    o.items = buildUnnamed1086();
+    o.items = buildUnnamed212();
     o.selfLink = "foo";
     o.totalItems = "foo";
   }
@@ -821,7 +821,7 @@
 checkPostReplies(api.PostReplies o) {
   buildCounterPostReplies++;
   if (buildCounterPostReplies < 3) {
-    checkUnnamed1086(o.items);
+    checkUnnamed212(o.items);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals('foo'));
   }
@@ -839,9 +839,9 @@
     o.customMetaData = "foo";
     o.etag = "foo";
     o.id = "foo";
-    o.images = buildUnnamed1084();
+    o.images = buildUnnamed210();
     o.kind = "foo";
-    o.labels = buildUnnamed1085();
+    o.labels = buildUnnamed211();
     o.location = buildPostLocation();
     o.published = core.DateTime.parse("2002-02-27T14:01:02");
     o.readerComments = "foo";
@@ -866,9 +866,9 @@
     unittest.expect(o.customMetaData, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1084(o.images);
+    checkUnnamed210(o.images);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1085(o.labels);
+    checkUnnamed211(o.labels);
     checkPostLocation(o.location);
     unittest.expect(o.published,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -885,14 +885,14 @@
   buildCounterPost--;
 }
 
-buildUnnamed1087() {
+buildUnnamed213() {
   var o = new core.List<api.Post>();
   o.add(buildPost());
   o.add(buildPost());
   return o;
 }
 
-checkUnnamed1087(core.List<api.Post> o) {
+checkUnnamed213(core.List<api.Post> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPost(o[0]);
   checkPost(o[1]);
@@ -904,7 +904,7 @@
   buildCounterPostList++;
   if (buildCounterPostList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1087();
+    o.items = buildUnnamed213();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -916,7 +916,7 @@
   buildCounterPostList++;
   if (buildCounterPostList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1087(o.items);
+    checkUnnamed213(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -973,14 +973,14 @@
   buildCounterPostUserInfo--;
 }
 
-buildUnnamed1088() {
+buildUnnamed214() {
   var o = new core.List<api.PostUserInfo>();
   o.add(buildPostUserInfo());
   o.add(buildPostUserInfo());
   return o;
 }
 
-checkUnnamed1088(core.List<api.PostUserInfo> o) {
+checkUnnamed214(core.List<api.PostUserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPostUserInfo(o[0]);
   checkPostUserInfo(o[1]);
@@ -991,7 +991,7 @@
   var o = new api.PostUserInfosList();
   buildCounterPostUserInfosList++;
   if (buildCounterPostUserInfosList < 3) {
-    o.items = buildUnnamed1088();
+    o.items = buildUnnamed214();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1002,7 +1002,7 @@
 checkPostUserInfosList(api.PostUserInfosList o) {
   buildCounterPostUserInfosList++;
   if (buildCounterPostUserInfosList < 3) {
-    checkUnnamed1088(o.items);
+    checkUnnamed214(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1087,105 +1087,105 @@
   buildCounterUser--;
 }
 
-buildUnnamed1089() {
+buildUnnamed215() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1089(core.List<core.String> o) {
+checkUnnamed215(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1090() {
+buildUnnamed216() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1090(core.List<core.String> o) {
+checkUnnamed216(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1091() {
+buildUnnamed217() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1091(core.List<core.String> o) {
+checkUnnamed217(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1092() {
+buildUnnamed218() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1092(core.List<core.String> o) {
+checkUnnamed218(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1093() {
+buildUnnamed219() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1093(core.List<core.String> o) {
+checkUnnamed219(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1094() {
+buildUnnamed220() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1094(core.List<core.String> o) {
+checkUnnamed220(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1095() {
+buildUnnamed221() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1095(core.List<core.String> o) {
+checkUnnamed221(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1096() {
+buildUnnamed222() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1096(core.List<core.String> o) {
+checkUnnamed222(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1538,7 +1538,7 @@
       res
           .get(arg_userId, arg_blogId,
               maxPosts: arg_maxPosts, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BlogUserInfo response) {
+          .then(unittest.expectAsync1(((response) {
         checkBlogUserInfo(response);
       })));
     });
@@ -1602,7 +1602,7 @@
       res
           .get(arg_blogId,
               maxPosts: arg_maxPosts, view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Blog response) {
+          .then(unittest.expectAsync1(((response) {
         checkBlog(response);
       })));
     });
@@ -1658,7 +1658,7 @@
       }), true);
       res
           .getByUrl(arg_url, view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Blog response) {
+          .then(unittest.expectAsync1(((response) {
         checkBlog(response);
       })));
     });
@@ -1668,8 +1668,8 @@
       api.BlogsResourceApi res = new api.BloggerApi(mock).blogs;
       var arg_userId = "foo";
       var arg_fetchUserInfo = true;
-      var arg_role = buildUnnamed1089();
-      var arg_status = buildUnnamed1090();
+      var arg_role = buildUnnamed215();
+      var arg_status = buildUnnamed216();
       var arg_view = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -1734,7 +1734,7 @@
               status: arg_status,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BlogList response) {
+          .then(unittest.expectAsync1(((response) {
         checkBlogList(response);
       })));
     });
@@ -1818,7 +1818,7 @@
       }), true);
       res
           .approve(arg_blogId, arg_postId, arg_commentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -1971,7 +1971,7 @@
       res
           .get(arg_blogId, arg_postId, arg_commentId,
               view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -1986,7 +1986,7 @@
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_startDate = core.DateTime.parse("2002-02-27T14:01:02");
-      var arg_status = buildUnnamed1091();
+      var arg_status = buildUnnamed217();
       var arg_view = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -2070,7 +2070,7 @@
               status: arg_status,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentList response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentList(response);
       })));
     });
@@ -2084,7 +2084,7 @@
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_startDate = core.DateTime.parse("2002-02-27T14:01:02");
-      var arg_status = buildUnnamed1092();
+      var arg_status = buildUnnamed218();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2156,7 +2156,7 @@
               startDate: arg_startDate,
               status: arg_status,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentList response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentList(response);
       })));
     });
@@ -2239,7 +2239,7 @@
       res
           .markAsSpam(arg_blogId, arg_postId, arg_commentId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -2322,7 +2322,7 @@
       res
           .removeContent(arg_blogId, arg_postId, arg_commentId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -2333,7 +2333,7 @@
       var mock = new HttpServerMock();
       api.PageViewsResourceApi res = new api.BloggerApi(mock).pageViews;
       var arg_blogId = "foo";
-      var arg_range = buildUnnamed1093();
+      var arg_range = buildUnnamed219();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2388,7 +2388,7 @@
       }), true);
       res
           .get(arg_blogId, range: arg_range, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Pageviews response) {
+          .then(unittest.expectAsync1(((response) {
         checkPageviews(response);
       })));
     });
@@ -2522,7 +2522,7 @@
       }), true);
       res
           .get(arg_blogId, arg_pageId, view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Page response) {
+          .then(unittest.expectAsync1(((response) {
         checkPage(response);
       })));
     });
@@ -2592,7 +2592,7 @@
       res
           .insert(arg_request, arg_blogId,
               isDraft: arg_isDraft, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Page response) {
+          .then(unittest.expectAsync1(((response) {
         checkPage(response);
       })));
     });
@@ -2604,7 +2604,7 @@
       var arg_fetchBodies = true;
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      var arg_status = buildUnnamed1094();
+      var arg_status = buildUnnamed220();
       var arg_view = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -2673,7 +2673,7 @@
               status: arg_status,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PageList response) {
+          .then(unittest.expectAsync1(((response) {
         checkPageList(response);
       })));
     });
@@ -2752,7 +2752,7 @@
               publish_1: arg_publish_1,
               revert_1: arg_revert_1,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Page response) {
+          .then(unittest.expectAsync1(((response) {
         checkPage(response);
       })));
     });
@@ -2824,7 +2824,7 @@
       }), true);
       res
           .publish(arg_blogId, arg_pageId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Page response) {
+          .then(unittest.expectAsync1(((response) {
         checkPage(response);
       })));
     });
@@ -2896,7 +2896,7 @@
       }), true);
       res
           .revert(arg_blogId, arg_pageId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Page response) {
+          .then(unittest.expectAsync1(((response) {
         checkPage(response);
       })));
     });
@@ -2975,7 +2975,7 @@
               publish_1: arg_publish_1,
               revert_1: arg_revert_1,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Page response) {
+          .then(unittest.expectAsync1(((response) {
         checkPage(response);
       })));
     });
@@ -3057,7 +3057,7 @@
       res
           .get(arg_userId, arg_blogId, arg_postId,
               maxComments: arg_maxComments, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PostUserInfo response) {
+          .then(unittest.expectAsync1(((response) {
         checkPostUserInfo(response);
       })));
     });
@@ -3074,7 +3074,7 @@
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
       var arg_startDate = core.DateTime.parse("2002-02-27T14:01:02");
-      var arg_status = buildUnnamed1095();
+      var arg_status = buildUnnamed221();
       var arg_view = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -3163,7 +3163,7 @@
               status: arg_status,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PostUserInfosList response) {
+          .then(unittest.expectAsync1(((response) {
         checkPostUserInfosList(response);
       })));
     });
@@ -3311,7 +3311,7 @@
               maxComments: arg_maxComments,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Post response) {
+          .then(unittest.expectAsync1(((response) {
         checkPost(response);
       })));
     });
@@ -3383,7 +3383,7 @@
               maxComments: arg_maxComments,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Post response) {
+          .then(unittest.expectAsync1(((response) {
         checkPost(response);
       })));
     });
@@ -3462,7 +3462,7 @@
               fetchImages: arg_fetchImages,
               isDraft: arg_isDraft,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Post response) {
+          .then(unittest.expectAsync1(((response) {
         checkPost(response);
       })));
     });
@@ -3479,7 +3479,7 @@
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
       var arg_startDate = core.DateTime.parse("2002-02-27T14:01:02");
-      var arg_status = buildUnnamed1096();
+      var arg_status = buildUnnamed222();
       var arg_view = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -3562,7 +3562,7 @@
               status: arg_status,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PostList response) {
+          .then(unittest.expectAsync1(((response) {
         checkPostList(response);
       })));
     });
@@ -3653,7 +3653,7 @@
               publish_1: arg_publish_1,
               revert_1: arg_revert_1,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Post response) {
+          .then(unittest.expectAsync1(((response) {
         checkPost(response);
       })));
     });
@@ -3729,7 +3729,7 @@
       res
           .publish(arg_blogId, arg_postId,
               publishDate: arg_publishDate, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Post response) {
+          .then(unittest.expectAsync1(((response) {
         checkPost(response);
       })));
     });
@@ -3801,7 +3801,7 @@
       }), true);
       res
           .revert(arg_blogId, arg_postId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Post response) {
+          .then(unittest.expectAsync1(((response) {
         checkPost(response);
       })));
     });
@@ -3874,7 +3874,7 @@
               fetchBodies: arg_fetchBodies,
               orderBy: arg_orderBy,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PostList response) {
+          .then(unittest.expectAsync1(((response) {
         checkPostList(response);
       })));
     });
@@ -3965,7 +3965,7 @@
               publish_1: arg_publish_1,
               revert_1: arg_revert_1,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Post response) {
+          .then(unittest.expectAsync1(((response) {
         checkPost(response);
       })));
     });
@@ -4023,7 +4023,7 @@
       }), true);
       res
           .get(arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.User response) {
+          .then(unittest.expectAsync1(((response) {
         checkUser(response);
       })));
     });
diff --git a/generated/googleapis/test/books/v1_test.dart b/generated/googleapis/test/books/v1_test.dart
index ee98d90..99181c5 100644
--- a/generated/googleapis/test/books/v1_test.dart
+++ b/generated/googleapis/test/books/v1_test.dart
@@ -127,14 +127,14 @@
   buildCounterAnnotationLayerSummary--;
 }
 
-buildUnnamed2962() {
+buildUnnamed2589() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2962(core.List<core.String> o) {
+checkUnnamed2589(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -157,7 +157,7 @@
     o.kind = "foo";
     o.layerId = "foo";
     o.layerSummary = buildAnnotationLayerSummary();
-    o.pageIds = buildUnnamed2962();
+    o.pageIds = buildUnnamed2589();
     o.selectedText = "foo";
     o.selfLink = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
@@ -183,7 +183,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.layerId, unittest.equals('foo'));
     checkAnnotationLayerSummary(o.layerSummary);
-    checkUnnamed2962(o.pageIds);
+    checkUnnamed2589(o.pageIds);
     unittest.expect(o.selectedText, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(
@@ -237,14 +237,14 @@
   buildCounterAnnotationdata--;
 }
 
-buildUnnamed2963() {
+buildUnnamed2590() {
   var o = new core.List<api.Annotation>();
   o.add(buildAnnotation());
   o.add(buildAnnotation());
   return o;
 }
 
-checkUnnamed2963(core.List<api.Annotation> o) {
+checkUnnamed2590(core.List<api.Annotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnnotation(o[0]);
   checkAnnotation(o[1]);
@@ -255,7 +255,7 @@
   var o = new api.Annotations();
   buildCounterAnnotations++;
   if (buildCounterAnnotations < 3) {
-    o.items = buildUnnamed2963();
+    o.items = buildUnnamed2590();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -267,7 +267,7 @@
 checkAnnotations(api.Annotations o) {
   buildCounterAnnotations++;
   if (buildCounterAnnotations < 3) {
-    checkUnnamed2963(o.items);
+    checkUnnamed2590(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -303,14 +303,14 @@
   buildCounterAnnotationsSummaryLayers--;
 }
 
-buildUnnamed2964() {
+buildUnnamed2591() {
   var o = new core.List<api.AnnotationsSummaryLayers>();
   o.add(buildAnnotationsSummaryLayers());
   o.add(buildAnnotationsSummaryLayers());
   return o;
 }
 
-checkUnnamed2964(core.List<api.AnnotationsSummaryLayers> o) {
+checkUnnamed2591(core.List<api.AnnotationsSummaryLayers> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnnotationsSummaryLayers(o[0]);
   checkAnnotationsSummaryLayers(o[1]);
@@ -322,7 +322,7 @@
   buildCounterAnnotationsSummary++;
   if (buildCounterAnnotationsSummary < 3) {
     o.kind = "foo";
-    o.layers = buildUnnamed2964();
+    o.layers = buildUnnamed2591();
   }
   buildCounterAnnotationsSummary--;
   return o;
@@ -332,19 +332,19 @@
   buildCounterAnnotationsSummary++;
   if (buildCounterAnnotationsSummary < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2964(o.layers);
+    checkUnnamed2591(o.layers);
   }
   buildCounterAnnotationsSummary--;
 }
 
-buildUnnamed2965() {
+buildUnnamed2592() {
   var o = new core.List<api.Annotationdata>();
   o.add(buildAnnotationdata());
   o.add(buildAnnotationdata());
   return o;
 }
 
-checkUnnamed2965(core.List<api.Annotationdata> o) {
+checkUnnamed2592(core.List<api.Annotationdata> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnnotationdata(o[0]);
   checkAnnotationdata(o[1]);
@@ -355,7 +355,7 @@
   var o = new api.Annotationsdata();
   buildCounterAnnotationsdata++;
   if (buildCounterAnnotationsdata < 3) {
-    o.items = buildUnnamed2965();
+    o.items = buildUnnamed2592();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -367,7 +367,7 @@
 checkAnnotationsdata(api.Annotationsdata o) {
   buildCounterAnnotationsdata++;
   if (buildCounterAnnotationsdata < 3) {
-    checkUnnamed2965(o.items);
+    checkUnnamed2592(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -485,14 +485,14 @@
   buildCounterBookshelf--;
 }
 
-buildUnnamed2966() {
+buildUnnamed2593() {
   var o = new core.List<api.Bookshelf>();
   o.add(buildBookshelf());
   o.add(buildBookshelf());
   return o;
 }
 
-checkUnnamed2966(core.List<api.Bookshelf> o) {
+checkUnnamed2593(core.List<api.Bookshelf> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBookshelf(o[0]);
   checkBookshelf(o[1]);
@@ -503,7 +503,7 @@
   var o = new api.Bookshelves();
   buildCounterBookshelves++;
   if (buildCounterBookshelves < 3) {
-    o.items = buildUnnamed2966();
+    o.items = buildUnnamed2593();
     o.kind = "foo";
   }
   buildCounterBookshelves--;
@@ -513,7 +513,7 @@
 checkBookshelves(api.Bookshelves o) {
   buildCounterBookshelves++;
   if (buildCounterBookshelves < 3) {
-    checkUnnamed2966(o.items);
+    checkUnnamed2593(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBookshelves--;
@@ -542,14 +542,14 @@
   buildCounterCategoryItems--;
 }
 
-buildUnnamed2967() {
+buildUnnamed2594() {
   var o = new core.List<api.CategoryItems>();
   o.add(buildCategoryItems());
   o.add(buildCategoryItems());
   return o;
 }
 
-checkUnnamed2967(core.List<api.CategoryItems> o) {
+checkUnnamed2594(core.List<api.CategoryItems> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCategoryItems(o[0]);
   checkCategoryItems(o[1]);
@@ -560,7 +560,7 @@
   var o = new api.Category();
   buildCounterCategory++;
   if (buildCounterCategory < 3) {
-    o.items = buildUnnamed2967();
+    o.items = buildUnnamed2594();
     o.kind = "foo";
   }
   buildCounterCategory--;
@@ -570,7 +570,7 @@
 checkCategory(api.Category o) {
   buildCounterCategory++;
   if (buildCounterCategory < 3) {
-    checkUnnamed2967(o.items);
+    checkUnnamed2594(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCategory--;
@@ -699,14 +699,14 @@
   buildCounterDictlayerdataDictWordsDerivatives--;
 }
 
-buildUnnamed2968() {
+buildUnnamed2595() {
   var o = new core.List<api.DictlayerdataDictWordsDerivatives>();
   o.add(buildDictlayerdataDictWordsDerivatives());
   o.add(buildDictlayerdataDictWordsDerivatives());
   return o;
 }
 
-checkUnnamed2968(core.List<api.DictlayerdataDictWordsDerivatives> o) {
+checkUnnamed2595(core.List<api.DictlayerdataDictWordsDerivatives> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsDerivatives(o[0]);
   checkDictlayerdataDictWordsDerivatives(o[1]);
@@ -755,14 +755,14 @@
   buildCounterDictlayerdataDictWordsExamples--;
 }
 
-buildUnnamed2969() {
+buildUnnamed2596() {
   var o = new core.List<api.DictlayerdataDictWordsExamples>();
   o.add(buildDictlayerdataDictWordsExamples());
   o.add(buildDictlayerdataDictWordsExamples());
   return o;
 }
 
-checkUnnamed2969(core.List<api.DictlayerdataDictWordsExamples> o) {
+checkUnnamed2596(core.List<api.DictlayerdataDictWordsExamples> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsExamples(o[0]);
   checkDictlayerdataDictWordsExamples(o[1]);
@@ -790,14 +790,14 @@
   buildCounterDictlayerdataDictWordsSensesConjugations--;
 }
 
-buildUnnamed2970() {
+buildUnnamed2597() {
   var o = new core.List<api.DictlayerdataDictWordsSensesConjugations>();
   o.add(buildDictlayerdataDictWordsSensesConjugations());
   o.add(buildDictlayerdataDictWordsSensesConjugations());
   return o;
 }
 
-checkUnnamed2970(core.List<api.DictlayerdataDictWordsSensesConjugations> o) {
+checkUnnamed2597(core.List<api.DictlayerdataDictWordsSensesConjugations> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsSensesConjugations(o[0]);
   checkDictlayerdataDictWordsSensesConjugations(o[1]);
@@ -847,14 +847,14 @@
   buildCounterDictlayerdataDictWordsSensesDefinitionsExamples--;
 }
 
-buildUnnamed2971() {
+buildUnnamed2598() {
   var o = new core.List<api.DictlayerdataDictWordsSensesDefinitionsExamples>();
   o.add(buildDictlayerdataDictWordsSensesDefinitionsExamples());
   o.add(buildDictlayerdataDictWordsSensesDefinitionsExamples());
   return o;
 }
 
-checkUnnamed2971(
+checkUnnamed2598(
     core.List<api.DictlayerdataDictWordsSensesDefinitionsExamples> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsSensesDefinitionsExamples(o[0]);
@@ -867,7 +867,7 @@
   buildCounterDictlayerdataDictWordsSensesDefinitions++;
   if (buildCounterDictlayerdataDictWordsSensesDefinitions < 3) {
     o.definition = "foo";
-    o.examples = buildUnnamed2971();
+    o.examples = buildUnnamed2598();
   }
   buildCounterDictlayerdataDictWordsSensesDefinitions--;
   return o;
@@ -878,19 +878,19 @@
   buildCounterDictlayerdataDictWordsSensesDefinitions++;
   if (buildCounterDictlayerdataDictWordsSensesDefinitions < 3) {
     unittest.expect(o.definition, unittest.equals('foo'));
-    checkUnnamed2971(o.examples);
+    checkUnnamed2598(o.examples);
   }
   buildCounterDictlayerdataDictWordsSensesDefinitions--;
 }
 
-buildUnnamed2972() {
+buildUnnamed2599() {
   var o = new core.List<api.DictlayerdataDictWordsSensesDefinitions>();
   o.add(buildDictlayerdataDictWordsSensesDefinitions());
   o.add(buildDictlayerdataDictWordsSensesDefinitions());
   return o;
 }
 
-checkUnnamed2972(core.List<api.DictlayerdataDictWordsSensesDefinitions> o) {
+checkUnnamed2599(core.List<api.DictlayerdataDictWordsSensesDefinitions> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsSensesDefinitions(o[0]);
   checkDictlayerdataDictWordsSensesDefinitions(o[1]);
@@ -962,14 +962,14 @@
   buildCounterDictlayerdataDictWordsSensesSynonyms--;
 }
 
-buildUnnamed2973() {
+buildUnnamed2600() {
   var o = new core.List<api.DictlayerdataDictWordsSensesSynonyms>();
   o.add(buildDictlayerdataDictWordsSensesSynonyms());
   o.add(buildDictlayerdataDictWordsSensesSynonyms());
   return o;
 }
 
-checkUnnamed2973(core.List<api.DictlayerdataDictWordsSensesSynonyms> o) {
+checkUnnamed2600(core.List<api.DictlayerdataDictWordsSensesSynonyms> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsSensesSynonyms(o[0]);
   checkDictlayerdataDictWordsSensesSynonyms(o[1]);
@@ -980,14 +980,14 @@
   var o = new api.DictlayerdataDictWordsSenses();
   buildCounterDictlayerdataDictWordsSenses++;
   if (buildCounterDictlayerdataDictWordsSenses < 3) {
-    o.conjugations = buildUnnamed2970();
-    o.definitions = buildUnnamed2972();
+    o.conjugations = buildUnnamed2597();
+    o.definitions = buildUnnamed2599();
     o.partOfSpeech = "foo";
     o.pronunciation = "foo";
     o.pronunciationUrl = "foo";
     o.source = buildDictlayerdataDictWordsSensesSource();
     o.syllabification = "foo";
-    o.synonyms = buildUnnamed2973();
+    o.synonyms = buildUnnamed2600();
   }
   buildCounterDictlayerdataDictWordsSenses--;
   return o;
@@ -996,26 +996,26 @@
 checkDictlayerdataDictWordsSenses(api.DictlayerdataDictWordsSenses o) {
   buildCounterDictlayerdataDictWordsSenses++;
   if (buildCounterDictlayerdataDictWordsSenses < 3) {
-    checkUnnamed2970(o.conjugations);
-    checkUnnamed2972(o.definitions);
+    checkUnnamed2597(o.conjugations);
+    checkUnnamed2599(o.definitions);
     unittest.expect(o.partOfSpeech, unittest.equals('foo'));
     unittest.expect(o.pronunciation, unittest.equals('foo'));
     unittest.expect(o.pronunciationUrl, unittest.equals('foo'));
     checkDictlayerdataDictWordsSensesSource(o.source);
     unittest.expect(o.syllabification, unittest.equals('foo'));
-    checkUnnamed2973(o.synonyms);
+    checkUnnamed2600(o.synonyms);
   }
   buildCounterDictlayerdataDictWordsSenses--;
 }
 
-buildUnnamed2974() {
+buildUnnamed2601() {
   var o = new core.List<api.DictlayerdataDictWordsSenses>();
   o.add(buildDictlayerdataDictWordsSenses());
   o.add(buildDictlayerdataDictWordsSenses());
   return o;
 }
 
-checkUnnamed2974(core.List<api.DictlayerdataDictWordsSenses> o) {
+checkUnnamed2601(core.List<api.DictlayerdataDictWordsSenses> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWordsSenses(o[0]);
   checkDictlayerdataDictWordsSenses(o[1]);
@@ -1047,9 +1047,9 @@
   var o = new api.DictlayerdataDictWords();
   buildCounterDictlayerdataDictWords++;
   if (buildCounterDictlayerdataDictWords < 3) {
-    o.derivatives = buildUnnamed2968();
-    o.examples = buildUnnamed2969();
-    o.senses = buildUnnamed2974();
+    o.derivatives = buildUnnamed2595();
+    o.examples = buildUnnamed2596();
+    o.senses = buildUnnamed2601();
     o.source = buildDictlayerdataDictWordsSource();
   }
   buildCounterDictlayerdataDictWords--;
@@ -1059,22 +1059,22 @@
 checkDictlayerdataDictWords(api.DictlayerdataDictWords o) {
   buildCounterDictlayerdataDictWords++;
   if (buildCounterDictlayerdataDictWords < 3) {
-    checkUnnamed2968(o.derivatives);
-    checkUnnamed2969(o.examples);
-    checkUnnamed2974(o.senses);
+    checkUnnamed2595(o.derivatives);
+    checkUnnamed2596(o.examples);
+    checkUnnamed2601(o.senses);
     checkDictlayerdataDictWordsSource(o.source);
   }
   buildCounterDictlayerdataDictWords--;
 }
 
-buildUnnamed2975() {
+buildUnnamed2602() {
   var o = new core.List<api.DictlayerdataDictWords>();
   o.add(buildDictlayerdataDictWords());
   o.add(buildDictlayerdataDictWords());
   return o;
 }
 
-checkUnnamed2975(core.List<api.DictlayerdataDictWords> o) {
+checkUnnamed2602(core.List<api.DictlayerdataDictWords> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDictlayerdataDictWords(o[0]);
   checkDictlayerdataDictWords(o[1]);
@@ -1086,7 +1086,7 @@
   buildCounterDictlayerdataDict++;
   if (buildCounterDictlayerdataDict < 3) {
     o.source = buildDictlayerdataDictSource();
-    o.words = buildUnnamed2975();
+    o.words = buildUnnamed2602();
   }
   buildCounterDictlayerdataDict--;
   return o;
@@ -1096,7 +1096,7 @@
   buildCounterDictlayerdataDict++;
   if (buildCounterDictlayerdataDict < 3) {
     checkDictlayerdataDictSource(o.source);
-    checkUnnamed2975(o.words);
+    checkUnnamed2602(o.words);
   }
   buildCounterDictlayerdataDict--;
 }
@@ -1154,14 +1154,14 @@
   buildCounterDiscoveryclustersClustersBannerWithContentContainer--;
 }
 
-buildUnnamed2976() {
+buildUnnamed2603() {
   var o = new core.List<api.Volume>();
   o.add(buildVolume());
   o.add(buildVolume());
   return o;
 }
 
-checkUnnamed2976(core.List<api.Volume> o) {
+checkUnnamed2603(core.List<api.Volume> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolume(o[0]);
   checkVolume(o[1]);
@@ -1178,7 +1178,7 @@
     o.title = "foo";
     o.totalVolumes = 42;
     o.uid = "foo";
-    o.volumes = buildUnnamed2976();
+    o.volumes = buildUnnamed2603();
   }
   buildCounterDiscoveryclustersClusters--;
   return o;
@@ -1193,19 +1193,19 @@
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.totalVolumes, unittest.equals(42));
     unittest.expect(o.uid, unittest.equals('foo'));
-    checkUnnamed2976(o.volumes);
+    checkUnnamed2603(o.volumes);
   }
   buildCounterDiscoveryclustersClusters--;
 }
 
-buildUnnamed2977() {
+buildUnnamed2604() {
   var o = new core.List<api.DiscoveryclustersClusters>();
   o.add(buildDiscoveryclustersClusters());
   o.add(buildDiscoveryclustersClusters());
   return o;
 }
 
-checkUnnamed2977(core.List<api.DiscoveryclustersClusters> o) {
+checkUnnamed2604(core.List<api.DiscoveryclustersClusters> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiscoveryclustersClusters(o[0]);
   checkDiscoveryclustersClusters(o[1]);
@@ -1216,7 +1216,7 @@
   var o = new api.Discoveryclusters();
   buildCounterDiscoveryclusters++;
   if (buildCounterDiscoveryclusters < 3) {
-    o.clusters = buildUnnamed2977();
+    o.clusters = buildUnnamed2604();
     o.kind = "foo";
     o.totalClusters = 42;
   }
@@ -1227,7 +1227,7 @@
 checkDiscoveryclusters(api.Discoveryclusters o) {
   buildCounterDiscoveryclusters++;
   if (buildCounterDiscoveryclusters < 3) {
-    checkUnnamed2977(o.clusters);
+    checkUnnamed2604(o.clusters);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.totalClusters, unittest.equals(42));
   }
@@ -1275,14 +1275,14 @@
   buildCounterDownloadAccessRestriction--;
 }
 
-buildUnnamed2978() {
+buildUnnamed2605() {
   var o = new core.List<api.DownloadAccessRestriction>();
   o.add(buildDownloadAccessRestriction());
   o.add(buildDownloadAccessRestriction());
   return o;
 }
 
-checkUnnamed2978(core.List<api.DownloadAccessRestriction> o) {
+checkUnnamed2605(core.List<api.DownloadAccessRestriction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDownloadAccessRestriction(o[0]);
   checkDownloadAccessRestriction(o[1]);
@@ -1293,7 +1293,7 @@
   var o = new api.DownloadAccesses();
   buildCounterDownloadAccesses++;
   if (buildCounterDownloadAccesses < 3) {
-    o.downloadAccessList = buildUnnamed2978();
+    o.downloadAccessList = buildUnnamed2605();
     o.kind = "foo";
   }
   buildCounterDownloadAccesses--;
@@ -1303,7 +1303,7 @@
 checkDownloadAccesses(api.DownloadAccesses o) {
   buildCounterDownloadAccesses++;
   if (buildCounterDownloadAccesses < 3) {
-    checkUnnamed2978(o.downloadAccessList);
+    checkUnnamed2605(o.downloadAccessList);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDownloadAccesses--;
@@ -1405,30 +1405,30 @@
   buildCounterGeolayerdataGeoBoundary--;
 }
 
-buildUnnamed2979() {
+buildUnnamed2606() {
   var o = new core.List<api.GeolayerdataGeoBoundary>();
   o.add(buildGeolayerdataGeoBoundary());
   o.add(buildGeolayerdataGeoBoundary());
   return o;
 }
 
-checkUnnamed2979(core.List<api.GeolayerdataGeoBoundary> o) {
+checkUnnamed2606(core.List<api.GeolayerdataGeoBoundary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeolayerdataGeoBoundary(o[0]);
   checkGeolayerdataGeoBoundary(o[1]);
 }
 
-buildUnnamed2980() {
+buildUnnamed2607() {
   var o = new core.List<core.List<api.GeolayerdataGeoBoundary>>();
-  o.add(buildUnnamed2979());
-  o.add(buildUnnamed2979());
+  o.add(buildUnnamed2606());
+  o.add(buildUnnamed2606());
   return o;
 }
 
-checkUnnamed2980(core.List<core.List<api.GeolayerdataGeoBoundary>> o) {
+checkUnnamed2607(core.List<core.List<api.GeolayerdataGeoBoundary>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2979(o[0]);
-  checkUnnamed2979(o[1]);
+  checkUnnamed2606(o[0]);
+  checkUnnamed2606(o[1]);
 }
 
 core.int buildCounterGeolayerdataGeoViewportHi = 0;
@@ -1499,7 +1499,7 @@
   var o = new api.GeolayerdataGeo();
   buildCounterGeolayerdataGeo++;
   if (buildCounterGeolayerdataGeo < 3) {
-    o.boundary = buildUnnamed2980();
+    o.boundary = buildUnnamed2607();
     o.cachePolicy = "foo";
     o.countryCode = "foo";
     o.latitude = 42.0;
@@ -1515,7 +1515,7 @@
 checkGeolayerdataGeo(api.GeolayerdataGeo o) {
   buildCounterGeolayerdataGeo++;
   if (buildCounterGeolayerdataGeo < 3) {
-    checkUnnamed2980(o.boundary);
+    checkUnnamed2607(o.boundary);
     unittest.expect(o.cachePolicy, unittest.equals('foo'));
     unittest.expect(o.countryCode, unittest.equals('foo'));
     unittest.expect(o.latitude, unittest.equals(42.0));
@@ -1550,14 +1550,14 @@
   buildCounterGeolayerdata--;
 }
 
-buildUnnamed2981() {
+buildUnnamed2608() {
   var o = new core.List<api.Layersummary>();
   o.add(buildLayersummary());
   o.add(buildLayersummary());
   return o;
 }
 
-checkUnnamed2981(core.List<api.Layersummary> o) {
+checkUnnamed2608(core.List<api.Layersummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLayersummary(o[0]);
   checkLayersummary(o[1]);
@@ -1568,7 +1568,7 @@
   var o = new api.Layersummaries();
   buildCounterLayersummaries++;
   if (buildCounterLayersummaries < 3) {
-    o.items = buildUnnamed2981();
+    o.items = buildUnnamed2608();
     o.kind = "foo";
     o.totalItems = 42;
   }
@@ -1579,21 +1579,21 @@
 checkLayersummaries(api.Layersummaries o) {
   buildCounterLayersummaries++;
   if (buildCounterLayersummaries < 3) {
-    checkUnnamed2981(o.items);
+    checkUnnamed2608(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
   }
   buildCounterLayersummaries--;
 }
 
-buildUnnamed2982() {
+buildUnnamed2609() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2982(core.List<core.String> o) {
+checkUnnamed2609(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1605,7 +1605,7 @@
   buildCounterLayersummary++;
   if (buildCounterLayersummary < 3) {
     o.annotationCount = 42;
-    o.annotationTypes = buildUnnamed2982();
+    o.annotationTypes = buildUnnamed2609();
     o.annotationsDataLink = "foo";
     o.annotationsLink = "foo";
     o.contentVersion = "foo";
@@ -1626,7 +1626,7 @@
   buildCounterLayersummary++;
   if (buildCounterLayersummary < 3) {
     unittest.expect(o.annotationCount, unittest.equals(42));
-    checkUnnamed2982(o.annotationTypes);
+    checkUnnamed2609(o.annotationTypes);
     unittest.expect(o.annotationsDataLink, unittest.equals('foo'));
     unittest.expect(o.annotationsLink, unittest.equals('foo'));
     unittest.expect(o.contentVersion, unittest.equals('foo'));
@@ -1670,14 +1670,14 @@
   buildCounterMetadataItems--;
 }
 
-buildUnnamed2983() {
+buildUnnamed2610() {
   var o = new core.List<api.MetadataItems>();
   o.add(buildMetadataItems());
   o.add(buildMetadataItems());
   return o;
 }
 
-checkUnnamed2983(core.List<api.MetadataItems> o) {
+checkUnnamed2610(core.List<api.MetadataItems> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetadataItems(o[0]);
   checkMetadataItems(o[1]);
@@ -1688,7 +1688,7 @@
   var o = new api.Metadata();
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    o.items = buildUnnamed2983();
+    o.items = buildUnnamed2610();
     o.kind = "foo";
   }
   buildCounterMetadata--;
@@ -1698,20 +1698,20 @@
 checkMetadata(api.Metadata o) {
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
-    checkUnnamed2983(o.items);
+    checkUnnamed2610(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterMetadata--;
 }
 
-buildUnnamed2984() {
+buildUnnamed2611() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2984(core.List<core.String> o) {
+checkUnnamed2611(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1723,7 +1723,7 @@
   buildCounterNotification++;
   if (buildCounterNotification < 3) {
     o.body = "foo";
-    o.crmExperimentIds = buildUnnamed2984();
+    o.crmExperimentIds = buildUnnamed2611();
     o.docId = "foo";
     o.docType = "foo";
     o.dontShowNotification = true;
@@ -1745,7 +1745,7 @@
   buildCounterNotification++;
   if (buildCounterNotification < 3) {
     unittest.expect(o.body, unittest.equals('foo'));
-    checkUnnamed2984(o.crmExperimentIds);
+    checkUnnamed2611(o.crmExperimentIds);
     unittest.expect(o.docId, unittest.equals('foo'));
     unittest.expect(o.docType, unittest.equals('foo'));
     unittest.expect(o.dontShowNotification, unittest.isTrue);
@@ -1791,14 +1791,14 @@
   buildCounterOffersItemsItems--;
 }
 
-buildUnnamed2985() {
+buildUnnamed2612() {
   var o = new core.List<api.OffersItemsItems>();
   o.add(buildOffersItemsItems());
   o.add(buildOffersItemsItems());
   return o;
 }
 
-checkUnnamed2985(core.List<api.OffersItemsItems> o) {
+checkUnnamed2612(core.List<api.OffersItemsItems> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOffersItemsItems(o[0]);
   checkOffersItemsItems(o[1]);
@@ -1812,7 +1812,7 @@
     o.artUrl = "foo";
     o.gservicesKey = "foo";
     o.id = "foo";
-    o.items = buildUnnamed2985();
+    o.items = buildUnnamed2612();
   }
   buildCounterOffersItems--;
   return o;
@@ -1824,19 +1824,19 @@
     unittest.expect(o.artUrl, unittest.equals('foo'));
     unittest.expect(o.gservicesKey, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2985(o.items);
+    checkUnnamed2612(o.items);
   }
   buildCounterOffersItems--;
 }
 
-buildUnnamed2986() {
+buildUnnamed2613() {
   var o = new core.List<api.OffersItems>();
   o.add(buildOffersItems());
   o.add(buildOffersItems());
   return o;
 }
 
-checkUnnamed2986(core.List<api.OffersItems> o) {
+checkUnnamed2613(core.List<api.OffersItems> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOffersItems(o[0]);
   checkOffersItems(o[1]);
@@ -1847,7 +1847,7 @@
   var o = new api.Offers();
   buildCounterOffers++;
   if (buildCounterOffers < 3) {
-    o.items = buildUnnamed2986();
+    o.items = buildUnnamed2613();
     o.kind = "foo";
   }
   buildCounterOffers--;
@@ -1857,7 +1857,7 @@
 checkOffers(api.Offers o) {
   buildCounterOffers++;
   if (buildCounterOffers < 3) {
-    checkUnnamed2986(o.items);
+    checkUnnamed2613(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterOffers--;
@@ -2024,14 +2024,14 @@
   buildCounterSeriesSeries--;
 }
 
-buildUnnamed2987() {
+buildUnnamed2614() {
   var o = new core.List<api.SeriesSeries>();
   o.add(buildSeriesSeries());
   o.add(buildSeriesSeries());
   return o;
 }
 
-checkUnnamed2987(core.List<api.SeriesSeries> o) {
+checkUnnamed2614(core.List<api.SeriesSeries> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSeriesSeries(o[0]);
   checkSeriesSeries(o[1]);
@@ -2043,7 +2043,7 @@
   buildCounterSeries++;
   if (buildCounterSeries < 3) {
     o.kind = "foo";
-    o.series = buildUnnamed2987();
+    o.series = buildUnnamed2614();
   }
   buildCounterSeries--;
   return o;
@@ -2053,19 +2053,19 @@
   buildCounterSeries++;
   if (buildCounterSeries < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2987(o.series);
+    checkUnnamed2614(o.series);
   }
   buildCounterSeries--;
 }
 
-buildUnnamed2988() {
+buildUnnamed2615() {
   var o = new core.List<api.Volume>();
   o.add(buildVolume());
   o.add(buildVolume());
   return o;
 }
 
-checkUnnamed2988(core.List<api.Volume> o) {
+checkUnnamed2615(core.List<api.Volume> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolume(o[0]);
   checkVolume(o[1]);
@@ -2077,7 +2077,7 @@
   buildCounterSeriesmembership++;
   if (buildCounterSeriesmembership < 3) {
     o.kind = "foo";
-    o.member = buildUnnamed2988();
+    o.member = buildUnnamed2615();
     o.nextPageToken = "foo";
   }
   buildCounterSeriesmembership--;
@@ -2088,7 +2088,7 @@
   buildCounterSeriesmembership++;
   if (buildCounterSeriesmembership < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2988(o.member);
+    checkUnnamed2615(o.member);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterSeriesmembership--;
@@ -2377,14 +2377,14 @@
   buildCounterVolumeLayerInfoLayers--;
 }
 
-buildUnnamed2989() {
+buildUnnamed2616() {
   var o = new core.List<api.VolumeLayerInfoLayers>();
   o.add(buildVolumeLayerInfoLayers());
   o.add(buildVolumeLayerInfoLayers());
   return o;
 }
 
-checkUnnamed2989(core.List<api.VolumeLayerInfoLayers> o) {
+checkUnnamed2616(core.List<api.VolumeLayerInfoLayers> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolumeLayerInfoLayers(o[0]);
   checkVolumeLayerInfoLayers(o[1]);
@@ -2395,7 +2395,7 @@
   var o = new api.VolumeLayerInfo();
   buildCounterVolumeLayerInfo++;
   if (buildCounterVolumeLayerInfo < 3) {
-    o.layers = buildUnnamed2989();
+    o.layers = buildUnnamed2616();
   }
   buildCounterVolumeLayerInfo--;
   return o;
@@ -2404,7 +2404,7 @@
 checkVolumeLayerInfo(api.VolumeLayerInfo o) {
   buildCounterVolumeLayerInfo++;
   if (buildCounterVolumeLayerInfo < 3) {
-    checkUnnamed2989(o.layers);
+    checkUnnamed2616(o.layers);
   }
   buildCounterVolumeLayerInfo--;
 }
@@ -2540,14 +2540,14 @@
   buildCounterVolumeSaleInfoOffers--;
 }
 
-buildUnnamed2990() {
+buildUnnamed2617() {
   var o = new core.List<api.VolumeSaleInfoOffers>();
   o.add(buildVolumeSaleInfoOffers());
   o.add(buildVolumeSaleInfoOffers());
   return o;
 }
 
-checkUnnamed2990(core.List<api.VolumeSaleInfoOffers> o) {
+checkUnnamed2617(core.List<api.VolumeSaleInfoOffers> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolumeSaleInfoOffers(o[0]);
   checkVolumeSaleInfoOffers(o[1]);
@@ -2583,7 +2583,7 @@
     o.country = "foo";
     o.isEbook = true;
     o.listPrice = buildVolumeSaleInfoListPrice();
-    o.offers = buildUnnamed2990();
+    o.offers = buildUnnamed2617();
     o.onSaleDate = core.DateTime.parse("2002-02-27T14:01:02");
     o.retailPrice = buildVolumeSaleInfoRetailPrice();
     o.saleability = "foo";
@@ -2599,7 +2599,7 @@
     unittest.expect(o.country, unittest.equals('foo'));
     unittest.expect(o.isEbook, unittest.isTrue);
     checkVolumeSaleInfoListPrice(o.listPrice);
-    checkUnnamed2990(o.offers);
+    checkUnnamed2617(o.offers);
     unittest.expect(o.onSaleDate,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     checkVolumeSaleInfoRetailPrice(o.retailPrice);
@@ -2774,27 +2774,27 @@
   buildCounterVolumeUserInfo--;
 }
 
-buildUnnamed2991() {
+buildUnnamed2618() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2991(core.List<core.String> o) {
+checkUnnamed2618(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2992() {
+buildUnnamed2619() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2992(core.List<core.String> o) {
+checkUnnamed2619(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2874,14 +2874,14 @@
   buildCounterVolumeVolumeInfoIndustryIdentifiers--;
 }
 
-buildUnnamed2993() {
+buildUnnamed2620() {
   var o = new core.List<api.VolumeVolumeInfoIndustryIdentifiers>();
   o.add(buildVolumeVolumeInfoIndustryIdentifiers());
   o.add(buildVolumeVolumeInfoIndustryIdentifiers());
   return o;
 }
 
-checkUnnamed2993(core.List<api.VolumeVolumeInfoIndustryIdentifiers> o) {
+checkUnnamed2620(core.List<api.VolumeVolumeInfoIndustryIdentifiers> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolumeVolumeInfoIndustryIdentifiers(o[0]);
   checkVolumeVolumeInfoIndustryIdentifiers(o[1]);
@@ -2919,15 +2919,15 @@
   buildCounterVolumeVolumeInfo++;
   if (buildCounterVolumeVolumeInfo < 3) {
     o.allowAnonLogging = true;
-    o.authors = buildUnnamed2991();
+    o.authors = buildUnnamed2618();
     o.averageRating = 42.0;
     o.canonicalVolumeLink = "foo";
-    o.categories = buildUnnamed2992();
+    o.categories = buildUnnamed2619();
     o.contentVersion = "foo";
     o.description = "foo";
     o.dimensions = buildVolumeVolumeInfoDimensions();
     o.imageLinks = buildVolumeVolumeInfoImageLinks();
-    o.industryIdentifiers = buildUnnamed2993();
+    o.industryIdentifiers = buildUnnamed2620();
     o.infoLink = "foo";
     o.language = "foo";
     o.mainCategory = "foo";
@@ -2958,15 +2958,15 @@
   buildCounterVolumeVolumeInfo++;
   if (buildCounterVolumeVolumeInfo < 3) {
     unittest.expect(o.allowAnonLogging, unittest.isTrue);
-    checkUnnamed2991(o.authors);
+    checkUnnamed2618(o.authors);
     unittest.expect(o.averageRating, unittest.equals(42.0));
     unittest.expect(o.canonicalVolumeLink, unittest.equals('foo'));
-    checkUnnamed2992(o.categories);
+    checkUnnamed2619(o.categories);
     unittest.expect(o.contentVersion, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     checkVolumeVolumeInfoDimensions(o.dimensions);
     checkVolumeVolumeInfoImageLinks(o.imageLinks);
-    checkUnnamed2993(o.industryIdentifiers);
+    checkUnnamed2620(o.industryIdentifiers);
     unittest.expect(o.infoLink, unittest.equals('foo'));
     unittest.expect(o.language, unittest.equals('foo'));
     unittest.expect(o.mainCategory, unittest.equals('foo'));
@@ -3031,14 +3031,14 @@
   buildCounterVolume--;
 }
 
-buildUnnamed2994() {
+buildUnnamed2621() {
   var o = new core.List<api.Volume>();
   o.add(buildVolume());
   o.add(buildVolume());
   return o;
 }
 
-checkUnnamed2994(core.List<api.Volume> o) {
+checkUnnamed2621(core.List<api.Volume> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolume(o[0]);
   checkVolume(o[1]);
@@ -3049,7 +3049,7 @@
   var o = new api.Volume2();
   buildCounterVolume2++;
   if (buildCounterVolume2 < 3) {
-    o.items = buildUnnamed2994();
+    o.items = buildUnnamed2621();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3060,7 +3060,7 @@
 checkVolume2(api.Volume2 o) {
   buildCounterVolume2++;
   if (buildCounterVolume2 < 3) {
-    checkUnnamed2994(o.items);
+    checkUnnamed2621(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -3092,14 +3092,14 @@
   buildCounterVolumeannotationContentRanges--;
 }
 
-buildUnnamed2995() {
+buildUnnamed2622() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2995(core.List<core.String> o) {
+checkUnnamed2622(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3119,7 +3119,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.layerId = "foo";
-    o.pageIds = buildUnnamed2995();
+    o.pageIds = buildUnnamed2622();
     o.selectedText = "foo";
     o.selfLink = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
@@ -3141,7 +3141,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.layerId, unittest.equals('foo'));
-    checkUnnamed2995(o.pageIds);
+    checkUnnamed2622(o.pageIds);
     unittest.expect(o.selectedText, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(
@@ -3151,14 +3151,14 @@
   buildCounterVolumeannotation--;
 }
 
-buildUnnamed2996() {
+buildUnnamed2623() {
   var o = new core.List<api.Volumeannotation>();
   o.add(buildVolumeannotation());
   o.add(buildVolumeannotation());
   return o;
 }
 
-checkUnnamed2996(core.List<api.Volumeannotation> o) {
+checkUnnamed2623(core.List<api.Volumeannotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolumeannotation(o[0]);
   checkVolumeannotation(o[1]);
@@ -3169,7 +3169,7 @@
   var o = new api.Volumeannotations();
   buildCounterVolumeannotations++;
   if (buildCounterVolumeannotations < 3) {
-    o.items = buildUnnamed2996();
+    o.items = buildUnnamed2623();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -3182,7 +3182,7 @@
 checkVolumeannotations(api.Volumeannotations o) {
   buildCounterVolumeannotations++;
   if (buildCounterVolumeannotations < 3) {
-    checkUnnamed2996(o.items);
+    checkUnnamed2623(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -3191,14 +3191,14 @@
   buildCounterVolumeannotations--;
 }
 
-buildUnnamed2997() {
+buildUnnamed2624() {
   var o = new core.List<api.Volume>();
   o.add(buildVolume());
   o.add(buildVolume());
   return o;
 }
 
-checkUnnamed2997(core.List<api.Volume> o) {
+checkUnnamed2624(core.List<api.Volume> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolume(o[0]);
   checkVolume(o[1]);
@@ -3209,7 +3209,7 @@
   var o = new api.Volumes();
   buildCounterVolumes++;
   if (buildCounterVolumes < 3) {
-    o.items = buildUnnamed2997();
+    o.items = buildUnnamed2624();
     o.kind = "foo";
     o.totalItems = 42;
   }
@@ -3220,7 +3220,7 @@
 checkVolumes(api.Volumes o) {
   buildCounterVolumes++;
   if (buildCounterVolumes < 3) {
-    checkUnnamed2997(o.items);
+    checkUnnamed2624(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
   }
@@ -3249,14 +3249,14 @@
   buildCounterVolumeseriesinfoVolumeSeriesIssue--;
 }
 
-buildUnnamed2998() {
+buildUnnamed2625() {
   var o = new core.List<api.VolumeseriesinfoVolumeSeriesIssue>();
   o.add(buildVolumeseriesinfoVolumeSeriesIssue());
   o.add(buildVolumeseriesinfoVolumeSeriesIssue());
   return o;
 }
 
-checkUnnamed2998(core.List<api.VolumeseriesinfoVolumeSeriesIssue> o) {
+checkUnnamed2625(core.List<api.VolumeseriesinfoVolumeSeriesIssue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolumeseriesinfoVolumeSeriesIssue(o[0]);
   checkVolumeseriesinfoVolumeSeriesIssue(o[1]);
@@ -3267,7 +3267,7 @@
   var o = new api.VolumeseriesinfoVolumeSeries();
   buildCounterVolumeseriesinfoVolumeSeries++;
   if (buildCounterVolumeseriesinfoVolumeSeries < 3) {
-    o.issue = buildUnnamed2998();
+    o.issue = buildUnnamed2625();
     o.orderNumber = 42;
     o.seriesBookType = "foo";
     o.seriesId = "foo";
@@ -3279,7 +3279,7 @@
 checkVolumeseriesinfoVolumeSeries(api.VolumeseriesinfoVolumeSeries o) {
   buildCounterVolumeseriesinfoVolumeSeries++;
   if (buildCounterVolumeseriesinfoVolumeSeries < 3) {
-    checkUnnamed2998(o.issue);
+    checkUnnamed2625(o.issue);
     unittest.expect(o.orderNumber, unittest.equals(42));
     unittest.expect(o.seriesBookType, unittest.equals('foo'));
     unittest.expect(o.seriesId, unittest.equals('foo'));
@@ -3287,14 +3287,14 @@
   buildCounterVolumeseriesinfoVolumeSeries--;
 }
 
-buildUnnamed2999() {
+buildUnnamed2626() {
   var o = new core.List<api.VolumeseriesinfoVolumeSeries>();
   o.add(buildVolumeseriesinfoVolumeSeries());
   o.add(buildVolumeseriesinfoVolumeSeries());
   return o;
 }
 
-checkUnnamed2999(core.List<api.VolumeseriesinfoVolumeSeries> o) {
+checkUnnamed2626(core.List<api.VolumeseriesinfoVolumeSeries> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolumeseriesinfoVolumeSeries(o[0]);
   checkVolumeseriesinfoVolumeSeries(o[1]);
@@ -3308,7 +3308,7 @@
     o.bookDisplayNumber = "foo";
     o.kind = "foo";
     o.shortSeriesBookTitle = "foo";
-    o.volumeSeries = buildUnnamed2999();
+    o.volumeSeries = buildUnnamed2626();
   }
   buildCounterVolumeseriesinfo--;
   return o;
@@ -3320,162 +3320,162 @@
     unittest.expect(o.bookDisplayNumber, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.shortSeriesBookTitle, unittest.equals('foo'));
-    checkUnnamed2999(o.volumeSeries);
+    checkUnnamed2626(o.volumeSeries);
   }
   buildCounterVolumeseriesinfo--;
 }
 
-buildUnnamed3000() {
+buildUnnamed2627() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3000(core.List<core.String> o) {
+checkUnnamed2627(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3001() {
+buildUnnamed2628() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3001(core.List<core.String> o) {
+checkUnnamed2628(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3002() {
+buildUnnamed2629() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3002(core.List<core.String> o) {
+checkUnnamed2629(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3003() {
+buildUnnamed2630() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3003(core.List<core.String> o) {
+checkUnnamed2630(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3004() {
+buildUnnamed2631() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3004(core.List<core.String> o) {
+checkUnnamed2631(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3005() {
+buildUnnamed2632() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3005(core.List<core.String> o) {
+checkUnnamed2632(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3006() {
+buildUnnamed2633() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3006(core.List<core.String> o) {
+checkUnnamed2633(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3007() {
+buildUnnamed2634() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3007(core.List<core.String> o) {
+checkUnnamed2634(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3008() {
+buildUnnamed2635() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3008(core.List<core.String> o) {
+checkUnnamed2635(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3009() {
+buildUnnamed2636() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3009(core.List<core.String> o) {
+checkUnnamed2636(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3010() {
+buildUnnamed2637() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3010(core.List<core.String> o) {
+checkUnnamed2637(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3011() {
+buildUnnamed2638() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3011(core.List<core.String> o) {
+checkUnnamed2638(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4413,7 +4413,7 @@
       }), true);
       res
           .get(arg_userId, arg_shelf, source: arg_source, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Bookshelf response) {
+          .then(unittest.expectAsync1(((response) {
         checkBookshelf(response);
       })));
     });
@@ -4477,7 +4477,7 @@
       }), true);
       res
           .list(arg_userId, source: arg_source, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Bookshelves response) {
+          .then(unittest.expectAsync1(((response) {
         checkBookshelves(response);
       })));
     });
@@ -4568,7 +4568,7 @@
               source: arg_source,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Volumes response) {
+          .then(unittest.expectAsync1(((response) {
         checkVolumes(response);
       })));
     });
@@ -4638,8 +4638,7 @@
               name: arg_name,
               uploadClientToken: arg_uploadClientToken,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.BooksCloudloadingResource response) {
+          .then(unittest.expectAsync1(((response) {
         checkBooksCloudloadingResource(response);
       })));
     });
@@ -4746,8 +4745,9 @@
         var resp = convert.JSON.encode(buildBooksCloudloadingResource());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.updateBook(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.BooksCloudloadingResource response) {
+      res
+          .updateBook(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkBooksCloudloadingResource(response);
       })));
     });
@@ -4804,7 +4804,7 @@
       }), true);
       res
           .listOfflineMetadata(arg_cpksver, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Metadata response) {
+          .then(unittest.expectAsync1(((response) {
         checkMetadata(response);
       })));
     });
@@ -4860,7 +4860,7 @@
       }), true);
       res
           .getFamilyInfo(source: arg_source, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FamilyInfo response) {
+          .then(unittest.expectAsync1(((response) {
         checkFamilyInfo(response);
       })));
     });
@@ -5058,7 +5058,7 @@
               contentVersion: arg_contentVersion,
               source: arg_source,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Layersummary response) {
+          .then(unittest.expectAsync1(((response) {
         checkLayersummary(response);
       })));
     });
@@ -5136,7 +5136,7 @@
               pageToken: arg_pageToken,
               source: arg_source,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Layersummaries response) {
+          .then(unittest.expectAsync1(((response) {
         checkLayersummaries(response);
       })));
     });
@@ -5242,7 +5242,7 @@
               source: arg_source,
               w: arg_w,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Annotationdata response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotationdata(response);
       })));
     });
@@ -5254,7 +5254,7 @@
       var arg_volumeId = "foo";
       var arg_layerId = "foo";
       var arg_contentVersion = "foo";
-      var arg_annotationDataId = buildUnnamed3000();
+      var arg_annotationDataId = buildUnnamed2627();
       var arg_h = 42;
       var arg_locale = "foo";
       var arg_maxResults = 42;
@@ -5357,7 +5357,7 @@
               updatedMin: arg_updatedMin,
               w: arg_w,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Annotationsdata response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotationsdata(response);
       })));
     });
@@ -5441,7 +5441,7 @@
       res
           .get(arg_volumeId, arg_layerId, arg_annotationId,
               locale: arg_locale, source: arg_source, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Volumeannotation response) {
+          .then(unittest.expectAsync1(((response) {
         checkVolumeannotation(response);
       })));
     });
@@ -5558,7 +5558,7 @@
               updatedMin: arg_updatedMin,
               volumeAnnotationsVersion: arg_volumeAnnotationsVersion,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Volumeannotations response) {
+          .then(unittest.expectAsync1(((response) {
         checkVolumeannotations(response);
       })));
     });
@@ -5612,7 +5612,7 @@
       }), true);
       res
           .getUserSettings($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Usersettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkUsersettings(response);
       })));
     });
@@ -5620,7 +5620,7 @@
     unittest.test("method--releaseDownloadAccess", () {
       var mock = new HttpServerMock();
       api.MyconfigResourceApi res = new api.BooksApi(mock).myconfig;
-      var arg_volumeIds = buildUnnamed3001();
+      var arg_volumeIds = buildUnnamed2628();
       var arg_cpksver = "foo";
       var arg_locale = "foo";
       var arg_source = "foo";
@@ -5674,7 +5674,7 @@
       res
           .releaseDownloadAccess(arg_volumeIds, arg_cpksver,
               locale: arg_locale, source: arg_source, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DownloadAccesses response) {
+          .then(unittest.expectAsync1(((response) {
         checkDownloadAccesses(response);
       })));
     });
@@ -5744,7 +5744,7 @@
               licenseTypes: arg_licenseTypes,
               locale: arg_locale,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RequestAccess response) {
+          .then(unittest.expectAsync1(((response) {
         checkRequestAccess(response);
       })));
     });
@@ -5755,11 +5755,11 @@
       var arg_source = "foo";
       var arg_nonce = "foo";
       var arg_cpksver = "foo";
-      var arg_features = buildUnnamed3002();
+      var arg_features = buildUnnamed2629();
       var arg_includeNonComicsSeries = true;
       var arg_locale = "foo";
       var arg_showPreorders = true;
-      var arg_volumeIds = buildUnnamed3003();
+      var arg_volumeIds = buildUnnamed2630();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -5821,7 +5821,7 @@
               showPreorders: arg_showPreorders,
               volumeIds: arg_volumeIds,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Volumes response) {
+          .then(unittest.expectAsync1(((response) {
         checkVolumes(response);
       })));
     });
@@ -5877,7 +5877,7 @@
       }), true);
       res
           .updateUserSettings(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Usersettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkUsersettings(response);
       })));
     });
@@ -6009,7 +6009,7 @@
               showOnlySummaryInResponse: arg_showOnlySummaryInResponse,
               source: arg_source,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Annotation response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotation(response);
       })));
     });
@@ -6020,7 +6020,7 @@
           new api.BooksApi(mock).mylibrary.annotations;
       var arg_contentVersion = "foo";
       var arg_layerId = "foo";
-      var arg_layerIds = buildUnnamed3004();
+      var arg_layerIds = buildUnnamed2631();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_showDeleted = true;
@@ -6101,7 +6101,7 @@
               updatedMin: arg_updatedMin,
               volumeId: arg_volumeId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Annotations response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotations(response);
       })));
     });
@@ -6110,7 +6110,7 @@
       var mock = new HttpServerMock();
       api.MylibraryAnnotationsResourceApi res =
           new api.BooksApi(mock).mylibrary.annotations;
-      var arg_layerIds = buildUnnamed3005();
+      var arg_layerIds = buildUnnamed2632();
       var arg_volumeId = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -6159,7 +6159,7 @@
       }), true);
       res
           .summary(arg_layerIds, arg_volumeId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnnotationsSummary response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotationsSummary(response);
       })));
     });
@@ -6223,7 +6223,7 @@
       res
           .update(arg_request, arg_annotationId,
               source: arg_source, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Annotation response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotation(response);
       })));
     });
@@ -6416,7 +6416,7 @@
       }), true);
       res
           .get(arg_shelf, source: arg_source, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Bookshelf response) {
+          .then(unittest.expectAsync1(((response) {
         checkBookshelf(response);
       })));
     });
@@ -6471,7 +6471,7 @@
       }), true);
       res
           .list(source: arg_source, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Bookshelves response) {
+          .then(unittest.expectAsync1(((response) {
         checkBookshelves(response);
       })));
     });
@@ -6702,7 +6702,7 @@
               source: arg_source,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Volumes response) {
+          .then(unittest.expectAsync1(((response) {
         checkVolumes(response);
       })));
     });
@@ -6769,7 +6769,7 @@
               contentVersion: arg_contentVersion,
               source: arg_source,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReadingPosition response) {
+          .then(unittest.expectAsync1(((response) {
         checkReadingPosition(response);
       })));
     });
@@ -6913,7 +6913,7 @@
       res
           .get(arg_notificationId,
               locale: arg_locale, source: arg_source, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Notification response) {
+          .then(unittest.expectAsync1(((response) {
         checkNotification(response);
       })));
     });
@@ -6969,7 +6969,7 @@
       }), true);
       res
           .listCategories(locale: arg_locale, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Category response) {
+          .then(unittest.expectAsync1(((response) {
         checkCategory(response);
       })));
     });
@@ -6977,7 +6977,7 @@
     unittest.test("method--listCategoryVolumes", () {
       var mock = new HttpServerMock();
       api.OnboardingResourceApi res = new api.BooksApi(mock).onboarding;
-      var arg_categoryId = buildUnnamed3006();
+      var arg_categoryId = buildUnnamed2633();
       var arg_locale = "foo";
       var arg_maxAllowedMaturityRating = "foo";
       var arg_pageSize = 42;
@@ -7041,7 +7041,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Volume2 response) {
+          .then(unittest.expectAsync1(((response) {
         checkVolume2(response);
       })));
     });
@@ -7107,7 +7107,7 @@
               maxAllowedMaturityRating: arg_maxAllowedMaturityRating,
               source: arg_source,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Discoveryclusters response) {
+          .then(unittest.expectAsync1(((response) {
         checkDiscoveryclusters(response);
       })));
     });
@@ -7339,7 +7339,7 @@
               product: arg_product,
               serial: arg_serial,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Offers response) {
+          .then(unittest.expectAsync1(((response) {
         checkOffers(response);
       })));
     });
@@ -7349,7 +7349,7 @@
     unittest.test("method--get", () {
       var mock = new HttpServerMock();
       api.SeriesResourceApi res = new api.BooksApi(mock).series;
-      var arg_seriesId = buildUnnamed3007();
+      var arg_seriesId = buildUnnamed2634();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -7395,7 +7395,7 @@
       }), true);
       res
           .get(arg_seriesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Series response) {
+          .then(unittest.expectAsync1(((response) {
         checkSeries(response);
       })));
     });
@@ -7462,7 +7462,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Seriesmembership response) {
+          .then(unittest.expectAsync1(((response) {
         checkSeriesmembership(response);
       })));
     });
@@ -7544,7 +7544,7 @@
               source: arg_source,
               userLibraryConsistentRead: arg_userLibraryConsistentRead,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Volume response) {
+          .then(unittest.expectAsync1(((response) {
         checkVolume(response);
       })));
     });
@@ -7649,7 +7649,7 @@
               source: arg_source,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Volumes response) {
+          .then(unittest.expectAsync1(((response) {
         checkVolumes(response);
       })));
     });
@@ -7729,7 +7729,7 @@
               maxAllowedMaturityRating: arg_maxAllowedMaturityRating,
               source: arg_source,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Volumes response) {
+          .then(unittest.expectAsync1(((response) {
         checkVolumes(response);
       })));
     });
@@ -7740,11 +7740,11 @@
       var mock = new HttpServerMock();
       api.VolumesMybooksResourceApi res =
           new api.BooksApi(mock).volumes.mybooks;
-      var arg_acquireMethod = buildUnnamed3008();
+      var arg_acquireMethod = buildUnnamed2635();
       var arg_country = "foo";
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_processingState = buildUnnamed3009();
+      var arg_processingState = buildUnnamed2636();
       var arg_source = "foo";
       var arg_startIndex = 42;
       var arg_$fields = "foo";
@@ -7811,7 +7811,7 @@
               source: arg_source,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Volumes response) {
+          .then(unittest.expectAsync1(((response) {
         checkVolumes(response);
       })));
     });
@@ -7877,7 +7877,7 @@
               maxAllowedMaturityRating: arg_maxAllowedMaturityRating,
               source: arg_source,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Volumes response) {
+          .then(unittest.expectAsync1(((response) {
         checkVolumes(response);
       })));
     });
@@ -7941,8 +7941,7 @@
       res
           .rate(arg_rating, arg_volumeId,
               locale: arg_locale, source: arg_source, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.BooksVolumesRecommendedRateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBooksVolumesRecommendedRateResponse(response);
       })));
     });
@@ -7955,10 +7954,10 @@
           new api.BooksApi(mock).volumes.useruploaded;
       var arg_locale = "foo";
       var arg_maxResults = 42;
-      var arg_processingState = buildUnnamed3010();
+      var arg_processingState = buildUnnamed2637();
       var arg_source = "foo";
       var arg_startIndex = 42;
-      var arg_volumeId = buildUnnamed3011();
+      var arg_volumeId = buildUnnamed2638();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -8019,7 +8018,7 @@
               startIndex: arg_startIndex,
               volumeId: arg_volumeId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Volumes response) {
+          .then(unittest.expectAsync1(((response) {
         checkVolumes(response);
       })));
     });
diff --git a/generated/googleapis/test/calendar/v3_test.dart b/generated/googleapis/test/calendar/v3_test.dart
index f12b287..e9be4eb 100644
--- a/generated/googleapis/test/calendar/v3_test.dart
+++ b/generated/googleapis/test/calendar/v3_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed160() {
+buildUnnamed2978() {
   var o = new core.List<api.AclRule>();
   o.add(buildAclRule());
   o.add(buildAclRule());
   return o;
 }
 
-checkUnnamed160(core.List<api.AclRule> o) {
+checkUnnamed2978(core.List<api.AclRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAclRule(o[0]);
   checkAclRule(o[1]);
@@ -69,7 +69,7 @@
   buildCounterAcl++;
   if (buildCounterAcl < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed160();
+    o.items = buildUnnamed2978();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.nextSyncToken = "foo";
@@ -82,7 +82,7 @@
   buildCounterAcl++;
   if (buildCounterAcl < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed160(o.items);
+    checkUnnamed2978(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.nextSyncToken, unittest.equals('foo'));
@@ -171,14 +171,14 @@
   buildCounterCalendar--;
 }
 
-buildUnnamed161() {
+buildUnnamed2979() {
   var o = new core.List<api.CalendarListEntry>();
   o.add(buildCalendarListEntry());
   o.add(buildCalendarListEntry());
   return o;
 }
 
-checkUnnamed161(core.List<api.CalendarListEntry> o) {
+checkUnnamed2979(core.List<api.CalendarListEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCalendarListEntry(o[0]);
   checkCalendarListEntry(o[1]);
@@ -190,7 +190,7 @@
   buildCounterCalendarList++;
   if (buildCounterCalendarList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed161();
+    o.items = buildUnnamed2979();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.nextSyncToken = "foo";
@@ -203,7 +203,7 @@
   buildCounterCalendarList++;
   if (buildCounterCalendarList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed161(o.items);
+    checkUnnamed2979(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.nextSyncToken, unittest.equals('foo'));
@@ -211,27 +211,27 @@
   buildCounterCalendarList--;
 }
 
-buildUnnamed162() {
+buildUnnamed2980() {
   var o = new core.List<api.EventReminder>();
   o.add(buildEventReminder());
   o.add(buildEventReminder());
   return o;
 }
 
-checkUnnamed162(core.List<api.EventReminder> o) {
+checkUnnamed2980(core.List<api.EventReminder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventReminder(o[0]);
   checkEventReminder(o[1]);
 }
 
-buildUnnamed163() {
+buildUnnamed2981() {
   var o = new core.List<api.CalendarNotification>();
   o.add(buildCalendarNotification());
   o.add(buildCalendarNotification());
   return o;
 }
 
-checkUnnamed163(core.List<api.CalendarNotification> o) {
+checkUnnamed2981(core.List<api.CalendarNotification> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCalendarNotification(o[0]);
   checkCalendarNotification(o[1]);
@@ -242,7 +242,7 @@
   var o = new api.CalendarListEntryNotificationSettings();
   buildCounterCalendarListEntryNotificationSettings++;
   if (buildCounterCalendarListEntryNotificationSettings < 3) {
-    o.notifications = buildUnnamed163();
+    o.notifications = buildUnnamed2981();
   }
   buildCounterCalendarListEntryNotificationSettings--;
   return o;
@@ -252,7 +252,7 @@
     api.CalendarListEntryNotificationSettings o) {
   buildCounterCalendarListEntryNotificationSettings++;
   if (buildCounterCalendarListEntryNotificationSettings < 3) {
-    checkUnnamed163(o.notifications);
+    checkUnnamed2981(o.notifications);
   }
   buildCounterCalendarListEntryNotificationSettings--;
 }
@@ -266,7 +266,7 @@
     o.backgroundColor = "foo";
     o.colorId = "foo";
     o.conferenceProperties = buildConferenceProperties();
-    o.defaultReminders = buildUnnamed162();
+    o.defaultReminders = buildUnnamed2980();
     o.deleted = true;
     o.description = "foo";
     o.etag = "foo";
@@ -293,7 +293,7 @@
     unittest.expect(o.backgroundColor, unittest.equals('foo'));
     unittest.expect(o.colorId, unittest.equals('foo'));
     checkConferenceProperties(o.conferenceProperties);
-    checkUnnamed162(o.defaultReminders);
+    checkUnnamed2980(o.defaultReminders);
     unittest.expect(o.deleted, unittest.isTrue);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
@@ -333,14 +333,14 @@
   buildCounterCalendarNotification--;
 }
 
-buildUnnamed164() {
+buildUnnamed2982() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed164(core.Map<core.String, core.String> o) {
+checkUnnamed2982(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -355,7 +355,7 @@
     o.expiration = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.params = buildUnnamed164();
+    o.params = buildUnnamed2982();
     o.payload = true;
     o.resourceId = "foo";
     o.resourceUri = "foo";
@@ -373,7 +373,7 @@
     unittest.expect(o.expiration, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed164(o.params);
+    checkUnnamed2982(o.params);
     unittest.expect(o.payload, unittest.isTrue);
     unittest.expect(o.resourceId, unittest.equals('foo'));
     unittest.expect(o.resourceUri, unittest.equals('foo'));
@@ -404,27 +404,27 @@
   buildCounterColorDefinition--;
 }
 
-buildUnnamed165() {
+buildUnnamed2983() {
   var o = new core.Map<core.String, api.ColorDefinition>();
   o["x"] = buildColorDefinition();
   o["y"] = buildColorDefinition();
   return o;
 }
 
-checkUnnamed165(core.Map<core.String, api.ColorDefinition> o) {
+checkUnnamed2983(core.Map<core.String, api.ColorDefinition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColorDefinition(o["x"]);
   checkColorDefinition(o["y"]);
 }
 
-buildUnnamed166() {
+buildUnnamed2984() {
   var o = new core.Map<core.String, api.ColorDefinition>();
   o["x"] = buildColorDefinition();
   o["y"] = buildColorDefinition();
   return o;
 }
 
-checkUnnamed166(core.Map<core.String, api.ColorDefinition> o) {
+checkUnnamed2984(core.Map<core.String, api.ColorDefinition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColorDefinition(o["x"]);
   checkColorDefinition(o["y"]);
@@ -435,8 +435,8 @@
   var o = new api.Colors();
   buildCounterColors++;
   if (buildCounterColors < 3) {
-    o.calendar = buildUnnamed165();
-    o.event = buildUnnamed166();
+    o.calendar = buildUnnamed2983();
+    o.event = buildUnnamed2984();
     o.kind = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
   }
@@ -447,8 +447,8 @@
 checkColors(api.Colors o) {
   buildCounterColors++;
   if (buildCounterColors < 3) {
-    checkUnnamed165(o.calendar);
-    checkUnnamed166(o.event);
+    checkUnnamed2983(o.calendar);
+    checkUnnamed2984(o.event);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(
         o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -456,14 +456,14 @@
   buildCounterColors--;
 }
 
-buildUnnamed167() {
+buildUnnamed2985() {
   var o = new core.List<api.EntryPoint>();
   o.add(buildEntryPoint());
   o.add(buildEntryPoint());
   return o;
 }
 
-checkUnnamed167(core.List<api.EntryPoint> o) {
+checkUnnamed2985(core.List<api.EntryPoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntryPoint(o[0]);
   checkEntryPoint(o[1]);
@@ -477,7 +477,7 @@
     o.conferenceId = "foo";
     o.conferenceSolution = buildConferenceSolution();
     o.createRequest = buildCreateConferenceRequest();
-    o.entryPoints = buildUnnamed167();
+    o.entryPoints = buildUnnamed2985();
     o.notes = "foo";
     o.parameters = buildConferenceParameters();
     o.signature = "foo";
@@ -492,7 +492,7 @@
     unittest.expect(o.conferenceId, unittest.equals('foo'));
     checkConferenceSolution(o.conferenceSolution);
     checkCreateConferenceRequest(o.createRequest);
-    checkUnnamed167(o.entryPoints);
+    checkUnnamed2985(o.entryPoints);
     unittest.expect(o.notes, unittest.equals('foo'));
     checkConferenceParameters(o.parameters);
     unittest.expect(o.signature, unittest.equals('foo'));
@@ -519,14 +519,14 @@
   buildCounterConferenceParameters--;
 }
 
-buildUnnamed168() {
+buildUnnamed2986() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed168(core.Map<core.String, core.String> o) {
+checkUnnamed2986(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -537,7 +537,7 @@
   var o = new api.ConferenceParametersAddOnParameters();
   buildCounterConferenceParametersAddOnParameters++;
   if (buildCounterConferenceParametersAddOnParameters < 3) {
-    o.parameters = buildUnnamed168();
+    o.parameters = buildUnnamed2986();
   }
   buildCounterConferenceParametersAddOnParameters--;
   return o;
@@ -547,19 +547,19 @@
     api.ConferenceParametersAddOnParameters o) {
   buildCounterConferenceParametersAddOnParameters++;
   if (buildCounterConferenceParametersAddOnParameters < 3) {
-    checkUnnamed168(o.parameters);
+    checkUnnamed2986(o.parameters);
   }
   buildCounterConferenceParametersAddOnParameters--;
 }
 
-buildUnnamed169() {
+buildUnnamed2987() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed169(core.List<core.String> o) {
+checkUnnamed2987(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -570,7 +570,7 @@
   var o = new api.ConferenceProperties();
   buildCounterConferenceProperties++;
   if (buildCounterConferenceProperties < 3) {
-    o.allowedConferenceSolutionTypes = buildUnnamed169();
+    o.allowedConferenceSolutionTypes = buildUnnamed2987();
   }
   buildCounterConferenceProperties--;
   return o;
@@ -579,7 +579,7 @@
 checkConferenceProperties(api.ConferenceProperties o) {
   buildCounterConferenceProperties++;
   if (buildCounterConferenceProperties < 3) {
-    checkUnnamed169(o.allowedConferenceSolutionTypes);
+    checkUnnamed2987(o.allowedConferenceSolutionTypes);
   }
   buildCounterConferenceProperties--;
 }
@@ -722,27 +722,27 @@
   buildCounterError--;
 }
 
-buildUnnamed170() {
+buildUnnamed2988() {
   var o = new core.List<api.EventAttachment>();
   o.add(buildEventAttachment());
   o.add(buildEventAttachment());
   return o;
 }
 
-checkUnnamed170(core.List<api.EventAttachment> o) {
+checkUnnamed2988(core.List<api.EventAttachment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventAttachment(o[0]);
   checkEventAttachment(o[1]);
 }
 
-buildUnnamed171() {
+buildUnnamed2989() {
   var o = new core.List<api.EventAttendee>();
   o.add(buildEventAttendee());
   o.add(buildEventAttendee());
   return o;
 }
 
-checkUnnamed171(core.List<api.EventAttendee> o) {
+checkUnnamed2989(core.List<api.EventAttendee> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventAttendee(o[0]);
   checkEventAttendee(o[1]);
@@ -773,27 +773,27 @@
   buildCounterEventCreator--;
 }
 
-buildUnnamed172() {
+buildUnnamed2990() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed172(core.Map<core.String, core.String> o) {
+checkUnnamed2990(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed173() {
+buildUnnamed2991() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed173(core.Map<core.String, core.String> o) {
+checkUnnamed2991(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -804,8 +804,8 @@
   var o = new api.EventExtendedProperties();
   buildCounterEventExtendedProperties++;
   if (buildCounterEventExtendedProperties < 3) {
-    o.private = buildUnnamed172();
-    o.shared = buildUnnamed173();
+    o.private = buildUnnamed2990();
+    o.shared = buildUnnamed2991();
   }
   buildCounterEventExtendedProperties--;
   return o;
@@ -814,20 +814,20 @@
 checkEventExtendedProperties(api.EventExtendedProperties o) {
   buildCounterEventExtendedProperties++;
   if (buildCounterEventExtendedProperties < 3) {
-    checkUnnamed172(o.private);
-    checkUnnamed173(o.shared);
+    checkUnnamed2990(o.private);
+    checkUnnamed2991(o.shared);
   }
   buildCounterEventExtendedProperties--;
 }
 
-buildUnnamed174() {
+buildUnnamed2992() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed174(core.Map<core.String, core.String> o) {
+checkUnnamed2992(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -842,7 +842,7 @@
     o.height = 42;
     o.iconLink = "foo";
     o.link = "foo";
-    o.preferences = buildUnnamed174();
+    o.preferences = buildUnnamed2992();
     o.title = "foo";
     o.type = "foo";
     o.width = 42;
@@ -858,7 +858,7 @@
     unittest.expect(o.height, unittest.equals(42));
     unittest.expect(o.iconLink, unittest.equals('foo'));
     unittest.expect(o.link, unittest.equals('foo'));
-    checkUnnamed174(o.preferences);
+    checkUnnamed2992(o.preferences);
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.width, unittest.equals(42));
@@ -891,27 +891,27 @@
   buildCounterEventOrganizer--;
 }
 
-buildUnnamed175() {
+buildUnnamed2993() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed175(core.List<core.String> o) {
+checkUnnamed2993(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed176() {
+buildUnnamed2994() {
   var o = new core.List<api.EventReminder>();
   o.add(buildEventReminder());
   o.add(buildEventReminder());
   return o;
 }
 
-checkUnnamed176(core.List<api.EventReminder> o) {
+checkUnnamed2994(core.List<api.EventReminder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventReminder(o[0]);
   checkEventReminder(o[1]);
@@ -922,7 +922,7 @@
   var o = new api.EventReminders();
   buildCounterEventReminders++;
   if (buildCounterEventReminders < 3) {
-    o.overrides = buildUnnamed176();
+    o.overrides = buildUnnamed2994();
     o.useDefault = true;
   }
   buildCounterEventReminders--;
@@ -932,7 +932,7 @@
 checkEventReminders(api.EventReminders o) {
   buildCounterEventReminders++;
   if (buildCounterEventReminders < 3) {
-    checkUnnamed176(o.overrides);
+    checkUnnamed2994(o.overrides);
     unittest.expect(o.useDefault, unittest.isTrue);
   }
   buildCounterEventReminders--;
@@ -965,8 +965,8 @@
   buildCounterEvent++;
   if (buildCounterEvent < 3) {
     o.anyoneCanAddSelf = true;
-    o.attachments = buildUnnamed170();
-    o.attendees = buildUnnamed171();
+    o.attachments = buildUnnamed2988();
+    o.attendees = buildUnnamed2989();
     o.attendeesOmitted = true;
     o.colorId = "foo";
     o.conferenceData = buildConferenceData();
@@ -991,7 +991,7 @@
     o.organizer = buildEventOrganizer();
     o.originalStartTime = buildEventDateTime();
     o.privateCopy = true;
-    o.recurrence = buildUnnamed175();
+    o.recurrence = buildUnnamed2993();
     o.recurringEventId = "foo";
     o.reminders = buildEventReminders();
     o.sequence = 42;
@@ -1011,8 +1011,8 @@
   buildCounterEvent++;
   if (buildCounterEvent < 3) {
     unittest.expect(o.anyoneCanAddSelf, unittest.isTrue);
-    checkUnnamed170(o.attachments);
-    checkUnnamed171(o.attendees);
+    checkUnnamed2988(o.attachments);
+    checkUnnamed2989(o.attendees);
     unittest.expect(o.attendeesOmitted, unittest.isTrue);
     unittest.expect(o.colorId, unittest.equals('foo'));
     checkConferenceData(o.conferenceData);
@@ -1038,7 +1038,7 @@
     checkEventOrganizer(o.organizer);
     checkEventDateTime(o.originalStartTime);
     unittest.expect(o.privateCopy, unittest.isTrue);
-    checkUnnamed175(o.recurrence);
+    checkUnnamed2993(o.recurrence);
     unittest.expect(o.recurringEventId, unittest.equals('foo'));
     checkEventReminders(o.reminders);
     unittest.expect(o.sequence, unittest.equals(42));
@@ -1164,27 +1164,27 @@
   buildCounterEventReminder--;
 }
 
-buildUnnamed177() {
+buildUnnamed2995() {
   var o = new core.List<api.EventReminder>();
   o.add(buildEventReminder());
   o.add(buildEventReminder());
   return o;
 }
 
-checkUnnamed177(core.List<api.EventReminder> o) {
+checkUnnamed2995(core.List<api.EventReminder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventReminder(o[0]);
   checkEventReminder(o[1]);
 }
 
-buildUnnamed178() {
+buildUnnamed2996() {
   var o = new core.List<api.Event>();
   o.add(buildEvent());
   o.add(buildEvent());
   return o;
 }
 
-checkUnnamed178(core.List<api.Event> o) {
+checkUnnamed2996(core.List<api.Event> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEvent(o[0]);
   checkEvent(o[1]);
@@ -1196,10 +1196,10 @@
   buildCounterEvents++;
   if (buildCounterEvents < 3) {
     o.accessRole = "foo";
-    o.defaultReminders = buildUnnamed177();
+    o.defaultReminders = buildUnnamed2995();
     o.description = "foo";
     o.etag = "foo";
-    o.items = buildUnnamed178();
+    o.items = buildUnnamed2996();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.nextSyncToken = "foo";
@@ -1215,10 +1215,10 @@
   buildCounterEvents++;
   if (buildCounterEvents < 3) {
     unittest.expect(o.accessRole, unittest.equals('foo'));
-    checkUnnamed177(o.defaultReminders);
+    checkUnnamed2995(o.defaultReminders);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed178(o.items);
+    checkUnnamed2996(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.nextSyncToken, unittest.equals('foo'));
@@ -1230,27 +1230,27 @@
   buildCounterEvents--;
 }
 
-buildUnnamed179() {
+buildUnnamed2997() {
   var o = new core.List<api.TimePeriod>();
   o.add(buildTimePeriod());
   o.add(buildTimePeriod());
   return o;
 }
 
-checkUnnamed179(core.List<api.TimePeriod> o) {
+checkUnnamed2997(core.List<api.TimePeriod> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTimePeriod(o[0]);
   checkTimePeriod(o[1]);
 }
 
-buildUnnamed180() {
+buildUnnamed2998() {
   var o = new core.List<api.Error>();
   o.add(buildError());
   o.add(buildError());
   return o;
 }
 
-checkUnnamed180(core.List<api.Error> o) {
+checkUnnamed2998(core.List<api.Error> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkError(o[0]);
   checkError(o[1]);
@@ -1261,8 +1261,8 @@
   var o = new api.FreeBusyCalendar();
   buildCounterFreeBusyCalendar++;
   if (buildCounterFreeBusyCalendar < 3) {
-    o.busy = buildUnnamed179();
-    o.errors = buildUnnamed180();
+    o.busy = buildUnnamed2997();
+    o.errors = buildUnnamed2998();
   }
   buildCounterFreeBusyCalendar--;
   return o;
@@ -1271,33 +1271,33 @@
 checkFreeBusyCalendar(api.FreeBusyCalendar o) {
   buildCounterFreeBusyCalendar++;
   if (buildCounterFreeBusyCalendar < 3) {
-    checkUnnamed179(o.busy);
-    checkUnnamed180(o.errors);
+    checkUnnamed2997(o.busy);
+    checkUnnamed2998(o.errors);
   }
   buildCounterFreeBusyCalendar--;
 }
 
-buildUnnamed181() {
+buildUnnamed2999() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed181(core.List<core.String> o) {
+checkUnnamed2999(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed182() {
+buildUnnamed3000() {
   var o = new core.List<api.Error>();
   o.add(buildError());
   o.add(buildError());
   return o;
 }
 
-checkUnnamed182(core.List<api.Error> o) {
+checkUnnamed3000(core.List<api.Error> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkError(o[0]);
   checkError(o[1]);
@@ -1308,8 +1308,8 @@
   var o = new api.FreeBusyGroup();
   buildCounterFreeBusyGroup++;
   if (buildCounterFreeBusyGroup < 3) {
-    o.calendars = buildUnnamed181();
-    o.errors = buildUnnamed182();
+    o.calendars = buildUnnamed2999();
+    o.errors = buildUnnamed3000();
   }
   buildCounterFreeBusyGroup--;
   return o;
@@ -1318,20 +1318,20 @@
 checkFreeBusyGroup(api.FreeBusyGroup o) {
   buildCounterFreeBusyGroup++;
   if (buildCounterFreeBusyGroup < 3) {
-    checkUnnamed181(o.calendars);
-    checkUnnamed182(o.errors);
+    checkUnnamed2999(o.calendars);
+    checkUnnamed3000(o.errors);
   }
   buildCounterFreeBusyGroup--;
 }
 
-buildUnnamed183() {
+buildUnnamed3001() {
   var o = new core.List<api.FreeBusyRequestItem>();
   o.add(buildFreeBusyRequestItem());
   o.add(buildFreeBusyRequestItem());
   return o;
 }
 
-checkUnnamed183(core.List<api.FreeBusyRequestItem> o) {
+checkUnnamed3001(core.List<api.FreeBusyRequestItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFreeBusyRequestItem(o[0]);
   checkFreeBusyRequestItem(o[1]);
@@ -1344,7 +1344,7 @@
   if (buildCounterFreeBusyRequest < 3) {
     o.calendarExpansionMax = 42;
     o.groupExpansionMax = 42;
-    o.items = buildUnnamed183();
+    o.items = buildUnnamed3001();
     o.timeMax = core.DateTime.parse("2002-02-27T14:01:02");
     o.timeMin = core.DateTime.parse("2002-02-27T14:01:02");
     o.timeZone = "foo";
@@ -1358,7 +1358,7 @@
   if (buildCounterFreeBusyRequest < 3) {
     unittest.expect(o.calendarExpansionMax, unittest.equals(42));
     unittest.expect(o.groupExpansionMax, unittest.equals(42));
-    checkUnnamed183(o.items);
+    checkUnnamed3001(o.items);
     unittest.expect(
         o.timeMax, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(
@@ -1387,27 +1387,27 @@
   buildCounterFreeBusyRequestItem--;
 }
 
-buildUnnamed184() {
+buildUnnamed3002() {
   var o = new core.Map<core.String, api.FreeBusyCalendar>();
   o["x"] = buildFreeBusyCalendar();
   o["y"] = buildFreeBusyCalendar();
   return o;
 }
 
-checkUnnamed184(core.Map<core.String, api.FreeBusyCalendar> o) {
+checkUnnamed3002(core.Map<core.String, api.FreeBusyCalendar> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFreeBusyCalendar(o["x"]);
   checkFreeBusyCalendar(o["y"]);
 }
 
-buildUnnamed185() {
+buildUnnamed3003() {
   var o = new core.Map<core.String, api.FreeBusyGroup>();
   o["x"] = buildFreeBusyGroup();
   o["y"] = buildFreeBusyGroup();
   return o;
 }
 
-checkUnnamed185(core.Map<core.String, api.FreeBusyGroup> o) {
+checkUnnamed3003(core.Map<core.String, api.FreeBusyGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFreeBusyGroup(o["x"]);
   checkFreeBusyGroup(o["y"]);
@@ -1418,8 +1418,8 @@
   var o = new api.FreeBusyResponse();
   buildCounterFreeBusyResponse++;
   if (buildCounterFreeBusyResponse < 3) {
-    o.calendars = buildUnnamed184();
-    o.groups = buildUnnamed185();
+    o.calendars = buildUnnamed3002();
+    o.groups = buildUnnamed3003();
     o.kind = "foo";
     o.timeMax = core.DateTime.parse("2002-02-27T14:01:02");
     o.timeMin = core.DateTime.parse("2002-02-27T14:01:02");
@@ -1431,8 +1431,8 @@
 checkFreeBusyResponse(api.FreeBusyResponse o) {
   buildCounterFreeBusyResponse++;
   if (buildCounterFreeBusyResponse < 3) {
-    checkUnnamed184(o.calendars);
-    checkUnnamed185(o.groups);
+    checkUnnamed3002(o.calendars);
+    checkUnnamed3003(o.groups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(
         o.timeMax, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -1467,14 +1467,14 @@
   buildCounterSetting--;
 }
 
-buildUnnamed186() {
+buildUnnamed3004() {
   var o = new core.List<api.Setting>();
   o.add(buildSetting());
   o.add(buildSetting());
   return o;
 }
 
-checkUnnamed186(core.List<api.Setting> o) {
+checkUnnamed3004(core.List<api.Setting> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSetting(o[0]);
   checkSetting(o[1]);
@@ -1486,7 +1486,7 @@
   buildCounterSettings++;
   if (buildCounterSettings < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed186();
+    o.items = buildUnnamed3004();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.nextSyncToken = "foo";
@@ -1499,7 +1499,7 @@
   buildCounterSettings++;
   if (buildCounterSettings < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed186(o.items);
+    checkUnnamed3004(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.nextSyncToken, unittest.equals('foo'));
@@ -1530,53 +1530,53 @@
   buildCounterTimePeriod--;
 }
 
-buildUnnamed187() {
+buildUnnamed3005() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed187(core.List<core.String> o) {
+checkUnnamed3005(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed188() {
+buildUnnamed3006() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed188(core.List<core.String> o) {
+checkUnnamed3006(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed189() {
+buildUnnamed3007() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed189(core.List<core.String> o) {
+checkUnnamed3007(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed190() {
+buildUnnamed3008() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed190(core.List<core.String> o) {
+checkUnnamed3008(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2038,7 +2038,7 @@
       }), true);
       res
           .get(arg_calendarId, arg_ruleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AclRule response) {
+          .then(unittest.expectAsync1(((response) {
         checkAclRule(response);
       })));
     });
@@ -2108,7 +2108,7 @@
       res
           .insert(arg_request, arg_calendarId,
               sendNotifications: arg_sendNotifications, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AclRule response) {
+          .then(unittest.expectAsync1(((response) {
         checkAclRule(response);
       })));
     });
@@ -2187,7 +2187,7 @@
               showDeleted: arg_showDeleted,
               syncToken: arg_syncToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Acl response) {
+          .then(unittest.expectAsync1(((response) {
         checkAcl(response);
       })));
     });
@@ -2261,7 +2261,7 @@
       res
           .patch(arg_request, arg_calendarId, arg_ruleId,
               sendNotifications: arg_sendNotifications, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AclRule response) {
+          .then(unittest.expectAsync1(((response) {
         checkAclRule(response);
       })));
     });
@@ -2335,7 +2335,7 @@
       res
           .update(arg_request, arg_calendarId, arg_ruleId,
               sendNotifications: arg_sendNotifications, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AclRule response) {
+          .then(unittest.expectAsync1(((response) {
         checkAclRule(response);
       })));
     });
@@ -2418,7 +2418,7 @@
               showDeleted: arg_showDeleted,
               syncToken: arg_syncToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
@@ -2530,7 +2530,7 @@
       }), true);
       res
           .get(arg_calendarId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CalendarListEntry response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendarListEntry(response);
       })));
     });
@@ -2590,7 +2590,7 @@
       res
           .insert(arg_request,
               colorRgbFormat: arg_colorRgbFormat, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CalendarListEntry response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendarListEntry(response);
       })));
     });
@@ -2667,7 +2667,7 @@
               showHidden: arg_showHidden,
               syncToken: arg_syncToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CalendarList response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendarList(response);
       })));
     });
@@ -2731,7 +2731,7 @@
       res
           .patch(arg_request, arg_calendarId,
               colorRgbFormat: arg_colorRgbFormat, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CalendarListEntry response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendarListEntry(response);
       })));
     });
@@ -2795,7 +2795,7 @@
       res
           .update(arg_request, arg_calendarId,
               colorRgbFormat: arg_colorRgbFormat, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CalendarListEntry response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendarListEntry(response);
       })));
     });
@@ -2876,7 +2876,7 @@
               showHidden: arg_showHidden,
               syncToken: arg_syncToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
@@ -3048,7 +3048,7 @@
       }), true);
       res
           .get(arg_calendarId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Calendar response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendar(response);
       })));
     });
@@ -3104,7 +3104,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Calendar response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendar(response);
       })));
     });
@@ -3164,7 +3164,7 @@
       }), true);
       res
           .patch(arg_request, arg_calendarId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Calendar response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendar(response);
       })));
     });
@@ -3224,7 +3224,7 @@
       }), true);
       res
           .update(arg_request, arg_calendarId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Calendar response) {
+          .then(unittest.expectAsync1(((response) {
         checkCalendar(response);
       })));
     });
@@ -3332,9 +3332,7 @@
         var resp = convert.JSON.encode(buildColors());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .get($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Colors response) {
+      res.get($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkColors(response);
       })));
     });
@@ -3483,7 +3481,7 @@
               maxAttendees: arg_maxAttendees,
               timeZone: arg_timeZone,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Event response) {
+          .then(unittest.expectAsync1(((response) {
         checkEvent(response);
       })));
     });
@@ -3558,7 +3556,7 @@
               conferenceDataVersion: arg_conferenceDataVersion,
               supportsAttachments: arg_supportsAttachments,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Event response) {
+          .then(unittest.expectAsync1(((response) {
         checkEvent(response);
       })));
     });
@@ -3641,7 +3639,7 @@
               sendNotifications: arg_sendNotifications,
               supportsAttachments: arg_supportsAttachments,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Event response) {
+          .then(unittest.expectAsync1(((response) {
         checkEvent(response);
       })));
     });
@@ -3750,7 +3748,7 @@
               timeMin: arg_timeMin,
               timeZone: arg_timeZone,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Events response) {
+          .then(unittest.expectAsync1(((response) {
         checkEvents(response);
       })));
     });
@@ -3765,9 +3763,9 @@
       var arg_maxResults = 42;
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
-      var arg_privateExtendedProperty = buildUnnamed187();
+      var arg_privateExtendedProperty = buildUnnamed3005();
       var arg_q = "foo";
-      var arg_sharedExtendedProperty = buildUnnamed188();
+      var arg_sharedExtendedProperty = buildUnnamed3006();
       var arg_showDeleted = true;
       var arg_showHiddenInvitations = true;
       var arg_singleEvents = true;
@@ -3880,7 +3878,7 @@
               timeZone: arg_timeZone,
               updatedMin: arg_updatedMin,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Events response) {
+          .then(unittest.expectAsync1(((response) {
         checkEvents(response);
       })));
     });
@@ -3959,7 +3957,7 @@
       res
           .move(arg_calendarId, arg_eventId, arg_destination,
               sendNotifications: arg_sendNotifications, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Event response) {
+          .then(unittest.expectAsync1(((response) {
         checkEvent(response);
       })));
     });
@@ -4050,7 +4048,7 @@
               sendNotifications: arg_sendNotifications,
               supportsAttachments: arg_supportsAttachments,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Event response) {
+          .then(unittest.expectAsync1(((response) {
         checkEvent(response);
       })));
     });
@@ -4118,7 +4116,7 @@
       res
           .quickAdd(arg_calendarId, arg_text,
               sendNotifications: arg_sendNotifications, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Event response) {
+          .then(unittest.expectAsync1(((response) {
         checkEvent(response);
       })));
     });
@@ -4209,7 +4207,7 @@
               sendNotifications: arg_sendNotifications,
               supportsAttachments: arg_supportsAttachments,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Event response) {
+          .then(unittest.expectAsync1(((response) {
         checkEvent(response);
       })));
     });
@@ -4225,9 +4223,9 @@
       var arg_maxResults = 42;
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
-      var arg_privateExtendedProperty = buildUnnamed189();
+      var arg_privateExtendedProperty = buildUnnamed3007();
       var arg_q = "foo";
-      var arg_sharedExtendedProperty = buildUnnamed190();
+      var arg_sharedExtendedProperty = buildUnnamed3008();
       var arg_showDeleted = true;
       var arg_showHiddenInvitations = true;
       var arg_singleEvents = true;
@@ -4343,7 +4341,7 @@
               timeZone: arg_timeZone,
               updatedMin: arg_updatedMin,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
@@ -4401,7 +4399,7 @@
       }), true);
       res
           .query(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FreeBusyResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFreeBusyResponse(response);
       })));
     });
@@ -4459,7 +4457,7 @@
       }), true);
       res
           .get(arg_setting, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Setting response) {
+          .then(unittest.expectAsync1(((response) {
         checkSetting(response);
       })));
     });
@@ -4524,7 +4522,7 @@
               pageToken: arg_pageToken,
               syncToken: arg_syncToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Settings response) {
+          .then(unittest.expectAsync1(((response) {
         checkSettings(response);
       })));
     });
@@ -4593,7 +4591,7 @@
               pageToken: arg_pageToken,
               syncToken: arg_syncToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
diff --git a/generated/googleapis/test/civicinfo/v2_test.dart b/generated/googleapis/test/civicinfo/v2_test.dart
index e99bc44..43b37a4 100644
--- a/generated/googleapis/test/civicinfo/v2_test.dart
+++ b/generated/googleapis/test/civicinfo/v2_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed1104() {
+buildUnnamed1437() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed1104(core.List<api.Source> o) {
+checkUnnamed1437(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -72,7 +72,7 @@
     o.id = "foo";
     o.localJurisdiction = buildAdministrationRegion();
     o.name = "foo";
-    o.sources = buildUnnamed1104();
+    o.sources = buildUnnamed1437();
   }
   buildCounterAdministrationRegion--;
   return o;
@@ -85,45 +85,45 @@
     unittest.expect(o.id, unittest.equals('foo'));
     checkAdministrationRegion(o.localJurisdiction);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1104(o.sources);
+    checkUnnamed1437(o.sources);
   }
   buildCounterAdministrationRegion--;
 }
 
-buildUnnamed1105() {
+buildUnnamed1438() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1105(core.List<core.String> o) {
+checkUnnamed1438(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1106() {
+buildUnnamed1439() {
   var o = new core.List<api.ElectionOfficial>();
   o.add(buildElectionOfficial());
   o.add(buildElectionOfficial());
   return o;
 }
 
-checkUnnamed1106(core.List<api.ElectionOfficial> o) {
+checkUnnamed1439(core.List<api.ElectionOfficial> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkElectionOfficial(o[0]);
   checkElectionOfficial(o[1]);
 }
 
-buildUnnamed1107() {
+buildUnnamed1440() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1107(core.List<core.String> o) {
+checkUnnamed1440(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -135,18 +135,18 @@
   buildCounterAdministrativeBody++;
   if (buildCounterAdministrativeBody < 3) {
     o.absenteeVotingInfoUrl = "foo";
-    o.addressLines = buildUnnamed1105();
+    o.addressLines = buildUnnamed1438();
     o.ballotInfoUrl = "foo";
     o.correspondenceAddress = buildSimpleAddressType();
     o.electionInfoUrl = "foo";
-    o.electionOfficials = buildUnnamed1106();
+    o.electionOfficials = buildUnnamed1439();
     o.electionRegistrationConfirmationUrl = "foo";
     o.electionRegistrationUrl = "foo";
     o.electionRulesUrl = "foo";
     o.hoursOfOperation = "foo";
     o.name = "foo";
     o.physicalAddress = buildSimpleAddressType();
-    o.voterServices = buildUnnamed1107();
+    o.voterServices = buildUnnamed1440();
     o.votingLocationFinderUrl = "foo";
   }
   buildCounterAdministrativeBody--;
@@ -157,11 +157,11 @@
   buildCounterAdministrativeBody++;
   if (buildCounterAdministrativeBody < 3) {
     unittest.expect(o.absenteeVotingInfoUrl, unittest.equals('foo'));
-    checkUnnamed1105(o.addressLines);
+    checkUnnamed1438(o.addressLines);
     unittest.expect(o.ballotInfoUrl, unittest.equals('foo'));
     checkSimpleAddressType(o.correspondenceAddress);
     unittest.expect(o.electionInfoUrl, unittest.equals('foo'));
-    checkUnnamed1106(o.electionOfficials);
+    checkUnnamed1439(o.electionOfficials);
     unittest.expect(
         o.electionRegistrationConfirmationUrl, unittest.equals('foo'));
     unittest.expect(o.electionRegistrationUrl, unittest.equals('foo'));
@@ -169,20 +169,20 @@
     unittest.expect(o.hoursOfOperation, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     checkSimpleAddressType(o.physicalAddress);
-    checkUnnamed1107(o.voterServices);
+    checkUnnamed1440(o.voterServices);
     unittest.expect(o.votingLocationFinderUrl, unittest.equals('foo'));
   }
   buildCounterAdministrativeBody--;
 }
 
-buildUnnamed1108() {
+buildUnnamed1441() {
   var o = new core.List<api.Channel>();
   o.add(buildChannel());
   o.add(buildChannel());
   return o;
 }
 
-checkUnnamed1108(core.List<api.Channel> o) {
+checkUnnamed1441(core.List<api.Channel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannel(o[0]);
   checkChannel(o[1]);
@@ -194,7 +194,7 @@
   buildCounterCandidate++;
   if (buildCounterCandidate < 3) {
     o.candidateUrl = "foo";
-    o.channels = buildUnnamed1108();
+    o.channels = buildUnnamed1441();
     o.email = "foo";
     o.name = "foo";
     o.orderOnBallot = "foo";
@@ -210,7 +210,7 @@
   buildCounterCandidate++;
   if (buildCounterCandidate < 3) {
     unittest.expect(o.candidateUrl, unittest.equals('foo'));
-    checkUnnamed1108(o.channels);
+    checkUnnamed1441(o.channels);
     unittest.expect(o.email, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.orderOnBallot, unittest.equals('foo'));
@@ -242,66 +242,66 @@
   buildCounterChannel--;
 }
 
-buildUnnamed1109() {
+buildUnnamed1442() {
   var o = new core.List<api.Candidate>();
   o.add(buildCandidate());
   o.add(buildCandidate());
   return o;
 }
 
-checkUnnamed1109(core.List<api.Candidate> o) {
+checkUnnamed1442(core.List<api.Candidate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCandidate(o[0]);
   checkCandidate(o[1]);
 }
 
-buildUnnamed1110() {
+buildUnnamed1443() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1110(core.List<core.String> o) {
+checkUnnamed1443(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1111() {
+buildUnnamed1444() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1111(core.List<core.String> o) {
+checkUnnamed1444(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1112() {
+buildUnnamed1445() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1112(core.List<core.String> o) {
+checkUnnamed1445(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1113() {
+buildUnnamed1446() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed1113(core.List<api.Source> o) {
+checkUnnamed1446(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -313,16 +313,16 @@
   buildCounterContest++;
   if (buildCounterContest < 3) {
     o.ballotPlacement = "foo";
-    o.candidates = buildUnnamed1109();
+    o.candidates = buildUnnamed1442();
     o.district = buildElectoralDistrict();
     o.electorateSpecifications = "foo";
     o.id = "foo";
-    o.level = buildUnnamed1110();
+    o.level = buildUnnamed1443();
     o.numberElected = "foo";
     o.numberVotingFor = "foo";
     o.office = "foo";
     o.primaryParty = "foo";
-    o.referendumBallotResponses = buildUnnamed1111();
+    o.referendumBallotResponses = buildUnnamed1444();
     o.referendumBrief = "foo";
     o.referendumConStatement = "foo";
     o.referendumEffectOfAbstain = "foo";
@@ -332,8 +332,8 @@
     o.referendumText = "foo";
     o.referendumTitle = "foo";
     o.referendumUrl = "foo";
-    o.roles = buildUnnamed1112();
-    o.sources = buildUnnamed1113();
+    o.roles = buildUnnamed1445();
+    o.sources = buildUnnamed1446();
     o.special = "foo";
     o.type = "foo";
   }
@@ -345,16 +345,16 @@
   buildCounterContest++;
   if (buildCounterContest < 3) {
     unittest.expect(o.ballotPlacement, unittest.equals('foo'));
-    checkUnnamed1109(o.candidates);
+    checkUnnamed1442(o.candidates);
     checkElectoralDistrict(o.district);
     unittest.expect(o.electorateSpecifications, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1110(o.level);
+    checkUnnamed1443(o.level);
     unittest.expect(o.numberElected, unittest.equals('foo'));
     unittest.expect(o.numberVotingFor, unittest.equals('foo'));
     unittest.expect(o.office, unittest.equals('foo'));
     unittest.expect(o.primaryParty, unittest.equals('foo'));
-    checkUnnamed1111(o.referendumBallotResponses);
+    checkUnnamed1444(o.referendumBallotResponses);
     unittest.expect(o.referendumBrief, unittest.equals('foo'));
     unittest.expect(o.referendumConStatement, unittest.equals('foo'));
     unittest.expect(o.referendumEffectOfAbstain, unittest.equals('foo'));
@@ -364,8 +364,8 @@
     unittest.expect(o.referendumText, unittest.equals('foo'));
     unittest.expect(o.referendumTitle, unittest.equals('foo'));
     unittest.expect(o.referendumUrl, unittest.equals('foo'));
-    checkUnnamed1112(o.roles);
-    checkUnnamed1113(o.sources);
+    checkUnnamed1445(o.roles);
+    checkUnnamed1446(o.sources);
     unittest.expect(o.special, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
@@ -430,14 +430,14 @@
   buildCounterDivisionSearchRequest--;
 }
 
-buildUnnamed1114() {
+buildUnnamed1447() {
   var o = new core.List<api.DivisionSearchResult>();
   o.add(buildDivisionSearchResult());
   o.add(buildDivisionSearchResult());
   return o;
 }
 
-checkUnnamed1114(core.List<api.DivisionSearchResult> o) {
+checkUnnamed1447(core.List<api.DivisionSearchResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDivisionSearchResult(o[0]);
   checkDivisionSearchResult(o[1]);
@@ -449,7 +449,7 @@
   buildCounterDivisionSearchResponse++;
   if (buildCounterDivisionSearchResponse < 3) {
     o.kind = "foo";
-    o.results = buildUnnamed1114();
+    o.results = buildUnnamed1447();
   }
   buildCounterDivisionSearchResponse--;
   return o;
@@ -459,19 +459,19 @@
   buildCounterDivisionSearchResponse++;
   if (buildCounterDivisionSearchResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1114(o.results);
+    checkUnnamed1447(o.results);
   }
   buildCounterDivisionSearchResponse--;
 }
 
-buildUnnamed1115() {
+buildUnnamed1448() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1115(core.List<core.String> o) {
+checkUnnamed1448(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -482,7 +482,7 @@
   var o = new api.DivisionSearchResult();
   buildCounterDivisionSearchResult++;
   if (buildCounterDivisionSearchResult < 3) {
-    o.aliases = buildUnnamed1115();
+    o.aliases = buildUnnamed1448();
     o.name = "foo";
     o.ocdId = "foo";
   }
@@ -493,7 +493,7 @@
 checkDivisionSearchResult(api.DivisionSearchResult o) {
   buildCounterDivisionSearchResult++;
   if (buildCounterDivisionSearchResult < 3) {
-    checkUnnamed1115(o.aliases);
+    checkUnnamed1448(o.aliases);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.ocdId, unittest.equals('foo'));
   }
@@ -571,14 +571,14 @@
   buildCounterElectionsQueryRequest--;
 }
 
-buildUnnamed1116() {
+buildUnnamed1449() {
   var o = new core.List<api.Election>();
   o.add(buildElection());
   o.add(buildElection());
   return o;
 }
 
-checkUnnamed1116(core.List<api.Election> o) {
+checkUnnamed1449(core.List<api.Election> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkElection(o[0]);
   checkElection(o[1]);
@@ -589,7 +589,7 @@
   var o = new api.ElectionsQueryResponse();
   buildCounterElectionsQueryResponse++;
   if (buildCounterElectionsQueryResponse < 3) {
-    o.elections = buildUnnamed1116();
+    o.elections = buildUnnamed1449();
     o.kind = "foo";
   }
   buildCounterElectionsQueryResponse--;
@@ -599,7 +599,7 @@
 checkElectionsQueryResponse(api.ElectionsQueryResponse o) {
   buildCounterElectionsQueryResponse++;
   if (buildCounterElectionsQueryResponse < 3) {
-    checkUnnamed1116(o.elections);
+    checkUnnamed1449(o.elections);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterElectionsQueryResponse--;
@@ -630,27 +630,27 @@
   buildCounterElectoralDistrict--;
 }
 
-buildUnnamed1117() {
+buildUnnamed1450() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1117(core.List<core.String> o) {
+checkUnnamed1450(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1118() {
+buildUnnamed1451() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1118(core.List<core.int> o) {
+checkUnnamed1451(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -661,9 +661,9 @@
   var o = new api.GeographicDivision();
   buildCounterGeographicDivision++;
   if (buildCounterGeographicDivision < 3) {
-    o.alsoKnownAs = buildUnnamed1117();
+    o.alsoKnownAs = buildUnnamed1450();
     o.name = "foo";
-    o.officeIndices = buildUnnamed1118();
+    o.officeIndices = buildUnnamed1451();
   }
   buildCounterGeographicDivision--;
   return o;
@@ -672,60 +672,60 @@
 checkGeographicDivision(api.GeographicDivision o) {
   buildCounterGeographicDivision++;
   if (buildCounterGeographicDivision < 3) {
-    checkUnnamed1117(o.alsoKnownAs);
+    checkUnnamed1450(o.alsoKnownAs);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1118(o.officeIndices);
+    checkUnnamed1451(o.officeIndices);
   }
   buildCounterGeographicDivision--;
 }
 
-buildUnnamed1119() {
+buildUnnamed1452() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1119(core.List<core.String> o) {
+checkUnnamed1452(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1120() {
+buildUnnamed1453() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1120(core.List<core.int> o) {
+checkUnnamed1453(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed1121() {
+buildUnnamed1454() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1121(core.List<core.String> o) {
+checkUnnamed1454(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1122() {
+buildUnnamed1455() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed1122(core.List<api.Source> o) {
+checkUnnamed1455(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -737,11 +737,11 @@
   buildCounterOffice++;
   if (buildCounterOffice < 3) {
     o.divisionId = "foo";
-    o.levels = buildUnnamed1119();
+    o.levels = buildUnnamed1452();
     o.name = "foo";
-    o.officialIndices = buildUnnamed1120();
-    o.roles = buildUnnamed1121();
-    o.sources = buildUnnamed1122();
+    o.officialIndices = buildUnnamed1453();
+    o.roles = buildUnnamed1454();
+    o.sources = buildUnnamed1455();
   }
   buildCounterOffice--;
   return o;
@@ -751,75 +751,75 @@
   buildCounterOffice++;
   if (buildCounterOffice < 3) {
     unittest.expect(o.divisionId, unittest.equals('foo'));
-    checkUnnamed1119(o.levels);
+    checkUnnamed1452(o.levels);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1120(o.officialIndices);
-    checkUnnamed1121(o.roles);
-    checkUnnamed1122(o.sources);
+    checkUnnamed1453(o.officialIndices);
+    checkUnnamed1454(o.roles);
+    checkUnnamed1455(o.sources);
   }
   buildCounterOffice--;
 }
 
-buildUnnamed1123() {
+buildUnnamed1456() {
   var o = new core.List<api.SimpleAddressType>();
   o.add(buildSimpleAddressType());
   o.add(buildSimpleAddressType());
   return o;
 }
 
-checkUnnamed1123(core.List<api.SimpleAddressType> o) {
+checkUnnamed1456(core.List<api.SimpleAddressType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSimpleAddressType(o[0]);
   checkSimpleAddressType(o[1]);
 }
 
-buildUnnamed1124() {
+buildUnnamed1457() {
   var o = new core.List<api.Channel>();
   o.add(buildChannel());
   o.add(buildChannel());
   return o;
 }
 
-checkUnnamed1124(core.List<api.Channel> o) {
+checkUnnamed1457(core.List<api.Channel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannel(o[0]);
   checkChannel(o[1]);
 }
 
-buildUnnamed1125() {
+buildUnnamed1458() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1125(core.List<core.String> o) {
+checkUnnamed1458(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1126() {
+buildUnnamed1459() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1126(core.List<core.String> o) {
+checkUnnamed1459(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1127() {
+buildUnnamed1460() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1127(core.List<core.String> o) {
+checkUnnamed1460(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -830,14 +830,14 @@
   var o = new api.Official();
   buildCounterOfficial++;
   if (buildCounterOfficial < 3) {
-    o.address = buildUnnamed1123();
-    o.channels = buildUnnamed1124();
-    o.emails = buildUnnamed1125();
+    o.address = buildUnnamed1456();
+    o.channels = buildUnnamed1457();
+    o.emails = buildUnnamed1458();
     o.name = "foo";
     o.party = "foo";
-    o.phones = buildUnnamed1126();
+    o.phones = buildUnnamed1459();
     o.photoUrl = "foo";
-    o.urls = buildUnnamed1127();
+    o.urls = buildUnnamed1460();
   }
   buildCounterOfficial--;
   return o;
@@ -846,26 +846,26 @@
 checkOfficial(api.Official o) {
   buildCounterOfficial++;
   if (buildCounterOfficial < 3) {
-    checkUnnamed1123(o.address);
-    checkUnnamed1124(o.channels);
-    checkUnnamed1125(o.emails);
+    checkUnnamed1456(o.address);
+    checkUnnamed1457(o.channels);
+    checkUnnamed1458(o.emails);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.party, unittest.equals('foo'));
-    checkUnnamed1126(o.phones);
+    checkUnnamed1459(o.phones);
     unittest.expect(o.photoUrl, unittest.equals('foo'));
-    checkUnnamed1127(o.urls);
+    checkUnnamed1460(o.urls);
   }
   buildCounterOfficial--;
 }
 
-buildUnnamed1128() {
+buildUnnamed1461() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed1128(core.List<api.Source> o) {
+checkUnnamed1461(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -882,7 +882,7 @@
     o.name = "foo";
     o.notes = "foo";
     o.pollingHours = "foo";
-    o.sources = buildUnnamed1128();
+    o.sources = buildUnnamed1461();
     o.startDate = "foo";
     o.voterServices = "foo";
   }
@@ -899,21 +899,21 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
     unittest.expect(o.pollingHours, unittest.equals('foo'));
-    checkUnnamed1128(o.sources);
+    checkUnnamed1461(o.sources);
     unittest.expect(o.startDate, unittest.equals('foo'));
     unittest.expect(o.voterServices, unittest.equals('foo'));
   }
   buildCounterPollingLocation--;
 }
 
-buildUnnamed1129() {
+buildUnnamed1462() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1129(core.List<core.String> o) {
+checkUnnamed1462(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -924,7 +924,7 @@
   var o = new api.PostalAddress();
   buildCounterPostalAddress++;
   if (buildCounterPostalAddress < 3) {
-    o.addressLines = buildUnnamed1129();
+    o.addressLines = buildUnnamed1462();
     o.administrativeAreaName = "foo";
     o.countryName = "foo";
     o.countryNameCode = "foo";
@@ -963,7 +963,7 @@
 checkPostalAddress(api.PostalAddress o) {
   buildCounterPostalAddress++;
   if (buildCounterPostalAddress < 3) {
-    checkUnnamed1129(o.addressLines);
+    checkUnnamed1462(o.addressLines);
     unittest.expect(o.administrativeAreaName, unittest.equals('foo'));
     unittest.expect(o.countryName, unittest.equals('foo'));
     unittest.expect(o.countryNameCode, unittest.equals('foo'));
@@ -1001,40 +1001,40 @@
   buildCounterPostalAddress--;
 }
 
-buildUnnamed1130() {
+buildUnnamed1463() {
   var o = new core.Map<core.String, api.GeographicDivision>();
   o["x"] = buildGeographicDivision();
   o["y"] = buildGeographicDivision();
   return o;
 }
 
-checkUnnamed1130(core.Map<core.String, api.GeographicDivision> o) {
+checkUnnamed1463(core.Map<core.String, api.GeographicDivision> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeographicDivision(o["x"]);
   checkGeographicDivision(o["y"]);
 }
 
-buildUnnamed1131() {
+buildUnnamed1464() {
   var o = new core.List<api.Office>();
   o.add(buildOffice());
   o.add(buildOffice());
   return o;
 }
 
-checkUnnamed1131(core.List<api.Office> o) {
+checkUnnamed1464(core.List<api.Office> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOffice(o[0]);
   checkOffice(o[1]);
 }
 
-buildUnnamed1132() {
+buildUnnamed1465() {
   var o = new core.List<api.Official>();
   o.add(buildOfficial());
   o.add(buildOfficial());
   return o;
 }
 
-checkUnnamed1132(core.List<api.Official> o) {
+checkUnnamed1465(core.List<api.Official> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOfficial(o[0]);
   checkOfficial(o[1]);
@@ -1045,9 +1045,9 @@
   var o = new api.RepresentativeInfoData();
   buildCounterRepresentativeInfoData++;
   if (buildCounterRepresentativeInfoData < 3) {
-    o.divisions = buildUnnamed1130();
-    o.offices = buildUnnamed1131();
-    o.officials = buildUnnamed1132();
+    o.divisions = buildUnnamed1463();
+    o.offices = buildUnnamed1464();
+    o.officials = buildUnnamed1465();
   }
   buildCounterRepresentativeInfoData--;
   return o;
@@ -1056,9 +1056,9 @@
 checkRepresentativeInfoData(api.RepresentativeInfoData o) {
   buildCounterRepresentativeInfoData++;
   if (buildCounterRepresentativeInfoData < 3) {
-    checkUnnamed1130(o.divisions);
-    checkUnnamed1131(o.offices);
-    checkUnnamed1132(o.officials);
+    checkUnnamed1463(o.divisions);
+    checkUnnamed1464(o.offices);
+    checkUnnamed1465(o.officials);
   }
   buildCounterRepresentativeInfoData--;
 }
@@ -1082,40 +1082,40 @@
   buildCounterRepresentativeInfoRequest--;
 }
 
-buildUnnamed1133() {
+buildUnnamed1466() {
   var o = new core.Map<core.String, api.GeographicDivision>();
   o["x"] = buildGeographicDivision();
   o["y"] = buildGeographicDivision();
   return o;
 }
 
-checkUnnamed1133(core.Map<core.String, api.GeographicDivision> o) {
+checkUnnamed1466(core.Map<core.String, api.GeographicDivision> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGeographicDivision(o["x"]);
   checkGeographicDivision(o["y"]);
 }
 
-buildUnnamed1134() {
+buildUnnamed1467() {
   var o = new core.List<api.Office>();
   o.add(buildOffice());
   o.add(buildOffice());
   return o;
 }
 
-checkUnnamed1134(core.List<api.Office> o) {
+checkUnnamed1467(core.List<api.Office> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOffice(o[0]);
   checkOffice(o[1]);
 }
 
-buildUnnamed1135() {
+buildUnnamed1468() {
   var o = new core.List<api.Official>();
   o.add(buildOfficial());
   o.add(buildOfficial());
   return o;
 }
 
-checkUnnamed1135(core.List<api.Official> o) {
+checkUnnamed1468(core.List<api.Official> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOfficial(o[0]);
   checkOfficial(o[1]);
@@ -1126,11 +1126,11 @@
   var o = new api.RepresentativeInfoResponse();
   buildCounterRepresentativeInfoResponse++;
   if (buildCounterRepresentativeInfoResponse < 3) {
-    o.divisions = buildUnnamed1133();
+    o.divisions = buildUnnamed1466();
     o.kind = "foo";
     o.normalizedInput = buildSimpleAddressType();
-    o.offices = buildUnnamed1134();
-    o.officials = buildUnnamed1135();
+    o.offices = buildUnnamed1467();
+    o.officials = buildUnnamed1468();
   }
   buildCounterRepresentativeInfoResponse--;
   return o;
@@ -1139,11 +1139,11 @@
 checkRepresentativeInfoResponse(api.RepresentativeInfoResponse o) {
   buildCounterRepresentativeInfoResponse++;
   if (buildCounterRepresentativeInfoResponse < 3) {
-    checkUnnamed1133(o.divisions);
+    checkUnnamed1466(o.divisions);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkSimpleAddressType(o.normalizedInput);
-    checkUnnamed1134(o.offices);
-    checkUnnamed1135(o.officials);
+    checkUnnamed1467(o.offices);
+    checkUnnamed1468(o.officials);
   }
   buildCounterRepresentativeInfoResponse--;
 }
@@ -1221,79 +1221,79 @@
   buildCounterVoterInfoRequest--;
 }
 
-buildUnnamed1136() {
+buildUnnamed1469() {
   var o = new core.List<api.Contest>();
   o.add(buildContest());
   o.add(buildContest());
   return o;
 }
 
-checkUnnamed1136(core.List<api.Contest> o) {
+checkUnnamed1469(core.List<api.Contest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContest(o[0]);
   checkContest(o[1]);
 }
 
-buildUnnamed1137() {
+buildUnnamed1470() {
   var o = new core.List<api.PollingLocation>();
   o.add(buildPollingLocation());
   o.add(buildPollingLocation());
   return o;
 }
 
-checkUnnamed1137(core.List<api.PollingLocation> o) {
+checkUnnamed1470(core.List<api.PollingLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPollingLocation(o[0]);
   checkPollingLocation(o[1]);
 }
 
-buildUnnamed1138() {
+buildUnnamed1471() {
   var o = new core.List<api.PollingLocation>();
   o.add(buildPollingLocation());
   o.add(buildPollingLocation());
   return o;
 }
 
-checkUnnamed1138(core.List<api.PollingLocation> o) {
+checkUnnamed1471(core.List<api.PollingLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPollingLocation(o[0]);
   checkPollingLocation(o[1]);
 }
 
-buildUnnamed1139() {
+buildUnnamed1472() {
   var o = new core.List<api.Election>();
   o.add(buildElection());
   o.add(buildElection());
   return o;
 }
 
-checkUnnamed1139(core.List<api.Election> o) {
+checkUnnamed1472(core.List<api.Election> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkElection(o[0]);
   checkElection(o[1]);
 }
 
-buildUnnamed1140() {
+buildUnnamed1473() {
   var o = new core.List<api.PollingLocation>();
   o.add(buildPollingLocation());
   o.add(buildPollingLocation());
   return o;
 }
 
-checkUnnamed1140(core.List<api.PollingLocation> o) {
+checkUnnamed1473(core.List<api.PollingLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPollingLocation(o[0]);
   checkPollingLocation(o[1]);
 }
 
-buildUnnamed1141() {
+buildUnnamed1474() {
   var o = new core.List<api.AdministrationRegion>();
   o.add(buildAdministrationRegion());
   o.add(buildAdministrationRegion());
   return o;
 }
 
-checkUnnamed1141(core.List<api.AdministrationRegion> o) {
+checkUnnamed1474(core.List<api.AdministrationRegion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdministrationRegion(o[0]);
   checkAdministrationRegion(o[1]);
@@ -1304,17 +1304,17 @@
   var o = new api.VoterInfoResponse();
   buildCounterVoterInfoResponse++;
   if (buildCounterVoterInfoResponse < 3) {
-    o.contests = buildUnnamed1136();
-    o.dropOffLocations = buildUnnamed1137();
-    o.earlyVoteSites = buildUnnamed1138();
+    o.contests = buildUnnamed1469();
+    o.dropOffLocations = buildUnnamed1470();
+    o.earlyVoteSites = buildUnnamed1471();
     o.election = buildElection();
     o.kind = "foo";
     o.mailOnly = true;
     o.normalizedInput = buildSimpleAddressType();
-    o.otherElections = buildUnnamed1139();
-    o.pollingLocations = buildUnnamed1140();
+    o.otherElections = buildUnnamed1472();
+    o.pollingLocations = buildUnnamed1473();
     o.precinctId = "foo";
-    o.state = buildUnnamed1141();
+    o.state = buildUnnamed1474();
   }
   buildCounterVoterInfoResponse--;
   return o;
@@ -1323,17 +1323,17 @@
 checkVoterInfoResponse(api.VoterInfoResponse o) {
   buildCounterVoterInfoResponse++;
   if (buildCounterVoterInfoResponse < 3) {
-    checkUnnamed1136(o.contests);
-    checkUnnamed1137(o.dropOffLocations);
-    checkUnnamed1138(o.earlyVoteSites);
+    checkUnnamed1469(o.contests);
+    checkUnnamed1470(o.dropOffLocations);
+    checkUnnamed1471(o.earlyVoteSites);
     checkElection(o.election);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.mailOnly, unittest.isTrue);
     checkSimpleAddressType(o.normalizedInput);
-    checkUnnamed1139(o.otherElections);
-    checkUnnamed1140(o.pollingLocations);
+    checkUnnamed1472(o.otherElections);
+    checkUnnamed1473(o.pollingLocations);
     unittest.expect(o.precinctId, unittest.equals('foo'));
-    checkUnnamed1141(o.state);
+    checkUnnamed1474(o.state);
   }
   buildCounterVoterInfoResponse--;
 }
@@ -1363,53 +1363,53 @@
   buildCounterVoterInfoSegmentResult--;
 }
 
-buildUnnamed1142() {
+buildUnnamed1475() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1142(core.List<core.String> o) {
+checkUnnamed1475(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1143() {
+buildUnnamed1476() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1143(core.List<core.String> o) {
+checkUnnamed1476(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1144() {
+buildUnnamed1477() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1144(core.List<core.String> o) {
+checkUnnamed1477(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1145() {
+buildUnnamed1478() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1145(core.List<core.String> o) {
+checkUnnamed1478(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1694,7 +1694,7 @@
       }), true);
       res
           .search(arg_request, query: arg_query, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DivisionSearchResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDivisionSearchResponse(response);
       })));
     });
@@ -1752,7 +1752,7 @@
       }), true);
       res
           .electionQuery(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ElectionsQueryResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkElectionsQueryResponse(response);
       })));
     });
@@ -1824,7 +1824,7 @@
               officialOnly: arg_officialOnly,
               returnAllAvailableData: arg_returnAllAvailableData,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VoterInfoResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkVoterInfoResponse(response);
       })));
     });
@@ -1838,8 +1838,8 @@
       var arg_request = buildRepresentativeInfoRequest();
       var arg_address = "foo";
       var arg_includeOffices = true;
-      var arg_levels = buildUnnamed1142();
-      var arg_roles = buildUnnamed1143();
+      var arg_levels = buildUnnamed1475();
+      var arg_roles = buildUnnamed1476();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.RepresentativeInfoRequest.fromJson(json);
@@ -1898,8 +1898,7 @@
               levels: arg_levels,
               roles: arg_roles,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.RepresentativeInfoResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRepresentativeInfoResponse(response);
       })));
     });
@@ -1910,9 +1909,9 @@
           new api.CivicinfoApi(mock).representatives;
       var arg_request = buildDivisionRepresentativeInfoRequest();
       var arg_ocdId = "foo";
-      var arg_levels = buildUnnamed1144();
+      var arg_levels = buildUnnamed1477();
       var arg_recursive = true;
-      var arg_roles = buildUnnamed1145();
+      var arg_roles = buildUnnamed1478();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.DivisionRepresentativeInfoRequest.fromJson(json);
@@ -1971,7 +1970,7 @@
               recursive: arg_recursive,
               roles: arg_roles,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RepresentativeInfoData response) {
+          .then(unittest.expectAsync1(((response) {
         checkRepresentativeInfoData(response);
       })));
     });
diff --git a/generated/googleapis/test/classroom/v1_test.dart b/generated/googleapis/test/classroom/v1_test.dart
index 17172e1..2da8187 100644
--- a/generated/googleapis/test/classroom/v1_test.dart
+++ b/generated/googleapis/test/classroom/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed608() {
+buildUnnamed1919() {
   var o = new core.List<api.Material>();
   o.add(buildMaterial());
   o.add(buildMaterial());
   return o;
 }
 
-checkUnnamed608(core.List<api.Material> o) {
+checkUnnamed1919(core.List<api.Material> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMaterial(o[0]);
   checkMaterial(o[1]);
@@ -75,7 +75,7 @@
     o.creatorUserId = "foo";
     o.id = "foo";
     o.individualStudentsOptions = buildIndividualStudentsOptions();
-    o.materials = buildUnnamed608();
+    o.materials = buildUnnamed1919();
     o.scheduledTime = "foo";
     o.state = "foo";
     o.text = "foo";
@@ -95,7 +95,7 @@
     unittest.expect(o.creatorUserId, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkIndividualStudentsOptions(o.individualStudentsOptions);
-    checkUnnamed608(o.materials);
+    checkUnnamed1919(o.materials);
     unittest.expect(o.scheduledTime, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
     unittest.expect(o.text, unittest.equals('foo'));
@@ -123,14 +123,14 @@
   buildCounterAssignment--;
 }
 
-buildUnnamed609() {
+buildUnnamed1920() {
   var o = new core.List<api.Attachment>();
   o.add(buildAttachment());
   o.add(buildAttachment());
   return o;
 }
 
-checkUnnamed609(core.List<api.Attachment> o) {
+checkUnnamed1920(core.List<api.Attachment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAttachment(o[0]);
   checkAttachment(o[1]);
@@ -141,7 +141,7 @@
   var o = new api.AssignmentSubmission();
   buildCounterAssignmentSubmission++;
   if (buildCounterAssignmentSubmission < 3) {
-    o.attachments = buildUnnamed609();
+    o.attachments = buildUnnamed1920();
   }
   buildCounterAssignmentSubmission--;
   return o;
@@ -150,7 +150,7 @@
 checkAssignmentSubmission(api.AssignmentSubmission o) {
   buildCounterAssignmentSubmission++;
   if (buildCounterAssignmentSubmission < 3) {
-    checkUnnamed609(o.attachments);
+    checkUnnamed1920(o.attachments);
   }
   buildCounterAssignmentSubmission--;
 }
@@ -199,14 +199,14 @@
   buildCounterCloudPubsubTopic--;
 }
 
-buildUnnamed610() {
+buildUnnamed1921() {
   var o = new core.List<api.CourseMaterialSet>();
   o.add(buildCourseMaterialSet());
   o.add(buildCourseMaterialSet());
   return o;
 }
 
-checkUnnamed610(core.List<api.CourseMaterialSet> o) {
+checkUnnamed1921(core.List<api.CourseMaterialSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCourseMaterialSet(o[0]);
   checkCourseMaterialSet(o[1]);
@@ -220,7 +220,7 @@
     o.alternateLink = "foo";
     o.calendarId = "foo";
     o.courseGroupEmail = "foo";
-    o.courseMaterialSets = buildUnnamed610();
+    o.courseMaterialSets = buildUnnamed1921();
     o.courseState = "foo";
     o.creationTime = "foo";
     o.description = "foo";
@@ -246,7 +246,7 @@
     unittest.expect(o.alternateLink, unittest.equals('foo'));
     unittest.expect(o.calendarId, unittest.equals('foo'));
     unittest.expect(o.courseGroupEmail, unittest.equals('foo'));
-    checkUnnamed610(o.courseMaterialSets);
+    checkUnnamed1921(o.courseMaterialSets);
     unittest.expect(o.courseState, unittest.equals('foo'));
     unittest.expect(o.creationTime, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
@@ -309,14 +309,14 @@
   buildCounterCourseMaterial--;
 }
 
-buildUnnamed611() {
+buildUnnamed1922() {
   var o = new core.List<api.CourseMaterial>();
   o.add(buildCourseMaterial());
   o.add(buildCourseMaterial());
   return o;
 }
 
-checkUnnamed611(core.List<api.CourseMaterial> o) {
+checkUnnamed1922(core.List<api.CourseMaterial> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCourseMaterial(o[0]);
   checkCourseMaterial(o[1]);
@@ -327,7 +327,7 @@
   var o = new api.CourseMaterialSet();
   buildCounterCourseMaterialSet++;
   if (buildCounterCourseMaterialSet < 3) {
-    o.materials = buildUnnamed611();
+    o.materials = buildUnnamed1922();
     o.title = "foo";
   }
   buildCounterCourseMaterialSet--;
@@ -337,7 +337,7 @@
 checkCourseMaterialSet(api.CourseMaterialSet o) {
   buildCounterCourseMaterialSet++;
   if (buildCounterCourseMaterialSet < 3) {
-    checkUnnamed611(o.materials);
+    checkUnnamed1922(o.materials);
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterCourseMaterialSet--;
@@ -362,14 +362,14 @@
   buildCounterCourseRosterChangesInfo--;
 }
 
-buildUnnamed612() {
+buildUnnamed1923() {
   var o = new core.List<api.Material>();
   o.add(buildMaterial());
   o.add(buildMaterial());
   return o;
 }
 
-checkUnnamed612(core.List<api.Material> o) {
+checkUnnamed1923(core.List<api.Material> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMaterial(o[0]);
   checkMaterial(o[1]);
@@ -392,7 +392,7 @@
     o.dueTime = buildTimeOfDay();
     o.id = "foo";
     o.individualStudentsOptions = buildIndividualStudentsOptions();
-    o.materials = buildUnnamed612();
+    o.materials = buildUnnamed1923();
     o.maxPoints = 42.0;
     o.multipleChoiceQuestion = buildMultipleChoiceQuestion();
     o.scheduledTime = "foo";
@@ -421,7 +421,7 @@
     checkTimeOfDay(o.dueTime);
     unittest.expect(o.id, unittest.equals('foo'));
     checkIndividualStudentsOptions(o.individualStudentsOptions);
-    checkUnnamed612(o.materials);
+    checkUnnamed1923(o.materials);
     unittest.expect(o.maxPoints, unittest.equals(42.0));
     checkMultipleChoiceQuestion(o.multipleChoiceQuestion);
     unittest.expect(o.scheduledTime, unittest.equals('foo'));
@@ -664,14 +664,14 @@
   buildCounterGuardianInvitation--;
 }
 
-buildUnnamed613() {
+buildUnnamed1924() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed613(core.List<core.String> o) {
+checkUnnamed1924(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -682,7 +682,7 @@
   var o = new api.IndividualStudentsOptions();
   buildCounterIndividualStudentsOptions++;
   if (buildCounterIndividualStudentsOptions < 3) {
-    o.studentIds = buildUnnamed613();
+    o.studentIds = buildUnnamed1924();
   }
   buildCounterIndividualStudentsOptions--;
   return o;
@@ -691,7 +691,7 @@
 checkIndividualStudentsOptions(api.IndividualStudentsOptions o) {
   buildCounterIndividualStudentsOptions++;
   if (buildCounterIndividualStudentsOptions < 3) {
-    checkUnnamed613(o.studentIds);
+    checkUnnamed1924(o.studentIds);
   }
   buildCounterIndividualStudentsOptions--;
 }
@@ -744,14 +744,14 @@
   buildCounterLink--;
 }
 
-buildUnnamed614() {
+buildUnnamed1925() {
   var o = new core.List<api.Announcement>();
   o.add(buildAnnouncement());
   o.add(buildAnnouncement());
   return o;
 }
 
-checkUnnamed614(core.List<api.Announcement> o) {
+checkUnnamed1925(core.List<api.Announcement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnnouncement(o[0]);
   checkAnnouncement(o[1]);
@@ -762,7 +762,7 @@
   var o = new api.ListAnnouncementsResponse();
   buildCounterListAnnouncementsResponse++;
   if (buildCounterListAnnouncementsResponse < 3) {
-    o.announcements = buildUnnamed614();
+    o.announcements = buildUnnamed1925();
     o.nextPageToken = "foo";
   }
   buildCounterListAnnouncementsResponse--;
@@ -772,20 +772,20 @@
 checkListAnnouncementsResponse(api.ListAnnouncementsResponse o) {
   buildCounterListAnnouncementsResponse++;
   if (buildCounterListAnnouncementsResponse < 3) {
-    checkUnnamed614(o.announcements);
+    checkUnnamed1925(o.announcements);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListAnnouncementsResponse--;
 }
 
-buildUnnamed615() {
+buildUnnamed1926() {
   var o = new core.List<api.CourseAlias>();
   o.add(buildCourseAlias());
   o.add(buildCourseAlias());
   return o;
 }
 
-checkUnnamed615(core.List<api.CourseAlias> o) {
+checkUnnamed1926(core.List<api.CourseAlias> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCourseAlias(o[0]);
   checkCourseAlias(o[1]);
@@ -796,7 +796,7 @@
   var o = new api.ListCourseAliasesResponse();
   buildCounterListCourseAliasesResponse++;
   if (buildCounterListCourseAliasesResponse < 3) {
-    o.aliases = buildUnnamed615();
+    o.aliases = buildUnnamed1926();
     o.nextPageToken = "foo";
   }
   buildCounterListCourseAliasesResponse--;
@@ -806,20 +806,20 @@
 checkListCourseAliasesResponse(api.ListCourseAliasesResponse o) {
   buildCounterListCourseAliasesResponse++;
   if (buildCounterListCourseAliasesResponse < 3) {
-    checkUnnamed615(o.aliases);
+    checkUnnamed1926(o.aliases);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListCourseAliasesResponse--;
 }
 
-buildUnnamed616() {
+buildUnnamed1927() {
   var o = new core.List<api.CourseWork>();
   o.add(buildCourseWork());
   o.add(buildCourseWork());
   return o;
 }
 
-checkUnnamed616(core.List<api.CourseWork> o) {
+checkUnnamed1927(core.List<api.CourseWork> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCourseWork(o[0]);
   checkCourseWork(o[1]);
@@ -830,7 +830,7 @@
   var o = new api.ListCourseWorkResponse();
   buildCounterListCourseWorkResponse++;
   if (buildCounterListCourseWorkResponse < 3) {
-    o.courseWork = buildUnnamed616();
+    o.courseWork = buildUnnamed1927();
     o.nextPageToken = "foo";
   }
   buildCounterListCourseWorkResponse--;
@@ -840,20 +840,20 @@
 checkListCourseWorkResponse(api.ListCourseWorkResponse o) {
   buildCounterListCourseWorkResponse++;
   if (buildCounterListCourseWorkResponse < 3) {
-    checkUnnamed616(o.courseWork);
+    checkUnnamed1927(o.courseWork);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListCourseWorkResponse--;
 }
 
-buildUnnamed617() {
+buildUnnamed1928() {
   var o = new core.List<api.Course>();
   o.add(buildCourse());
   o.add(buildCourse());
   return o;
 }
 
-checkUnnamed617(core.List<api.Course> o) {
+checkUnnamed1928(core.List<api.Course> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCourse(o[0]);
   checkCourse(o[1]);
@@ -864,7 +864,7 @@
   var o = new api.ListCoursesResponse();
   buildCounterListCoursesResponse++;
   if (buildCounterListCoursesResponse < 3) {
-    o.courses = buildUnnamed617();
+    o.courses = buildUnnamed1928();
     o.nextPageToken = "foo";
   }
   buildCounterListCoursesResponse--;
@@ -874,20 +874,20 @@
 checkListCoursesResponse(api.ListCoursesResponse o) {
   buildCounterListCoursesResponse++;
   if (buildCounterListCoursesResponse < 3) {
-    checkUnnamed617(o.courses);
+    checkUnnamed1928(o.courses);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListCoursesResponse--;
 }
 
-buildUnnamed618() {
+buildUnnamed1929() {
   var o = new core.List<api.GuardianInvitation>();
   o.add(buildGuardianInvitation());
   o.add(buildGuardianInvitation());
   return o;
 }
 
-checkUnnamed618(core.List<api.GuardianInvitation> o) {
+checkUnnamed1929(core.List<api.GuardianInvitation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGuardianInvitation(o[0]);
   checkGuardianInvitation(o[1]);
@@ -898,7 +898,7 @@
   var o = new api.ListGuardianInvitationsResponse();
   buildCounterListGuardianInvitationsResponse++;
   if (buildCounterListGuardianInvitationsResponse < 3) {
-    o.guardianInvitations = buildUnnamed618();
+    o.guardianInvitations = buildUnnamed1929();
     o.nextPageToken = "foo";
   }
   buildCounterListGuardianInvitationsResponse--;
@@ -908,20 +908,20 @@
 checkListGuardianInvitationsResponse(api.ListGuardianInvitationsResponse o) {
   buildCounterListGuardianInvitationsResponse++;
   if (buildCounterListGuardianInvitationsResponse < 3) {
-    checkUnnamed618(o.guardianInvitations);
+    checkUnnamed1929(o.guardianInvitations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListGuardianInvitationsResponse--;
 }
 
-buildUnnamed619() {
+buildUnnamed1930() {
   var o = new core.List<api.Guardian>();
   o.add(buildGuardian());
   o.add(buildGuardian());
   return o;
 }
 
-checkUnnamed619(core.List<api.Guardian> o) {
+checkUnnamed1930(core.List<api.Guardian> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGuardian(o[0]);
   checkGuardian(o[1]);
@@ -932,7 +932,7 @@
   var o = new api.ListGuardiansResponse();
   buildCounterListGuardiansResponse++;
   if (buildCounterListGuardiansResponse < 3) {
-    o.guardians = buildUnnamed619();
+    o.guardians = buildUnnamed1930();
     o.nextPageToken = "foo";
   }
   buildCounterListGuardiansResponse--;
@@ -942,20 +942,20 @@
 checkListGuardiansResponse(api.ListGuardiansResponse o) {
   buildCounterListGuardiansResponse++;
   if (buildCounterListGuardiansResponse < 3) {
-    checkUnnamed619(o.guardians);
+    checkUnnamed1930(o.guardians);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListGuardiansResponse--;
 }
 
-buildUnnamed620() {
+buildUnnamed1931() {
   var o = new core.List<api.Invitation>();
   o.add(buildInvitation());
   o.add(buildInvitation());
   return o;
 }
 
-checkUnnamed620(core.List<api.Invitation> o) {
+checkUnnamed1931(core.List<api.Invitation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInvitation(o[0]);
   checkInvitation(o[1]);
@@ -966,7 +966,7 @@
   var o = new api.ListInvitationsResponse();
   buildCounterListInvitationsResponse++;
   if (buildCounterListInvitationsResponse < 3) {
-    o.invitations = buildUnnamed620();
+    o.invitations = buildUnnamed1931();
     o.nextPageToken = "foo";
   }
   buildCounterListInvitationsResponse--;
@@ -976,20 +976,20 @@
 checkListInvitationsResponse(api.ListInvitationsResponse o) {
   buildCounterListInvitationsResponse++;
   if (buildCounterListInvitationsResponse < 3) {
-    checkUnnamed620(o.invitations);
+    checkUnnamed1931(o.invitations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListInvitationsResponse--;
 }
 
-buildUnnamed621() {
+buildUnnamed1932() {
   var o = new core.List<api.StudentSubmission>();
   o.add(buildStudentSubmission());
   o.add(buildStudentSubmission());
   return o;
 }
 
-checkUnnamed621(core.List<api.StudentSubmission> o) {
+checkUnnamed1932(core.List<api.StudentSubmission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStudentSubmission(o[0]);
   checkStudentSubmission(o[1]);
@@ -1001,7 +1001,7 @@
   buildCounterListStudentSubmissionsResponse++;
   if (buildCounterListStudentSubmissionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.studentSubmissions = buildUnnamed621();
+    o.studentSubmissions = buildUnnamed1932();
   }
   buildCounterListStudentSubmissionsResponse--;
   return o;
@@ -1011,19 +1011,19 @@
   buildCounterListStudentSubmissionsResponse++;
   if (buildCounterListStudentSubmissionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed621(o.studentSubmissions);
+    checkUnnamed1932(o.studentSubmissions);
   }
   buildCounterListStudentSubmissionsResponse--;
 }
 
-buildUnnamed622() {
+buildUnnamed1933() {
   var o = new core.List<api.Student>();
   o.add(buildStudent());
   o.add(buildStudent());
   return o;
 }
 
-checkUnnamed622(core.List<api.Student> o) {
+checkUnnamed1933(core.List<api.Student> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStudent(o[0]);
   checkStudent(o[1]);
@@ -1035,7 +1035,7 @@
   buildCounterListStudentsResponse++;
   if (buildCounterListStudentsResponse < 3) {
     o.nextPageToken = "foo";
-    o.students = buildUnnamed622();
+    o.students = buildUnnamed1933();
   }
   buildCounterListStudentsResponse--;
   return o;
@@ -1045,19 +1045,19 @@
   buildCounterListStudentsResponse++;
   if (buildCounterListStudentsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed622(o.students);
+    checkUnnamed1933(o.students);
   }
   buildCounterListStudentsResponse--;
 }
 
-buildUnnamed623() {
+buildUnnamed1934() {
   var o = new core.List<api.Teacher>();
   o.add(buildTeacher());
   o.add(buildTeacher());
   return o;
 }
 
-checkUnnamed623(core.List<api.Teacher> o) {
+checkUnnamed1934(core.List<api.Teacher> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTeacher(o[0]);
   checkTeacher(o[1]);
@@ -1069,7 +1069,7 @@
   buildCounterListTeachersResponse++;
   if (buildCounterListTeachersResponse < 3) {
     o.nextPageToken = "foo";
-    o.teachers = buildUnnamed623();
+    o.teachers = buildUnnamed1934();
   }
   buildCounterListTeachersResponse--;
   return o;
@@ -1079,19 +1079,19 @@
   buildCounterListTeachersResponse++;
   if (buildCounterListTeachersResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed623(o.teachers);
+    checkUnnamed1934(o.teachers);
   }
   buildCounterListTeachersResponse--;
 }
 
-buildUnnamed624() {
+buildUnnamed1935() {
   var o = new core.List<api.Topic>();
   o.add(buildTopic());
   o.add(buildTopic());
   return o;
 }
 
-checkUnnamed624(core.List<api.Topic> o) {
+checkUnnamed1935(core.List<api.Topic> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTopic(o[0]);
   checkTopic(o[1]);
@@ -1103,7 +1103,7 @@
   buildCounterListTopicResponse++;
   if (buildCounterListTopicResponse < 3) {
     o.nextPageToken = "foo";
-    o.topic = buildUnnamed624();
+    o.topic = buildUnnamed1935();
   }
   buildCounterListTopicResponse--;
   return o;
@@ -1113,7 +1113,7 @@
   buildCounterListTopicResponse++;
   if (buildCounterListTopicResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed624(o.topic);
+    checkUnnamed1935(o.topic);
   }
   buildCounterListTopicResponse--;
 }
@@ -1165,14 +1165,14 @@
   buildCounterModifyAnnouncementAssigneesRequest--;
 }
 
-buildUnnamed625() {
+buildUnnamed1936() {
   var o = new core.List<api.Attachment>();
   o.add(buildAttachment());
   o.add(buildAttachment());
   return o;
 }
 
-checkUnnamed625(core.List<api.Attachment> o) {
+checkUnnamed1936(core.List<api.Attachment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAttachment(o[0]);
   checkAttachment(o[1]);
@@ -1183,7 +1183,7 @@
   var o = new api.ModifyAttachmentsRequest();
   buildCounterModifyAttachmentsRequest++;
   if (buildCounterModifyAttachmentsRequest < 3) {
-    o.addAttachments = buildUnnamed625();
+    o.addAttachments = buildUnnamed1936();
   }
   buildCounterModifyAttachmentsRequest--;
   return o;
@@ -1192,7 +1192,7 @@
 checkModifyAttachmentsRequest(api.ModifyAttachmentsRequest o) {
   buildCounterModifyAttachmentsRequest++;
   if (buildCounterModifyAttachmentsRequest < 3) {
-    checkUnnamed625(o.addAttachments);
+    checkUnnamed1936(o.addAttachments);
   }
   buildCounterModifyAttachmentsRequest--;
 }
@@ -1218,27 +1218,27 @@
   buildCounterModifyCourseWorkAssigneesRequest--;
 }
 
-buildUnnamed626() {
+buildUnnamed1937() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed626(core.List<core.String> o) {
+checkUnnamed1937(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed627() {
+buildUnnamed1938() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed627(core.List<core.String> o) {
+checkUnnamed1938(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1249,8 +1249,8 @@
   var o = new api.ModifyIndividualStudentsOptions();
   buildCounterModifyIndividualStudentsOptions++;
   if (buildCounterModifyIndividualStudentsOptions < 3) {
-    o.addStudentIds = buildUnnamed626();
-    o.removeStudentIds = buildUnnamed627();
+    o.addStudentIds = buildUnnamed1937();
+    o.removeStudentIds = buildUnnamed1938();
   }
   buildCounterModifyIndividualStudentsOptions--;
   return o;
@@ -1259,20 +1259,20 @@
 checkModifyIndividualStudentsOptions(api.ModifyIndividualStudentsOptions o) {
   buildCounterModifyIndividualStudentsOptions++;
   if (buildCounterModifyIndividualStudentsOptions < 3) {
-    checkUnnamed626(o.addStudentIds);
-    checkUnnamed627(o.removeStudentIds);
+    checkUnnamed1937(o.addStudentIds);
+    checkUnnamed1938(o.removeStudentIds);
   }
   buildCounterModifyIndividualStudentsOptions--;
 }
 
-buildUnnamed628() {
+buildUnnamed1939() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed628(core.List<core.String> o) {
+checkUnnamed1939(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1283,7 +1283,7 @@
   var o = new api.MultipleChoiceQuestion();
   buildCounterMultipleChoiceQuestion++;
   if (buildCounterMultipleChoiceQuestion < 3) {
-    o.choices = buildUnnamed628();
+    o.choices = buildUnnamed1939();
   }
   buildCounterMultipleChoiceQuestion--;
   return o;
@@ -1292,7 +1292,7 @@
 checkMultipleChoiceQuestion(api.MultipleChoiceQuestion o) {
   buildCounterMultipleChoiceQuestion++;
   if (buildCounterMultipleChoiceQuestion < 3) {
-    checkUnnamed628(o.choices);
+    checkUnnamed1939(o.choices);
   }
   buildCounterMultipleChoiceQuestion--;
 }
@@ -1482,14 +1482,14 @@
   buildCounterStudent--;
 }
 
-buildUnnamed629() {
+buildUnnamed1940() {
   var o = new core.List<api.SubmissionHistory>();
   o.add(buildSubmissionHistory());
   o.add(buildSubmissionHistory());
   return o;
 }
 
-checkUnnamed629(core.List<api.SubmissionHistory> o) {
+checkUnnamed1940(core.List<api.SubmissionHistory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubmissionHistory(o[0]);
   checkSubmissionHistory(o[1]);
@@ -1514,7 +1514,7 @@
     o.multipleChoiceSubmission = buildMultipleChoiceSubmission();
     o.shortAnswerSubmission = buildShortAnswerSubmission();
     o.state = "foo";
-    o.submissionHistory = buildUnnamed629();
+    o.submissionHistory = buildUnnamed1940();
     o.updateTime = "foo";
     o.userId = "foo";
   }
@@ -1539,7 +1539,7 @@
     checkMultipleChoiceSubmission(o.multipleChoiceSubmission);
     checkShortAnswerSubmission(o.shortAnswerSubmission);
     unittest.expect(o.state, unittest.equals('foo'));
-    checkUnnamed629(o.submissionHistory);
+    checkUnnamed1940(o.submissionHistory);
     unittest.expect(o.updateTime, unittest.equals('foo'));
     unittest.expect(o.userId, unittest.equals('foo'));
   }
@@ -1655,14 +1655,14 @@
   buildCounterTurnInStudentSubmissionRequest--;
 }
 
-buildUnnamed630() {
+buildUnnamed1941() {
   var o = new core.List<api.GlobalPermission>();
   o.add(buildGlobalPermission());
   o.add(buildGlobalPermission());
   return o;
 }
 
-checkUnnamed630(core.List<api.GlobalPermission> o) {
+checkUnnamed1941(core.List<api.GlobalPermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGlobalPermission(o[0]);
   checkGlobalPermission(o[1]);
@@ -1676,7 +1676,7 @@
     o.emailAddress = "foo";
     o.id = "foo";
     o.name = buildName();
-    o.permissions = buildUnnamed630();
+    o.permissions = buildUnnamed1941();
     o.photoUrl = "foo";
     o.verifiedTeacher = true;
   }
@@ -1690,7 +1690,7 @@
     unittest.expect(o.emailAddress, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkName(o.name);
-    checkUnnamed630(o.permissions);
+    checkUnnamed1941(o.permissions);
     unittest.expect(o.photoUrl, unittest.equals('foo'));
     unittest.expect(o.verifiedTeacher, unittest.isTrue);
   }
@@ -1722,66 +1722,66 @@
   buildCounterYouTubeVideo--;
 }
 
-buildUnnamed631() {
+buildUnnamed1942() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed631(core.List<core.String> o) {
+checkUnnamed1942(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed632() {
+buildUnnamed1943() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed632(core.List<core.String> o) {
+checkUnnamed1943(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed633() {
+buildUnnamed1944() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed633(core.List<core.String> o) {
+checkUnnamed1944(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed634() {
+buildUnnamed1945() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed634(core.List<core.String> o) {
+checkUnnamed1945(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed635() {
+buildUnnamed1946() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed635(core.List<core.String> o) {
+checkUnnamed1946(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2301,7 +2301,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Course response) {
+          .then(unittest.expectAsync1(((response) {
         checkCourse(response);
       })));
     });
@@ -2354,7 +2354,7 @@
       }), true);
       res
           .delete(arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2407,7 +2407,7 @@
       }), true);
       res
           .get(arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Course response) {
+          .then(unittest.expectAsync1(((response) {
         checkCourse(response);
       })));
     });
@@ -2416,7 +2416,7 @@
       var mock = new HttpServerMock();
       api.CoursesResourceApi res = new api.ClassroomApi(mock).courses;
       var arg_teacherId = "foo";
-      var arg_courseStates = buildUnnamed631();
+      var arg_courseStates = buildUnnamed1942();
       var arg_studentId = "foo";
       var arg_pageToken = "foo";
       var arg_pageSize = 42;
@@ -2477,7 +2477,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListCoursesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCoursesResponse(response);
       })));
     });
@@ -2538,7 +2538,7 @@
       res
           .patch(arg_request, arg_id,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Course response) {
+          .then(unittest.expectAsync1(((response) {
         checkCourse(response);
       })));
     });
@@ -2595,7 +2595,7 @@
       }), true);
       res
           .update(arg_request, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Course response) {
+          .then(unittest.expectAsync1(((response) {
         checkCourse(response);
       })));
     });
@@ -2661,7 +2661,7 @@
       }), true);
       res
           .create(arg_request, arg_courseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CourseAlias response) {
+          .then(unittest.expectAsync1(((response) {
         checkCourseAlias(response);
       })));
     });
@@ -2725,7 +2725,7 @@
       }), true);
       res
           .delete(arg_courseId, arg_alias, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2794,8 +2794,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListCourseAliasesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCourseAliasesResponse(response);
       })));
     });
@@ -2861,7 +2860,7 @@
       }), true);
       res
           .create(arg_request, arg_courseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Announcement response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnouncement(response);
       })));
     });
@@ -2925,7 +2924,7 @@
       }), true);
       res
           .delete(arg_courseId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2989,7 +2988,7 @@
       }), true);
       res
           .get(arg_courseId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Announcement response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnouncement(response);
       })));
     });
@@ -3002,7 +3001,7 @@
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
       var arg_pageSize = 42;
-      var arg_announcementStates = buildUnnamed632();
+      var arg_announcementStates = buildUnnamed1943();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3066,8 +3065,7 @@
               pageSize: arg_pageSize,
               announcementStates: arg_announcementStates,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListAnnouncementsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListAnnouncementsResponse(response);
       })));
     });
@@ -3142,7 +3140,7 @@
       res
           .modifyAssignees(arg_request, arg_courseId, arg_id,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Announcement response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnouncement(response);
       })));
     });
@@ -3214,7 +3212,7 @@
       res
           .patch(arg_request, arg_courseId, arg_id,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Announcement response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnouncement(response);
       })));
     });
@@ -3280,7 +3278,7 @@
       }), true);
       res
           .create(arg_request, arg_courseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CourseWork response) {
+          .then(unittest.expectAsync1(((response) {
         checkCourseWork(response);
       })));
     });
@@ -3344,7 +3342,7 @@
       }), true);
       res
           .delete(arg_courseId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3408,7 +3406,7 @@
       }), true);
       res
           .get(arg_courseId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CourseWork response) {
+          .then(unittest.expectAsync1(((response) {
         checkCourseWork(response);
       })));
     });
@@ -3421,7 +3419,7 @@
       var arg_orderBy = "foo";
       var arg_pageToken = "foo";
       var arg_pageSize = 42;
-      var arg_courseWorkStates = buildUnnamed633();
+      var arg_courseWorkStates = buildUnnamed1944();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3485,7 +3483,7 @@
               pageSize: arg_pageSize,
               courseWorkStates: arg_courseWorkStates,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListCourseWorkResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCourseWorkResponse(response);
       })));
     });
@@ -3560,7 +3558,7 @@
       res
           .modifyAssignees(arg_request, arg_courseId, arg_id,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CourseWork response) {
+          .then(unittest.expectAsync1(((response) {
         checkCourseWork(response);
       })));
     });
@@ -3632,7 +3630,7 @@
       res
           .patch(arg_request, arg_courseId, arg_id,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CourseWork response) {
+          .then(unittest.expectAsync1(((response) {
         checkCourseWork(response);
       })));
     });
@@ -3708,7 +3706,7 @@
       }), true);
       res
           .get(arg_courseId, arg_courseWorkId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StudentSubmission response) {
+          .then(unittest.expectAsync1(((response) {
         checkStudentSubmission(response);
       })));
     });
@@ -3720,7 +3718,7 @@
       var arg_courseId = "foo";
       var arg_courseWorkId = "foo";
       var arg_pageToken = "foo";
-      var arg_states = buildUnnamed634();
+      var arg_states = buildUnnamed1945();
       var arg_pageSize = 42;
       var arg_userId = "foo";
       var arg_late = "foo";
@@ -3796,8 +3794,7 @@
               userId: arg_userId,
               late: arg_late,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListStudentSubmissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListStudentSubmissionsResponse(response);
       })));
     });
@@ -3883,7 +3880,7 @@
           .modifyAttachments(
               arg_request, arg_courseId, arg_courseWorkId, arg_id,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StudentSubmission response) {
+          .then(unittest.expectAsync1(((response) {
         checkStudentSubmission(response);
       })));
     });
@@ -3965,7 +3962,7 @@
       res
           .patch(arg_request, arg_courseId, arg_courseWorkId, arg_id,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StudentSubmission response) {
+          .then(unittest.expectAsync1(((response) {
         checkStudentSubmission(response);
       })));
     });
@@ -4050,7 +4047,7 @@
       res
           .reclaim(arg_request, arg_courseId, arg_courseWorkId, arg_id,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4135,7 +4132,7 @@
       res
           .return_(arg_request, arg_courseId, arg_courseWorkId, arg_id,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4220,7 +4217,7 @@
       res
           .turnIn(arg_request, arg_courseId, arg_courseWorkId, arg_id,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4290,7 +4287,7 @@
       res
           .create(arg_request, arg_courseId,
               enrollmentCode: arg_enrollmentCode, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Student response) {
+          .then(unittest.expectAsync1(((response) {
         checkStudent(response);
       })));
     });
@@ -4354,7 +4351,7 @@
       }), true);
       res
           .delete(arg_courseId, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4418,7 +4415,7 @@
       }), true);
       res
           .get(arg_courseId, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Student response) {
+          .then(unittest.expectAsync1(((response) {
         checkStudent(response);
       })));
     });
@@ -4487,7 +4484,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListStudentsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListStudentsResponse(response);
       })));
     });
@@ -4553,7 +4550,7 @@
       }), true);
       res
           .create(arg_request, arg_courseId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Teacher response) {
+          .then(unittest.expectAsync1(((response) {
         checkTeacher(response);
       })));
     });
@@ -4617,7 +4614,7 @@
       }), true);
       res
           .delete(arg_courseId, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4681,7 +4678,7 @@
       }), true);
       res
           .get(arg_courseId, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Teacher response) {
+          .then(unittest.expectAsync1(((response) {
         checkTeacher(response);
       })));
     });
@@ -4750,7 +4747,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTeachersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTeachersResponse(response);
       })));
     });
@@ -4816,7 +4813,7 @@
       }), true);
       res
           .get(arg_courseId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Topic response) {
+          .then(unittest.expectAsync1(((response) {
         checkTopic(response);
       })));
     });
@@ -4885,7 +4882,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTopicResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTopicResponse(response);
       })));
     });
@@ -4946,7 +4943,7 @@
       }), true);
       res
           .accept(arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4999,7 +4996,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Invitation response) {
+          .then(unittest.expectAsync1(((response) {
         checkInvitation(response);
       })));
     });
@@ -5052,7 +5049,7 @@
       }), true);
       res
           .delete(arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -5105,7 +5102,7 @@
       }), true);
       res
           .get(arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Invitation response) {
+          .then(unittest.expectAsync1(((response) {
         checkInvitation(response);
       })));
     });
@@ -5170,7 +5167,7 @@
               pageSize: arg_pageSize,
               courseId: arg_courseId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListInvitationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListInvitationsResponse(response);
       })));
     });
@@ -5226,7 +5223,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Registration response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegistration(response);
       })));
     });
@@ -5280,7 +5277,7 @@
       }), true);
       res
           .delete(arg_registrationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -5335,7 +5332,7 @@
       }), true);
       res
           .get(arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserProfile(response);
       })));
     });
@@ -5401,7 +5398,7 @@
       }), true);
       res
           .create(arg_request, arg_studentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GuardianInvitation response) {
+          .then(unittest.expectAsync1(((response) {
         checkGuardianInvitation(response);
       })));
     });
@@ -5465,7 +5462,7 @@
       }), true);
       res
           .get(arg_studentId, arg_invitationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GuardianInvitation response) {
+          .then(unittest.expectAsync1(((response) {
         checkGuardianInvitation(response);
       })));
     });
@@ -5477,7 +5474,7 @@
       var arg_studentId = "foo";
       var arg_pageToken = "foo";
       var arg_invitedEmailAddress = "foo";
-      var arg_states = buildUnnamed635();
+      var arg_states = buildUnnamed1946();
       var arg_pageSize = 42;
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -5541,8 +5538,7 @@
               states: arg_states,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListGuardianInvitationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListGuardianInvitationsResponse(response);
       })));
     });
@@ -5614,7 +5610,7 @@
       res
           .patch(arg_request, arg_studentId, arg_invitationId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GuardianInvitation response) {
+          .then(unittest.expectAsync1(((response) {
         checkGuardianInvitation(response);
       })));
     });
@@ -5680,7 +5676,7 @@
       }), true);
       res
           .delete(arg_studentId, arg_guardianId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -5744,7 +5740,7 @@
       }), true);
       res
           .get(arg_studentId, arg_guardianId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Guardian response) {
+          .then(unittest.expectAsync1(((response) {
         checkGuardian(response);
       })));
     });
@@ -5817,7 +5813,7 @@
               invitedEmailAddress: arg_invitedEmailAddress,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListGuardiansResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListGuardiansResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/cloudbilling/v1_test.dart b/generated/googleapis/test/cloudbilling/v1_test.dart
index 4610c25..34e5975 100644
--- a/generated/googleapis/test/cloudbilling/v1_test.dart
+++ b/generated/googleapis/test/cloudbilling/v1_test.dart
@@ -121,14 +121,14 @@
   buildCounterCategory--;
 }
 
-buildUnnamed2952() {
+buildUnnamed3009() {
   var o = new core.List<api.BillingAccount>();
   o.add(buildBillingAccount());
   o.add(buildBillingAccount());
   return o;
 }
 
-checkUnnamed2952(core.List<api.BillingAccount> o) {
+checkUnnamed3009(core.List<api.BillingAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBillingAccount(o[0]);
   checkBillingAccount(o[1]);
@@ -139,7 +139,7 @@
   var o = new api.ListBillingAccountsResponse();
   buildCounterListBillingAccountsResponse++;
   if (buildCounterListBillingAccountsResponse < 3) {
-    o.billingAccounts = buildUnnamed2952();
+    o.billingAccounts = buildUnnamed3009();
     o.nextPageToken = "foo";
   }
   buildCounterListBillingAccountsResponse--;
@@ -149,20 +149,20 @@
 checkListBillingAccountsResponse(api.ListBillingAccountsResponse o) {
   buildCounterListBillingAccountsResponse++;
   if (buildCounterListBillingAccountsResponse < 3) {
-    checkUnnamed2952(o.billingAccounts);
+    checkUnnamed3009(o.billingAccounts);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListBillingAccountsResponse--;
 }
 
-buildUnnamed2953() {
+buildUnnamed3010() {
   var o = new core.List<api.ProjectBillingInfo>();
   o.add(buildProjectBillingInfo());
   o.add(buildProjectBillingInfo());
   return o;
 }
 
-checkUnnamed2953(core.List<api.ProjectBillingInfo> o) {
+checkUnnamed3010(core.List<api.ProjectBillingInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProjectBillingInfo(o[0]);
   checkProjectBillingInfo(o[1]);
@@ -174,7 +174,7 @@
   buildCounterListProjectBillingInfoResponse++;
   if (buildCounterListProjectBillingInfoResponse < 3) {
     o.nextPageToken = "foo";
-    o.projectBillingInfo = buildUnnamed2953();
+    o.projectBillingInfo = buildUnnamed3010();
   }
   buildCounterListProjectBillingInfoResponse--;
   return o;
@@ -184,19 +184,19 @@
   buildCounterListProjectBillingInfoResponse++;
   if (buildCounterListProjectBillingInfoResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2953(o.projectBillingInfo);
+    checkUnnamed3010(o.projectBillingInfo);
   }
   buildCounterListProjectBillingInfoResponse--;
 }
 
-buildUnnamed2954() {
+buildUnnamed3011() {
   var o = new core.List<api.Service>();
   o.add(buildService());
   o.add(buildService());
   return o;
 }
 
-checkUnnamed2954(core.List<api.Service> o) {
+checkUnnamed3011(core.List<api.Service> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkService(o[0]);
   checkService(o[1]);
@@ -208,7 +208,7 @@
   buildCounterListServicesResponse++;
   if (buildCounterListServicesResponse < 3) {
     o.nextPageToken = "foo";
-    o.services = buildUnnamed2954();
+    o.services = buildUnnamed3011();
   }
   buildCounterListServicesResponse--;
   return o;
@@ -218,19 +218,19 @@
   buildCounterListServicesResponse++;
   if (buildCounterListServicesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2954(o.services);
+    checkUnnamed3011(o.services);
   }
   buildCounterListServicesResponse--;
 }
 
-buildUnnamed2955() {
+buildUnnamed3012() {
   var o = new core.List<api.Sku>();
   o.add(buildSku());
   o.add(buildSku());
   return o;
 }
 
-checkUnnamed2955(core.List<api.Sku> o) {
+checkUnnamed3012(core.List<api.Sku> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSku(o[0]);
   checkSku(o[1]);
@@ -242,7 +242,7 @@
   buildCounterListSkusResponse++;
   if (buildCounterListSkusResponse < 3) {
     o.nextPageToken = "foo";
-    o.skus = buildUnnamed2955();
+    o.skus = buildUnnamed3012();
   }
   buildCounterListSkusResponse--;
   return o;
@@ -252,7 +252,7 @@
   buildCounterListSkusResponse++;
   if (buildCounterListSkusResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2955(o.skus);
+    checkUnnamed3012(o.skus);
   }
   buildCounterListSkusResponse--;
 }
@@ -280,14 +280,14 @@
   buildCounterMoney--;
 }
 
-buildUnnamed2956() {
+buildUnnamed3013() {
   var o = new core.List<api.TierRate>();
   o.add(buildTierRate());
   o.add(buildTierRate());
   return o;
 }
 
-checkUnnamed2956(core.List<api.TierRate> o) {
+checkUnnamed3013(core.List<api.TierRate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTierRate(o[0]);
   checkTierRate(o[1]);
@@ -302,7 +302,7 @@
     o.baseUnitConversionFactor = 42.0;
     o.baseUnitDescription = "foo";
     o.displayQuantity = 42.0;
-    o.tieredRates = buildUnnamed2956();
+    o.tieredRates = buildUnnamed3013();
     o.usageUnit = "foo";
     o.usageUnitDescription = "foo";
   }
@@ -317,7 +317,7 @@
     unittest.expect(o.baseUnitConversionFactor, unittest.equals(42.0));
     unittest.expect(o.baseUnitDescription, unittest.equals('foo'));
     unittest.expect(o.displayQuantity, unittest.equals(42.0));
-    checkUnnamed2956(o.tieredRates);
+    checkUnnamed3013(o.tieredRates);
     unittest.expect(o.usageUnit, unittest.equals('foo'));
     unittest.expect(o.usageUnitDescription, unittest.equals('foo'));
   }
@@ -399,27 +399,27 @@
   buildCounterService--;
 }
 
-buildUnnamed2957() {
+buildUnnamed3014() {
   var o = new core.List<api.PricingInfo>();
   o.add(buildPricingInfo());
   o.add(buildPricingInfo());
   return o;
 }
 
-checkUnnamed2957(core.List<api.PricingInfo> o) {
+checkUnnamed3014(core.List<api.PricingInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPricingInfo(o[0]);
   checkPricingInfo(o[1]);
 }
 
-buildUnnamed2958() {
+buildUnnamed3015() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2958(core.List<core.String> o) {
+checkUnnamed3015(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -433,9 +433,9 @@
     o.category = buildCategory();
     o.description = "foo";
     o.name = "foo";
-    o.pricingInfo = buildUnnamed2957();
+    o.pricingInfo = buildUnnamed3014();
     o.serviceProviderName = "foo";
-    o.serviceRegions = buildUnnamed2958();
+    o.serviceRegions = buildUnnamed3015();
     o.skuId = "foo";
   }
   buildCounterSku--;
@@ -448,9 +448,9 @@
     checkCategory(o.category);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2957(o.pricingInfo);
+    checkUnnamed3014(o.pricingInfo);
     unittest.expect(o.serviceProviderName, unittest.equals('foo'));
-    checkUnnamed2958(o.serviceRegions);
+    checkUnnamed3015(o.serviceRegions);
     unittest.expect(o.skuId, unittest.equals('foo'));
   }
   buildCounterSku--;
@@ -638,7 +638,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BillingAccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkBillingAccount(response);
       })));
     });
@@ -697,8 +697,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListBillingAccountsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListBillingAccountsResponse(response);
       })));
     });
@@ -761,8 +760,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListProjectBillingInfoResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListProjectBillingInfoResponse(response);
       })));
     });
@@ -815,7 +813,7 @@
       }), true);
       res
           .getBillingInfo(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProjectBillingInfo response) {
+          .then(unittest.expectAsync1(((response) {
         checkProjectBillingInfo(response);
       })));
     });
@@ -870,7 +868,7 @@
       }), true);
       res
           .updateBillingInfo(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProjectBillingInfo response) {
+          .then(unittest.expectAsync1(((response) {
         checkProjectBillingInfo(response);
       })));
     });
@@ -930,7 +928,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListServicesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListServicesResponse(response);
       })));
     });
@@ -1005,7 +1003,7 @@
               startTime: arg_startTime,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListSkusResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSkusResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/cloudbuild/v1_test.dart b/generated/googleapis/test/cloudbuild/v1_test.dart
index 9153e01..ebbe2b3 100644
--- a/generated/googleapis/test/cloudbuild/v1_test.dart
+++ b/generated/googleapis/test/cloudbuild/v1_test.dart
@@ -50,79 +50,79 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2176() {
+buildUnnamed927() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2176(core.List<core.String> o) {
+checkUnnamed927(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2177() {
+buildUnnamed928() {
   var o = new core.List<api.Secret>();
   o.add(buildSecret());
   o.add(buildSecret());
   return o;
 }
 
-checkUnnamed2177(core.List<api.Secret> o) {
+checkUnnamed928(core.List<api.Secret> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSecret(o[0]);
   checkSecret(o[1]);
 }
 
-buildUnnamed2178() {
+buildUnnamed929() {
   var o = new core.List<api.BuildStep>();
   o.add(buildBuildStep());
   o.add(buildBuildStep());
   return o;
 }
 
-checkUnnamed2178(core.List<api.BuildStep> o) {
+checkUnnamed929(core.List<api.BuildStep> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBuildStep(o[0]);
   checkBuildStep(o[1]);
 }
 
-buildUnnamed2179() {
+buildUnnamed930() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2179(core.Map<core.String, core.String> o) {
+checkUnnamed930(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed2180() {
+buildUnnamed931() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2180(core.List<core.String> o) {
+checkUnnamed931(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2181() {
+buildUnnamed932() {
   var o = new core.Map<core.String, api.TimeSpan>();
   o["x"] = buildTimeSpan();
   o["y"] = buildTimeSpan();
   return o;
 }
 
-checkUnnamed2181(core.Map<core.String, api.TimeSpan> o) {
+checkUnnamed932(core.Map<core.String, api.TimeSpan> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTimeSpan(o["x"]);
   checkTimeSpan(o["y"]);
@@ -137,23 +137,23 @@
     o.createTime = "foo";
     o.finishTime = "foo";
     o.id = "foo";
-    o.images = buildUnnamed2176();
+    o.images = buildUnnamed927();
     o.logUrl = "foo";
     o.logsBucket = "foo";
     o.options = buildBuildOptions();
     o.projectId = "foo";
     o.results = buildResults();
-    o.secrets = buildUnnamed2177();
+    o.secrets = buildUnnamed928();
     o.source = buildSource();
     o.sourceProvenance = buildSourceProvenance();
     o.startTime = "foo";
     o.status = "foo";
     o.statusDetail = "foo";
-    o.steps = buildUnnamed2178();
-    o.substitutions = buildUnnamed2179();
-    o.tags = buildUnnamed2180();
+    o.steps = buildUnnamed929();
+    o.substitutions = buildUnnamed930();
+    o.tags = buildUnnamed931();
     o.timeout = "foo";
-    o.timing = buildUnnamed2181();
+    o.timing = buildUnnamed932();
   }
   buildCounterBuild--;
   return o;
@@ -166,23 +166,23 @@
     unittest.expect(o.createTime, unittest.equals('foo'));
     unittest.expect(o.finishTime, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2176(o.images);
+    checkUnnamed927(o.images);
     unittest.expect(o.logUrl, unittest.equals('foo'));
     unittest.expect(o.logsBucket, unittest.equals('foo'));
     checkBuildOptions(o.options);
     unittest.expect(o.projectId, unittest.equals('foo'));
     checkResults(o.results);
-    checkUnnamed2177(o.secrets);
+    checkUnnamed928(o.secrets);
     checkSource(o.source);
     checkSourceProvenance(o.sourceProvenance);
     unittest.expect(o.startTime, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.statusDetail, unittest.equals('foo'));
-    checkUnnamed2178(o.steps);
-    checkUnnamed2179(o.substitutions);
-    checkUnnamed2180(o.tags);
+    checkUnnamed929(o.steps);
+    checkUnnamed930(o.substitutions);
+    checkUnnamed931(o.tags);
     unittest.expect(o.timeout, unittest.equals('foo'));
-    checkUnnamed2181(o.timing);
+    checkUnnamed932(o.timing);
   }
   buildCounterBuild--;
 }
@@ -206,14 +206,14 @@
   buildCounterBuildOperationMetadata--;
 }
 
-buildUnnamed2182() {
+buildUnnamed933() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2182(core.List<core.String> o) {
+checkUnnamed933(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -228,7 +228,7 @@
     o.logStreamingOption = "foo";
     o.machineType = "foo";
     o.requestedVerifyOption = "foo";
-    o.sourceProvenanceHash = buildUnnamed2182();
+    o.sourceProvenanceHash = buildUnnamed933();
     o.substitutionOption = "foo";
   }
   buildCounterBuildOptions--;
@@ -242,72 +242,72 @@
     unittest.expect(o.logStreamingOption, unittest.equals('foo'));
     unittest.expect(o.machineType, unittest.equals('foo'));
     unittest.expect(o.requestedVerifyOption, unittest.equals('foo'));
-    checkUnnamed2182(o.sourceProvenanceHash);
+    checkUnnamed933(o.sourceProvenanceHash);
     unittest.expect(o.substitutionOption, unittest.equals('foo'));
   }
   buildCounterBuildOptions--;
 }
 
-buildUnnamed2183() {
+buildUnnamed934() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2183(core.List<core.String> o) {
+checkUnnamed934(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2184() {
+buildUnnamed935() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2184(core.List<core.String> o) {
+checkUnnamed935(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2185() {
+buildUnnamed936() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2185(core.List<core.String> o) {
+checkUnnamed936(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2186() {
+buildUnnamed937() {
   var o = new core.List<api.Volume>();
   o.add(buildVolume());
   o.add(buildVolume());
   return o;
 }
 
-checkUnnamed2186(core.List<api.Volume> o) {
+checkUnnamed937(core.List<api.Volume> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolume(o[0]);
   checkVolume(o[1]);
 }
 
-buildUnnamed2187() {
+buildUnnamed938() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2187(core.List<core.String> o) {
+checkUnnamed938(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -318,16 +318,16 @@
   var o = new api.BuildStep();
   buildCounterBuildStep++;
   if (buildCounterBuildStep < 3) {
-    o.args = buildUnnamed2183();
+    o.args = buildUnnamed934();
     o.dir = "foo";
     o.entrypoint = "foo";
-    o.env = buildUnnamed2184();
+    o.env = buildUnnamed935();
     o.id = "foo";
     o.name = "foo";
-    o.secretEnv = buildUnnamed2185();
+    o.secretEnv = buildUnnamed936();
     o.timing = buildTimeSpan();
-    o.volumes = buildUnnamed2186();
-    o.waitFor = buildUnnamed2187();
+    o.volumes = buildUnnamed937();
+    o.waitFor = buildUnnamed938();
   }
   buildCounterBuildStep--;
   return o;
@@ -336,28 +336,28 @@
 checkBuildStep(api.BuildStep o) {
   buildCounterBuildStep++;
   if (buildCounterBuildStep < 3) {
-    checkUnnamed2183(o.args);
+    checkUnnamed934(o.args);
     unittest.expect(o.dir, unittest.equals('foo'));
     unittest.expect(o.entrypoint, unittest.equals('foo'));
-    checkUnnamed2184(o.env);
+    checkUnnamed935(o.env);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2185(o.secretEnv);
+    checkUnnamed936(o.secretEnv);
     checkTimeSpan(o.timing);
-    checkUnnamed2186(o.volumes);
-    checkUnnamed2187(o.waitFor);
+    checkUnnamed937(o.volumes);
+    checkUnnamed938(o.waitFor);
   }
   buildCounterBuildStep--;
 }
 
-buildUnnamed2188() {
+buildUnnamed939() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2188(core.Map<core.String, core.String> o) {
+checkUnnamed939(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -374,7 +374,7 @@
     o.disabled = true;
     o.filename = "foo";
     o.id = "foo";
-    o.substitutions = buildUnnamed2188();
+    o.substitutions = buildUnnamed939();
     o.triggerTemplate = buildRepoSource();
   }
   buildCounterBuildTrigger--;
@@ -390,7 +390,7 @@
     unittest.expect(o.disabled, unittest.isTrue);
     unittest.expect(o.filename, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2188(o.substitutions);
+    checkUnnamed939(o.substitutions);
     checkRepoSource(o.triggerTemplate);
   }
   buildCounterBuildTrigger--;
@@ -464,14 +464,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed2189() {
+buildUnnamed940() {
   var o = new core.List<api.Hash>();
   o.add(buildHash());
   o.add(buildHash());
   return o;
 }
 
-checkUnnamed2189(core.List<api.Hash> o) {
+checkUnnamed940(core.List<api.Hash> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHash(o[0]);
   checkHash(o[1]);
@@ -482,7 +482,7 @@
   var o = new api.FileHashes();
   buildCounterFileHashes++;
   if (buildCounterFileHashes < 3) {
-    o.fileHash = buildUnnamed2189();
+    o.fileHash = buildUnnamed940();
   }
   buildCounterFileHashes--;
   return o;
@@ -491,7 +491,7 @@
 checkFileHashes(api.FileHashes o) {
   buildCounterFileHashes++;
   if (buildCounterFileHashes < 3) {
-    checkUnnamed2189(o.fileHash);
+    checkUnnamed940(o.fileHash);
   }
   buildCounterFileHashes--;
 }
@@ -517,14 +517,14 @@
   buildCounterHash--;
 }
 
-buildUnnamed2190() {
+buildUnnamed941() {
   var o = new core.List<api.BuildTrigger>();
   o.add(buildBuildTrigger());
   o.add(buildBuildTrigger());
   return o;
 }
 
-checkUnnamed2190(core.List<api.BuildTrigger> o) {
+checkUnnamed941(core.List<api.BuildTrigger> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBuildTrigger(o[0]);
   checkBuildTrigger(o[1]);
@@ -535,7 +535,7 @@
   var o = new api.ListBuildTriggersResponse();
   buildCounterListBuildTriggersResponse++;
   if (buildCounterListBuildTriggersResponse < 3) {
-    o.triggers = buildUnnamed2190();
+    o.triggers = buildUnnamed941();
   }
   buildCounterListBuildTriggersResponse--;
   return o;
@@ -544,19 +544,19 @@
 checkListBuildTriggersResponse(api.ListBuildTriggersResponse o) {
   buildCounterListBuildTriggersResponse++;
   if (buildCounterListBuildTriggersResponse < 3) {
-    checkUnnamed2190(o.triggers);
+    checkUnnamed941(o.triggers);
   }
   buildCounterListBuildTriggersResponse--;
 }
 
-buildUnnamed2191() {
+buildUnnamed942() {
   var o = new core.List<api.Build>();
   o.add(buildBuild());
   o.add(buildBuild());
   return o;
 }
 
-checkUnnamed2191(core.List<api.Build> o) {
+checkUnnamed942(core.List<api.Build> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBuild(o[0]);
   checkBuild(o[1]);
@@ -567,7 +567,7 @@
   var o = new api.ListBuildsResponse();
   buildCounterListBuildsResponse++;
   if (buildCounterListBuildsResponse < 3) {
-    o.builds = buildUnnamed2191();
+    o.builds = buildUnnamed942();
     o.nextPageToken = "foo";
   }
   buildCounterListBuildsResponse--;
@@ -577,20 +577,20 @@
 checkListBuildsResponse(api.ListBuildsResponse o) {
   buildCounterListBuildsResponse++;
   if (buildCounterListBuildsResponse < 3) {
-    checkUnnamed2191(o.builds);
+    checkUnnamed942(o.builds);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListBuildsResponse--;
 }
 
-buildUnnamed2192() {
+buildUnnamed943() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed2192(core.List<api.Operation> o) {
+checkUnnamed943(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -602,7 +602,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed2192();
+    o.operations = buildUnnamed943();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -612,12 +612,12 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2192(o.operations);
+    checkUnnamed943(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed2193() {
+buildUnnamed944() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -632,7 +632,7 @@
   return o;
 }
 
-checkUnnamed2193(core.Map<core.String, core.Object> o) {
+checkUnnamed944(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -646,7 +646,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2194() {
+buildUnnamed945() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -661,7 +661,7 @@
   return o;
 }
 
-checkUnnamed2194(core.Map<core.String, core.Object> o) {
+checkUnnamed945(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -682,9 +682,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed2193();
+    o.metadata = buildUnnamed944();
     o.name = "foo";
-    o.response = buildUnnamed2194();
+    o.response = buildUnnamed945();
   }
   buildCounterOperation--;
   return o;
@@ -695,9 +695,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed2193(o.metadata);
+    checkUnnamed944(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2194(o.response);
+    checkUnnamed945(o.response);
   }
   buildCounterOperation--;
 }
@@ -731,27 +731,27 @@
   buildCounterRepoSource--;
 }
 
-buildUnnamed2195() {
+buildUnnamed946() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2195(core.List<core.String> o) {
+checkUnnamed946(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2196() {
+buildUnnamed947() {
   var o = new core.List<api.BuiltImage>();
   o.add(buildBuiltImage());
   o.add(buildBuiltImage());
   return o;
 }
 
-checkUnnamed2196(core.List<api.BuiltImage> o) {
+checkUnnamed947(core.List<api.BuiltImage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBuiltImage(o[0]);
   checkBuiltImage(o[1]);
@@ -762,8 +762,8 @@
   var o = new api.Results();
   buildCounterResults++;
   if (buildCounterResults < 3) {
-    o.buildStepImages = buildUnnamed2195();
-    o.images = buildUnnamed2196();
+    o.buildStepImages = buildUnnamed946();
+    o.images = buildUnnamed947();
   }
   buildCounterResults--;
   return o;
@@ -772,8 +772,8 @@
 checkResults(api.Results o) {
   buildCounterResults++;
   if (buildCounterResults < 3) {
-    checkUnnamed2195(o.buildStepImages);
-    checkUnnamed2196(o.images);
+    checkUnnamed946(o.buildStepImages);
+    checkUnnamed947(o.images);
   }
   buildCounterResults--;
 }
@@ -793,14 +793,14 @@
   buildCounterRetryBuildRequest--;
 }
 
-buildUnnamed2197() {
+buildUnnamed948() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2197(core.Map<core.String, core.String> o) {
+checkUnnamed948(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -812,7 +812,7 @@
   buildCounterSecret++;
   if (buildCounterSecret < 3) {
     o.kmsKeyName = "foo";
-    o.secretEnv = buildUnnamed2197();
+    o.secretEnv = buildUnnamed948();
   }
   buildCounterSecret--;
   return o;
@@ -822,7 +822,7 @@
   buildCounterSecret++;
   if (buildCounterSecret < 3) {
     unittest.expect(o.kmsKeyName, unittest.equals('foo'));
-    checkUnnamed2197(o.secretEnv);
+    checkUnnamed948(o.secretEnv);
   }
   buildCounterSecret--;
 }
@@ -848,14 +848,14 @@
   buildCounterSource--;
 }
 
-buildUnnamed2198() {
+buildUnnamed949() {
   var o = new core.Map<core.String, api.FileHashes>();
   o["x"] = buildFileHashes();
   o["y"] = buildFileHashes();
   return o;
 }
 
-checkUnnamed2198(core.Map<core.String, api.FileHashes> o) {
+checkUnnamed949(core.Map<core.String, api.FileHashes> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFileHashes(o["x"]);
   checkFileHashes(o["y"]);
@@ -866,7 +866,7 @@
   var o = new api.SourceProvenance();
   buildCounterSourceProvenance++;
   if (buildCounterSourceProvenance < 3) {
-    o.fileHashes = buildUnnamed2198();
+    o.fileHashes = buildUnnamed949();
     o.resolvedRepoSource = buildRepoSource();
     o.resolvedStorageSource = buildStorageSource();
   }
@@ -877,14 +877,14 @@
 checkSourceProvenance(api.SourceProvenance o) {
   buildCounterSourceProvenance++;
   if (buildCounterSourceProvenance < 3) {
-    checkUnnamed2198(o.fileHashes);
+    checkUnnamed949(o.fileHashes);
     checkRepoSource(o.resolvedRepoSource);
     checkStorageSource(o.resolvedStorageSource);
   }
   buildCounterSourceProvenance--;
 }
 
-buildUnnamed2199() {
+buildUnnamed950() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -899,7 +899,7 @@
   return o;
 }
 
-checkUnnamed2199(core.Map<core.String, core.Object> o) {
+checkUnnamed950(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -913,17 +913,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2200() {
+buildUnnamed951() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2199());
-  o.add(buildUnnamed2199());
+  o.add(buildUnnamed950());
+  o.add(buildUnnamed950());
   return o;
 }
 
-checkUnnamed2200(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed951(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2199(o[0]);
-  checkUnnamed2199(o[1]);
+  checkUnnamed950(o[0]);
+  checkUnnamed950(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -932,7 +932,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed2200();
+    o.details = buildUnnamed951();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -943,7 +943,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed2200(o.details);
+    checkUnnamed951(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -1266,7 +1266,7 @@
       }), true);
       res
           .cancel(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1317,7 +1317,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1380,7 +1380,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -1456,7 +1456,7 @@
       }), true);
       res
           .cancel(arg_request, arg_projectId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Build response) {
+          .then(unittest.expectAsync1(((response) {
         checkBuild(response);
       })));
     });
@@ -1520,7 +1520,7 @@
       }), true);
       res
           .create(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1584,7 +1584,7 @@
       }), true);
       res
           .get(arg_projectId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Build response) {
+          .then(unittest.expectAsync1(((response) {
         checkBuild(response);
       })));
     });
@@ -1656,7 +1656,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListBuildsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListBuildsResponse(response);
       })));
     });
@@ -1730,7 +1730,7 @@
       }), true);
       res
           .retry(arg_request, arg_projectId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1796,7 +1796,7 @@
       }), true);
       res
           .create(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BuildTrigger response) {
+          .then(unittest.expectAsync1(((response) {
         checkBuildTrigger(response);
       })));
     });
@@ -1860,7 +1860,7 @@
       }), true);
       res
           .delete(arg_projectId, arg_triggerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1924,7 +1924,7 @@
       }), true);
       res
           .get(arg_projectId, arg_triggerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BuildTrigger response) {
+          .then(unittest.expectAsync1(((response) {
         checkBuildTrigger(response);
       })));
     });
@@ -1982,8 +1982,9 @@
         var resp = convert.JSON.encode(buildListBuildTriggersResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_projectId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ListBuildTriggersResponse response) {
+      res
+          .list(arg_projectId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkListBuildTriggersResponse(response);
       })));
     });
@@ -2052,7 +2053,7 @@
       res
           .patch(arg_request, arg_projectId, arg_triggerId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BuildTrigger response) {
+          .then(unittest.expectAsync1(((response) {
         checkBuildTrigger(response);
       })));
     });
@@ -2126,7 +2127,7 @@
       }), true);
       res
           .run(arg_request, arg_projectId, arg_triggerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
diff --git a/generated/googleapis/test/clouddebugger/v2_test.dart b/generated/googleapis/test/clouddebugger/v2_test.dart
index 6a36727..de22f80 100644
--- a/generated/googleapis/test/clouddebugger/v2_test.dart
+++ b/generated/googleapis/test/clouddebugger/v2_test.dart
@@ -71,66 +71,66 @@
   buildCounterAliasContext--;
 }
 
-buildUnnamed1042() {
+buildUnnamed3426() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed1042(core.List<api.Variable> o) {
+checkUnnamed3426(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
 }
 
-buildUnnamed1043() {
+buildUnnamed3427() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1043(core.List<core.String> o) {
+checkUnnamed3427(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1044() {
+buildUnnamed3428() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1044(core.Map<core.String, core.String> o) {
+checkUnnamed3428(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1045() {
+buildUnnamed3429() {
   var o = new core.List<api.StackFrame>();
   o.add(buildStackFrame());
   o.add(buildStackFrame());
   return o;
 }
 
-checkUnnamed1045(core.List<api.StackFrame> o) {
+checkUnnamed3429(core.List<api.StackFrame> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStackFrame(o[0]);
   checkStackFrame(o[1]);
 }
 
-buildUnnamed1046() {
+buildUnnamed3430() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed1046(core.List<api.Variable> o) {
+checkUnnamed3430(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
@@ -144,19 +144,19 @@
     o.action = "foo";
     o.condition = "foo";
     o.createTime = "foo";
-    o.evaluatedExpressions = buildUnnamed1042();
-    o.expressions = buildUnnamed1043();
+    o.evaluatedExpressions = buildUnnamed3426();
+    o.expressions = buildUnnamed3427();
     o.finalTime = "foo";
     o.id = "foo";
     o.isFinalState = true;
-    o.labels = buildUnnamed1044();
+    o.labels = buildUnnamed3428();
     o.location = buildSourceLocation();
     o.logLevel = "foo";
     o.logMessageFormat = "foo";
-    o.stackFrames = buildUnnamed1045();
+    o.stackFrames = buildUnnamed3429();
     o.status = buildStatusMessage();
     o.userEmail = "foo";
-    o.variableTable = buildUnnamed1046();
+    o.variableTable = buildUnnamed3430();
   }
   buildCounterBreakpoint--;
   return o;
@@ -168,19 +168,19 @@
     unittest.expect(o.action, unittest.equals('foo'));
     unittest.expect(o.condition, unittest.equals('foo'));
     unittest.expect(o.createTime, unittest.equals('foo'));
-    checkUnnamed1042(o.evaluatedExpressions);
-    checkUnnamed1043(o.expressions);
+    checkUnnamed3426(o.evaluatedExpressions);
+    checkUnnamed3427(o.expressions);
     unittest.expect(o.finalTime, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.isFinalState, unittest.isTrue);
-    checkUnnamed1044(o.labels);
+    checkUnnamed3428(o.labels);
     checkSourceLocation(o.location);
     unittest.expect(o.logLevel, unittest.equals('foo'));
     unittest.expect(o.logMessageFormat, unittest.equals('foo'));
-    checkUnnamed1045(o.stackFrames);
+    checkUnnamed3429(o.stackFrames);
     checkStatusMessage(o.status);
     unittest.expect(o.userEmail, unittest.equals('foo'));
-    checkUnnamed1046(o.variableTable);
+    checkUnnamed3430(o.variableTable);
   }
   buildCounterBreakpoint--;
 }
@@ -252,40 +252,40 @@
   buildCounterCloudWorkspaceSourceContext--;
 }
 
-buildUnnamed1047() {
+buildUnnamed3431() {
   var o = new core.List<api.ExtendedSourceContext>();
   o.add(buildExtendedSourceContext());
   o.add(buildExtendedSourceContext());
   return o;
 }
 
-checkUnnamed1047(core.List<api.ExtendedSourceContext> o) {
+checkUnnamed3431(core.List<api.ExtendedSourceContext> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExtendedSourceContext(o[0]);
   checkExtendedSourceContext(o[1]);
 }
 
-buildUnnamed1048() {
+buildUnnamed3432() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1048(core.Map<core.String, core.String> o) {
+checkUnnamed3432(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1049() {
+buildUnnamed3433() {
   var o = new core.List<api.SourceContext>();
   o.add(buildSourceContext());
   o.add(buildSourceContext());
   return o;
 }
 
-checkUnnamed1049(core.List<api.SourceContext> o) {
+checkUnnamed3433(core.List<api.SourceContext> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSourceContext(o[0]);
   checkSourceContext(o[1]);
@@ -298,13 +298,13 @@
   if (buildCounterDebuggee < 3) {
     o.agentVersion = "foo";
     o.description = "foo";
-    o.extSourceContexts = buildUnnamed1047();
+    o.extSourceContexts = buildUnnamed3431();
     o.id = "foo";
     o.isDisabled = true;
     o.isInactive = true;
-    o.labels = buildUnnamed1048();
+    o.labels = buildUnnamed3432();
     o.project = "foo";
-    o.sourceContexts = buildUnnamed1049();
+    o.sourceContexts = buildUnnamed3433();
     o.status = buildStatusMessage();
     o.uniquifier = "foo";
   }
@@ -317,13 +317,13 @@
   if (buildCounterDebuggee < 3) {
     unittest.expect(o.agentVersion, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed1047(o.extSourceContexts);
+    checkUnnamed3431(o.extSourceContexts);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.isDisabled, unittest.isTrue);
     unittest.expect(o.isInactive, unittest.isTrue);
-    checkUnnamed1048(o.labels);
+    checkUnnamed3432(o.labels);
     unittest.expect(o.project, unittest.equals('foo'));
-    checkUnnamed1049(o.sourceContexts);
+    checkUnnamed3433(o.sourceContexts);
     checkStatusMessage(o.status);
     unittest.expect(o.uniquifier, unittest.equals('foo'));
   }
@@ -345,14 +345,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed1050() {
+buildUnnamed3434() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1050(core.Map<core.String, core.String> o) {
+checkUnnamed3434(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -364,7 +364,7 @@
   buildCounterExtendedSourceContext++;
   if (buildCounterExtendedSourceContext < 3) {
     o.context = buildSourceContext();
-    o.labels = buildUnnamed1050();
+    o.labels = buildUnnamed3434();
   }
   buildCounterExtendedSourceContext--;
   return o;
@@ -374,19 +374,19 @@
   buildCounterExtendedSourceContext++;
   if (buildCounterExtendedSourceContext < 3) {
     checkSourceContext(o.context);
-    checkUnnamed1050(o.labels);
+    checkUnnamed3434(o.labels);
   }
   buildCounterExtendedSourceContext--;
 }
 
-buildUnnamed1051() {
+buildUnnamed3435() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1051(core.List<core.String> o) {
+checkUnnamed3435(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -398,7 +398,7 @@
   buildCounterFormatMessage++;
   if (buildCounterFormatMessage < 3) {
     o.format = "foo";
-    o.parameters = buildUnnamed1051();
+    o.parameters = buildUnnamed3435();
   }
   buildCounterFormatMessage--;
   return o;
@@ -408,7 +408,7 @@
   buildCounterFormatMessage++;
   if (buildCounterFormatMessage < 3) {
     unittest.expect(o.format, unittest.equals('foo'));
-    checkUnnamed1051(o.parameters);
+    checkUnnamed3435(o.parameters);
   }
   buildCounterFormatMessage--;
 }
@@ -480,14 +480,14 @@
   buildCounterGitSourceContext--;
 }
 
-buildUnnamed1052() {
+buildUnnamed3436() {
   var o = new core.List<api.Breakpoint>();
   o.add(buildBreakpoint());
   o.add(buildBreakpoint());
   return o;
 }
 
-checkUnnamed1052(core.List<api.Breakpoint> o) {
+checkUnnamed3436(core.List<api.Breakpoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBreakpoint(o[0]);
   checkBreakpoint(o[1]);
@@ -498,7 +498,7 @@
   var o = new api.ListActiveBreakpointsResponse();
   buildCounterListActiveBreakpointsResponse++;
   if (buildCounterListActiveBreakpointsResponse < 3) {
-    o.breakpoints = buildUnnamed1052();
+    o.breakpoints = buildUnnamed3436();
     o.nextWaitToken = "foo";
     o.waitExpired = true;
   }
@@ -509,21 +509,21 @@
 checkListActiveBreakpointsResponse(api.ListActiveBreakpointsResponse o) {
   buildCounterListActiveBreakpointsResponse++;
   if (buildCounterListActiveBreakpointsResponse < 3) {
-    checkUnnamed1052(o.breakpoints);
+    checkUnnamed3436(o.breakpoints);
     unittest.expect(o.nextWaitToken, unittest.equals('foo'));
     unittest.expect(o.waitExpired, unittest.isTrue);
   }
   buildCounterListActiveBreakpointsResponse--;
 }
 
-buildUnnamed1053() {
+buildUnnamed3437() {
   var o = new core.List<api.Breakpoint>();
   o.add(buildBreakpoint());
   o.add(buildBreakpoint());
   return o;
 }
 
-checkUnnamed1053(core.List<api.Breakpoint> o) {
+checkUnnamed3437(core.List<api.Breakpoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBreakpoint(o[0]);
   checkBreakpoint(o[1]);
@@ -534,7 +534,7 @@
   var o = new api.ListBreakpointsResponse();
   buildCounterListBreakpointsResponse++;
   if (buildCounterListBreakpointsResponse < 3) {
-    o.breakpoints = buildUnnamed1053();
+    o.breakpoints = buildUnnamed3437();
     o.nextWaitToken = "foo";
   }
   buildCounterListBreakpointsResponse--;
@@ -544,20 +544,20 @@
 checkListBreakpointsResponse(api.ListBreakpointsResponse o) {
   buildCounterListBreakpointsResponse++;
   if (buildCounterListBreakpointsResponse < 3) {
-    checkUnnamed1053(o.breakpoints);
+    checkUnnamed3437(o.breakpoints);
     unittest.expect(o.nextWaitToken, unittest.equals('foo'));
   }
   buildCounterListBreakpointsResponse--;
 }
 
-buildUnnamed1054() {
+buildUnnamed3438() {
   var o = new core.List<api.Debuggee>();
   o.add(buildDebuggee());
   o.add(buildDebuggee());
   return o;
 }
 
-checkUnnamed1054(core.List<api.Debuggee> o) {
+checkUnnamed3438(core.List<api.Debuggee> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDebuggee(o[0]);
   checkDebuggee(o[1]);
@@ -568,7 +568,7 @@
   var o = new api.ListDebuggeesResponse();
   buildCounterListDebuggeesResponse++;
   if (buildCounterListDebuggeesResponse < 3) {
-    o.debuggees = buildUnnamed1054();
+    o.debuggees = buildUnnamed3438();
   }
   buildCounterListDebuggeesResponse--;
   return o;
@@ -577,7 +577,7 @@
 checkListDebuggeesResponse(api.ListDebuggeesResponse o) {
   buildCounterListDebuggeesResponse++;
   if (buildCounterListDebuggeesResponse < 3) {
-    checkUnnamed1054(o.debuggees);
+    checkUnnamed3438(o.debuggees);
   }
   buildCounterListDebuggeesResponse--;
 }
@@ -727,27 +727,27 @@
   buildCounterSourceLocation--;
 }
 
-buildUnnamed1055() {
+buildUnnamed3439() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed1055(core.List<api.Variable> o) {
+checkUnnamed3439(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
 }
 
-buildUnnamed1056() {
+buildUnnamed3440() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed1056(core.List<api.Variable> o) {
+checkUnnamed3440(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
@@ -758,9 +758,9 @@
   var o = new api.StackFrame();
   buildCounterStackFrame++;
   if (buildCounterStackFrame < 3) {
-    o.arguments = buildUnnamed1055();
+    o.arguments = buildUnnamed3439();
     o.function = "foo";
-    o.locals = buildUnnamed1056();
+    o.locals = buildUnnamed3440();
     o.location = buildSourceLocation();
   }
   buildCounterStackFrame--;
@@ -770,9 +770,9 @@
 checkStackFrame(api.StackFrame o) {
   buildCounterStackFrame++;
   if (buildCounterStackFrame < 3) {
-    checkUnnamed1055(o.arguments);
+    checkUnnamed3439(o.arguments);
     unittest.expect(o.function, unittest.equals('foo'));
-    checkUnnamed1056(o.locals);
+    checkUnnamed3440(o.locals);
     checkSourceLocation(o.location);
   }
   buildCounterStackFrame--;
@@ -835,14 +835,14 @@
   buildCounterUpdateActiveBreakpointResponse--;
 }
 
-buildUnnamed1057() {
+buildUnnamed3441() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed1057(core.List<api.Variable> o) {
+checkUnnamed3441(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
@@ -853,7 +853,7 @@
   var o = new api.Variable();
   buildCounterVariable++;
   if (buildCounterVariable < 3) {
-    o.members = buildUnnamed1057();
+    o.members = buildUnnamed3441();
     o.name = "foo";
     o.status = buildStatusMessage();
     o.type = "foo";
@@ -867,7 +867,7 @@
 checkVariable(api.Variable o) {
   buildCounterVariable++;
   if (buildCounterVariable < 3) {
-    checkUnnamed1057(o.members);
+    checkUnnamed3441(o.members);
     unittest.expect(o.name, unittest.equals('foo'));
     checkStatusMessage(o.status);
     unittest.expect(o.type, unittest.equals('foo'));
@@ -1144,7 +1144,7 @@
       }), true);
       res
           .register(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RegisterDebuggeeResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegisterDebuggeeResponse(response);
       })));
     });
@@ -1215,8 +1215,7 @@
               successOnTimeout: arg_successOnTimeout,
               waitToken: arg_waitToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListActiveBreakpointsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListActiveBreakpointsResponse(response);
       })));
     });
@@ -1284,8 +1283,7 @@
       }), true);
       res
           .update(arg_request, arg_debuggeeId, arg_id, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.UpdateActiveBreakpointResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkUpdateActiveBreakpointResponse(response);
       })));
     });
@@ -1350,7 +1348,7 @@
               project: arg_project,
               clientVersion: arg_clientVersion,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDebuggeesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDebuggeesResponse(response);
       })));
     });
@@ -1420,7 +1418,7 @@
       res
           .delete(arg_debuggeeId, arg_breakpointId,
               clientVersion: arg_clientVersion, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1488,7 +1486,7 @@
       res
           .get(arg_debuggeeId, arg_breakpointId,
               clientVersion: arg_clientVersion, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetBreakpointResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetBreakpointResponse(response);
       })));
     });
@@ -1573,7 +1571,7 @@
               includeInactive: arg_includeInactive,
               stripResults: arg_stripResults,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListBreakpointsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListBreakpointsResponse(response);
       })));
     });
@@ -1641,7 +1639,7 @@
       res
           .set(arg_request, arg_debuggeeId,
               clientVersion: arg_clientVersion, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SetBreakpointResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSetBreakpointResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/cloudfunctions/v1_test.dart b/generated/googleapis/test/cloudfunctions/v1_test.dart
index 0b96aa5..239cee5 100644
--- a/generated/googleapis/test/cloudfunctions/v1_test.dart
+++ b/generated/googleapis/test/cloudfunctions/v1_test.dart
@@ -92,14 +92,14 @@
   buildCounterCallFunctionResponse--;
 }
 
-buildUnnamed1873() {
+buildUnnamed1867() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1873(core.Map<core.String, core.String> o) {
+checkUnnamed1867(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -115,7 +115,7 @@
     o.entryPoint = "foo";
     o.eventTrigger = buildEventTrigger();
     o.httpsTrigger = buildHttpsTrigger();
-    o.labels = buildUnnamed1873();
+    o.labels = buildUnnamed1867();
     o.name = "foo";
     o.serviceAccountEmail = "foo";
     o.sourceArchiveUrl = "foo";
@@ -138,7 +138,7 @@
     unittest.expect(o.entryPoint, unittest.equals('foo'));
     checkEventTrigger(o.eventTrigger);
     checkHttpsTrigger(o.httpsTrigger);
-    checkUnnamed1873(o.labels);
+    checkUnnamed1867(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.serviceAccountEmail, unittest.equals('foo'));
     unittest.expect(o.sourceArchiveUrl, unittest.equals('foo'));
@@ -287,14 +287,14 @@
   buildCounterHttpsTrigger--;
 }
 
-buildUnnamed1874() {
+buildUnnamed1868() {
   var o = new core.List<api.CloudFunction>();
   o.add(buildCloudFunction());
   o.add(buildCloudFunction());
   return o;
 }
 
-checkUnnamed1874(core.List<api.CloudFunction> o) {
+checkUnnamed1868(core.List<api.CloudFunction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCloudFunction(o[0]);
   checkCloudFunction(o[1]);
@@ -305,7 +305,7 @@
   var o = new api.ListFunctionsResponse();
   buildCounterListFunctionsResponse++;
   if (buildCounterListFunctionsResponse < 3) {
-    o.functions = buildUnnamed1874();
+    o.functions = buildUnnamed1868();
     o.nextPageToken = "foo";
   }
   buildCounterListFunctionsResponse--;
@@ -315,20 +315,20 @@
 checkListFunctionsResponse(api.ListFunctionsResponse o) {
   buildCounterListFunctionsResponse++;
   if (buildCounterListFunctionsResponse < 3) {
-    checkUnnamed1874(o.functions);
+    checkUnnamed1868(o.functions);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListFunctionsResponse--;
 }
 
-buildUnnamed1875() {
+buildUnnamed1869() {
   var o = new core.List<api.Location>();
   o.add(buildLocation());
   o.add(buildLocation());
   return o;
 }
 
-checkUnnamed1875(core.List<api.Location> o) {
+checkUnnamed1869(core.List<api.Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocation(o[0]);
   checkLocation(o[1]);
@@ -339,7 +339,7 @@
   var o = new api.ListLocationsResponse();
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    o.locations = buildUnnamed1875();
+    o.locations = buildUnnamed1869();
     o.nextPageToken = "foo";
   }
   buildCounterListLocationsResponse--;
@@ -349,20 +349,20 @@
 checkListLocationsResponse(api.ListLocationsResponse o) {
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    checkUnnamed1875(o.locations);
+    checkUnnamed1869(o.locations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLocationsResponse--;
 }
 
-buildUnnamed1876() {
+buildUnnamed1870() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed1876(core.List<api.Operation> o) {
+checkUnnamed1870(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -374,7 +374,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed1876();
+    o.operations = buildUnnamed1870();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -384,25 +384,25 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1876(o.operations);
+    checkUnnamed1870(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed1877() {
+buildUnnamed1871() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1877(core.Map<core.String, core.String> o) {
+checkUnnamed1871(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1878() {
+buildUnnamed1872() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -417,7 +417,7 @@
   return o;
 }
 
-checkUnnamed1878(core.Map<core.String, core.Object> o) {
+checkUnnamed1872(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -436,9 +436,9 @@
   var o = new api.Location();
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    o.labels = buildUnnamed1877();
+    o.labels = buildUnnamed1871();
     o.locationId = "foo";
-    o.metadata = buildUnnamed1878();
+    o.metadata = buildUnnamed1872();
     o.name = "foo";
   }
   buildCounterLocation--;
@@ -448,15 +448,15 @@
 checkLocation(api.Location o) {
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    checkUnnamed1877(o.labels);
+    checkUnnamed1871(o.labels);
     unittest.expect(o.locationId, unittest.equals('foo'));
-    checkUnnamed1878(o.metadata);
+    checkUnnamed1872(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLocation--;
 }
 
-buildUnnamed1879() {
+buildUnnamed1873() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -471,7 +471,7 @@
   return o;
 }
 
-checkUnnamed1879(core.Map<core.String, core.Object> o) {
+checkUnnamed1873(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -485,7 +485,7 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1880() {
+buildUnnamed1874() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -500,7 +500,7 @@
   return o;
 }
 
-checkUnnamed1880(core.Map<core.String, core.Object> o) {
+checkUnnamed1874(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -521,9 +521,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed1879();
+    o.metadata = buildUnnamed1873();
     o.name = "foo";
-    o.response = buildUnnamed1880();
+    o.response = buildUnnamed1874();
   }
   buildCounterOperation--;
   return o;
@@ -534,14 +534,14 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed1879(o.metadata);
+    checkUnnamed1873(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1880(o.response);
+    checkUnnamed1874(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed1881() {
+buildUnnamed1875() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -556,7 +556,7 @@
   return o;
 }
 
-checkUnnamed1881(core.Map<core.String, core.Object> o) {
+checkUnnamed1875(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -575,7 +575,7 @@
   var o = new api.OperationMetadataV1();
   buildCounterOperationMetadataV1++;
   if (buildCounterOperationMetadataV1 < 3) {
-    o.request = buildUnnamed1881();
+    o.request = buildUnnamed1875();
     o.target = "foo";
     o.type = "foo";
     o.updateTime = "foo";
@@ -588,7 +588,7 @@
 checkOperationMetadataV1(api.OperationMetadataV1 o) {
   buildCounterOperationMetadataV1++;
   if (buildCounterOperationMetadataV1 < 3) {
-    checkUnnamed1881(o.request);
+    checkUnnamed1875(o.request);
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.updateTime, unittest.equals('foo'));
@@ -597,7 +597,7 @@
   buildCounterOperationMetadataV1--;
 }
 
-buildUnnamed1882() {
+buildUnnamed1876() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -612,7 +612,7 @@
   return o;
 }
 
-checkUnnamed1882(core.Map<core.String, core.Object> o) {
+checkUnnamed1876(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted9 = (o["x"]) as core.Map;
   unittest.expect(casted9, unittest.hasLength(3));
@@ -631,7 +631,7 @@
   var o = new api.OperationMetadataV1Beta2();
   buildCounterOperationMetadataV1Beta2++;
   if (buildCounterOperationMetadataV1Beta2 < 3) {
-    o.request = buildUnnamed1882();
+    o.request = buildUnnamed1876();
     o.target = "foo";
     o.type = "foo";
     o.updateTime = "foo";
@@ -644,7 +644,7 @@
 checkOperationMetadataV1Beta2(api.OperationMetadataV1Beta2 o) {
   buildCounterOperationMetadataV1Beta2++;
   if (buildCounterOperationMetadataV1Beta2 < 3) {
-    checkUnnamed1882(o.request);
+    checkUnnamed1876(o.request);
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.updateTime, unittest.equals('foo'));
@@ -689,7 +689,7 @@
   buildCounterSourceRepository--;
 }
 
-buildUnnamed1883() {
+buildUnnamed1877() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -704,7 +704,7 @@
   return o;
 }
 
-checkUnnamed1883(core.Map<core.String, core.Object> o) {
+checkUnnamed1877(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted11 = (o["x"]) as core.Map;
   unittest.expect(casted11, unittest.hasLength(3));
@@ -718,17 +718,17 @@
   unittest.expect(casted12["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1884() {
+buildUnnamed1878() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed1883());
-  o.add(buildUnnamed1883());
+  o.add(buildUnnamed1877());
+  o.add(buildUnnamed1877());
   return o;
 }
 
-checkUnnamed1884(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1878(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1883(o[0]);
-  checkUnnamed1883(o[1]);
+  checkUnnamed1877(o[0]);
+  checkUnnamed1877(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -737,7 +737,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed1884();
+    o.details = buildUnnamed1878();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -748,7 +748,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed1884(o.details);
+    checkUnnamed1878(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -963,7 +963,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1028,7 +1028,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -1094,7 +1094,7 @@
               filter: arg_filter,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLocationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLocationsResponse(response);
       })));
     });
@@ -1152,7 +1152,7 @@
       }), true);
       res
           .call(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CallFunctionResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCallFunctionResponse(response);
       })));
     });
@@ -1208,7 +1208,7 @@
       }), true);
       res
           .create(arg_request, arg_location, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1260,7 +1260,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1314,8 +1314,9 @@
         var resp = convert.JSON.encode(buildGenerateDownloadUrlResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.generateDownloadUrl(arg_request, arg_name, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GenerateDownloadUrlResponse response) {
+      res
+          .generateDownloadUrl(arg_request, arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGenerateDownloadUrlResponse(response);
       })));
     });
@@ -1369,8 +1370,9 @@
         var resp = convert.JSON.encode(buildGenerateUploadUrlResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.generateUploadUrl(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GenerateUploadUrlResponse response) {
+      res
+          .generateUploadUrl(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGenerateUploadUrlResponse(response);
       })));
     });
@@ -1422,7 +1424,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CloudFunction response) {
+          .then(unittest.expectAsync1(((response) {
         checkCloudFunction(response);
       })));
     });
@@ -1483,7 +1485,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListFunctionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListFunctionsResponse(response);
       })));
     });
@@ -1543,7 +1545,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
diff --git a/generated/googleapis/test/cloudiot/v1_test.dart b/generated/googleapis/test/cloudiot/v1_test.dart
index 10ea34f..9bea538 100644
--- a/generated/googleapis/test/cloudiot/v1_test.dart
+++ b/generated/googleapis/test/cloudiot/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3521() {
+buildUnnamed3466() {
   var o = new core.List<api.AuditLogConfig>();
   o.add(buildAuditLogConfig());
   o.add(buildAuditLogConfig());
   return o;
 }
 
-checkUnnamed3521(core.List<api.AuditLogConfig> o) {
+checkUnnamed3466(core.List<api.AuditLogConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditLogConfig(o[0]);
   checkAuditLogConfig(o[1]);
@@ -68,7 +68,7 @@
   var o = new api.AuditConfig();
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    o.auditLogConfigs = buildUnnamed3521();
+    o.auditLogConfigs = buildUnnamed3466();
     o.service = "foo";
   }
   buildCounterAuditConfig--;
@@ -78,20 +78,20 @@
 checkAuditConfig(api.AuditConfig o) {
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    checkUnnamed3521(o.auditLogConfigs);
+    checkUnnamed3466(o.auditLogConfigs);
     unittest.expect(o.service, unittest.equals('foo'));
   }
   buildCounterAuditConfig--;
 }
 
-buildUnnamed3522() {
+buildUnnamed3467() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3522(core.List<core.String> o) {
+checkUnnamed3467(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -102,7 +102,7 @@
   var o = new api.AuditLogConfig();
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    o.exemptedMembers = buildUnnamed3522();
+    o.exemptedMembers = buildUnnamed3467();
     o.logType = "foo";
   }
   buildCounterAuditLogConfig--;
@@ -112,20 +112,20 @@
 checkAuditLogConfig(api.AuditLogConfig o) {
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    checkUnnamed3522(o.exemptedMembers);
+    checkUnnamed3467(o.exemptedMembers);
     unittest.expect(o.logType, unittest.equals('foo'));
   }
   buildCounterAuditLogConfig--;
 }
 
-buildUnnamed3523() {
+buildUnnamed3468() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3523(core.List<core.String> o) {
+checkUnnamed3468(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -136,7 +136,7 @@
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed3523();
+    o.members = buildUnnamed3468();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -146,33 +146,33 @@
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed3523(o.members);
+    checkUnnamed3468(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
 }
 
-buildUnnamed3524() {
+buildUnnamed3469() {
   var o = new core.List<api.DeviceCredential>();
   o.add(buildDeviceCredential());
   o.add(buildDeviceCredential());
   return o;
 }
 
-checkUnnamed3524(core.List<api.DeviceCredential> o) {
+checkUnnamed3469(core.List<api.DeviceCredential> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeviceCredential(o[0]);
   checkDeviceCredential(o[1]);
 }
 
-buildUnnamed3525() {
+buildUnnamed3470() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3525(core.Map<core.String, core.String> o) {
+checkUnnamed3470(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -185,7 +185,7 @@
   if (buildCounterDevice < 3) {
     o.blocked = true;
     o.config = buildDeviceConfig();
-    o.credentials = buildUnnamed3524();
+    o.credentials = buildUnnamed3469();
     o.id = "foo";
     o.lastConfigAckTime = "foo";
     o.lastConfigSendTime = "foo";
@@ -194,7 +194,7 @@
     o.lastEventTime = "foo";
     o.lastHeartbeatTime = "foo";
     o.lastStateTime = "foo";
-    o.metadata = buildUnnamed3525();
+    o.metadata = buildUnnamed3470();
     o.name = "foo";
     o.numId = "foo";
     o.state = buildDeviceState();
@@ -208,7 +208,7 @@
   if (buildCounterDevice < 3) {
     unittest.expect(o.blocked, unittest.isTrue);
     checkDeviceConfig(o.config);
-    checkUnnamed3524(o.credentials);
+    checkUnnamed3469(o.credentials);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.lastConfigAckTime, unittest.equals('foo'));
     unittest.expect(o.lastConfigSendTime, unittest.equals('foo'));
@@ -217,7 +217,7 @@
     unittest.expect(o.lastEventTime, unittest.equals('foo'));
     unittest.expect(o.lastHeartbeatTime, unittest.equals('foo'));
     unittest.expect(o.lastStateTime, unittest.equals('foo'));
-    checkUnnamed3525(o.metadata);
+    checkUnnamed3470(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.numId, unittest.equals('foo'));
     checkDeviceState(o.state);
@@ -271,27 +271,27 @@
   buildCounterDeviceCredential--;
 }
 
-buildUnnamed3526() {
+buildUnnamed3471() {
   var o = new core.List<api.RegistryCredential>();
   o.add(buildRegistryCredential());
   o.add(buildRegistryCredential());
   return o;
 }
 
-checkUnnamed3526(core.List<api.RegistryCredential> o) {
+checkUnnamed3471(core.List<api.RegistryCredential> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegistryCredential(o[0]);
   checkRegistryCredential(o[1]);
 }
 
-buildUnnamed3527() {
+buildUnnamed3472() {
   var o = new core.List<api.EventNotificationConfig>();
   o.add(buildEventNotificationConfig());
   o.add(buildEventNotificationConfig());
   return o;
 }
 
-checkUnnamed3527(core.List<api.EventNotificationConfig> o) {
+checkUnnamed3472(core.List<api.EventNotificationConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventNotificationConfig(o[0]);
   checkEventNotificationConfig(o[1]);
@@ -302,8 +302,8 @@
   var o = new api.DeviceRegistry();
   buildCounterDeviceRegistry++;
   if (buildCounterDeviceRegistry < 3) {
-    o.credentials = buildUnnamed3526();
-    o.eventNotificationConfigs = buildUnnamed3527();
+    o.credentials = buildUnnamed3471();
+    o.eventNotificationConfigs = buildUnnamed3472();
     o.httpConfig = buildHttpConfig();
     o.id = "foo";
     o.mqttConfig = buildMqttConfig();
@@ -317,8 +317,8 @@
 checkDeviceRegistry(api.DeviceRegistry o) {
   buildCounterDeviceRegistry++;
   if (buildCounterDeviceRegistry < 3) {
-    checkUnnamed3526(o.credentials);
-    checkUnnamed3527(o.eventNotificationConfigs);
+    checkUnnamed3471(o.credentials);
+    checkUnnamed3472(o.eventNotificationConfigs);
     checkHttpConfig(o.httpConfig);
     unittest.expect(o.id, unittest.equals('foo'));
     checkMqttConfig(o.mqttConfig);
@@ -419,14 +419,14 @@
   buildCounterHttpConfig--;
 }
 
-buildUnnamed3528() {
+buildUnnamed3473() {
   var o = new core.List<api.DeviceConfig>();
   o.add(buildDeviceConfig());
   o.add(buildDeviceConfig());
   return o;
 }
 
-checkUnnamed3528(core.List<api.DeviceConfig> o) {
+checkUnnamed3473(core.List<api.DeviceConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeviceConfig(o[0]);
   checkDeviceConfig(o[1]);
@@ -437,7 +437,7 @@
   var o = new api.ListDeviceConfigVersionsResponse();
   buildCounterListDeviceConfigVersionsResponse++;
   if (buildCounterListDeviceConfigVersionsResponse < 3) {
-    o.deviceConfigs = buildUnnamed3528();
+    o.deviceConfigs = buildUnnamed3473();
   }
   buildCounterListDeviceConfigVersionsResponse--;
   return o;
@@ -446,19 +446,19 @@
 checkListDeviceConfigVersionsResponse(api.ListDeviceConfigVersionsResponse o) {
   buildCounterListDeviceConfigVersionsResponse++;
   if (buildCounterListDeviceConfigVersionsResponse < 3) {
-    checkUnnamed3528(o.deviceConfigs);
+    checkUnnamed3473(o.deviceConfigs);
   }
   buildCounterListDeviceConfigVersionsResponse--;
 }
 
-buildUnnamed3529() {
+buildUnnamed3474() {
   var o = new core.List<api.DeviceRegistry>();
   o.add(buildDeviceRegistry());
   o.add(buildDeviceRegistry());
   return o;
 }
 
-checkUnnamed3529(core.List<api.DeviceRegistry> o) {
+checkUnnamed3474(core.List<api.DeviceRegistry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeviceRegistry(o[0]);
   checkDeviceRegistry(o[1]);
@@ -469,7 +469,7 @@
   var o = new api.ListDeviceRegistriesResponse();
   buildCounterListDeviceRegistriesResponse++;
   if (buildCounterListDeviceRegistriesResponse < 3) {
-    o.deviceRegistries = buildUnnamed3529();
+    o.deviceRegistries = buildUnnamed3474();
     o.nextPageToken = "foo";
   }
   buildCounterListDeviceRegistriesResponse--;
@@ -479,20 +479,20 @@
 checkListDeviceRegistriesResponse(api.ListDeviceRegistriesResponse o) {
   buildCounterListDeviceRegistriesResponse++;
   if (buildCounterListDeviceRegistriesResponse < 3) {
-    checkUnnamed3529(o.deviceRegistries);
+    checkUnnamed3474(o.deviceRegistries);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDeviceRegistriesResponse--;
 }
 
-buildUnnamed3530() {
+buildUnnamed3475() {
   var o = new core.List<api.DeviceState>();
   o.add(buildDeviceState());
   o.add(buildDeviceState());
   return o;
 }
 
-checkUnnamed3530(core.List<api.DeviceState> o) {
+checkUnnamed3475(core.List<api.DeviceState> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeviceState(o[0]);
   checkDeviceState(o[1]);
@@ -503,7 +503,7 @@
   var o = new api.ListDeviceStatesResponse();
   buildCounterListDeviceStatesResponse++;
   if (buildCounterListDeviceStatesResponse < 3) {
-    o.deviceStates = buildUnnamed3530();
+    o.deviceStates = buildUnnamed3475();
   }
   buildCounterListDeviceStatesResponse--;
   return o;
@@ -512,19 +512,19 @@
 checkListDeviceStatesResponse(api.ListDeviceStatesResponse o) {
   buildCounterListDeviceStatesResponse++;
   if (buildCounterListDeviceStatesResponse < 3) {
-    checkUnnamed3530(o.deviceStates);
+    checkUnnamed3475(o.deviceStates);
   }
   buildCounterListDeviceStatesResponse--;
 }
 
-buildUnnamed3531() {
+buildUnnamed3476() {
   var o = new core.List<api.Device>();
   o.add(buildDevice());
   o.add(buildDevice());
   return o;
 }
 
-checkUnnamed3531(core.List<api.Device> o) {
+checkUnnamed3476(core.List<api.Device> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDevice(o[0]);
   checkDevice(o[1]);
@@ -535,7 +535,7 @@
   var o = new api.ListDevicesResponse();
   buildCounterListDevicesResponse++;
   if (buildCounterListDevicesResponse < 3) {
-    o.devices = buildUnnamed3531();
+    o.devices = buildUnnamed3476();
     o.nextPageToken = "foo";
   }
   buildCounterListDevicesResponse--;
@@ -545,7 +545,7 @@
 checkListDevicesResponse(api.ListDevicesResponse o) {
   buildCounterListDevicesResponse++;
   if (buildCounterListDevicesResponse < 3) {
-    checkUnnamed3531(o.devices);
+    checkUnnamed3476(o.devices);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDevicesResponse--;
@@ -591,27 +591,27 @@
   buildCounterMqttConfig--;
 }
 
-buildUnnamed3532() {
+buildUnnamed3477() {
   var o = new core.List<api.AuditConfig>();
   o.add(buildAuditConfig());
   o.add(buildAuditConfig());
   return o;
 }
 
-checkUnnamed3532(core.List<api.AuditConfig> o) {
+checkUnnamed3477(core.List<api.AuditConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditConfig(o[0]);
   checkAuditConfig(o[1]);
 }
 
-buildUnnamed3533() {
+buildUnnamed3478() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed3533(core.List<api.Binding> o) {
+checkUnnamed3478(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -622,8 +622,8 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.auditConfigs = buildUnnamed3532();
-    o.bindings = buildUnnamed3533();
+    o.auditConfigs = buildUnnamed3477();
+    o.bindings = buildUnnamed3478();
     o.etag = "foo";
     o.version = 42;
   }
@@ -634,8 +634,8 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed3532(o.auditConfigs);
-    checkUnnamed3533(o.bindings);
+    checkUnnamed3477(o.auditConfigs);
+    checkUnnamed3478(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
@@ -745,7 +745,7 @@
   buildCounterStateNotificationConfig--;
 }
 
-buildUnnamed3534() {
+buildUnnamed3479() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -760,7 +760,7 @@
   return o;
 }
 
-checkUnnamed3534(core.Map<core.String, core.Object> o) {
+checkUnnamed3479(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -774,17 +774,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3535() {
+buildUnnamed3480() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3534());
-  o.add(buildUnnamed3534());
+  o.add(buildUnnamed3479());
+  o.add(buildUnnamed3479());
   return o;
 }
 
-checkUnnamed3535(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed3480(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3534(o[0]);
-  checkUnnamed3534(o[1]);
+  checkUnnamed3479(o[0]);
+  checkUnnamed3479(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -793,7 +793,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed3535();
+    o.details = buildUnnamed3480();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -804,20 +804,20 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed3535(o.details);
+    checkUnnamed3480(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed3536() {
+buildUnnamed3481() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3536(core.List<core.String> o) {
+checkUnnamed3481(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -828,7 +828,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed3536();
+    o.permissions = buildUnnamed3481();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -837,19 +837,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed3536(o.permissions);
+    checkUnnamed3481(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed3537() {
+buildUnnamed3482() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3537(core.List<core.String> o) {
+checkUnnamed3482(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -860,7 +860,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed3537();
+    o.permissions = buildUnnamed3482();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -869,7 +869,7 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed3537(o.permissions);
+    checkUnnamed3482(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
@@ -903,27 +903,27 @@
   buildCounterX509CertificateDetails--;
 }
 
-buildUnnamed3538() {
+buildUnnamed3483() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3538(core.List<core.String> o) {
+checkUnnamed3483(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3539() {
+buildUnnamed3484() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3539(core.List<core.String> o) {
+checkUnnamed3484(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1206,7 +1206,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DeviceRegistry response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeviceRegistry(response);
       })));
     });
@@ -1258,7 +1258,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1310,7 +1310,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DeviceRegistry response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeviceRegistry(response);
       })));
     });
@@ -1366,7 +1366,7 @@
       }), true);
       res
           .getIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1427,8 +1427,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListDeviceRegistriesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDeviceRegistriesResponse(response);
       })));
     });
@@ -1488,7 +1487,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DeviceRegistry response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeviceRegistry(response);
       })));
     });
@@ -1544,7 +1543,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1600,8 +1599,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -1659,7 +1657,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Device response) {
+          .then(unittest.expectAsync1(((response) {
         checkDevice(response);
       })));
     });
@@ -1711,7 +1709,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1766,7 +1764,7 @@
       }), true);
       res
           .get(arg_name, fieldMask: arg_fieldMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Device response) {
+          .then(unittest.expectAsync1(((response) {
         checkDevice(response);
       })));
     });
@@ -1779,8 +1777,8 @@
       var arg_pageToken = "foo";
       var arg_fieldMask = "foo";
       var arg_pageSize = 42;
-      var arg_deviceIds = buildUnnamed3538();
-      var arg_deviceNumIds = buildUnnamed3539();
+      var arg_deviceIds = buildUnnamed3483();
+      var arg_deviceNumIds = buildUnnamed3484();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1838,7 +1836,7 @@
               deviceIds: arg_deviceIds,
               deviceNumIds: arg_deviceNumIds,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDevicesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDevicesResponse(response);
       })));
     });
@@ -1895,7 +1893,7 @@
       res
           .modifyCloudToDeviceConfig(arg_request, arg_name,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DeviceConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeviceConfig(response);
       })));
     });
@@ -1955,7 +1953,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Device response) {
+          .then(unittest.expectAsync1(((response) {
         checkDevice(response);
       })));
     });
@@ -2019,8 +2017,7 @@
       }), true);
       res
           .list(arg_name, numVersions: arg_numVersions, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListDeviceConfigVersionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDeviceConfigVersionsResponse(response);
       })));
     });
@@ -2083,7 +2080,7 @@
       }), true);
       res
           .list(arg_name, numStates: arg_numStates, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDeviceStatesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDeviceStatesResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/cloudkms/v1_test.dart b/generated/googleapis/test/cloudkms/v1_test.dart
index b91937f..dc3e024 100644
--- a/generated/googleapis/test/cloudkms/v1_test.dart
+++ b/generated/googleapis/test/cloudkms/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed1330() {
+buildUnnamed1666() {
   var o = new core.List<api.AuditLogConfig>();
   o.add(buildAuditLogConfig());
   o.add(buildAuditLogConfig());
   return o;
 }
 
-checkUnnamed1330(core.List<api.AuditLogConfig> o) {
+checkUnnamed1666(core.List<api.AuditLogConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditLogConfig(o[0]);
   checkAuditLogConfig(o[1]);
@@ -68,7 +68,7 @@
   var o = new api.AuditConfig();
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    o.auditLogConfigs = buildUnnamed1330();
+    o.auditLogConfigs = buildUnnamed1666();
     o.service = "foo";
   }
   buildCounterAuditConfig--;
@@ -78,20 +78,20 @@
 checkAuditConfig(api.AuditConfig o) {
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    checkUnnamed1330(o.auditLogConfigs);
+    checkUnnamed1666(o.auditLogConfigs);
     unittest.expect(o.service, unittest.equals('foo'));
   }
   buildCounterAuditConfig--;
 }
 
-buildUnnamed1331() {
+buildUnnamed1667() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1331(core.List<core.String> o) {
+checkUnnamed1667(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -102,7 +102,7 @@
   var o = new api.AuditLogConfig();
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    o.exemptedMembers = buildUnnamed1331();
+    o.exemptedMembers = buildUnnamed1667();
     o.logType = "foo";
   }
   buildCounterAuditLogConfig--;
@@ -112,20 +112,20 @@
 checkAuditLogConfig(api.AuditLogConfig o) {
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    checkUnnamed1331(o.exemptedMembers);
+    checkUnnamed1667(o.exemptedMembers);
     unittest.expect(o.logType, unittest.equals('foo'));
   }
   buildCounterAuditLogConfig--;
 }
 
-buildUnnamed1332() {
+buildUnnamed1668() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1332(core.List<core.String> o) {
+checkUnnamed1668(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -136,7 +136,7 @@
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed1332();
+    o.members = buildUnnamed1668();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -146,20 +146,20 @@
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed1332(o.members);
+    checkUnnamed1668(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
 }
 
-buildUnnamed1333() {
+buildUnnamed1669() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1333(core.Map<core.String, core.String> o) {
+checkUnnamed1669(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -171,7 +171,7 @@
   buildCounterCryptoKey++;
   if (buildCounterCryptoKey < 3) {
     o.createTime = "foo";
-    o.labels = buildUnnamed1333();
+    o.labels = buildUnnamed1669();
     o.name = "foo";
     o.nextRotationTime = "foo";
     o.primary = buildCryptoKeyVersion();
@@ -186,7 +186,7 @@
   buildCounterCryptoKey++;
   if (buildCounterCryptoKey < 3) {
     unittest.expect(o.createTime, unittest.equals('foo'));
-    checkUnnamed1333(o.labels);
+    checkUnnamed1669(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.nextRotationTime, unittest.equals('foo'));
     checkCryptoKeyVersion(o.primary);
@@ -341,14 +341,14 @@
   buildCounterKeyRing--;
 }
 
-buildUnnamed1334() {
+buildUnnamed1670() {
   var o = new core.List<api.CryptoKeyVersion>();
   o.add(buildCryptoKeyVersion());
   o.add(buildCryptoKeyVersion());
   return o;
 }
 
-checkUnnamed1334(core.List<api.CryptoKeyVersion> o) {
+checkUnnamed1670(core.List<api.CryptoKeyVersion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCryptoKeyVersion(o[0]);
   checkCryptoKeyVersion(o[1]);
@@ -359,7 +359,7 @@
   var o = new api.ListCryptoKeyVersionsResponse();
   buildCounterListCryptoKeyVersionsResponse++;
   if (buildCounterListCryptoKeyVersionsResponse < 3) {
-    o.cryptoKeyVersions = buildUnnamed1334();
+    o.cryptoKeyVersions = buildUnnamed1670();
     o.nextPageToken = "foo";
     o.totalSize = 42;
   }
@@ -370,21 +370,21 @@
 checkListCryptoKeyVersionsResponse(api.ListCryptoKeyVersionsResponse o) {
   buildCounterListCryptoKeyVersionsResponse++;
   if (buildCounterListCryptoKeyVersionsResponse < 3) {
-    checkUnnamed1334(o.cryptoKeyVersions);
+    checkUnnamed1670(o.cryptoKeyVersions);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalSize, unittest.equals(42));
   }
   buildCounterListCryptoKeyVersionsResponse--;
 }
 
-buildUnnamed1335() {
+buildUnnamed1671() {
   var o = new core.List<api.CryptoKey>();
   o.add(buildCryptoKey());
   o.add(buildCryptoKey());
   return o;
 }
 
-checkUnnamed1335(core.List<api.CryptoKey> o) {
+checkUnnamed1671(core.List<api.CryptoKey> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCryptoKey(o[0]);
   checkCryptoKey(o[1]);
@@ -395,7 +395,7 @@
   var o = new api.ListCryptoKeysResponse();
   buildCounterListCryptoKeysResponse++;
   if (buildCounterListCryptoKeysResponse < 3) {
-    o.cryptoKeys = buildUnnamed1335();
+    o.cryptoKeys = buildUnnamed1671();
     o.nextPageToken = "foo";
     o.totalSize = 42;
   }
@@ -406,21 +406,21 @@
 checkListCryptoKeysResponse(api.ListCryptoKeysResponse o) {
   buildCounterListCryptoKeysResponse++;
   if (buildCounterListCryptoKeysResponse < 3) {
-    checkUnnamed1335(o.cryptoKeys);
+    checkUnnamed1671(o.cryptoKeys);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalSize, unittest.equals(42));
   }
   buildCounterListCryptoKeysResponse--;
 }
 
-buildUnnamed1336() {
+buildUnnamed1672() {
   var o = new core.List<api.KeyRing>();
   o.add(buildKeyRing());
   o.add(buildKeyRing());
   return o;
 }
 
-checkUnnamed1336(core.List<api.KeyRing> o) {
+checkUnnamed1672(core.List<api.KeyRing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkKeyRing(o[0]);
   checkKeyRing(o[1]);
@@ -431,7 +431,7 @@
   var o = new api.ListKeyRingsResponse();
   buildCounterListKeyRingsResponse++;
   if (buildCounterListKeyRingsResponse < 3) {
-    o.keyRings = buildUnnamed1336();
+    o.keyRings = buildUnnamed1672();
     o.nextPageToken = "foo";
     o.totalSize = 42;
   }
@@ -442,21 +442,21 @@
 checkListKeyRingsResponse(api.ListKeyRingsResponse o) {
   buildCounterListKeyRingsResponse++;
   if (buildCounterListKeyRingsResponse < 3) {
-    checkUnnamed1336(o.keyRings);
+    checkUnnamed1672(o.keyRings);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalSize, unittest.equals(42));
   }
   buildCounterListKeyRingsResponse--;
 }
 
-buildUnnamed1337() {
+buildUnnamed1673() {
   var o = new core.List<api.Location>();
   o.add(buildLocation());
   o.add(buildLocation());
   return o;
 }
 
-checkUnnamed1337(core.List<api.Location> o) {
+checkUnnamed1673(core.List<api.Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocation(o[0]);
   checkLocation(o[1]);
@@ -467,7 +467,7 @@
   var o = new api.ListLocationsResponse();
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    o.locations = buildUnnamed1337();
+    o.locations = buildUnnamed1673();
     o.nextPageToken = "foo";
   }
   buildCounterListLocationsResponse--;
@@ -477,26 +477,26 @@
 checkListLocationsResponse(api.ListLocationsResponse o) {
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    checkUnnamed1337(o.locations);
+    checkUnnamed1673(o.locations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLocationsResponse--;
 }
 
-buildUnnamed1338() {
+buildUnnamed1674() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1338(core.Map<core.String, core.String> o) {
+checkUnnamed1674(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1339() {
+buildUnnamed1675() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -511,7 +511,7 @@
   return o;
 }
 
-checkUnnamed1339(core.Map<core.String, core.Object> o) {
+checkUnnamed1675(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -530,9 +530,9 @@
   var o = new api.Location();
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    o.labels = buildUnnamed1338();
+    o.labels = buildUnnamed1674();
     o.locationId = "foo";
-    o.metadata = buildUnnamed1339();
+    o.metadata = buildUnnamed1675();
     o.name = "foo";
   }
   buildCounterLocation--;
@@ -542,35 +542,35 @@
 checkLocation(api.Location o) {
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    checkUnnamed1338(o.labels);
+    checkUnnamed1674(o.labels);
     unittest.expect(o.locationId, unittest.equals('foo'));
-    checkUnnamed1339(o.metadata);
+    checkUnnamed1675(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLocation--;
 }
 
-buildUnnamed1340() {
+buildUnnamed1676() {
   var o = new core.List<api.AuditConfig>();
   o.add(buildAuditConfig());
   o.add(buildAuditConfig());
   return o;
 }
 
-checkUnnamed1340(core.List<api.AuditConfig> o) {
+checkUnnamed1676(core.List<api.AuditConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditConfig(o[0]);
   checkAuditConfig(o[1]);
 }
 
-buildUnnamed1341() {
+buildUnnamed1677() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed1341(core.List<api.Binding> o) {
+checkUnnamed1677(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -581,8 +581,8 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.auditConfigs = buildUnnamed1340();
-    o.bindings = buildUnnamed1341();
+    o.auditConfigs = buildUnnamed1676();
+    o.bindings = buildUnnamed1677();
     o.etag = "foo";
     o.version = 42;
   }
@@ -593,8 +593,8 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed1340(o.auditConfigs);
-    checkUnnamed1341(o.bindings);
+    checkUnnamed1676(o.auditConfigs);
+    checkUnnamed1677(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
@@ -637,14 +637,14 @@
   buildCounterSetIamPolicyRequest--;
 }
 
-buildUnnamed1342() {
+buildUnnamed1678() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1342(core.List<core.String> o) {
+checkUnnamed1678(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -655,7 +655,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed1342();
+    o.permissions = buildUnnamed1678();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -664,19 +664,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed1342(o.permissions);
+    checkUnnamed1678(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed1343() {
+buildUnnamed1679() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1343(core.List<core.String> o) {
+checkUnnamed1679(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -687,7 +687,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed1343();
+    o.permissions = buildUnnamed1679();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -696,7 +696,7 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed1343(o.permissions);
+    checkUnnamed1679(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
@@ -947,7 +947,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Location response) {
+          .then(unittest.expectAsync1(((response) {
         checkLocation(response);
       })));
     });
@@ -1011,7 +1011,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLocationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLocationsResponse(response);
       })));
     });
@@ -1073,7 +1073,7 @@
       res
           .create(arg_request, arg_parent,
               keyRingId: arg_keyRingId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.KeyRing response) {
+          .then(unittest.expectAsync1(((response) {
         checkKeyRing(response);
       })));
     });
@@ -1125,7 +1125,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.KeyRing response) {
+          .then(unittest.expectAsync1(((response) {
         checkKeyRing(response);
       })));
     });
@@ -1177,7 +1177,7 @@
       }), true);
       res
           .getIamPolicy(arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1238,7 +1238,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListKeyRingsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListKeyRingsResponse(response);
       })));
     });
@@ -1294,7 +1294,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1350,8 +1350,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -1413,7 +1412,7 @@
       res
           .create(arg_request, arg_parent,
               cryptoKeyId: arg_cryptoKeyId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CryptoKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkCryptoKey(response);
       })));
     });
@@ -1469,7 +1468,7 @@
       }), true);
       res
           .decrypt(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DecryptResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDecryptResponse(response);
       })));
     });
@@ -1525,7 +1524,7 @@
       }), true);
       res
           .encrypt(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EncryptResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkEncryptResponse(response);
       })));
     });
@@ -1577,7 +1576,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CryptoKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkCryptoKey(response);
       })));
     });
@@ -1629,7 +1628,7 @@
       }), true);
       res
           .getIamPolicy(arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1690,7 +1689,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListCryptoKeysResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCryptoKeysResponse(response);
       })));
     });
@@ -1750,7 +1749,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CryptoKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkCryptoKey(response);
       })));
     });
@@ -1806,7 +1805,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1862,8 +1861,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -1919,7 +1917,7 @@
       }), true);
       res
           .updatePrimaryVersion(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CryptoKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkCryptoKey(response);
       })));
     });
@@ -1984,7 +1982,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CryptoKeyVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkCryptoKeyVersion(response);
       })));
     });
@@ -2045,7 +2043,7 @@
       }), true);
       res
           .destroy(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CryptoKeyVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkCryptoKeyVersion(response);
       })));
     });
@@ -2102,7 +2100,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CryptoKeyVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkCryptoKeyVersion(response);
       })));
     });
@@ -2168,8 +2166,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListCryptoKeyVersionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCryptoKeyVersionsResponse(response);
       })));
     });
@@ -2234,7 +2231,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CryptoKeyVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkCryptoKeyVersion(response);
       })));
     });
@@ -2295,7 +2292,7 @@
       }), true);
       res
           .restore(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CryptoKeyVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkCryptoKeyVersion(response);
       })));
     });
diff --git a/generated/googleapis/test/cloudresourcemanager/v1_test.dart b/generated/googleapis/test/cloudresourcemanager/v1_test.dart
index fa2454a..419d2cd 100644
--- a/generated/googleapis/test/cloudresourcemanager/v1_test.dart
+++ b/generated/googleapis/test/cloudresourcemanager/v1_test.dart
@@ -69,14 +69,14 @@
   buildCounterAncestor--;
 }
 
-buildUnnamed2860() {
+buildUnnamed2719() {
   var o = new core.List<api.AuditLogConfig>();
   o.add(buildAuditLogConfig());
   o.add(buildAuditLogConfig());
   return o;
 }
 
-checkUnnamed2860(core.List<api.AuditLogConfig> o) {
+checkUnnamed2719(core.List<api.AuditLogConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditLogConfig(o[0]);
   checkAuditLogConfig(o[1]);
@@ -87,7 +87,7 @@
   var o = new api.AuditConfig();
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    o.auditLogConfigs = buildUnnamed2860();
+    o.auditLogConfigs = buildUnnamed2719();
     o.service = "foo";
   }
   buildCounterAuditConfig--;
@@ -97,20 +97,20 @@
 checkAuditConfig(api.AuditConfig o) {
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    checkUnnamed2860(o.auditLogConfigs);
+    checkUnnamed2719(o.auditLogConfigs);
     unittest.expect(o.service, unittest.equals('foo'));
   }
   buildCounterAuditConfig--;
 }
 
-buildUnnamed2861() {
+buildUnnamed2720() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2861(core.List<core.String> o) {
+checkUnnamed2720(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -121,7 +121,7 @@
   var o = new api.AuditLogConfig();
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    o.exemptedMembers = buildUnnamed2861();
+    o.exemptedMembers = buildUnnamed2720();
     o.logType = "foo";
   }
   buildCounterAuditLogConfig--;
@@ -131,20 +131,20 @@
 checkAuditLogConfig(api.AuditLogConfig o) {
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    checkUnnamed2861(o.exemptedMembers);
+    checkUnnamed2720(o.exemptedMembers);
     unittest.expect(o.logType, unittest.equals('foo'));
   }
   buildCounterAuditLogConfig--;
 }
 
-buildUnnamed2862() {
+buildUnnamed2721() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2862(core.List<core.String> o) {
+checkUnnamed2721(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -155,7 +155,7 @@
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed2862();
+    o.members = buildUnnamed2721();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -165,7 +165,7 @@
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed2862(o.members);
+    checkUnnamed2721(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
@@ -331,14 +331,14 @@
   buildCounterGetAncestryRequest--;
 }
 
-buildUnnamed2863() {
+buildUnnamed2722() {
   var o = new core.List<api.Ancestor>();
   o.add(buildAncestor());
   o.add(buildAncestor());
   return o;
 }
 
-checkUnnamed2863(core.List<api.Ancestor> o) {
+checkUnnamed2722(core.List<api.Ancestor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAncestor(o[0]);
   checkAncestor(o[1]);
@@ -349,7 +349,7 @@
   var o = new api.GetAncestryResponse();
   buildCounterGetAncestryResponse++;
   if (buildCounterGetAncestryResponse < 3) {
-    o.ancestor = buildUnnamed2863();
+    o.ancestor = buildUnnamed2722();
   }
   buildCounterGetAncestryResponse--;
   return o;
@@ -358,7 +358,7 @@
 checkGetAncestryResponse(api.GetAncestryResponse o) {
   buildCounterGetAncestryResponse++;
   if (buildCounterGetAncestryResponse < 3) {
-    checkUnnamed2863(o.ancestor);
+    checkUnnamed2722(o.ancestor);
   }
   buildCounterGetAncestryResponse--;
 }
@@ -416,14 +416,14 @@
   buildCounterGetOrgPolicyRequest--;
 }
 
-buildUnnamed2864() {
+buildUnnamed2723() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2864(core.List<core.String> o) {
+checkUnnamed2723(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -439,7 +439,7 @@
     o.origin = "foo";
     o.parent = "foo";
     o.reason = "foo";
-    o.restrictions = buildUnnamed2864();
+    o.restrictions = buildUnnamed2723();
   }
   buildCounterLien--;
   return o;
@@ -453,7 +453,7 @@
     unittest.expect(o.origin, unittest.equals('foo'));
     unittest.expect(o.parent, unittest.equals('foo'));
     unittest.expect(o.reason, unittest.equals('foo'));
-    checkUnnamed2864(o.restrictions);
+    checkUnnamed2723(o.restrictions);
   }
   buildCounterLien--;
 }
@@ -480,14 +480,14 @@
   buildCounterListAvailableOrgPolicyConstraintsRequest--;
 }
 
-buildUnnamed2865() {
+buildUnnamed2724() {
   var o = new core.List<api.Constraint>();
   o.add(buildConstraint());
   o.add(buildConstraint());
   return o;
 }
 
-checkUnnamed2865(core.List<api.Constraint> o) {
+checkUnnamed2724(core.List<api.Constraint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConstraint(o[0]);
   checkConstraint(o[1]);
@@ -498,7 +498,7 @@
   var o = new api.ListAvailableOrgPolicyConstraintsResponse();
   buildCounterListAvailableOrgPolicyConstraintsResponse++;
   if (buildCounterListAvailableOrgPolicyConstraintsResponse < 3) {
-    o.constraints = buildUnnamed2865();
+    o.constraints = buildUnnamed2724();
     o.nextPageToken = "foo";
   }
   buildCounterListAvailableOrgPolicyConstraintsResponse--;
@@ -509,7 +509,7 @@
     api.ListAvailableOrgPolicyConstraintsResponse o) {
   buildCounterListAvailableOrgPolicyConstraintsResponse++;
   if (buildCounterListAvailableOrgPolicyConstraintsResponse < 3) {
-    checkUnnamed2865(o.constraints);
+    checkUnnamed2724(o.constraints);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListAvailableOrgPolicyConstraintsResponse--;
@@ -534,14 +534,14 @@
   buildCounterListConstraint--;
 }
 
-buildUnnamed2866() {
+buildUnnamed2725() {
   var o = new core.List<api.Lien>();
   o.add(buildLien());
   o.add(buildLien());
   return o;
 }
 
-checkUnnamed2866(core.List<api.Lien> o) {
+checkUnnamed2725(core.List<api.Lien> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLien(o[0]);
   checkLien(o[1]);
@@ -552,7 +552,7 @@
   var o = new api.ListLiensResponse();
   buildCounterListLiensResponse++;
   if (buildCounterListLiensResponse < 3) {
-    o.liens = buildUnnamed2866();
+    o.liens = buildUnnamed2725();
     o.nextPageToken = "foo";
   }
   buildCounterListLiensResponse--;
@@ -562,7 +562,7 @@
 checkListLiensResponse(api.ListLiensResponse o) {
   buildCounterListLiensResponse++;
   if (buildCounterListLiensResponse < 3) {
-    checkUnnamed2866(o.liens);
+    checkUnnamed2725(o.liens);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLiensResponse--;
@@ -589,14 +589,14 @@
   buildCounterListOrgPoliciesRequest--;
 }
 
-buildUnnamed2867() {
+buildUnnamed2726() {
   var o = new core.List<api.OrgPolicy>();
   o.add(buildOrgPolicy());
   o.add(buildOrgPolicy());
   return o;
 }
 
-checkUnnamed2867(core.List<api.OrgPolicy> o) {
+checkUnnamed2726(core.List<api.OrgPolicy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrgPolicy(o[0]);
   checkOrgPolicy(o[1]);
@@ -608,7 +608,7 @@
   buildCounterListOrgPoliciesResponse++;
   if (buildCounterListOrgPoliciesResponse < 3) {
     o.nextPageToken = "foo";
-    o.policies = buildUnnamed2867();
+    o.policies = buildUnnamed2726();
   }
   buildCounterListOrgPoliciesResponse--;
   return o;
@@ -618,32 +618,32 @@
   buildCounterListOrgPoliciesResponse++;
   if (buildCounterListOrgPoliciesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2867(o.policies);
+    checkUnnamed2726(o.policies);
   }
   buildCounterListOrgPoliciesResponse--;
 }
 
-buildUnnamed2868() {
+buildUnnamed2727() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2868(core.List<core.String> o) {
+checkUnnamed2727(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2869() {
+buildUnnamed2728() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2869(core.List<core.String> o) {
+checkUnnamed2728(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -655,8 +655,8 @@
   buildCounterListPolicy++;
   if (buildCounterListPolicy < 3) {
     o.allValues = "foo";
-    o.allowedValues = buildUnnamed2868();
-    o.deniedValues = buildUnnamed2869();
+    o.allowedValues = buildUnnamed2727();
+    o.deniedValues = buildUnnamed2728();
     o.inheritFromParent = true;
     o.suggestedValue = "foo";
   }
@@ -668,22 +668,22 @@
   buildCounterListPolicy++;
   if (buildCounterListPolicy < 3) {
     unittest.expect(o.allValues, unittest.equals('foo'));
-    checkUnnamed2868(o.allowedValues);
-    checkUnnamed2869(o.deniedValues);
+    checkUnnamed2727(o.allowedValues);
+    checkUnnamed2728(o.deniedValues);
     unittest.expect(o.inheritFromParent, unittest.isTrue);
     unittest.expect(o.suggestedValue, unittest.equals('foo'));
   }
   buildCounterListPolicy--;
 }
 
-buildUnnamed2870() {
+buildUnnamed2729() {
   var o = new core.List<api.Project>();
   o.add(buildProject());
   o.add(buildProject());
   return o;
 }
 
-checkUnnamed2870(core.List<api.Project> o) {
+checkUnnamed2729(core.List<api.Project> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProject(o[0]);
   checkProject(o[1]);
@@ -695,7 +695,7 @@
   buildCounterListProjectsResponse++;
   if (buildCounterListProjectsResponse < 3) {
     o.nextPageToken = "foo";
-    o.projects = buildUnnamed2870();
+    o.projects = buildUnnamed2729();
   }
   buildCounterListProjectsResponse--;
   return o;
@@ -705,12 +705,12 @@
   buildCounterListProjectsResponse++;
   if (buildCounterListProjectsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2870(o.projects);
+    checkUnnamed2729(o.projects);
   }
   buildCounterListProjectsResponse--;
 }
 
-buildUnnamed2871() {
+buildUnnamed2730() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -725,7 +725,7 @@
   return o;
 }
 
-checkUnnamed2871(core.Map<core.String, core.Object> o) {
+checkUnnamed2730(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -739,7 +739,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2872() {
+buildUnnamed2731() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -754,7 +754,7 @@
   return o;
 }
 
-checkUnnamed2872(core.Map<core.String, core.Object> o) {
+checkUnnamed2731(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -775,9 +775,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed2871();
+    o.metadata = buildUnnamed2730();
     o.name = "foo";
-    o.response = buildUnnamed2872();
+    o.response = buildUnnamed2731();
   }
   buildCounterOperation--;
   return o;
@@ -788,9 +788,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed2871(o.metadata);
+    checkUnnamed2730(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2872(o.response);
+    checkUnnamed2731(o.response);
   }
   buildCounterOperation--;
 }
@@ -872,27 +872,27 @@
   buildCounterOrganizationOwner--;
 }
 
-buildUnnamed2873() {
+buildUnnamed2732() {
   var o = new core.List<api.AuditConfig>();
   o.add(buildAuditConfig());
   o.add(buildAuditConfig());
   return o;
 }
 
-checkUnnamed2873(core.List<api.AuditConfig> o) {
+checkUnnamed2732(core.List<api.AuditConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditConfig(o[0]);
   checkAuditConfig(o[1]);
 }
 
-buildUnnamed2874() {
+buildUnnamed2733() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed2874(core.List<api.Binding> o) {
+checkUnnamed2733(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -903,8 +903,8 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.auditConfigs = buildUnnamed2873();
-    o.bindings = buildUnnamed2874();
+    o.auditConfigs = buildUnnamed2732();
+    o.bindings = buildUnnamed2733();
     o.etag = "foo";
     o.version = 42;
   }
@@ -915,22 +915,22 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed2873(o.auditConfigs);
-    checkUnnamed2874(o.bindings);
+    checkUnnamed2732(o.auditConfigs);
+    checkUnnamed2733(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
   buildCounterPolicy--;
 }
 
-buildUnnamed2875() {
+buildUnnamed2734() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2875(core.Map<core.String, core.String> o) {
+checkUnnamed2734(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -942,7 +942,7 @@
   buildCounterProject++;
   if (buildCounterProject < 3) {
     o.createTime = "foo";
-    o.labels = buildUnnamed2875();
+    o.labels = buildUnnamed2734();
     o.lifecycleState = "foo";
     o.name = "foo";
     o.parent = buildResourceId();
@@ -957,7 +957,7 @@
   buildCounterProject++;
   if (buildCounterProject < 3) {
     unittest.expect(o.createTime, unittest.equals('foo'));
-    checkUnnamed2875(o.labels);
+    checkUnnamed2734(o.labels);
     unittest.expect(o.lifecycleState, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     checkResourceId(o.parent);
@@ -1049,14 +1049,14 @@
   buildCounterSearchOrganizationsRequest--;
 }
 
-buildUnnamed2876() {
+buildUnnamed2735() {
   var o = new core.List<api.Organization>();
   o.add(buildOrganization());
   o.add(buildOrganization());
   return o;
 }
 
-checkUnnamed2876(core.List<api.Organization> o) {
+checkUnnamed2735(core.List<api.Organization> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrganization(o[0]);
   checkOrganization(o[1]);
@@ -1068,7 +1068,7 @@
   buildCounterSearchOrganizationsResponse++;
   if (buildCounterSearchOrganizationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.organizations = buildUnnamed2876();
+    o.organizations = buildUnnamed2735();
   }
   buildCounterSearchOrganizationsResponse--;
   return o;
@@ -1078,7 +1078,7 @@
   buildCounterSearchOrganizationsResponse++;
   if (buildCounterSearchOrganizationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2876(o.organizations);
+    checkUnnamed2735(o.organizations);
   }
   buildCounterSearchOrganizationsResponse--;
 }
@@ -1123,7 +1123,7 @@
   buildCounterSetOrgPolicyRequest--;
 }
 
-buildUnnamed2877() {
+buildUnnamed2736() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1138,7 +1138,7 @@
   return o;
 }
 
-checkUnnamed2877(core.Map<core.String, core.Object> o) {
+checkUnnamed2736(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1152,17 +1152,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2878() {
+buildUnnamed2737() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2877());
-  o.add(buildUnnamed2877());
+  o.add(buildUnnamed2736());
+  o.add(buildUnnamed2736());
   return o;
 }
 
-checkUnnamed2878(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed2737(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2877(o[0]);
-  checkUnnamed2877(o[1]);
+  checkUnnamed2736(o[0]);
+  checkUnnamed2736(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1171,7 +1171,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed2878();
+    o.details = buildUnnamed2737();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1182,20 +1182,20 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed2878(o.details);
+    checkUnnamed2737(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed2879() {
+buildUnnamed2738() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2879(core.List<core.String> o) {
+checkUnnamed2738(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1206,7 +1206,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed2879();
+    o.permissions = buildUnnamed2738();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -1215,19 +1215,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed2879(o.permissions);
+    checkUnnamed2738(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed2880() {
+buildUnnamed2739() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2880(core.List<core.String> o) {
+checkUnnamed2739(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1238,7 +1238,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed2880();
+    o.permissions = buildUnnamed2739();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -1247,7 +1247,7 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed2880(o.permissions);
+    checkUnnamed2739(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
@@ -1658,7 +1658,7 @@
       }), true);
       res
           .clearOrgPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1715,7 +1715,7 @@
       res
           .getEffectiveOrgPolicy(arg_request, arg_resource,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgPolicy response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgPolicy(response);
       })));
     });
@@ -1771,7 +1771,7 @@
       }), true);
       res
           .getOrgPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgPolicy response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgPolicy(response);
       })));
     });
@@ -1830,8 +1830,7 @@
       res
           .listAvailableOrgPolicyConstraints(arg_request, arg_resource,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ListAvailableOrgPolicyConstraintsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListAvailableOrgPolicyConstraintsResponse(response);
       })));
     });
@@ -1887,7 +1886,7 @@
       }), true);
       res
           .listOrgPolicies(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOrgPoliciesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOrgPoliciesResponse(response);
       })));
     });
@@ -1943,7 +1942,7 @@
       }), true);
       res
           .setOrgPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgPolicy response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgPolicy(response);
       })));
     });
@@ -1998,7 +1997,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Lien response) {
+          .then(unittest.expectAsync1(((response) {
         checkLien(response);
       })));
     });
@@ -2049,7 +2048,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2110,7 +2109,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLiensResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLiensResponse(response);
       })));
     });
@@ -2164,7 +2163,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2222,7 +2221,7 @@
       }), true);
       res
           .clearOrgPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2274,7 +2273,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Organization response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrganization(response);
       })));
     });
@@ -2331,7 +2330,7 @@
       res
           .getEffectiveOrgPolicy(arg_request, arg_resource,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgPolicy response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgPolicy(response);
       })));
     });
@@ -2387,7 +2386,7 @@
       }), true);
       res
           .getIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -2443,7 +2442,7 @@
       }), true);
       res
           .getOrgPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgPolicy response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgPolicy(response);
       })));
     });
@@ -2502,8 +2501,7 @@
       res
           .listAvailableOrgPolicyConstraints(arg_request, arg_resource,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ListAvailableOrgPolicyConstraintsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListAvailableOrgPolicyConstraintsResponse(response);
       })));
     });
@@ -2559,7 +2557,7 @@
       }), true);
       res
           .listOrgPolicies(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOrgPoliciesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOrgPoliciesResponse(response);
       })));
     });
@@ -2611,8 +2609,9 @@
         var resp = convert.JSON.encode(buildSearchOrganizationsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.search(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.SearchOrganizationsResponse response) {
+      res
+          .search(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSearchOrganizationsResponse(response);
       })));
     });
@@ -2668,7 +2667,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -2724,7 +2723,7 @@
       }), true);
       res
           .setOrgPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgPolicy response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgPolicy(response);
       })));
     });
@@ -2780,8 +2779,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -2839,7 +2837,7 @@
       }), true);
       res
           .clearOrgPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2893,7 +2891,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2947,7 +2945,7 @@
       }), true);
       res
           .delete(arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3001,7 +2999,7 @@
       }), true);
       res
           .get(arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
@@ -3065,7 +3063,7 @@
       }), true);
       res
           .getAncestry(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetAncestryResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetAncestryResponse(response);
       })));
     });
@@ -3122,7 +3120,7 @@
       res
           .getEffectiveOrgPolicy(arg_request, arg_resource,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgPolicy response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgPolicy(response);
       })));
     });
@@ -3186,7 +3184,7 @@
       }), true);
       res
           .getIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -3242,7 +3240,7 @@
       }), true);
       res
           .getOrgPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgPolicy response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgPolicy(response);
       })));
     });
@@ -3304,7 +3302,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListProjectsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListProjectsResponse(response);
       })));
     });
@@ -3363,8 +3361,7 @@
       res
           .listAvailableOrgPolicyConstraints(arg_request, arg_resource,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ListAvailableOrgPolicyConstraintsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListAvailableOrgPolicyConstraintsResponse(response);
       })));
     });
@@ -3420,7 +3417,7 @@
       }), true);
       res
           .listOrgPolicies(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOrgPoliciesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOrgPoliciesResponse(response);
       })));
     });
@@ -3484,7 +3481,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -3540,7 +3537,7 @@
       }), true);
       res
           .setOrgPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrgPolicy response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrgPolicy(response);
       })));
     });
@@ -3604,8 +3601,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -3669,7 +3665,7 @@
       }), true);
       res
           .undelete(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3727,7 +3723,7 @@
       }), true);
       res
           .update(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
diff --git a/generated/googleapis/test/cloudresourcemanager/v2beta1_test.dart b/generated/googleapis/test/cloudresourcemanager/v2beta1_test.dart
index e8398af..a96ad42 100644
--- a/generated/googleapis/test/cloudresourcemanager/v2beta1_test.dart
+++ b/generated/googleapis/test/cloudresourcemanager/v2beta1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed1925() {
+buildUnnamed1173() {
   var o = new core.List<api.AuditLogConfig>();
   o.add(buildAuditLogConfig());
   o.add(buildAuditLogConfig());
   return o;
 }
 
-checkUnnamed1925(core.List<api.AuditLogConfig> o) {
+checkUnnamed1173(core.List<api.AuditLogConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditLogConfig(o[0]);
   checkAuditLogConfig(o[1]);
@@ -68,7 +68,7 @@
   var o = new api.AuditConfig();
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    o.auditLogConfigs = buildUnnamed1925();
+    o.auditLogConfigs = buildUnnamed1173();
     o.service = "foo";
   }
   buildCounterAuditConfig--;
@@ -78,20 +78,20 @@
 checkAuditConfig(api.AuditConfig o) {
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    checkUnnamed1925(o.auditLogConfigs);
+    checkUnnamed1173(o.auditLogConfigs);
     unittest.expect(o.service, unittest.equals('foo'));
   }
   buildCounterAuditConfig--;
 }
 
-buildUnnamed1926() {
+buildUnnamed1174() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1926(core.List<core.String> o) {
+checkUnnamed1174(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -102,7 +102,7 @@
   var o = new api.AuditLogConfig();
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    o.exemptedMembers = buildUnnamed1926();
+    o.exemptedMembers = buildUnnamed1174();
     o.logType = "foo";
   }
   buildCounterAuditLogConfig--;
@@ -112,20 +112,20 @@
 checkAuditLogConfig(api.AuditLogConfig o) {
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    checkUnnamed1926(o.exemptedMembers);
+    checkUnnamed1174(o.exemptedMembers);
     unittest.expect(o.logType, unittest.equals('foo'));
   }
   buildCounterAuditLogConfig--;
 }
 
-buildUnnamed1927() {
+buildUnnamed1175() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1927(core.List<core.String> o) {
+checkUnnamed1175(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -136,7 +136,7 @@
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed1927();
+    o.members = buildUnnamed1175();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -146,7 +146,7 @@
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed1927(o.members);
+    checkUnnamed1175(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
@@ -238,14 +238,14 @@
   buildCounterGetIamPolicyRequest--;
 }
 
-buildUnnamed1928() {
+buildUnnamed1176() {
   var o = new core.List<api.Folder>();
   o.add(buildFolder());
   o.add(buildFolder());
   return o;
 }
 
-checkUnnamed1928(core.List<api.Folder> o) {
+checkUnnamed1176(core.List<api.Folder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFolder(o[0]);
   checkFolder(o[1]);
@@ -256,7 +256,7 @@
   var o = new api.ListFoldersResponse();
   buildCounterListFoldersResponse++;
   if (buildCounterListFoldersResponse < 3) {
-    o.folders = buildUnnamed1928();
+    o.folders = buildUnnamed1176();
     o.nextPageToken = "foo";
   }
   buildCounterListFoldersResponse--;
@@ -266,7 +266,7 @@
 checkListFoldersResponse(api.ListFoldersResponse o) {
   buildCounterListFoldersResponse++;
   if (buildCounterListFoldersResponse < 3) {
-    checkUnnamed1928(o.folders);
+    checkUnnamed1176(o.folders);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListFoldersResponse--;
@@ -291,7 +291,7 @@
   buildCounterMoveFolderRequest--;
 }
 
-buildUnnamed1929() {
+buildUnnamed1177() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -306,7 +306,7 @@
   return o;
 }
 
-checkUnnamed1929(core.Map<core.String, core.Object> o) {
+checkUnnamed1177(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -320,7 +320,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1930() {
+buildUnnamed1178() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -335,7 +335,7 @@
   return o;
 }
 
-checkUnnamed1930(core.Map<core.String, core.Object> o) {
+checkUnnamed1178(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -356,9 +356,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed1929();
+    o.metadata = buildUnnamed1177();
     o.name = "foo";
-    o.response = buildUnnamed1930();
+    o.response = buildUnnamed1178();
   }
   buildCounterOperation--;
   return o;
@@ -369,34 +369,34 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed1929(o.metadata);
+    checkUnnamed1177(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1930(o.response);
+    checkUnnamed1178(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed1931() {
+buildUnnamed1179() {
   var o = new core.List<api.AuditConfig>();
   o.add(buildAuditConfig());
   o.add(buildAuditConfig());
   return o;
 }
 
-checkUnnamed1931(core.List<api.AuditConfig> o) {
+checkUnnamed1179(core.List<api.AuditConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditConfig(o[0]);
   checkAuditConfig(o[1]);
 }
 
-buildUnnamed1932() {
+buildUnnamed1180() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed1932(core.List<api.Binding> o) {
+checkUnnamed1180(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -407,8 +407,8 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.auditConfigs = buildUnnamed1931();
-    o.bindings = buildUnnamed1932();
+    o.auditConfigs = buildUnnamed1179();
+    o.bindings = buildUnnamed1180();
     o.etag = "foo";
     o.version = 42;
   }
@@ -419,8 +419,8 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed1931(o.auditConfigs);
-    checkUnnamed1932(o.bindings);
+    checkUnnamed1179(o.auditConfigs);
+    checkUnnamed1180(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
@@ -473,14 +473,14 @@
   buildCounterSearchFoldersRequest--;
 }
 
-buildUnnamed1933() {
+buildUnnamed1181() {
   var o = new core.List<api.Folder>();
   o.add(buildFolder());
   o.add(buildFolder());
   return o;
 }
 
-checkUnnamed1933(core.List<api.Folder> o) {
+checkUnnamed1181(core.List<api.Folder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFolder(o[0]);
   checkFolder(o[1]);
@@ -491,7 +491,7 @@
   var o = new api.SearchFoldersResponse();
   buildCounterSearchFoldersResponse++;
   if (buildCounterSearchFoldersResponse < 3) {
-    o.folders = buildUnnamed1933();
+    o.folders = buildUnnamed1181();
     o.nextPageToken = "foo";
   }
   buildCounterSearchFoldersResponse--;
@@ -501,7 +501,7 @@
 checkSearchFoldersResponse(api.SearchFoldersResponse o) {
   buildCounterSearchFoldersResponse++;
   if (buildCounterSearchFoldersResponse < 3) {
-    checkUnnamed1933(o.folders);
+    checkUnnamed1181(o.folders);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterSearchFoldersResponse--;
@@ -528,7 +528,7 @@
   buildCounterSetIamPolicyRequest--;
 }
 
-buildUnnamed1934() {
+buildUnnamed1182() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -543,7 +543,7 @@
   return o;
 }
 
-checkUnnamed1934(core.Map<core.String, core.Object> o) {
+checkUnnamed1182(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -557,17 +557,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1935() {
+buildUnnamed1183() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed1934());
-  o.add(buildUnnamed1934());
+  o.add(buildUnnamed1182());
+  o.add(buildUnnamed1182());
   return o;
 }
 
-checkUnnamed1935(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1183(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1934(o[0]);
-  checkUnnamed1934(o[1]);
+  checkUnnamed1182(o[0]);
+  checkUnnamed1182(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -576,7 +576,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed1935();
+    o.details = buildUnnamed1183();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -587,20 +587,20 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed1935(o.details);
+    checkUnnamed1183(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed1936() {
+buildUnnamed1184() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1936(core.List<core.String> o) {
+checkUnnamed1184(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -611,7 +611,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed1936();
+    o.permissions = buildUnnamed1184();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -620,19 +620,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed1936(o.permissions);
+    checkUnnamed1184(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed1937() {
+buildUnnamed1185() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1937(core.List<core.String> o) {
+checkUnnamed1185(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -643,7 +643,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed1937();
+    o.permissions = buildUnnamed1185();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -652,7 +652,7 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed1937(o.permissions);
+    checkUnnamed1185(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
@@ -877,7 +877,7 @@
       }), true);
       res
           .create(arg_request, parent: arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -929,7 +929,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Folder response) {
+          .then(unittest.expectAsync1(((response) {
         checkFolder(response);
       })));
     });
@@ -981,7 +981,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Folder response) {
+          .then(unittest.expectAsync1(((response) {
         checkFolder(response);
       })));
     });
@@ -1037,7 +1037,7 @@
       }), true);
       res
           .getIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1103,7 +1103,7 @@
               pageSize: arg_pageSize,
               parent: arg_parent,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListFoldersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListFoldersResponse(response);
       })));
     });
@@ -1159,7 +1159,7 @@
       }), true);
       res
           .move(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1219,7 +1219,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Folder response) {
+          .then(unittest.expectAsync1(((response) {
         checkFolder(response);
       })));
     });
@@ -1273,7 +1273,7 @@
       }), true);
       res
           .search(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SearchFoldersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSearchFoldersResponse(response);
       })));
     });
@@ -1329,7 +1329,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1385,8 +1385,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -1442,7 +1441,7 @@
       }), true);
       res
           .undelete(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Folder response) {
+          .then(unittest.expectAsync1(((response) {
         checkFolder(response);
       })));
     });
diff --git a/generated/googleapis/test/cloudshell/v1_test.dart b/generated/googleapis/test/cloudshell/v1_test.dart
index 9ec2066..c5b15dc 100644
--- a/generated/googleapis/test/cloudshell/v1_test.dart
+++ b/generated/googleapis/test/cloudshell/v1_test.dart
@@ -80,14 +80,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed1947() {
+buildUnnamed1167() {
   var o = new core.List<api.PublicKey>();
   o.add(buildPublicKey());
   o.add(buildPublicKey());
   return o;
 }
 
-checkUnnamed1947(core.List<api.PublicKey> o) {
+checkUnnamed1167(core.List<api.PublicKey> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPublicKey(o[0]);
   checkPublicKey(o[1]);
@@ -101,7 +101,7 @@
     o.dockerImage = "foo";
     o.id = "foo";
     o.name = "foo";
-    o.publicKeys = buildUnnamed1947();
+    o.publicKeys = buildUnnamed1167();
     o.sshHost = "foo";
     o.sshPort = 42;
     o.sshUsername = "foo";
@@ -117,7 +117,7 @@
     unittest.expect(o.dockerImage, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1947(o.publicKeys);
+    checkUnnamed1167(o.publicKeys);
     unittest.expect(o.sshHost, unittest.equals('foo'));
     unittest.expect(o.sshPort, unittest.equals(42));
     unittest.expect(o.sshUsername, unittest.equals('foo'));
@@ -126,14 +126,14 @@
   buildCounterEnvironment--;
 }
 
-buildUnnamed1948() {
+buildUnnamed1168() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed1948(core.List<api.Operation> o) {
+checkUnnamed1168(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -145,7 +145,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed1948();
+    o.operations = buildUnnamed1168();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -155,12 +155,12 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1948(o.operations);
+    checkUnnamed1168(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed1949() {
+buildUnnamed1169() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -175,7 +175,7 @@
   return o;
 }
 
-checkUnnamed1949(core.Map<core.String, core.Object> o) {
+checkUnnamed1169(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -189,7 +189,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1950() {
+buildUnnamed1170() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -204,7 +204,7 @@
   return o;
 }
 
-checkUnnamed1950(core.Map<core.String, core.Object> o) {
+checkUnnamed1170(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -225,9 +225,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed1949();
+    o.metadata = buildUnnamed1169();
     o.name = "foo";
-    o.response = buildUnnamed1950();
+    o.response = buildUnnamed1170();
   }
   buildCounterOperation--;
   return o;
@@ -238,9 +238,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed1949(o.metadata);
+    checkUnnamed1169(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1950(o.response);
+    checkUnnamed1170(o.response);
   }
   buildCounterOperation--;
 }
@@ -306,7 +306,7 @@
   buildCounterStartEnvironmentResponse--;
 }
 
-buildUnnamed1951() {
+buildUnnamed1171() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -321,7 +321,7 @@
   return o;
 }
 
-checkUnnamed1951(core.Map<core.String, core.Object> o) {
+checkUnnamed1171(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -335,17 +335,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1952() {
+buildUnnamed1172() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed1951());
-  o.add(buildUnnamed1951());
+  o.add(buildUnnamed1171());
+  o.add(buildUnnamed1171());
   return o;
 }
 
-checkUnnamed1952(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1172(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1951(o[0]);
-  checkUnnamed1951(o[1]);
+  checkUnnamed1171(o[0]);
+  checkUnnamed1171(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -354,7 +354,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed1952();
+    o.details = buildUnnamed1172();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -365,7 +365,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed1952(o.details);
+    checkUnnamed1172(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -495,7 +495,7 @@
       }), true);
       res
           .cancel(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -546,7 +546,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -597,7 +597,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -660,7 +660,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/cloudtrace/v1_test.dart b/generated/googleapis/test/cloudtrace/v1_test.dart
index d65981c..caa0d93 100644
--- a/generated/googleapis/test/cloudtrace/v1_test.dart
+++ b/generated/googleapis/test/cloudtrace/v1_test.dart
@@ -65,14 +65,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed135() {
+buildUnnamed3453() {
   var o = new core.List<api.Trace>();
   o.add(buildTrace());
   o.add(buildTrace());
   return o;
 }
 
-checkUnnamed135(core.List<api.Trace> o) {
+checkUnnamed3453(core.List<api.Trace> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrace(o[0]);
   checkTrace(o[1]);
@@ -84,7 +84,7 @@
   buildCounterListTracesResponse++;
   if (buildCounterListTracesResponse < 3) {
     o.nextPageToken = "foo";
-    o.traces = buildUnnamed135();
+    o.traces = buildUnnamed3453();
   }
   buildCounterListTracesResponse--;
   return o;
@@ -94,19 +94,19 @@
   buildCounterListTracesResponse++;
   if (buildCounterListTracesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed135(o.traces);
+    checkUnnamed3453(o.traces);
   }
   buildCounterListTracesResponse--;
 }
 
-buildUnnamed136() {
+buildUnnamed3454() {
   var o = new core.List<api.TraceSpan>();
   o.add(buildTraceSpan());
   o.add(buildTraceSpan());
   return o;
 }
 
-checkUnnamed136(core.List<api.TraceSpan> o) {
+checkUnnamed3454(core.List<api.TraceSpan> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTraceSpan(o[0]);
   checkTraceSpan(o[1]);
@@ -118,7 +118,7 @@
   buildCounterTrace++;
   if (buildCounterTrace < 3) {
     o.projectId = "foo";
-    o.spans = buildUnnamed136();
+    o.spans = buildUnnamed3454();
     o.traceId = "foo";
   }
   buildCounterTrace--;
@@ -129,20 +129,20 @@
   buildCounterTrace++;
   if (buildCounterTrace < 3) {
     unittest.expect(o.projectId, unittest.equals('foo'));
-    checkUnnamed136(o.spans);
+    checkUnnamed3454(o.spans);
     unittest.expect(o.traceId, unittest.equals('foo'));
   }
   buildCounterTrace--;
 }
 
-buildUnnamed137() {
+buildUnnamed3455() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed137(core.Map<core.String, core.String> o) {
+checkUnnamed3455(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -155,7 +155,7 @@
   if (buildCounterTraceSpan < 3) {
     o.endTime = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed137();
+    o.labels = buildUnnamed3455();
     o.name = "foo";
     o.parentSpanId = "foo";
     o.spanId = "foo";
@@ -170,7 +170,7 @@
   if (buildCounterTraceSpan < 3) {
     unittest.expect(o.endTime, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed137(o.labels);
+    checkUnnamed3455(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.parentSpanId, unittest.equals('foo'));
     unittest.expect(o.spanId, unittest.equals('foo'));
@@ -179,14 +179,14 @@
   buildCounterTraceSpan--;
 }
 
-buildUnnamed138() {
+buildUnnamed3456() {
   var o = new core.List<api.Trace>();
   o.add(buildTrace());
   o.add(buildTrace());
   return o;
 }
 
-checkUnnamed138(core.List<api.Trace> o) {
+checkUnnamed3456(core.List<api.Trace> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrace(o[0]);
   checkTrace(o[1]);
@@ -197,7 +197,7 @@
   var o = new api.Traces();
   buildCounterTraces++;
   if (buildCounterTraces < 3) {
-    o.traces = buildUnnamed138();
+    o.traces = buildUnnamed3456();
   }
   buildCounterTraces--;
   return o;
@@ -206,7 +206,7 @@
 checkTraces(api.Traces o) {
   buildCounterTraces++;
   if (buildCounterTraces < 3) {
-    checkUnnamed138(o.traces);
+    checkUnnamed3456(o.traces);
   }
   buildCounterTraces--;
 }
@@ -311,7 +311,7 @@
       }), true);
       res
           .patchTraces(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -377,7 +377,7 @@
       }), true);
       res
           .get(arg_projectId, arg_traceId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Trace response) {
+          .then(unittest.expectAsync1(((response) {
         checkTrace(response);
       })));
     });
@@ -464,7 +464,7 @@
               view: arg_view,
               orderBy: arg_orderBy,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTracesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTracesResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/cloudtrace/v2_test.dart b/generated/googleapis/test/cloudtrace/v2_test.dart
index b23403a..55b3b72 100644
--- a/generated/googleapis/test/cloudtrace/v2_test.dart
+++ b/generated/googleapis/test/cloudtrace/v2_test.dart
@@ -94,14 +94,14 @@
   buildCounterAttributeValue--;
 }
 
-buildUnnamed1097() {
+buildUnnamed3459() {
   var o = new core.Map<core.String, api.AttributeValue>();
   o["x"] = buildAttributeValue();
   o["y"] = buildAttributeValue();
   return o;
 }
 
-checkUnnamed1097(core.Map<core.String, api.AttributeValue> o) {
+checkUnnamed3459(core.Map<core.String, api.AttributeValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAttributeValue(o["x"]);
   checkAttributeValue(o["y"]);
@@ -112,7 +112,7 @@
   var o = new api.Attributes();
   buildCounterAttributes++;
   if (buildCounterAttributes < 3) {
-    o.attributeMap = buildUnnamed1097();
+    o.attributeMap = buildUnnamed3459();
     o.droppedAttributesCount = 42;
   }
   buildCounterAttributes--;
@@ -122,20 +122,20 @@
 checkAttributes(api.Attributes o) {
   buildCounterAttributes++;
   if (buildCounterAttributes < 3) {
-    checkUnnamed1097(o.attributeMap);
+    checkUnnamed3459(o.attributeMap);
     unittest.expect(o.droppedAttributesCount, unittest.equals(42));
   }
   buildCounterAttributes--;
 }
 
-buildUnnamed1098() {
+buildUnnamed3460() {
   var o = new core.List<api.Span>();
   o.add(buildSpan());
   o.add(buildSpan());
   return o;
 }
 
-checkUnnamed1098(core.List<api.Span> o) {
+checkUnnamed3460(core.List<api.Span> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSpan(o[0]);
   checkSpan(o[1]);
@@ -146,7 +146,7 @@
   var o = new api.BatchWriteSpansRequest();
   buildCounterBatchWriteSpansRequest++;
   if (buildCounterBatchWriteSpansRequest < 3) {
-    o.spans = buildUnnamed1098();
+    o.spans = buildUnnamed3460();
   }
   buildCounterBatchWriteSpansRequest--;
   return o;
@@ -155,7 +155,7 @@
 checkBatchWriteSpansRequest(api.BatchWriteSpansRequest o) {
   buildCounterBatchWriteSpansRequest++;
   if (buildCounterBatchWriteSpansRequest < 3) {
-    checkUnnamed1098(o.spans);
+    checkUnnamed3460(o.spans);
   }
   buildCounterBatchWriteSpansRequest--;
 }
@@ -200,14 +200,14 @@
   buildCounterLink--;
 }
 
-buildUnnamed1099() {
+buildUnnamed3461() {
   var o = new core.List<api.Link>();
   o.add(buildLink());
   o.add(buildLink());
   return o;
 }
 
-checkUnnamed1099(core.List<api.Link> o) {
+checkUnnamed3461(core.List<api.Link> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLink(o[0]);
   checkLink(o[1]);
@@ -219,7 +219,7 @@
   buildCounterLinks++;
   if (buildCounterLinks < 3) {
     o.droppedLinksCount = 42;
-    o.link = buildUnnamed1099();
+    o.link = buildUnnamed3461();
   }
   buildCounterLinks--;
   return o;
@@ -229,7 +229,7 @@
   buildCounterLinks++;
   if (buildCounterLinks < 3) {
     unittest.expect(o.droppedLinksCount, unittest.equals(42));
-    checkUnnamed1099(o.link);
+    checkUnnamed3461(o.link);
   }
   buildCounterLinks--;
 }
@@ -354,14 +354,14 @@
   buildCounterStackFrame--;
 }
 
-buildUnnamed1100() {
+buildUnnamed3462() {
   var o = new core.List<api.StackFrame>();
   o.add(buildStackFrame());
   o.add(buildStackFrame());
   return o;
 }
 
-checkUnnamed1100(core.List<api.StackFrame> o) {
+checkUnnamed3462(core.List<api.StackFrame> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStackFrame(o[0]);
   checkStackFrame(o[1]);
@@ -373,7 +373,7 @@
   buildCounterStackFrames++;
   if (buildCounterStackFrames < 3) {
     o.droppedFramesCount = 42;
-    o.frame = buildUnnamed1100();
+    o.frame = buildUnnamed3462();
   }
   buildCounterStackFrames--;
   return o;
@@ -383,7 +383,7 @@
   buildCounterStackFrames++;
   if (buildCounterStackFrames < 3) {
     unittest.expect(o.droppedFramesCount, unittest.equals(42));
-    checkUnnamed1100(o.frame);
+    checkUnnamed3462(o.frame);
   }
   buildCounterStackFrames--;
 }
@@ -409,7 +409,7 @@
   buildCounterStackTrace--;
 }
 
-buildUnnamed1101() {
+buildUnnamed3463() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -424,7 +424,7 @@
   return o;
 }
 
-checkUnnamed1101(core.Map<core.String, core.Object> o) {
+checkUnnamed3463(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -438,17 +438,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1102() {
+buildUnnamed3464() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed1101());
-  o.add(buildUnnamed1101());
+  o.add(buildUnnamed3463());
+  o.add(buildUnnamed3463());
   return o;
 }
 
-checkUnnamed1102(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed3464(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1101(o[0]);
-  checkUnnamed1101(o[1]);
+  checkUnnamed3463(o[0]);
+  checkUnnamed3463(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -457,7 +457,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed1102();
+    o.details = buildUnnamed3464();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -468,7 +468,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed1102(o.details);
+    checkUnnamed3464(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -497,14 +497,14 @@
   buildCounterTimeEvent--;
 }
 
-buildUnnamed1103() {
+buildUnnamed3465() {
   var o = new core.List<api.TimeEvent>();
   o.add(buildTimeEvent());
   o.add(buildTimeEvent());
   return o;
 }
 
-checkUnnamed1103(core.List<api.TimeEvent> o) {
+checkUnnamed3465(core.List<api.TimeEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTimeEvent(o[0]);
   checkTimeEvent(o[1]);
@@ -517,7 +517,7 @@
   if (buildCounterTimeEvents < 3) {
     o.droppedAnnotationsCount = 42;
     o.droppedMessageEventsCount = 42;
-    o.timeEvent = buildUnnamed1103();
+    o.timeEvent = buildUnnamed3465();
   }
   buildCounterTimeEvents--;
   return o;
@@ -528,7 +528,7 @@
   if (buildCounterTimeEvents < 3) {
     unittest.expect(o.droppedAnnotationsCount, unittest.equals(42));
     unittest.expect(o.droppedMessageEventsCount, unittest.equals(42));
-    checkUnnamed1103(o.timeEvent);
+    checkUnnamed3465(o.timeEvent);
   }
   buildCounterTimeEvents--;
 }
@@ -743,7 +743,7 @@
       }), true);
       res
           .batchWrite(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -801,7 +801,7 @@
       }), true);
       res
           .createSpan(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Span response) {
+          .then(unittest.expectAsync1(((response) {
         checkSpan(response);
       })));
     });
diff --git a/generated/googleapis/test/compute/v1_test.dart b/generated/googleapis/test/compute/v1_test.dart
index 46d9dda..965940a 100644
--- a/generated/googleapis/test/compute/v1_test.dart
+++ b/generated/googleapis/test/compute/v1_test.dart
@@ -106,14 +106,14 @@
   buildCounterAcceleratorType--;
 }
 
-buildUnnamed241() {
+buildUnnamed2024() {
   var o = new core.Map<core.String, api.AcceleratorTypesScopedList>();
   o["x"] = buildAcceleratorTypesScopedList();
   o["y"] = buildAcceleratorTypesScopedList();
   return o;
 }
 
-checkUnnamed241(core.Map<core.String, api.AcceleratorTypesScopedList> o) {
+checkUnnamed2024(core.Map<core.String, api.AcceleratorTypesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAcceleratorTypesScopedList(o["x"]);
   checkAcceleratorTypesScopedList(o["y"]);
@@ -141,14 +141,14 @@
   buildCounterAcceleratorTypeAggregatedListWarningData--;
 }
 
-buildUnnamed242() {
+buildUnnamed2025() {
   var o = new core.List<api.AcceleratorTypeAggregatedListWarningData>();
   o.add(buildAcceleratorTypeAggregatedListWarningData());
   o.add(buildAcceleratorTypeAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed242(core.List<api.AcceleratorTypeAggregatedListWarningData> o) {
+checkUnnamed2025(core.List<api.AcceleratorTypeAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAcceleratorTypeAggregatedListWarningData(o[0]);
   checkAcceleratorTypeAggregatedListWarningData(o[1]);
@@ -160,7 +160,7 @@
   buildCounterAcceleratorTypeAggregatedListWarning++;
   if (buildCounterAcceleratorTypeAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed242();
+    o.data = buildUnnamed2025();
     o.message = "foo";
   }
   buildCounterAcceleratorTypeAggregatedListWarning--;
@@ -172,7 +172,7 @@
   buildCounterAcceleratorTypeAggregatedListWarning++;
   if (buildCounterAcceleratorTypeAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed242(o.data);
+    checkUnnamed2025(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterAcceleratorTypeAggregatedListWarning--;
@@ -184,7 +184,7 @@
   buildCounterAcceleratorTypeAggregatedList++;
   if (buildCounterAcceleratorTypeAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed241();
+    o.items = buildUnnamed2024();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -198,7 +198,7 @@
   buildCounterAcceleratorTypeAggregatedList++;
   if (buildCounterAcceleratorTypeAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed241(o.items);
+    checkUnnamed2024(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -207,14 +207,14 @@
   buildCounterAcceleratorTypeAggregatedList--;
 }
 
-buildUnnamed243() {
+buildUnnamed2026() {
   var o = new core.List<api.AcceleratorType>();
   o.add(buildAcceleratorType());
   o.add(buildAcceleratorType());
   return o;
 }
 
-checkUnnamed243(core.List<api.AcceleratorType> o) {
+checkUnnamed2026(core.List<api.AcceleratorType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAcceleratorType(o[0]);
   checkAcceleratorType(o[1]);
@@ -241,14 +241,14 @@
   buildCounterAcceleratorTypeListWarningData--;
 }
 
-buildUnnamed244() {
+buildUnnamed2027() {
   var o = new core.List<api.AcceleratorTypeListWarningData>();
   o.add(buildAcceleratorTypeListWarningData());
   o.add(buildAcceleratorTypeListWarningData());
   return o;
 }
 
-checkUnnamed244(core.List<api.AcceleratorTypeListWarningData> o) {
+checkUnnamed2027(core.List<api.AcceleratorTypeListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAcceleratorTypeListWarningData(o[0]);
   checkAcceleratorTypeListWarningData(o[1]);
@@ -260,7 +260,7 @@
   buildCounterAcceleratorTypeListWarning++;
   if (buildCounterAcceleratorTypeListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed244();
+    o.data = buildUnnamed2027();
     o.message = "foo";
   }
   buildCounterAcceleratorTypeListWarning--;
@@ -271,7 +271,7 @@
   buildCounterAcceleratorTypeListWarning++;
   if (buildCounterAcceleratorTypeListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed244(o.data);
+    checkUnnamed2027(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterAcceleratorTypeListWarning--;
@@ -283,7 +283,7 @@
   buildCounterAcceleratorTypeList++;
   if (buildCounterAcceleratorTypeList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed243();
+    o.items = buildUnnamed2026();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -297,7 +297,7 @@
   buildCounterAcceleratorTypeList++;
   if (buildCounterAcceleratorTypeList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed243(o.items);
+    checkUnnamed2026(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -306,14 +306,14 @@
   buildCounterAcceleratorTypeList--;
 }
 
-buildUnnamed245() {
+buildUnnamed2028() {
   var o = new core.List<api.AcceleratorType>();
   o.add(buildAcceleratorType());
   o.add(buildAcceleratorType());
   return o;
 }
 
-checkUnnamed245(core.List<api.AcceleratorType> o) {
+checkUnnamed2028(core.List<api.AcceleratorType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAcceleratorType(o[0]);
   checkAcceleratorType(o[1]);
@@ -341,14 +341,14 @@
   buildCounterAcceleratorTypesScopedListWarningData--;
 }
 
-buildUnnamed246() {
+buildUnnamed2029() {
   var o = new core.List<api.AcceleratorTypesScopedListWarningData>();
   o.add(buildAcceleratorTypesScopedListWarningData());
   o.add(buildAcceleratorTypesScopedListWarningData());
   return o;
 }
 
-checkUnnamed246(core.List<api.AcceleratorTypesScopedListWarningData> o) {
+checkUnnamed2029(core.List<api.AcceleratorTypesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAcceleratorTypesScopedListWarningData(o[0]);
   checkAcceleratorTypesScopedListWarningData(o[1]);
@@ -360,7 +360,7 @@
   buildCounterAcceleratorTypesScopedListWarning++;
   if (buildCounterAcceleratorTypesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed246();
+    o.data = buildUnnamed2029();
     o.message = "foo";
   }
   buildCounterAcceleratorTypesScopedListWarning--;
@@ -372,7 +372,7 @@
   buildCounterAcceleratorTypesScopedListWarning++;
   if (buildCounterAcceleratorTypesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed246(o.data);
+    checkUnnamed2029(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterAcceleratorTypesScopedListWarning--;
@@ -383,7 +383,7 @@
   var o = new api.AcceleratorTypesScopedList();
   buildCounterAcceleratorTypesScopedList++;
   if (buildCounterAcceleratorTypesScopedList < 3) {
-    o.acceleratorTypes = buildUnnamed245();
+    o.acceleratorTypes = buildUnnamed2028();
     o.warning = buildAcceleratorTypesScopedListWarning();
   }
   buildCounterAcceleratorTypesScopedList--;
@@ -393,7 +393,7 @@
 checkAcceleratorTypesScopedList(api.AcceleratorTypesScopedList o) {
   buildCounterAcceleratorTypesScopedList++;
   if (buildCounterAcceleratorTypesScopedList < 3) {
-    checkUnnamed245(o.acceleratorTypes);
+    checkUnnamed2028(o.acceleratorTypes);
     checkAcceleratorTypesScopedListWarning(o.warning);
   }
   buildCounterAcceleratorTypesScopedList--;
@@ -428,14 +428,14 @@
   buildCounterAccessConfig--;
 }
 
-buildUnnamed247() {
+buildUnnamed2030() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed247(core.List<core.String> o) {
+checkUnnamed2030(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -458,7 +458,7 @@
     o.selfLink = "foo";
     o.status = "foo";
     o.subnetwork = "foo";
-    o.users = buildUnnamed247();
+    o.users = buildUnnamed2030();
   }
   buildCounterAddress--;
   return o;
@@ -479,19 +479,19 @@
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.subnetwork, unittest.equals('foo'));
-    checkUnnamed247(o.users);
+    checkUnnamed2030(o.users);
   }
   buildCounterAddress--;
 }
 
-buildUnnamed248() {
+buildUnnamed2031() {
   var o = new core.Map<core.String, api.AddressesScopedList>();
   o["x"] = buildAddressesScopedList();
   o["y"] = buildAddressesScopedList();
   return o;
 }
 
-checkUnnamed248(core.Map<core.String, api.AddressesScopedList> o) {
+checkUnnamed2031(core.Map<core.String, api.AddressesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAddressesScopedList(o["x"]);
   checkAddressesScopedList(o["y"]);
@@ -518,14 +518,14 @@
   buildCounterAddressAggregatedListWarningData--;
 }
 
-buildUnnamed249() {
+buildUnnamed2032() {
   var o = new core.List<api.AddressAggregatedListWarningData>();
   o.add(buildAddressAggregatedListWarningData());
   o.add(buildAddressAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed249(core.List<api.AddressAggregatedListWarningData> o) {
+checkUnnamed2032(core.List<api.AddressAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAddressAggregatedListWarningData(o[0]);
   checkAddressAggregatedListWarningData(o[1]);
@@ -537,7 +537,7 @@
   buildCounterAddressAggregatedListWarning++;
   if (buildCounterAddressAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed249();
+    o.data = buildUnnamed2032();
     o.message = "foo";
   }
   buildCounterAddressAggregatedListWarning--;
@@ -548,7 +548,7 @@
   buildCounterAddressAggregatedListWarning++;
   if (buildCounterAddressAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed249(o.data);
+    checkUnnamed2032(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterAddressAggregatedListWarning--;
@@ -560,7 +560,7 @@
   buildCounterAddressAggregatedList++;
   if (buildCounterAddressAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed248();
+    o.items = buildUnnamed2031();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -574,7 +574,7 @@
   buildCounterAddressAggregatedList++;
   if (buildCounterAddressAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed248(o.items);
+    checkUnnamed2031(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -583,14 +583,14 @@
   buildCounterAddressAggregatedList--;
 }
 
-buildUnnamed250() {
+buildUnnamed2033() {
   var o = new core.List<api.Address>();
   o.add(buildAddress());
   o.add(buildAddress());
   return o;
 }
 
-checkUnnamed250(core.List<api.Address> o) {
+checkUnnamed2033(core.List<api.Address> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAddress(o[0]);
   checkAddress(o[1]);
@@ -617,14 +617,14 @@
   buildCounterAddressListWarningData--;
 }
 
-buildUnnamed251() {
+buildUnnamed2034() {
   var o = new core.List<api.AddressListWarningData>();
   o.add(buildAddressListWarningData());
   o.add(buildAddressListWarningData());
   return o;
 }
 
-checkUnnamed251(core.List<api.AddressListWarningData> o) {
+checkUnnamed2034(core.List<api.AddressListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAddressListWarningData(o[0]);
   checkAddressListWarningData(o[1]);
@@ -636,7 +636,7 @@
   buildCounterAddressListWarning++;
   if (buildCounterAddressListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed251();
+    o.data = buildUnnamed2034();
     o.message = "foo";
   }
   buildCounterAddressListWarning--;
@@ -647,7 +647,7 @@
   buildCounterAddressListWarning++;
   if (buildCounterAddressListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed251(o.data);
+    checkUnnamed2034(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterAddressListWarning--;
@@ -659,7 +659,7 @@
   buildCounterAddressList++;
   if (buildCounterAddressList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed250();
+    o.items = buildUnnamed2033();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -673,7 +673,7 @@
   buildCounterAddressList++;
   if (buildCounterAddressList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed250(o.items);
+    checkUnnamed2033(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -682,14 +682,14 @@
   buildCounterAddressList--;
 }
 
-buildUnnamed252() {
+buildUnnamed2035() {
   var o = new core.List<api.Address>();
   o.add(buildAddress());
   o.add(buildAddress());
   return o;
 }
 
-checkUnnamed252(core.List<api.Address> o) {
+checkUnnamed2035(core.List<api.Address> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAddress(o[0]);
   checkAddress(o[1]);
@@ -716,14 +716,14 @@
   buildCounterAddressesScopedListWarningData--;
 }
 
-buildUnnamed253() {
+buildUnnamed2036() {
   var o = new core.List<api.AddressesScopedListWarningData>();
   o.add(buildAddressesScopedListWarningData());
   o.add(buildAddressesScopedListWarningData());
   return o;
 }
 
-checkUnnamed253(core.List<api.AddressesScopedListWarningData> o) {
+checkUnnamed2036(core.List<api.AddressesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAddressesScopedListWarningData(o[0]);
   checkAddressesScopedListWarningData(o[1]);
@@ -735,7 +735,7 @@
   buildCounterAddressesScopedListWarning++;
   if (buildCounterAddressesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed253();
+    o.data = buildUnnamed2036();
     o.message = "foo";
   }
   buildCounterAddressesScopedListWarning--;
@@ -746,7 +746,7 @@
   buildCounterAddressesScopedListWarning++;
   if (buildCounterAddressesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed253(o.data);
+    checkUnnamed2036(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterAddressesScopedListWarning--;
@@ -757,7 +757,7 @@
   var o = new api.AddressesScopedList();
   buildCounterAddressesScopedList++;
   if (buildCounterAddressesScopedList < 3) {
-    o.addresses = buildUnnamed252();
+    o.addresses = buildUnnamed2035();
     o.warning = buildAddressesScopedListWarning();
   }
   buildCounterAddressesScopedList--;
@@ -767,7 +767,7 @@
 checkAddressesScopedList(api.AddressesScopedList o) {
   buildCounterAddressesScopedList++;
   if (buildCounterAddressesScopedList < 3) {
-    checkUnnamed252(o.addresses);
+    checkUnnamed2035(o.addresses);
     checkAddressesScopedListWarning(o.warning);
   }
   buildCounterAddressesScopedList--;
@@ -794,14 +794,14 @@
   buildCounterAliasIpRange--;
 }
 
-buildUnnamed254() {
+buildUnnamed2037() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed254(core.List<core.String> o) {
+checkUnnamed2037(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -820,7 +820,7 @@
     o.initializeParams = buildAttachedDiskInitializeParams();
     o.interface = "foo";
     o.kind = "foo";
-    o.licenses = buildUnnamed254();
+    o.licenses = buildUnnamed2037();
     o.mode = "foo";
     o.source = "foo";
     o.type = "foo";
@@ -840,7 +840,7 @@
     checkAttachedDiskInitializeParams(o.initializeParams);
     unittest.expect(o.interface, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed254(o.licenses);
+    checkUnnamed2037(o.licenses);
     unittest.expect(o.mode, unittest.equals('foo'));
     unittest.expect(o.source, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -848,14 +848,14 @@
   buildCounterAttachedDisk--;
 }
 
-buildUnnamed255() {
+buildUnnamed2038() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed255(core.Map<core.String, core.String> o) {
+checkUnnamed2038(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -869,7 +869,7 @@
     o.diskName = "foo";
     o.diskSizeGb = "foo";
     o.diskType = "foo";
-    o.labels = buildUnnamed255();
+    o.labels = buildUnnamed2038();
     o.sourceImage = "foo";
     o.sourceImageEncryptionKey = buildCustomerEncryptionKey();
   }
@@ -883,21 +883,21 @@
     unittest.expect(o.diskName, unittest.equals('foo'));
     unittest.expect(o.diskSizeGb, unittest.equals('foo'));
     unittest.expect(o.diskType, unittest.equals('foo'));
-    checkUnnamed255(o.labels);
+    checkUnnamed2038(o.labels);
     unittest.expect(o.sourceImage, unittest.equals('foo'));
     checkCustomerEncryptionKey(o.sourceImageEncryptionKey);
   }
   buildCounterAttachedDiskInitializeParams--;
 }
 
-buildUnnamed256() {
+buildUnnamed2039() {
   var o = new core.List<api.AutoscalerStatusDetails>();
   o.add(buildAutoscalerStatusDetails());
   o.add(buildAutoscalerStatusDetails());
   return o;
 }
 
-checkUnnamed256(core.List<api.AutoscalerStatusDetails> o) {
+checkUnnamed2039(core.List<api.AutoscalerStatusDetails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAutoscalerStatusDetails(o[0]);
   checkAutoscalerStatusDetails(o[1]);
@@ -917,7 +917,7 @@
     o.region = "foo";
     o.selfLink = "foo";
     o.status = "foo";
-    o.statusDetails = buildUnnamed256();
+    o.statusDetails = buildUnnamed2039();
     o.target = "foo";
     o.zone = "foo";
   }
@@ -937,21 +937,21 @@
     unittest.expect(o.region, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
-    checkUnnamed256(o.statusDetails);
+    checkUnnamed2039(o.statusDetails);
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.zone, unittest.equals('foo'));
   }
   buildCounterAutoscaler--;
 }
 
-buildUnnamed257() {
+buildUnnamed2040() {
   var o = new core.Map<core.String, api.AutoscalersScopedList>();
   o["x"] = buildAutoscalersScopedList();
   o["y"] = buildAutoscalersScopedList();
   return o;
 }
 
-checkUnnamed257(core.Map<core.String, api.AutoscalersScopedList> o) {
+checkUnnamed2040(core.Map<core.String, api.AutoscalersScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAutoscalersScopedList(o["x"]);
   checkAutoscalersScopedList(o["y"]);
@@ -979,14 +979,14 @@
   buildCounterAutoscalerAggregatedListWarningData--;
 }
 
-buildUnnamed258() {
+buildUnnamed2041() {
   var o = new core.List<api.AutoscalerAggregatedListWarningData>();
   o.add(buildAutoscalerAggregatedListWarningData());
   o.add(buildAutoscalerAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed258(core.List<api.AutoscalerAggregatedListWarningData> o) {
+checkUnnamed2041(core.List<api.AutoscalerAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAutoscalerAggregatedListWarningData(o[0]);
   checkAutoscalerAggregatedListWarningData(o[1]);
@@ -998,7 +998,7 @@
   buildCounterAutoscalerAggregatedListWarning++;
   if (buildCounterAutoscalerAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed258();
+    o.data = buildUnnamed2041();
     o.message = "foo";
   }
   buildCounterAutoscalerAggregatedListWarning--;
@@ -1009,7 +1009,7 @@
   buildCounterAutoscalerAggregatedListWarning++;
   if (buildCounterAutoscalerAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed258(o.data);
+    checkUnnamed2041(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterAutoscalerAggregatedListWarning--;
@@ -1021,7 +1021,7 @@
   buildCounterAutoscalerAggregatedList++;
   if (buildCounterAutoscalerAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed257();
+    o.items = buildUnnamed2040();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1035,7 +1035,7 @@
   buildCounterAutoscalerAggregatedList++;
   if (buildCounterAutoscalerAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed257(o.items);
+    checkUnnamed2040(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1044,14 +1044,14 @@
   buildCounterAutoscalerAggregatedList--;
 }
 
-buildUnnamed259() {
+buildUnnamed2042() {
   var o = new core.List<api.Autoscaler>();
   o.add(buildAutoscaler());
   o.add(buildAutoscaler());
   return o;
 }
 
-checkUnnamed259(core.List<api.Autoscaler> o) {
+checkUnnamed2042(core.List<api.Autoscaler> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAutoscaler(o[0]);
   checkAutoscaler(o[1]);
@@ -1078,14 +1078,14 @@
   buildCounterAutoscalerListWarningData--;
 }
 
-buildUnnamed260() {
+buildUnnamed2043() {
   var o = new core.List<api.AutoscalerListWarningData>();
   o.add(buildAutoscalerListWarningData());
   o.add(buildAutoscalerListWarningData());
   return o;
 }
 
-checkUnnamed260(core.List<api.AutoscalerListWarningData> o) {
+checkUnnamed2043(core.List<api.AutoscalerListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAutoscalerListWarningData(o[0]);
   checkAutoscalerListWarningData(o[1]);
@@ -1097,7 +1097,7 @@
   buildCounterAutoscalerListWarning++;
   if (buildCounterAutoscalerListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed260();
+    o.data = buildUnnamed2043();
     o.message = "foo";
   }
   buildCounterAutoscalerListWarning--;
@@ -1108,7 +1108,7 @@
   buildCounterAutoscalerListWarning++;
   if (buildCounterAutoscalerListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed260(o.data);
+    checkUnnamed2043(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterAutoscalerListWarning--;
@@ -1120,7 +1120,7 @@
   buildCounterAutoscalerList++;
   if (buildCounterAutoscalerList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed259();
+    o.items = buildUnnamed2042();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1134,7 +1134,7 @@
   buildCounterAutoscalerList++;
   if (buildCounterAutoscalerList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed259(o.items);
+    checkUnnamed2042(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1164,14 +1164,14 @@
   buildCounterAutoscalerStatusDetails--;
 }
 
-buildUnnamed261() {
+buildUnnamed2044() {
   var o = new core.List<api.Autoscaler>();
   o.add(buildAutoscaler());
   o.add(buildAutoscaler());
   return o;
 }
 
-checkUnnamed261(core.List<api.Autoscaler> o) {
+checkUnnamed2044(core.List<api.Autoscaler> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAutoscaler(o[0]);
   checkAutoscaler(o[1]);
@@ -1198,14 +1198,14 @@
   buildCounterAutoscalersScopedListWarningData--;
 }
 
-buildUnnamed262() {
+buildUnnamed2045() {
   var o = new core.List<api.AutoscalersScopedListWarningData>();
   o.add(buildAutoscalersScopedListWarningData());
   o.add(buildAutoscalersScopedListWarningData());
   return o;
 }
 
-checkUnnamed262(core.List<api.AutoscalersScopedListWarningData> o) {
+checkUnnamed2045(core.List<api.AutoscalersScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAutoscalersScopedListWarningData(o[0]);
   checkAutoscalersScopedListWarningData(o[1]);
@@ -1217,7 +1217,7 @@
   buildCounterAutoscalersScopedListWarning++;
   if (buildCounterAutoscalersScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed262();
+    o.data = buildUnnamed2045();
     o.message = "foo";
   }
   buildCounterAutoscalersScopedListWarning--;
@@ -1228,7 +1228,7 @@
   buildCounterAutoscalersScopedListWarning++;
   if (buildCounterAutoscalersScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed262(o.data);
+    checkUnnamed2045(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterAutoscalersScopedListWarning--;
@@ -1239,7 +1239,7 @@
   var o = new api.AutoscalersScopedList();
   buildCounterAutoscalersScopedList++;
   if (buildCounterAutoscalersScopedList < 3) {
-    o.autoscalers = buildUnnamed261();
+    o.autoscalers = buildUnnamed2044();
     o.warning = buildAutoscalersScopedListWarning();
   }
   buildCounterAutoscalersScopedList--;
@@ -1249,20 +1249,20 @@
 checkAutoscalersScopedList(api.AutoscalersScopedList o) {
   buildCounterAutoscalersScopedList++;
   if (buildCounterAutoscalersScopedList < 3) {
-    checkUnnamed261(o.autoscalers);
+    checkUnnamed2044(o.autoscalers);
     checkAutoscalersScopedListWarning(o.warning);
   }
   buildCounterAutoscalersScopedList--;
 }
 
-buildUnnamed263() {
+buildUnnamed2046() {
   var o = new core.List<api.AutoscalingPolicyCustomMetricUtilization>();
   o.add(buildAutoscalingPolicyCustomMetricUtilization());
   o.add(buildAutoscalingPolicyCustomMetricUtilization());
   return o;
 }
 
-checkUnnamed263(core.List<api.AutoscalingPolicyCustomMetricUtilization> o) {
+checkUnnamed2046(core.List<api.AutoscalingPolicyCustomMetricUtilization> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAutoscalingPolicyCustomMetricUtilization(o[0]);
   checkAutoscalingPolicyCustomMetricUtilization(o[1]);
@@ -1275,7 +1275,7 @@
   if (buildCounterAutoscalingPolicy < 3) {
     o.coolDownPeriodSec = 42;
     o.cpuUtilization = buildAutoscalingPolicyCpuUtilization();
-    o.customMetricUtilizations = buildUnnamed263();
+    o.customMetricUtilizations = buildUnnamed2046();
     o.loadBalancingUtilization =
         buildAutoscalingPolicyLoadBalancingUtilization();
     o.maxNumReplicas = 42;
@@ -1290,7 +1290,7 @@
   if (buildCounterAutoscalingPolicy < 3) {
     unittest.expect(o.coolDownPeriodSec, unittest.equals(42));
     checkAutoscalingPolicyCpuUtilization(o.cpuUtilization);
-    checkUnnamed263(o.customMetricUtilizations);
+    checkUnnamed2046(o.customMetricUtilizations);
     checkAutoscalingPolicyLoadBalancingUtilization(o.loadBalancingUtilization);
     unittest.expect(o.maxNumReplicas, unittest.equals(42));
     unittest.expect(o.minNumReplicas, unittest.equals(42));
@@ -1429,14 +1429,14 @@
   buildCounterBackendBucket--;
 }
 
-buildUnnamed264() {
+buildUnnamed2047() {
   var o = new core.List<api.BackendBucket>();
   o.add(buildBackendBucket());
   o.add(buildBackendBucket());
   return o;
 }
 
-checkUnnamed264(core.List<api.BackendBucket> o) {
+checkUnnamed2047(core.List<api.BackendBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendBucket(o[0]);
   checkBackendBucket(o[1]);
@@ -1463,14 +1463,14 @@
   buildCounterBackendBucketListWarningData--;
 }
 
-buildUnnamed265() {
+buildUnnamed2048() {
   var o = new core.List<api.BackendBucketListWarningData>();
   o.add(buildBackendBucketListWarningData());
   o.add(buildBackendBucketListWarningData());
   return o;
 }
 
-checkUnnamed265(core.List<api.BackendBucketListWarningData> o) {
+checkUnnamed2048(core.List<api.BackendBucketListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendBucketListWarningData(o[0]);
   checkBackendBucketListWarningData(o[1]);
@@ -1482,7 +1482,7 @@
   buildCounterBackendBucketListWarning++;
   if (buildCounterBackendBucketListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed265();
+    o.data = buildUnnamed2048();
     o.message = "foo";
   }
   buildCounterBackendBucketListWarning--;
@@ -1493,7 +1493,7 @@
   buildCounterBackendBucketListWarning++;
   if (buildCounterBackendBucketListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed265(o.data);
+    checkUnnamed2048(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterBackendBucketListWarning--;
@@ -1505,7 +1505,7 @@
   buildCounterBackendBucketList++;
   if (buildCounterBackendBucketList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed264();
+    o.items = buildUnnamed2047();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1519,7 +1519,7 @@
   buildCounterBackendBucketList++;
   if (buildCounterBackendBucketList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed264(o.items);
+    checkUnnamed2047(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1528,27 +1528,27 @@
   buildCounterBackendBucketList--;
 }
 
-buildUnnamed266() {
+buildUnnamed2049() {
   var o = new core.List<api.Backend>();
   o.add(buildBackend());
   o.add(buildBackend());
   return o;
 }
 
-checkUnnamed266(core.List<api.Backend> o) {
+checkUnnamed2049(core.List<api.Backend> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackend(o[0]);
   checkBackend(o[1]);
 }
 
-buildUnnamed267() {
+buildUnnamed2050() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed267(core.List<core.String> o) {
+checkUnnamed2050(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1560,14 +1560,14 @@
   buildCounterBackendService++;
   if (buildCounterBackendService < 3) {
     o.affinityCookieTtlSec = 42;
-    o.backends = buildUnnamed266();
+    o.backends = buildUnnamed2049();
     o.cdnPolicy = buildBackendServiceCdnPolicy();
     o.connectionDraining = buildConnectionDraining();
     o.creationTimestamp = "foo";
     o.description = "foo";
     o.enableCDN = true;
     o.fingerprint = "foo";
-    o.healthChecks = buildUnnamed267();
+    o.healthChecks = buildUnnamed2050();
     o.iap = buildBackendServiceIAP();
     o.id = "foo";
     o.kind = "foo";
@@ -1589,14 +1589,14 @@
   buildCounterBackendService++;
   if (buildCounterBackendService < 3) {
     unittest.expect(o.affinityCookieTtlSec, unittest.equals(42));
-    checkUnnamed266(o.backends);
+    checkUnnamed2049(o.backends);
     checkBackendServiceCdnPolicy(o.cdnPolicy);
     checkConnectionDraining(o.connectionDraining);
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.enableCDN, unittest.isTrue);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed267(o.healthChecks);
+    checkUnnamed2050(o.healthChecks);
     checkBackendServiceIAP(o.iap);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -1613,14 +1613,14 @@
   buildCounterBackendService--;
 }
 
-buildUnnamed268() {
+buildUnnamed2051() {
   var o = new core.Map<core.String, api.BackendServicesScopedList>();
   o["x"] = buildBackendServicesScopedList();
   o["y"] = buildBackendServicesScopedList();
   return o;
 }
 
-checkUnnamed268(core.Map<core.String, api.BackendServicesScopedList> o) {
+checkUnnamed2051(core.Map<core.String, api.BackendServicesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendServicesScopedList(o["x"]);
   checkBackendServicesScopedList(o["y"]);
@@ -1648,14 +1648,14 @@
   buildCounterBackendServiceAggregatedListWarningData--;
 }
 
-buildUnnamed269() {
+buildUnnamed2052() {
   var o = new core.List<api.BackendServiceAggregatedListWarningData>();
   o.add(buildBackendServiceAggregatedListWarningData());
   o.add(buildBackendServiceAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed269(core.List<api.BackendServiceAggregatedListWarningData> o) {
+checkUnnamed2052(core.List<api.BackendServiceAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendServiceAggregatedListWarningData(o[0]);
   checkBackendServiceAggregatedListWarningData(o[1]);
@@ -1667,7 +1667,7 @@
   buildCounterBackendServiceAggregatedListWarning++;
   if (buildCounterBackendServiceAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed269();
+    o.data = buildUnnamed2052();
     o.message = "foo";
   }
   buildCounterBackendServiceAggregatedListWarning--;
@@ -1679,7 +1679,7 @@
   buildCounterBackendServiceAggregatedListWarning++;
   if (buildCounterBackendServiceAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed269(o.data);
+    checkUnnamed2052(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterBackendServiceAggregatedListWarning--;
@@ -1691,7 +1691,7 @@
   buildCounterBackendServiceAggregatedList++;
   if (buildCounterBackendServiceAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed268();
+    o.items = buildUnnamed2051();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1705,7 +1705,7 @@
   buildCounterBackendServiceAggregatedList++;
   if (buildCounterBackendServiceAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed268(o.items);
+    checkUnnamed2051(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1733,14 +1733,14 @@
   buildCounterBackendServiceCdnPolicy--;
 }
 
-buildUnnamed270() {
+buildUnnamed2053() {
   var o = new core.List<api.HealthStatus>();
   o.add(buildHealthStatus());
   o.add(buildHealthStatus());
   return o;
 }
 
-checkUnnamed270(core.List<api.HealthStatus> o) {
+checkUnnamed2053(core.List<api.HealthStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHealthStatus(o[0]);
   checkHealthStatus(o[1]);
@@ -1751,7 +1751,7 @@
   var o = new api.BackendServiceGroupHealth();
   buildCounterBackendServiceGroupHealth++;
   if (buildCounterBackendServiceGroupHealth < 3) {
-    o.healthStatus = buildUnnamed270();
+    o.healthStatus = buildUnnamed2053();
     o.kind = "foo";
   }
   buildCounterBackendServiceGroupHealth--;
@@ -1761,7 +1761,7 @@
 checkBackendServiceGroupHealth(api.BackendServiceGroupHealth o) {
   buildCounterBackendServiceGroupHealth++;
   if (buildCounterBackendServiceGroupHealth < 3) {
-    checkUnnamed270(o.healthStatus);
+    checkUnnamed2053(o.healthStatus);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBackendServiceGroupHealth--;
@@ -1792,14 +1792,14 @@
   buildCounterBackendServiceIAP--;
 }
 
-buildUnnamed271() {
+buildUnnamed2054() {
   var o = new core.List<api.BackendService>();
   o.add(buildBackendService());
   o.add(buildBackendService());
   return o;
 }
 
-checkUnnamed271(core.List<api.BackendService> o) {
+checkUnnamed2054(core.List<api.BackendService> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendService(o[0]);
   checkBackendService(o[1]);
@@ -1826,14 +1826,14 @@
   buildCounterBackendServiceListWarningData--;
 }
 
-buildUnnamed272() {
+buildUnnamed2055() {
   var o = new core.List<api.BackendServiceListWarningData>();
   o.add(buildBackendServiceListWarningData());
   o.add(buildBackendServiceListWarningData());
   return o;
 }
 
-checkUnnamed272(core.List<api.BackendServiceListWarningData> o) {
+checkUnnamed2055(core.List<api.BackendServiceListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendServiceListWarningData(o[0]);
   checkBackendServiceListWarningData(o[1]);
@@ -1845,7 +1845,7 @@
   buildCounterBackendServiceListWarning++;
   if (buildCounterBackendServiceListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed272();
+    o.data = buildUnnamed2055();
     o.message = "foo";
   }
   buildCounterBackendServiceListWarning--;
@@ -1856,7 +1856,7 @@
   buildCounterBackendServiceListWarning++;
   if (buildCounterBackendServiceListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed272(o.data);
+    checkUnnamed2055(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterBackendServiceListWarning--;
@@ -1868,7 +1868,7 @@
   buildCounterBackendServiceList++;
   if (buildCounterBackendServiceList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed271();
+    o.items = buildUnnamed2054();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1882,7 +1882,7 @@
   buildCounterBackendServiceList++;
   if (buildCounterBackendServiceList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed271(o.items);
+    checkUnnamed2054(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1891,14 +1891,14 @@
   buildCounterBackendServiceList--;
 }
 
-buildUnnamed273() {
+buildUnnamed2056() {
   var o = new core.List<api.BackendService>();
   o.add(buildBackendService());
   o.add(buildBackendService());
   return o;
 }
 
-checkUnnamed273(core.List<api.BackendService> o) {
+checkUnnamed2056(core.List<api.BackendService> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendService(o[0]);
   checkBackendService(o[1]);
@@ -1926,14 +1926,14 @@
   buildCounterBackendServicesScopedListWarningData--;
 }
 
-buildUnnamed274() {
+buildUnnamed2057() {
   var o = new core.List<api.BackendServicesScopedListWarningData>();
   o.add(buildBackendServicesScopedListWarningData());
   o.add(buildBackendServicesScopedListWarningData());
   return o;
 }
 
-checkUnnamed274(core.List<api.BackendServicesScopedListWarningData> o) {
+checkUnnamed2057(core.List<api.BackendServicesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendServicesScopedListWarningData(o[0]);
   checkBackendServicesScopedListWarningData(o[1]);
@@ -1945,7 +1945,7 @@
   buildCounterBackendServicesScopedListWarning++;
   if (buildCounterBackendServicesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed274();
+    o.data = buildUnnamed2057();
     o.message = "foo";
   }
   buildCounterBackendServicesScopedListWarning--;
@@ -1956,7 +1956,7 @@
   buildCounterBackendServicesScopedListWarning++;
   if (buildCounterBackendServicesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed274(o.data);
+    checkUnnamed2057(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterBackendServicesScopedListWarning--;
@@ -1967,7 +1967,7 @@
   var o = new api.BackendServicesScopedList();
   buildCounterBackendServicesScopedList++;
   if (buildCounterBackendServicesScopedList < 3) {
-    o.backendServices = buildUnnamed273();
+    o.backendServices = buildUnnamed2056();
     o.warning = buildBackendServicesScopedListWarning();
   }
   buildCounterBackendServicesScopedList--;
@@ -1977,7 +1977,7 @@
 checkBackendServicesScopedList(api.BackendServicesScopedList o) {
   buildCounterBackendServicesScopedList++;
   if (buildCounterBackendServicesScopedList < 3) {
-    checkUnnamed273(o.backendServices);
+    checkUnnamed2056(o.backendServices);
     checkBackendServicesScopedListWarning(o.warning);
   }
   buildCounterBackendServicesScopedList--;
@@ -2004,27 +2004,27 @@
   buildCounterCacheInvalidationRule--;
 }
 
-buildUnnamed275() {
+buildUnnamed2058() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed275(core.List<core.String> o) {
+checkUnnamed2058(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed276() {
+buildUnnamed2059() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed276(core.List<core.String> o) {
+checkUnnamed2059(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2038,8 +2038,8 @@
     o.includeHost = true;
     o.includeProtocol = true;
     o.includeQueryString = true;
-    o.queryStringBlacklist = buildUnnamed275();
-    o.queryStringWhitelist = buildUnnamed276();
+    o.queryStringBlacklist = buildUnnamed2058();
+    o.queryStringWhitelist = buildUnnamed2059();
   }
   buildCounterCacheKeyPolicy--;
   return o;
@@ -2051,20 +2051,20 @@
     unittest.expect(o.includeHost, unittest.isTrue);
     unittest.expect(o.includeProtocol, unittest.isTrue);
     unittest.expect(o.includeQueryString, unittest.isTrue);
-    checkUnnamed275(o.queryStringBlacklist);
-    checkUnnamed276(o.queryStringWhitelist);
+    checkUnnamed2058(o.queryStringBlacklist);
+    checkUnnamed2059(o.queryStringWhitelist);
   }
   buildCounterCacheKeyPolicy--;
 }
 
-buildUnnamed277() {
+buildUnnamed2060() {
   var o = new core.List<api.ResourceCommitment>();
   o.add(buildResourceCommitment());
   o.add(buildResourceCommitment());
   return o;
 }
 
-checkUnnamed277(core.List<api.ResourceCommitment> o) {
+checkUnnamed2060(core.List<api.ResourceCommitment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceCommitment(o[0]);
   checkResourceCommitment(o[1]);
@@ -2083,7 +2083,7 @@
     o.name = "foo";
     o.plan = "foo";
     o.region = "foo";
-    o.resources = buildUnnamed277();
+    o.resources = buildUnnamed2060();
     o.selfLink = "foo";
     o.startTimestamp = "foo";
     o.status = "foo";
@@ -2104,7 +2104,7 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.plan, unittest.equals('foo'));
     unittest.expect(o.region, unittest.equals('foo'));
-    checkUnnamed277(o.resources);
+    checkUnnamed2060(o.resources);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.startTimestamp, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
@@ -2113,14 +2113,14 @@
   buildCounterCommitment--;
 }
 
-buildUnnamed278() {
+buildUnnamed2061() {
   var o = new core.Map<core.String, api.CommitmentsScopedList>();
   o["x"] = buildCommitmentsScopedList();
   o["y"] = buildCommitmentsScopedList();
   return o;
 }
 
-checkUnnamed278(core.Map<core.String, api.CommitmentsScopedList> o) {
+checkUnnamed2061(core.Map<core.String, api.CommitmentsScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommitmentsScopedList(o["x"]);
   checkCommitmentsScopedList(o["y"]);
@@ -2148,14 +2148,14 @@
   buildCounterCommitmentAggregatedListWarningData--;
 }
 
-buildUnnamed279() {
+buildUnnamed2062() {
   var o = new core.List<api.CommitmentAggregatedListWarningData>();
   o.add(buildCommitmentAggregatedListWarningData());
   o.add(buildCommitmentAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed279(core.List<api.CommitmentAggregatedListWarningData> o) {
+checkUnnamed2062(core.List<api.CommitmentAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommitmentAggregatedListWarningData(o[0]);
   checkCommitmentAggregatedListWarningData(o[1]);
@@ -2167,7 +2167,7 @@
   buildCounterCommitmentAggregatedListWarning++;
   if (buildCounterCommitmentAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed279();
+    o.data = buildUnnamed2062();
     o.message = "foo";
   }
   buildCounterCommitmentAggregatedListWarning--;
@@ -2178,7 +2178,7 @@
   buildCounterCommitmentAggregatedListWarning++;
   if (buildCounterCommitmentAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed279(o.data);
+    checkUnnamed2062(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterCommitmentAggregatedListWarning--;
@@ -2190,7 +2190,7 @@
   buildCounterCommitmentAggregatedList++;
   if (buildCounterCommitmentAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed278();
+    o.items = buildUnnamed2061();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -2204,7 +2204,7 @@
   buildCounterCommitmentAggregatedList++;
   if (buildCounterCommitmentAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed278(o.items);
+    checkUnnamed2061(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -2213,14 +2213,14 @@
   buildCounterCommitmentAggregatedList--;
 }
 
-buildUnnamed280() {
+buildUnnamed2063() {
   var o = new core.List<api.Commitment>();
   o.add(buildCommitment());
   o.add(buildCommitment());
   return o;
 }
 
-checkUnnamed280(core.List<api.Commitment> o) {
+checkUnnamed2063(core.List<api.Commitment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommitment(o[0]);
   checkCommitment(o[1]);
@@ -2247,14 +2247,14 @@
   buildCounterCommitmentListWarningData--;
 }
 
-buildUnnamed281() {
+buildUnnamed2064() {
   var o = new core.List<api.CommitmentListWarningData>();
   o.add(buildCommitmentListWarningData());
   o.add(buildCommitmentListWarningData());
   return o;
 }
 
-checkUnnamed281(core.List<api.CommitmentListWarningData> o) {
+checkUnnamed2064(core.List<api.CommitmentListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommitmentListWarningData(o[0]);
   checkCommitmentListWarningData(o[1]);
@@ -2266,7 +2266,7 @@
   buildCounterCommitmentListWarning++;
   if (buildCounterCommitmentListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed281();
+    o.data = buildUnnamed2064();
     o.message = "foo";
   }
   buildCounterCommitmentListWarning--;
@@ -2277,7 +2277,7 @@
   buildCounterCommitmentListWarning++;
   if (buildCounterCommitmentListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed281(o.data);
+    checkUnnamed2064(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterCommitmentListWarning--;
@@ -2289,7 +2289,7 @@
   buildCounterCommitmentList++;
   if (buildCounterCommitmentList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed280();
+    o.items = buildUnnamed2063();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -2303,7 +2303,7 @@
   buildCounterCommitmentList++;
   if (buildCounterCommitmentList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed280(o.items);
+    checkUnnamed2063(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -2312,14 +2312,14 @@
   buildCounterCommitmentList--;
 }
 
-buildUnnamed282() {
+buildUnnamed2065() {
   var o = new core.List<api.Commitment>();
   o.add(buildCommitment());
   o.add(buildCommitment());
   return o;
 }
 
-checkUnnamed282(core.List<api.Commitment> o) {
+checkUnnamed2065(core.List<api.Commitment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommitment(o[0]);
   checkCommitment(o[1]);
@@ -2346,14 +2346,14 @@
   buildCounterCommitmentsScopedListWarningData--;
 }
 
-buildUnnamed283() {
+buildUnnamed2066() {
   var o = new core.List<api.CommitmentsScopedListWarningData>();
   o.add(buildCommitmentsScopedListWarningData());
   o.add(buildCommitmentsScopedListWarningData());
   return o;
 }
 
-checkUnnamed283(core.List<api.CommitmentsScopedListWarningData> o) {
+checkUnnamed2066(core.List<api.CommitmentsScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommitmentsScopedListWarningData(o[0]);
   checkCommitmentsScopedListWarningData(o[1]);
@@ -2365,7 +2365,7 @@
   buildCounterCommitmentsScopedListWarning++;
   if (buildCounterCommitmentsScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed283();
+    o.data = buildUnnamed2066();
     o.message = "foo";
   }
   buildCounterCommitmentsScopedListWarning--;
@@ -2376,7 +2376,7 @@
   buildCounterCommitmentsScopedListWarning++;
   if (buildCounterCommitmentsScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed283(o.data);
+    checkUnnamed2066(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterCommitmentsScopedListWarning--;
@@ -2387,7 +2387,7 @@
   var o = new api.CommitmentsScopedList();
   buildCounterCommitmentsScopedList++;
   if (buildCounterCommitmentsScopedList < 3) {
-    o.commitments = buildUnnamed282();
+    o.commitments = buildUnnamed2065();
     o.warning = buildCommitmentsScopedListWarning();
   }
   buildCounterCommitmentsScopedList--;
@@ -2397,7 +2397,7 @@
 checkCommitmentsScopedList(api.CommitmentsScopedList o) {
   buildCounterCommitmentsScopedList++;
   if (buildCounterCommitmentsScopedList < 3) {
-    checkUnnamed282(o.commitments);
+    checkUnnamed2065(o.commitments);
     checkCommitmentsScopedListWarning(o.warning);
   }
   buildCounterCommitmentsScopedList--;
@@ -2492,40 +2492,40 @@
   buildCounterDeprecationStatus--;
 }
 
-buildUnnamed284() {
+buildUnnamed2067() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed284(core.Map<core.String, core.String> o) {
+checkUnnamed2067(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed285() {
+buildUnnamed2068() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed285(core.List<core.String> o) {
+checkUnnamed2068(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed286() {
+buildUnnamed2069() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed286(core.List<core.String> o) {
+checkUnnamed2069(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2542,10 +2542,10 @@
     o.id = "foo";
     o.kind = "foo";
     o.labelFingerprint = "foo";
-    o.labels = buildUnnamed284();
+    o.labels = buildUnnamed2067();
     o.lastAttachTimestamp = "foo";
     o.lastDetachTimestamp = "foo";
-    o.licenses = buildUnnamed285();
+    o.licenses = buildUnnamed2068();
     o.name = "foo";
     o.options = "foo";
     o.selfLink = "foo";
@@ -2558,7 +2558,7 @@
     o.sourceSnapshotId = "foo";
     o.status = "foo";
     o.type = "foo";
-    o.users = buildUnnamed286();
+    o.users = buildUnnamed2069();
     o.zone = "foo";
   }
   buildCounterDisk--;
@@ -2574,10 +2574,10 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.labelFingerprint, unittest.equals('foo'));
-    checkUnnamed284(o.labels);
+    checkUnnamed2067(o.labels);
     unittest.expect(o.lastAttachTimestamp, unittest.equals('foo'));
     unittest.expect(o.lastDetachTimestamp, unittest.equals('foo'));
-    checkUnnamed285(o.licenses);
+    checkUnnamed2068(o.licenses);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.options, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -2590,20 +2590,20 @@
     unittest.expect(o.sourceSnapshotId, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
-    checkUnnamed286(o.users);
+    checkUnnamed2069(o.users);
     unittest.expect(o.zone, unittest.equals('foo'));
   }
   buildCounterDisk--;
 }
 
-buildUnnamed287() {
+buildUnnamed2070() {
   var o = new core.Map<core.String, api.DisksScopedList>();
   o["x"] = buildDisksScopedList();
   o["y"] = buildDisksScopedList();
   return o;
 }
 
-checkUnnamed287(core.Map<core.String, api.DisksScopedList> o) {
+checkUnnamed2070(core.Map<core.String, api.DisksScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisksScopedList(o["x"]);
   checkDisksScopedList(o["y"]);
@@ -2630,14 +2630,14 @@
   buildCounterDiskAggregatedListWarningData--;
 }
 
-buildUnnamed288() {
+buildUnnamed2071() {
   var o = new core.List<api.DiskAggregatedListWarningData>();
   o.add(buildDiskAggregatedListWarningData());
   o.add(buildDiskAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed288(core.List<api.DiskAggregatedListWarningData> o) {
+checkUnnamed2071(core.List<api.DiskAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiskAggregatedListWarningData(o[0]);
   checkDiskAggregatedListWarningData(o[1]);
@@ -2649,7 +2649,7 @@
   buildCounterDiskAggregatedListWarning++;
   if (buildCounterDiskAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed288();
+    o.data = buildUnnamed2071();
     o.message = "foo";
   }
   buildCounterDiskAggregatedListWarning--;
@@ -2660,7 +2660,7 @@
   buildCounterDiskAggregatedListWarning++;
   if (buildCounterDiskAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed288(o.data);
+    checkUnnamed2071(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterDiskAggregatedListWarning--;
@@ -2672,7 +2672,7 @@
   buildCounterDiskAggregatedList++;
   if (buildCounterDiskAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed287();
+    o.items = buildUnnamed2070();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -2686,7 +2686,7 @@
   buildCounterDiskAggregatedList++;
   if (buildCounterDiskAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed287(o.items);
+    checkUnnamed2070(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -2695,14 +2695,14 @@
   buildCounterDiskAggregatedList--;
 }
 
-buildUnnamed289() {
+buildUnnamed2072() {
   var o = new core.List<api.Disk>();
   o.add(buildDisk());
   o.add(buildDisk());
   return o;
 }
 
-checkUnnamed289(core.List<api.Disk> o) {
+checkUnnamed2072(core.List<api.Disk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisk(o[0]);
   checkDisk(o[1]);
@@ -2729,14 +2729,14 @@
   buildCounterDiskListWarningData--;
 }
 
-buildUnnamed290() {
+buildUnnamed2073() {
   var o = new core.List<api.DiskListWarningData>();
   o.add(buildDiskListWarningData());
   o.add(buildDiskListWarningData());
   return o;
 }
 
-checkUnnamed290(core.List<api.DiskListWarningData> o) {
+checkUnnamed2073(core.List<api.DiskListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiskListWarningData(o[0]);
   checkDiskListWarningData(o[1]);
@@ -2748,7 +2748,7 @@
   buildCounterDiskListWarning++;
   if (buildCounterDiskListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed290();
+    o.data = buildUnnamed2073();
     o.message = "foo";
   }
   buildCounterDiskListWarning--;
@@ -2759,7 +2759,7 @@
   buildCounterDiskListWarning++;
   if (buildCounterDiskListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed290(o.data);
+    checkUnnamed2073(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterDiskListWarning--;
@@ -2771,7 +2771,7 @@
   buildCounterDiskList++;
   if (buildCounterDiskList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed289();
+    o.items = buildUnnamed2072();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -2785,7 +2785,7 @@
   buildCounterDiskList++;
   if (buildCounterDiskList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed289(o.items);
+    checkUnnamed2072(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -2852,14 +2852,14 @@
   buildCounterDiskType--;
 }
 
-buildUnnamed291() {
+buildUnnamed2074() {
   var o = new core.Map<core.String, api.DiskTypesScopedList>();
   o["x"] = buildDiskTypesScopedList();
   o["y"] = buildDiskTypesScopedList();
   return o;
 }
 
-checkUnnamed291(core.Map<core.String, api.DiskTypesScopedList> o) {
+checkUnnamed2074(core.Map<core.String, api.DiskTypesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiskTypesScopedList(o["x"]);
   checkDiskTypesScopedList(o["y"]);
@@ -2887,14 +2887,14 @@
   buildCounterDiskTypeAggregatedListWarningData--;
 }
 
-buildUnnamed292() {
+buildUnnamed2075() {
   var o = new core.List<api.DiskTypeAggregatedListWarningData>();
   o.add(buildDiskTypeAggregatedListWarningData());
   o.add(buildDiskTypeAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed292(core.List<api.DiskTypeAggregatedListWarningData> o) {
+checkUnnamed2075(core.List<api.DiskTypeAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiskTypeAggregatedListWarningData(o[0]);
   checkDiskTypeAggregatedListWarningData(o[1]);
@@ -2906,7 +2906,7 @@
   buildCounterDiskTypeAggregatedListWarning++;
   if (buildCounterDiskTypeAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed292();
+    o.data = buildUnnamed2075();
     o.message = "foo";
   }
   buildCounterDiskTypeAggregatedListWarning--;
@@ -2917,7 +2917,7 @@
   buildCounterDiskTypeAggregatedListWarning++;
   if (buildCounterDiskTypeAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed292(o.data);
+    checkUnnamed2075(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterDiskTypeAggregatedListWarning--;
@@ -2929,7 +2929,7 @@
   buildCounterDiskTypeAggregatedList++;
   if (buildCounterDiskTypeAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed291();
+    o.items = buildUnnamed2074();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -2943,7 +2943,7 @@
   buildCounterDiskTypeAggregatedList++;
   if (buildCounterDiskTypeAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed291(o.items);
+    checkUnnamed2074(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -2952,14 +2952,14 @@
   buildCounterDiskTypeAggregatedList--;
 }
 
-buildUnnamed293() {
+buildUnnamed2076() {
   var o = new core.List<api.DiskType>();
   o.add(buildDiskType());
   o.add(buildDiskType());
   return o;
 }
 
-checkUnnamed293(core.List<api.DiskType> o) {
+checkUnnamed2076(core.List<api.DiskType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiskType(o[0]);
   checkDiskType(o[1]);
@@ -2986,14 +2986,14 @@
   buildCounterDiskTypeListWarningData--;
 }
 
-buildUnnamed294() {
+buildUnnamed2077() {
   var o = new core.List<api.DiskTypeListWarningData>();
   o.add(buildDiskTypeListWarningData());
   o.add(buildDiskTypeListWarningData());
   return o;
 }
 
-checkUnnamed294(core.List<api.DiskTypeListWarningData> o) {
+checkUnnamed2077(core.List<api.DiskTypeListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiskTypeListWarningData(o[0]);
   checkDiskTypeListWarningData(o[1]);
@@ -3005,7 +3005,7 @@
   buildCounterDiskTypeListWarning++;
   if (buildCounterDiskTypeListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed294();
+    o.data = buildUnnamed2077();
     o.message = "foo";
   }
   buildCounterDiskTypeListWarning--;
@@ -3016,7 +3016,7 @@
   buildCounterDiskTypeListWarning++;
   if (buildCounterDiskTypeListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed294(o.data);
+    checkUnnamed2077(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterDiskTypeListWarning--;
@@ -3028,7 +3028,7 @@
   buildCounterDiskTypeList++;
   if (buildCounterDiskTypeList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed293();
+    o.items = buildUnnamed2076();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -3042,7 +3042,7 @@
   buildCounterDiskTypeList++;
   if (buildCounterDiskTypeList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed293(o.items);
+    checkUnnamed2076(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -3051,14 +3051,14 @@
   buildCounterDiskTypeList--;
 }
 
-buildUnnamed295() {
+buildUnnamed2078() {
   var o = new core.List<api.DiskType>();
   o.add(buildDiskType());
   o.add(buildDiskType());
   return o;
 }
 
-checkUnnamed295(core.List<api.DiskType> o) {
+checkUnnamed2078(core.List<api.DiskType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiskType(o[0]);
   checkDiskType(o[1]);
@@ -3085,14 +3085,14 @@
   buildCounterDiskTypesScopedListWarningData--;
 }
 
-buildUnnamed296() {
+buildUnnamed2079() {
   var o = new core.List<api.DiskTypesScopedListWarningData>();
   o.add(buildDiskTypesScopedListWarningData());
   o.add(buildDiskTypesScopedListWarningData());
   return o;
 }
 
-checkUnnamed296(core.List<api.DiskTypesScopedListWarningData> o) {
+checkUnnamed2079(core.List<api.DiskTypesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiskTypesScopedListWarningData(o[0]);
   checkDiskTypesScopedListWarningData(o[1]);
@@ -3104,7 +3104,7 @@
   buildCounterDiskTypesScopedListWarning++;
   if (buildCounterDiskTypesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed296();
+    o.data = buildUnnamed2079();
     o.message = "foo";
   }
   buildCounterDiskTypesScopedListWarning--;
@@ -3115,7 +3115,7 @@
   buildCounterDiskTypesScopedListWarning++;
   if (buildCounterDiskTypesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed296(o.data);
+    checkUnnamed2079(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterDiskTypesScopedListWarning--;
@@ -3126,7 +3126,7 @@
   var o = new api.DiskTypesScopedList();
   buildCounterDiskTypesScopedList++;
   if (buildCounterDiskTypesScopedList < 3) {
-    o.diskTypes = buildUnnamed295();
+    o.diskTypes = buildUnnamed2078();
     o.warning = buildDiskTypesScopedListWarning();
   }
   buildCounterDiskTypesScopedList--;
@@ -3136,7 +3136,7 @@
 checkDiskTypesScopedList(api.DiskTypesScopedList o) {
   buildCounterDiskTypesScopedList++;
   if (buildCounterDiskTypesScopedList < 3) {
-    checkUnnamed295(o.diskTypes);
+    checkUnnamed2078(o.diskTypes);
     checkDiskTypesScopedListWarning(o.warning);
   }
   buildCounterDiskTypesScopedList--;
@@ -3161,14 +3161,14 @@
   buildCounterDisksResizeRequest--;
 }
 
-buildUnnamed297() {
+buildUnnamed2080() {
   var o = new core.List<api.Disk>();
   o.add(buildDisk());
   o.add(buildDisk());
   return o;
 }
 
-checkUnnamed297(core.List<api.Disk> o) {
+checkUnnamed2080(core.List<api.Disk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisk(o[0]);
   checkDisk(o[1]);
@@ -3195,14 +3195,14 @@
   buildCounterDisksScopedListWarningData--;
 }
 
-buildUnnamed298() {
+buildUnnamed2081() {
   var o = new core.List<api.DisksScopedListWarningData>();
   o.add(buildDisksScopedListWarningData());
   o.add(buildDisksScopedListWarningData());
   return o;
 }
 
-checkUnnamed298(core.List<api.DisksScopedListWarningData> o) {
+checkUnnamed2081(core.List<api.DisksScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisksScopedListWarningData(o[0]);
   checkDisksScopedListWarningData(o[1]);
@@ -3214,7 +3214,7 @@
   buildCounterDisksScopedListWarning++;
   if (buildCounterDisksScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed298();
+    o.data = buildUnnamed2081();
     o.message = "foo";
   }
   buildCounterDisksScopedListWarning--;
@@ -3225,7 +3225,7 @@
   buildCounterDisksScopedListWarning++;
   if (buildCounterDisksScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed298(o.data);
+    checkUnnamed2081(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterDisksScopedListWarning--;
@@ -3236,7 +3236,7 @@
   var o = new api.DisksScopedList();
   buildCounterDisksScopedList++;
   if (buildCounterDisksScopedList < 3) {
-    o.disks = buildUnnamed297();
+    o.disks = buildUnnamed2080();
     o.warning = buildDisksScopedListWarning();
   }
   buildCounterDisksScopedList--;
@@ -3246,20 +3246,20 @@
 checkDisksScopedList(api.DisksScopedList o) {
   buildCounterDisksScopedList++;
   if (buildCounterDisksScopedList < 3) {
-    checkUnnamed297(o.disks);
+    checkUnnamed2080(o.disks);
     checkDisksScopedListWarning(o.warning);
   }
   buildCounterDisksScopedList--;
 }
 
-buildUnnamed299() {
+buildUnnamed2082() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed299(core.List<core.String> o) {
+checkUnnamed2082(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3271,7 +3271,7 @@
   buildCounterFirewallAllowed++;
   if (buildCounterFirewallAllowed < 3) {
     o.IPProtocol = "foo";
-    o.ports = buildUnnamed299();
+    o.ports = buildUnnamed2082();
   }
   buildCounterFirewallAllowed--;
   return o;
@@ -3281,32 +3281,32 @@
   buildCounterFirewallAllowed++;
   if (buildCounterFirewallAllowed < 3) {
     unittest.expect(o.IPProtocol, unittest.equals('foo'));
-    checkUnnamed299(o.ports);
+    checkUnnamed2082(o.ports);
   }
   buildCounterFirewallAllowed--;
 }
 
-buildUnnamed300() {
+buildUnnamed2083() {
   var o = new core.List<api.FirewallAllowed>();
   o.add(buildFirewallAllowed());
   o.add(buildFirewallAllowed());
   return o;
 }
 
-checkUnnamed300(core.List<api.FirewallAllowed> o) {
+checkUnnamed2083(core.List<api.FirewallAllowed> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFirewallAllowed(o[0]);
   checkFirewallAllowed(o[1]);
 }
 
-buildUnnamed301() {
+buildUnnamed2084() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed301(core.List<core.String> o) {
+checkUnnamed2084(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3318,7 +3318,7 @@
   buildCounterFirewallDenied++;
   if (buildCounterFirewallDenied < 3) {
     o.IPProtocol = "foo";
-    o.ports = buildUnnamed301();
+    o.ports = buildUnnamed2084();
   }
   buildCounterFirewallDenied--;
   return o;
@@ -3328,97 +3328,97 @@
   buildCounterFirewallDenied++;
   if (buildCounterFirewallDenied < 3) {
     unittest.expect(o.IPProtocol, unittest.equals('foo'));
-    checkUnnamed301(o.ports);
+    checkUnnamed2084(o.ports);
   }
   buildCounterFirewallDenied--;
 }
 
-buildUnnamed302() {
+buildUnnamed2085() {
   var o = new core.List<api.FirewallDenied>();
   o.add(buildFirewallDenied());
   o.add(buildFirewallDenied());
   return o;
 }
 
-checkUnnamed302(core.List<api.FirewallDenied> o) {
+checkUnnamed2085(core.List<api.FirewallDenied> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFirewallDenied(o[0]);
   checkFirewallDenied(o[1]);
 }
 
-buildUnnamed303() {
+buildUnnamed2086() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed303(core.List<core.String> o) {
+checkUnnamed2086(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed304() {
+buildUnnamed2087() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed304(core.List<core.String> o) {
+checkUnnamed2087(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed305() {
+buildUnnamed2088() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed305(core.List<core.String> o) {
+checkUnnamed2088(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed306() {
+buildUnnamed2089() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed306(core.List<core.String> o) {
+checkUnnamed2089(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed307() {
+buildUnnamed2090() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed307(core.List<core.String> o) {
+checkUnnamed2090(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed308() {
+buildUnnamed2091() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed308(core.List<core.String> o) {
+checkUnnamed2091(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3429,11 +3429,11 @@
   var o = new api.Firewall();
   buildCounterFirewall++;
   if (buildCounterFirewall < 3) {
-    o.allowed = buildUnnamed300();
+    o.allowed = buildUnnamed2083();
     o.creationTimestamp = "foo";
-    o.denied = buildUnnamed302();
+    o.denied = buildUnnamed2085();
     o.description = "foo";
-    o.destinationRanges = buildUnnamed303();
+    o.destinationRanges = buildUnnamed2086();
     o.direction = "foo";
     o.id = "foo";
     o.kind = "foo";
@@ -3441,11 +3441,11 @@
     o.network = "foo";
     o.priority = 42;
     o.selfLink = "foo";
-    o.sourceRanges = buildUnnamed304();
-    o.sourceServiceAccounts = buildUnnamed305();
-    o.sourceTags = buildUnnamed306();
-    o.targetServiceAccounts = buildUnnamed307();
-    o.targetTags = buildUnnamed308();
+    o.sourceRanges = buildUnnamed2087();
+    o.sourceServiceAccounts = buildUnnamed2088();
+    o.sourceTags = buildUnnamed2089();
+    o.targetServiceAccounts = buildUnnamed2090();
+    o.targetTags = buildUnnamed2091();
   }
   buildCounterFirewall--;
   return o;
@@ -3454,11 +3454,11 @@
 checkFirewall(api.Firewall o) {
   buildCounterFirewall++;
   if (buildCounterFirewall < 3) {
-    checkUnnamed300(o.allowed);
+    checkUnnamed2083(o.allowed);
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
-    checkUnnamed302(o.denied);
+    checkUnnamed2085(o.denied);
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed303(o.destinationRanges);
+    checkUnnamed2086(o.destinationRanges);
     unittest.expect(o.direction, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -3466,23 +3466,23 @@
     unittest.expect(o.network, unittest.equals('foo'));
     unittest.expect(o.priority, unittest.equals(42));
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed304(o.sourceRanges);
-    checkUnnamed305(o.sourceServiceAccounts);
-    checkUnnamed306(o.sourceTags);
-    checkUnnamed307(o.targetServiceAccounts);
-    checkUnnamed308(o.targetTags);
+    checkUnnamed2087(o.sourceRanges);
+    checkUnnamed2088(o.sourceServiceAccounts);
+    checkUnnamed2089(o.sourceTags);
+    checkUnnamed2090(o.targetServiceAccounts);
+    checkUnnamed2091(o.targetTags);
   }
   buildCounterFirewall--;
 }
 
-buildUnnamed309() {
+buildUnnamed2092() {
   var o = new core.List<api.Firewall>();
   o.add(buildFirewall());
   o.add(buildFirewall());
   return o;
 }
 
-checkUnnamed309(core.List<api.Firewall> o) {
+checkUnnamed2092(core.List<api.Firewall> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFirewall(o[0]);
   checkFirewall(o[1]);
@@ -3509,14 +3509,14 @@
   buildCounterFirewallListWarningData--;
 }
 
-buildUnnamed310() {
+buildUnnamed2093() {
   var o = new core.List<api.FirewallListWarningData>();
   o.add(buildFirewallListWarningData());
   o.add(buildFirewallListWarningData());
   return o;
 }
 
-checkUnnamed310(core.List<api.FirewallListWarningData> o) {
+checkUnnamed2093(core.List<api.FirewallListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFirewallListWarningData(o[0]);
   checkFirewallListWarningData(o[1]);
@@ -3528,7 +3528,7 @@
   buildCounterFirewallListWarning++;
   if (buildCounterFirewallListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed310();
+    o.data = buildUnnamed2093();
     o.message = "foo";
   }
   buildCounterFirewallListWarning--;
@@ -3539,7 +3539,7 @@
   buildCounterFirewallListWarning++;
   if (buildCounterFirewallListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed310(o.data);
+    checkUnnamed2093(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterFirewallListWarning--;
@@ -3551,7 +3551,7 @@
   buildCounterFirewallList++;
   if (buildCounterFirewallList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed309();
+    o.items = buildUnnamed2092();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -3565,7 +3565,7 @@
   buildCounterFirewallList++;
   if (buildCounterFirewallList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed309(o.items);
+    checkUnnamed2092(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -3574,14 +3574,14 @@
   buildCounterFirewallList--;
 }
 
-buildUnnamed311() {
+buildUnnamed2094() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed311(core.List<core.String> o) {
+checkUnnamed2094(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3604,7 +3604,7 @@
     o.name = "foo";
     o.network = "foo";
     o.portRange = "foo";
-    o.ports = buildUnnamed311();
+    o.ports = buildUnnamed2094();
     o.region = "foo";
     o.selfLink = "foo";
     o.subnetwork = "foo";
@@ -3629,7 +3629,7 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.network, unittest.equals('foo'));
     unittest.expect(o.portRange, unittest.equals('foo'));
-    checkUnnamed311(o.ports);
+    checkUnnamed2094(o.ports);
     unittest.expect(o.region, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.subnetwork, unittest.equals('foo'));
@@ -3638,14 +3638,14 @@
   buildCounterForwardingRule--;
 }
 
-buildUnnamed312() {
+buildUnnamed2095() {
   var o = new core.Map<core.String, api.ForwardingRulesScopedList>();
   o["x"] = buildForwardingRulesScopedList();
   o["y"] = buildForwardingRulesScopedList();
   return o;
 }
 
-checkUnnamed312(core.Map<core.String, api.ForwardingRulesScopedList> o) {
+checkUnnamed2095(core.Map<core.String, api.ForwardingRulesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkForwardingRulesScopedList(o["x"]);
   checkForwardingRulesScopedList(o["y"]);
@@ -3673,14 +3673,14 @@
   buildCounterForwardingRuleAggregatedListWarningData--;
 }
 
-buildUnnamed313() {
+buildUnnamed2096() {
   var o = new core.List<api.ForwardingRuleAggregatedListWarningData>();
   o.add(buildForwardingRuleAggregatedListWarningData());
   o.add(buildForwardingRuleAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed313(core.List<api.ForwardingRuleAggregatedListWarningData> o) {
+checkUnnamed2096(core.List<api.ForwardingRuleAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkForwardingRuleAggregatedListWarningData(o[0]);
   checkForwardingRuleAggregatedListWarningData(o[1]);
@@ -3692,7 +3692,7 @@
   buildCounterForwardingRuleAggregatedListWarning++;
   if (buildCounterForwardingRuleAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed313();
+    o.data = buildUnnamed2096();
     o.message = "foo";
   }
   buildCounterForwardingRuleAggregatedListWarning--;
@@ -3704,7 +3704,7 @@
   buildCounterForwardingRuleAggregatedListWarning++;
   if (buildCounterForwardingRuleAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed313(o.data);
+    checkUnnamed2096(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterForwardingRuleAggregatedListWarning--;
@@ -3716,7 +3716,7 @@
   buildCounterForwardingRuleAggregatedList++;
   if (buildCounterForwardingRuleAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed312();
+    o.items = buildUnnamed2095();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -3730,7 +3730,7 @@
   buildCounterForwardingRuleAggregatedList++;
   if (buildCounterForwardingRuleAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed312(o.items);
+    checkUnnamed2095(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -3739,14 +3739,14 @@
   buildCounterForwardingRuleAggregatedList--;
 }
 
-buildUnnamed314() {
+buildUnnamed2097() {
   var o = new core.List<api.ForwardingRule>();
   o.add(buildForwardingRule());
   o.add(buildForwardingRule());
   return o;
 }
 
-checkUnnamed314(core.List<api.ForwardingRule> o) {
+checkUnnamed2097(core.List<api.ForwardingRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkForwardingRule(o[0]);
   checkForwardingRule(o[1]);
@@ -3773,14 +3773,14 @@
   buildCounterForwardingRuleListWarningData--;
 }
 
-buildUnnamed315() {
+buildUnnamed2098() {
   var o = new core.List<api.ForwardingRuleListWarningData>();
   o.add(buildForwardingRuleListWarningData());
   o.add(buildForwardingRuleListWarningData());
   return o;
 }
 
-checkUnnamed315(core.List<api.ForwardingRuleListWarningData> o) {
+checkUnnamed2098(core.List<api.ForwardingRuleListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkForwardingRuleListWarningData(o[0]);
   checkForwardingRuleListWarningData(o[1]);
@@ -3792,7 +3792,7 @@
   buildCounterForwardingRuleListWarning++;
   if (buildCounterForwardingRuleListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed315();
+    o.data = buildUnnamed2098();
     o.message = "foo";
   }
   buildCounterForwardingRuleListWarning--;
@@ -3803,7 +3803,7 @@
   buildCounterForwardingRuleListWarning++;
   if (buildCounterForwardingRuleListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed315(o.data);
+    checkUnnamed2098(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterForwardingRuleListWarning--;
@@ -3815,7 +3815,7 @@
   buildCounterForwardingRuleList++;
   if (buildCounterForwardingRuleList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed314();
+    o.items = buildUnnamed2097();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -3829,7 +3829,7 @@
   buildCounterForwardingRuleList++;
   if (buildCounterForwardingRuleList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed314(o.items);
+    checkUnnamed2097(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -3838,14 +3838,14 @@
   buildCounterForwardingRuleList--;
 }
 
-buildUnnamed316() {
+buildUnnamed2099() {
   var o = new core.List<api.ForwardingRule>();
   o.add(buildForwardingRule());
   o.add(buildForwardingRule());
   return o;
 }
 
-checkUnnamed316(core.List<api.ForwardingRule> o) {
+checkUnnamed2099(core.List<api.ForwardingRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkForwardingRule(o[0]);
   checkForwardingRule(o[1]);
@@ -3873,14 +3873,14 @@
   buildCounterForwardingRulesScopedListWarningData--;
 }
 
-buildUnnamed317() {
+buildUnnamed2100() {
   var o = new core.List<api.ForwardingRulesScopedListWarningData>();
   o.add(buildForwardingRulesScopedListWarningData());
   o.add(buildForwardingRulesScopedListWarningData());
   return o;
 }
 
-checkUnnamed317(core.List<api.ForwardingRulesScopedListWarningData> o) {
+checkUnnamed2100(core.List<api.ForwardingRulesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkForwardingRulesScopedListWarningData(o[0]);
   checkForwardingRulesScopedListWarningData(o[1]);
@@ -3892,7 +3892,7 @@
   buildCounterForwardingRulesScopedListWarning++;
   if (buildCounterForwardingRulesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed317();
+    o.data = buildUnnamed2100();
     o.message = "foo";
   }
   buildCounterForwardingRulesScopedListWarning--;
@@ -3903,7 +3903,7 @@
   buildCounterForwardingRulesScopedListWarning++;
   if (buildCounterForwardingRulesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed317(o.data);
+    checkUnnamed2100(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterForwardingRulesScopedListWarning--;
@@ -3914,7 +3914,7 @@
   var o = new api.ForwardingRulesScopedList();
   buildCounterForwardingRulesScopedList++;
   if (buildCounterForwardingRulesScopedList < 3) {
-    o.forwardingRules = buildUnnamed316();
+    o.forwardingRules = buildUnnamed2099();
     o.warning = buildForwardingRulesScopedListWarning();
   }
   buildCounterForwardingRulesScopedList--;
@@ -3924,20 +3924,20 @@
 checkForwardingRulesScopedList(api.ForwardingRulesScopedList o) {
   buildCounterForwardingRulesScopedList++;
   if (buildCounterForwardingRulesScopedList < 3) {
-    checkUnnamed316(o.forwardingRules);
+    checkUnnamed2099(o.forwardingRules);
     checkForwardingRulesScopedListWarning(o.warning);
   }
   buildCounterForwardingRulesScopedList--;
 }
 
-buildUnnamed318() {
+buildUnnamed2101() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed318(core.Map<core.String, core.String> o) {
+checkUnnamed2101(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -3949,7 +3949,7 @@
   buildCounterGlobalSetLabelsRequest++;
   if (buildCounterGlobalSetLabelsRequest < 3) {
     o.labelFingerprint = "foo";
-    o.labels = buildUnnamed318();
+    o.labels = buildUnnamed2101();
   }
   buildCounterGlobalSetLabelsRequest--;
   return o;
@@ -3959,7 +3959,7 @@
   buildCounterGlobalSetLabelsRequest++;
   if (buildCounterGlobalSetLabelsRequest < 3) {
     unittest.expect(o.labelFingerprint, unittest.equals('foo'));
-    checkUnnamed318(o.labels);
+    checkUnnamed2101(o.labels);
   }
   buildCounterGlobalSetLabelsRequest--;
 }
@@ -4084,14 +4084,14 @@
   buildCounterHealthCheck--;
 }
 
-buildUnnamed319() {
+buildUnnamed2102() {
   var o = new core.List<api.HealthCheck>();
   o.add(buildHealthCheck());
   o.add(buildHealthCheck());
   return o;
 }
 
-checkUnnamed319(core.List<api.HealthCheck> o) {
+checkUnnamed2102(core.List<api.HealthCheck> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHealthCheck(o[0]);
   checkHealthCheck(o[1]);
@@ -4118,14 +4118,14 @@
   buildCounterHealthCheckListWarningData--;
 }
 
-buildUnnamed320() {
+buildUnnamed2103() {
   var o = new core.List<api.HealthCheckListWarningData>();
   o.add(buildHealthCheckListWarningData());
   o.add(buildHealthCheckListWarningData());
   return o;
 }
 
-checkUnnamed320(core.List<api.HealthCheckListWarningData> o) {
+checkUnnamed2103(core.List<api.HealthCheckListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHealthCheckListWarningData(o[0]);
   checkHealthCheckListWarningData(o[1]);
@@ -4137,7 +4137,7 @@
   buildCounterHealthCheckListWarning++;
   if (buildCounterHealthCheckListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed320();
+    o.data = buildUnnamed2103();
     o.message = "foo";
   }
   buildCounterHealthCheckListWarning--;
@@ -4148,7 +4148,7 @@
   buildCounterHealthCheckListWarning++;
   if (buildCounterHealthCheckListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed320(o.data);
+    checkUnnamed2103(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterHealthCheckListWarning--;
@@ -4160,7 +4160,7 @@
   buildCounterHealthCheckList++;
   if (buildCounterHealthCheckList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed319();
+    o.items = buildUnnamed2102();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -4174,7 +4174,7 @@
   buildCounterHealthCheckList++;
   if (buildCounterHealthCheckList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed319(o.items);
+    checkUnnamed2102(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -4227,14 +4227,14 @@
   buildCounterHealthStatus--;
 }
 
-buildUnnamed321() {
+buildUnnamed2104() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed321(core.List<core.String> o) {
+checkUnnamed2104(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4246,7 +4246,7 @@
   buildCounterHostRule++;
   if (buildCounterHostRule < 3) {
     o.description = "foo";
-    o.hosts = buildUnnamed321();
+    o.hosts = buildUnnamed2104();
     o.pathMatcher = "foo";
   }
   buildCounterHostRule--;
@@ -4257,7 +4257,7 @@
   buildCounterHostRule++;
   if (buildCounterHostRule < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed321(o.hosts);
+    checkUnnamed2104(o.hosts);
     unittest.expect(o.pathMatcher, unittest.equals('foo'));
   }
   buildCounterHostRule--;
@@ -4306,14 +4306,14 @@
   buildCounterHttpHealthCheck--;
 }
 
-buildUnnamed322() {
+buildUnnamed2105() {
   var o = new core.List<api.HttpHealthCheck>();
   o.add(buildHttpHealthCheck());
   o.add(buildHttpHealthCheck());
   return o;
 }
 
-checkUnnamed322(core.List<api.HttpHealthCheck> o) {
+checkUnnamed2105(core.List<api.HttpHealthCheck> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpHealthCheck(o[0]);
   checkHttpHealthCheck(o[1]);
@@ -4340,14 +4340,14 @@
   buildCounterHttpHealthCheckListWarningData--;
 }
 
-buildUnnamed323() {
+buildUnnamed2106() {
   var o = new core.List<api.HttpHealthCheckListWarningData>();
   o.add(buildHttpHealthCheckListWarningData());
   o.add(buildHttpHealthCheckListWarningData());
   return o;
 }
 
-checkUnnamed323(core.List<api.HttpHealthCheckListWarningData> o) {
+checkUnnamed2106(core.List<api.HttpHealthCheckListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpHealthCheckListWarningData(o[0]);
   checkHttpHealthCheckListWarningData(o[1]);
@@ -4359,7 +4359,7 @@
   buildCounterHttpHealthCheckListWarning++;
   if (buildCounterHttpHealthCheckListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed323();
+    o.data = buildUnnamed2106();
     o.message = "foo";
   }
   buildCounterHttpHealthCheckListWarning--;
@@ -4370,7 +4370,7 @@
   buildCounterHttpHealthCheckListWarning++;
   if (buildCounterHttpHealthCheckListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed323(o.data);
+    checkUnnamed2106(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterHttpHealthCheckListWarning--;
@@ -4382,7 +4382,7 @@
   buildCounterHttpHealthCheckList++;
   if (buildCounterHttpHealthCheckList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed322();
+    o.items = buildUnnamed2105();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -4396,7 +4396,7 @@
   buildCounterHttpHealthCheckList++;
   if (buildCounterHttpHealthCheckList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed322(o.items);
+    checkUnnamed2105(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -4448,14 +4448,14 @@
   buildCounterHttpsHealthCheck--;
 }
 
-buildUnnamed324() {
+buildUnnamed2107() {
   var o = new core.List<api.HttpsHealthCheck>();
   o.add(buildHttpsHealthCheck());
   o.add(buildHttpsHealthCheck());
   return o;
 }
 
-checkUnnamed324(core.List<api.HttpsHealthCheck> o) {
+checkUnnamed2107(core.List<api.HttpsHealthCheck> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpsHealthCheck(o[0]);
   checkHttpsHealthCheck(o[1]);
@@ -4482,14 +4482,14 @@
   buildCounterHttpsHealthCheckListWarningData--;
 }
 
-buildUnnamed325() {
+buildUnnamed2108() {
   var o = new core.List<api.HttpsHealthCheckListWarningData>();
   o.add(buildHttpsHealthCheckListWarningData());
   o.add(buildHttpsHealthCheckListWarningData());
   return o;
 }
 
-checkUnnamed325(core.List<api.HttpsHealthCheckListWarningData> o) {
+checkUnnamed2108(core.List<api.HttpsHealthCheckListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpsHealthCheckListWarningData(o[0]);
   checkHttpsHealthCheckListWarningData(o[1]);
@@ -4501,7 +4501,7 @@
   buildCounterHttpsHealthCheckListWarning++;
   if (buildCounterHttpsHealthCheckListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed325();
+    o.data = buildUnnamed2108();
     o.message = "foo";
   }
   buildCounterHttpsHealthCheckListWarning--;
@@ -4512,7 +4512,7 @@
   buildCounterHttpsHealthCheckListWarning++;
   if (buildCounterHttpsHealthCheckListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed325(o.data);
+    checkUnnamed2108(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterHttpsHealthCheckListWarning--;
@@ -4524,7 +4524,7 @@
   buildCounterHttpsHealthCheckList++;
   if (buildCounterHttpsHealthCheckList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed324();
+    o.items = buildUnnamed2107();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -4538,7 +4538,7 @@
   buildCounterHttpsHealthCheckList++;
   if (buildCounterHttpsHealthCheckList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed324(o.items);
+    checkUnnamed2107(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -4547,40 +4547,40 @@
   buildCounterHttpsHealthCheckList--;
 }
 
-buildUnnamed326() {
+buildUnnamed2109() {
   var o = new core.List<api.GuestOsFeature>();
   o.add(buildGuestOsFeature());
   o.add(buildGuestOsFeature());
   return o;
 }
 
-checkUnnamed326(core.List<api.GuestOsFeature> o) {
+checkUnnamed2109(core.List<api.GuestOsFeature> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGuestOsFeature(o[0]);
   checkGuestOsFeature(o[1]);
 }
 
-buildUnnamed327() {
+buildUnnamed2110() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed327(core.Map<core.String, core.String> o) {
+checkUnnamed2110(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed328() {
+buildUnnamed2111() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed328(core.List<core.String> o) {
+checkUnnamed2111(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4620,13 +4620,13 @@
     o.description = "foo";
     o.diskSizeGb = "foo";
     o.family = "foo";
-    o.guestOsFeatures = buildUnnamed326();
+    o.guestOsFeatures = buildUnnamed2109();
     o.id = "foo";
     o.imageEncryptionKey = buildCustomerEncryptionKey();
     o.kind = "foo";
     o.labelFingerprint = "foo";
-    o.labels = buildUnnamed327();
-    o.licenses = buildUnnamed328();
+    o.labels = buildUnnamed2110();
+    o.licenses = buildUnnamed2111();
     o.name = "foo";
     o.rawDisk = buildImageRawDisk();
     o.selfLink = "foo";
@@ -4652,13 +4652,13 @@
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.diskSizeGb, unittest.equals('foo'));
     unittest.expect(o.family, unittest.equals('foo'));
-    checkUnnamed326(o.guestOsFeatures);
+    checkUnnamed2109(o.guestOsFeatures);
     unittest.expect(o.id, unittest.equals('foo'));
     checkCustomerEncryptionKey(o.imageEncryptionKey);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.labelFingerprint, unittest.equals('foo'));
-    checkUnnamed327(o.labels);
-    checkUnnamed328(o.licenses);
+    checkUnnamed2110(o.labels);
+    checkUnnamed2111(o.licenses);
     unittest.expect(o.name, unittest.equals('foo'));
     checkImageRawDisk(o.rawDisk);
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -4674,14 +4674,14 @@
   buildCounterImage--;
 }
 
-buildUnnamed329() {
+buildUnnamed2112() {
   var o = new core.List<api.Image>();
   o.add(buildImage());
   o.add(buildImage());
   return o;
 }
 
-checkUnnamed329(core.List<api.Image> o) {
+checkUnnamed2112(core.List<api.Image> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImage(o[0]);
   checkImage(o[1]);
@@ -4708,14 +4708,14 @@
   buildCounterImageListWarningData--;
 }
 
-buildUnnamed330() {
+buildUnnamed2113() {
   var o = new core.List<api.ImageListWarningData>();
   o.add(buildImageListWarningData());
   o.add(buildImageListWarningData());
   return o;
 }
 
-checkUnnamed330(core.List<api.ImageListWarningData> o) {
+checkUnnamed2113(core.List<api.ImageListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImageListWarningData(o[0]);
   checkImageListWarningData(o[1]);
@@ -4727,7 +4727,7 @@
   buildCounterImageListWarning++;
   if (buildCounterImageListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed330();
+    o.data = buildUnnamed2113();
     o.message = "foo";
   }
   buildCounterImageListWarning--;
@@ -4738,7 +4738,7 @@
   buildCounterImageListWarning++;
   if (buildCounterImageListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed330(o.data);
+    checkUnnamed2113(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterImageListWarning--;
@@ -4750,7 +4750,7 @@
   buildCounterImageList++;
   if (buildCounterImageList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed329();
+    o.items = buildUnnamed2112();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -4764,7 +4764,7 @@
   buildCounterImageList++;
   if (buildCounterImageList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed329(o.items);
+    checkUnnamed2112(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -4773,66 +4773,66 @@
   buildCounterImageList--;
 }
 
-buildUnnamed331() {
+buildUnnamed2114() {
   var o = new core.List<api.AttachedDisk>();
   o.add(buildAttachedDisk());
   o.add(buildAttachedDisk());
   return o;
 }
 
-checkUnnamed331(core.List<api.AttachedDisk> o) {
+checkUnnamed2114(core.List<api.AttachedDisk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAttachedDisk(o[0]);
   checkAttachedDisk(o[1]);
 }
 
-buildUnnamed332() {
+buildUnnamed2115() {
   var o = new core.List<api.AcceleratorConfig>();
   o.add(buildAcceleratorConfig());
   o.add(buildAcceleratorConfig());
   return o;
 }
 
-checkUnnamed332(core.List<api.AcceleratorConfig> o) {
+checkUnnamed2115(core.List<api.AcceleratorConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAcceleratorConfig(o[0]);
   checkAcceleratorConfig(o[1]);
 }
 
-buildUnnamed333() {
+buildUnnamed2116() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed333(core.Map<core.String, core.String> o) {
+checkUnnamed2116(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed334() {
+buildUnnamed2117() {
   var o = new core.List<api.NetworkInterface>();
   o.add(buildNetworkInterface());
   o.add(buildNetworkInterface());
   return o;
 }
 
-checkUnnamed334(core.List<api.NetworkInterface> o) {
+checkUnnamed2117(core.List<api.NetworkInterface> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNetworkInterface(o[0]);
   checkNetworkInterface(o[1]);
 }
 
-buildUnnamed335() {
+buildUnnamed2118() {
   var o = new core.List<api.ServiceAccount>();
   o.add(buildServiceAccount());
   o.add(buildServiceAccount());
   return o;
 }
 
-checkUnnamed335(core.List<api.ServiceAccount> o) {
+checkUnnamed2118(core.List<api.ServiceAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServiceAccount(o[0]);
   checkServiceAccount(o[1]);
@@ -4848,20 +4848,20 @@
     o.creationTimestamp = "foo";
     o.deletionProtection = true;
     o.description = "foo";
-    o.disks = buildUnnamed331();
-    o.guestAccelerators = buildUnnamed332();
+    o.disks = buildUnnamed2114();
+    o.guestAccelerators = buildUnnamed2115();
     o.id = "foo";
     o.kind = "foo";
     o.labelFingerprint = "foo";
-    o.labels = buildUnnamed333();
+    o.labels = buildUnnamed2116();
     o.machineType = "foo";
     o.metadata = buildMetadata();
     o.minCpuPlatform = "foo";
     o.name = "foo";
-    o.networkInterfaces = buildUnnamed334();
+    o.networkInterfaces = buildUnnamed2117();
     o.scheduling = buildScheduling();
     o.selfLink = "foo";
-    o.serviceAccounts = buildUnnamed335();
+    o.serviceAccounts = buildUnnamed2118();
     o.startRestricted = true;
     o.status = "foo";
     o.statusMessage = "foo";
@@ -4880,20 +4880,20 @@
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.deletionProtection, unittest.isTrue);
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed331(o.disks);
-    checkUnnamed332(o.guestAccelerators);
+    checkUnnamed2114(o.disks);
+    checkUnnamed2115(o.guestAccelerators);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.labelFingerprint, unittest.equals('foo'));
-    checkUnnamed333(o.labels);
+    checkUnnamed2116(o.labels);
     unittest.expect(o.machineType, unittest.equals('foo'));
     checkMetadata(o.metadata);
     unittest.expect(o.minCpuPlatform, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed334(o.networkInterfaces);
+    checkUnnamed2117(o.networkInterfaces);
     checkScheduling(o.scheduling);
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed335(o.serviceAccounts);
+    checkUnnamed2118(o.serviceAccounts);
     unittest.expect(o.startRestricted, unittest.isTrue);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.statusMessage, unittest.equals('foo'));
@@ -4903,14 +4903,14 @@
   buildCounterInstance--;
 }
 
-buildUnnamed336() {
+buildUnnamed2119() {
   var o = new core.Map<core.String, api.InstancesScopedList>();
   o["x"] = buildInstancesScopedList();
   o["y"] = buildInstancesScopedList();
   return o;
 }
 
-checkUnnamed336(core.Map<core.String, api.InstancesScopedList> o) {
+checkUnnamed2119(core.Map<core.String, api.InstancesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstancesScopedList(o["x"]);
   checkInstancesScopedList(o["y"]);
@@ -4938,14 +4938,14 @@
   buildCounterInstanceAggregatedListWarningData--;
 }
 
-buildUnnamed337() {
+buildUnnamed2120() {
   var o = new core.List<api.InstanceAggregatedListWarningData>();
   o.add(buildInstanceAggregatedListWarningData());
   o.add(buildInstanceAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed337(core.List<api.InstanceAggregatedListWarningData> o) {
+checkUnnamed2120(core.List<api.InstanceAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceAggregatedListWarningData(o[0]);
   checkInstanceAggregatedListWarningData(o[1]);
@@ -4957,7 +4957,7 @@
   buildCounterInstanceAggregatedListWarning++;
   if (buildCounterInstanceAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed337();
+    o.data = buildUnnamed2120();
     o.message = "foo";
   }
   buildCounterInstanceAggregatedListWarning--;
@@ -4968,7 +4968,7 @@
   buildCounterInstanceAggregatedListWarning++;
   if (buildCounterInstanceAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed337(o.data);
+    checkUnnamed2120(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstanceAggregatedListWarning--;
@@ -4980,7 +4980,7 @@
   buildCounterInstanceAggregatedList++;
   if (buildCounterInstanceAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed336();
+    o.items = buildUnnamed2119();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -4994,7 +4994,7 @@
   buildCounterInstanceAggregatedList++;
   if (buildCounterInstanceAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed336(o.items);
+    checkUnnamed2119(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -5003,14 +5003,14 @@
   buildCounterInstanceAggregatedList--;
 }
 
-buildUnnamed338() {
+buildUnnamed2121() {
   var o = new core.List<api.NamedPort>();
   o.add(buildNamedPort());
   o.add(buildNamedPort());
   return o;
 }
 
-checkUnnamed338(core.List<api.NamedPort> o) {
+checkUnnamed2121(core.List<api.NamedPort> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNamedPort(o[0]);
   checkNamedPort(o[1]);
@@ -5027,7 +5027,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.namedPorts = buildUnnamed338();
+    o.namedPorts = buildUnnamed2121();
     o.network = "foo";
     o.region = "foo";
     o.selfLink = "foo";
@@ -5048,7 +5048,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed338(o.namedPorts);
+    checkUnnamed2121(o.namedPorts);
     unittest.expect(o.network, unittest.equals('foo'));
     unittest.expect(o.region, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -5059,14 +5059,14 @@
   buildCounterInstanceGroup--;
 }
 
-buildUnnamed339() {
+buildUnnamed2122() {
   var o = new core.Map<core.String, api.InstanceGroupsScopedList>();
   o["x"] = buildInstanceGroupsScopedList();
   o["y"] = buildInstanceGroupsScopedList();
   return o;
 }
 
-checkUnnamed339(core.Map<core.String, api.InstanceGroupsScopedList> o) {
+checkUnnamed2122(core.Map<core.String, api.InstanceGroupsScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupsScopedList(o["x"]);
   checkInstanceGroupsScopedList(o["y"]);
@@ -5094,14 +5094,14 @@
   buildCounterInstanceGroupAggregatedListWarningData--;
 }
 
-buildUnnamed340() {
+buildUnnamed2123() {
   var o = new core.List<api.InstanceGroupAggregatedListWarningData>();
   o.add(buildInstanceGroupAggregatedListWarningData());
   o.add(buildInstanceGroupAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed340(core.List<api.InstanceGroupAggregatedListWarningData> o) {
+checkUnnamed2123(core.List<api.InstanceGroupAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupAggregatedListWarningData(o[0]);
   checkInstanceGroupAggregatedListWarningData(o[1]);
@@ -5113,7 +5113,7 @@
   buildCounterInstanceGroupAggregatedListWarning++;
   if (buildCounterInstanceGroupAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed340();
+    o.data = buildUnnamed2123();
     o.message = "foo";
   }
   buildCounterInstanceGroupAggregatedListWarning--;
@@ -5125,7 +5125,7 @@
   buildCounterInstanceGroupAggregatedListWarning++;
   if (buildCounterInstanceGroupAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed340(o.data);
+    checkUnnamed2123(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstanceGroupAggregatedListWarning--;
@@ -5137,7 +5137,7 @@
   buildCounterInstanceGroupAggregatedList++;
   if (buildCounterInstanceGroupAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed339();
+    o.items = buildUnnamed2122();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -5151,7 +5151,7 @@
   buildCounterInstanceGroupAggregatedList++;
   if (buildCounterInstanceGroupAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed339(o.items);
+    checkUnnamed2122(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -5160,14 +5160,14 @@
   buildCounterInstanceGroupAggregatedList--;
 }
 
-buildUnnamed341() {
+buildUnnamed2124() {
   var o = new core.List<api.InstanceGroup>();
   o.add(buildInstanceGroup());
   o.add(buildInstanceGroup());
   return o;
 }
 
-checkUnnamed341(core.List<api.InstanceGroup> o) {
+checkUnnamed2124(core.List<api.InstanceGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroup(o[0]);
   checkInstanceGroup(o[1]);
@@ -5194,14 +5194,14 @@
   buildCounterInstanceGroupListWarningData--;
 }
 
-buildUnnamed342() {
+buildUnnamed2125() {
   var o = new core.List<api.InstanceGroupListWarningData>();
   o.add(buildInstanceGroupListWarningData());
   o.add(buildInstanceGroupListWarningData());
   return o;
 }
 
-checkUnnamed342(core.List<api.InstanceGroupListWarningData> o) {
+checkUnnamed2125(core.List<api.InstanceGroupListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupListWarningData(o[0]);
   checkInstanceGroupListWarningData(o[1]);
@@ -5213,7 +5213,7 @@
   buildCounterInstanceGroupListWarning++;
   if (buildCounterInstanceGroupListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed342();
+    o.data = buildUnnamed2125();
     o.message = "foo";
   }
   buildCounterInstanceGroupListWarning--;
@@ -5224,7 +5224,7 @@
   buildCounterInstanceGroupListWarning++;
   if (buildCounterInstanceGroupListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed342(o.data);
+    checkUnnamed2125(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstanceGroupListWarning--;
@@ -5236,7 +5236,7 @@
   buildCounterInstanceGroupList++;
   if (buildCounterInstanceGroupList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed341();
+    o.items = buildUnnamed2124();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -5250,7 +5250,7 @@
   buildCounterInstanceGroupList++;
   if (buildCounterInstanceGroupList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed341(o.items);
+    checkUnnamed2124(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -5259,27 +5259,27 @@
   buildCounterInstanceGroupList--;
 }
 
-buildUnnamed343() {
+buildUnnamed2126() {
   var o = new core.List<api.NamedPort>();
   o.add(buildNamedPort());
   o.add(buildNamedPort());
   return o;
 }
 
-checkUnnamed343(core.List<api.NamedPort> o) {
+checkUnnamed2126(core.List<api.NamedPort> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNamedPort(o[0]);
   checkNamedPort(o[1]);
 }
 
-buildUnnamed344() {
+buildUnnamed2127() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed344(core.List<core.String> o) {
+checkUnnamed2127(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5300,10 +5300,10 @@
     o.instanceTemplate = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.namedPorts = buildUnnamed343();
+    o.namedPorts = buildUnnamed2126();
     o.region = "foo";
     o.selfLink = "foo";
-    o.targetPools = buildUnnamed344();
+    o.targetPools = buildUnnamed2127();
     o.targetSize = 42;
     o.zone = "foo";
   }
@@ -5324,10 +5324,10 @@
     unittest.expect(o.instanceTemplate, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed343(o.namedPorts);
+    checkUnnamed2126(o.namedPorts);
     unittest.expect(o.region, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed344(o.targetPools);
+    checkUnnamed2127(o.targetPools);
     unittest.expect(o.targetSize, unittest.equals(42));
     unittest.expect(o.zone, unittest.equals('foo'));
   }
@@ -5368,14 +5368,14 @@
   buildCounterInstanceGroupManagerActionsSummary--;
 }
 
-buildUnnamed345() {
+buildUnnamed2128() {
   var o = new core.Map<core.String, api.InstanceGroupManagersScopedList>();
   o["x"] = buildInstanceGroupManagersScopedList();
   o["y"] = buildInstanceGroupManagersScopedList();
   return o;
 }
 
-checkUnnamed345(core.Map<core.String, api.InstanceGroupManagersScopedList> o) {
+checkUnnamed2128(core.Map<core.String, api.InstanceGroupManagersScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupManagersScopedList(o["x"]);
   checkInstanceGroupManagersScopedList(o["y"]);
@@ -5403,14 +5403,14 @@
   buildCounterInstanceGroupManagerAggregatedListWarningData--;
 }
 
-buildUnnamed346() {
+buildUnnamed2129() {
   var o = new core.List<api.InstanceGroupManagerAggregatedListWarningData>();
   o.add(buildInstanceGroupManagerAggregatedListWarningData());
   o.add(buildInstanceGroupManagerAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed346(
+checkUnnamed2129(
     core.List<api.InstanceGroupManagerAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupManagerAggregatedListWarningData(o[0]);
@@ -5423,7 +5423,7 @@
   buildCounterInstanceGroupManagerAggregatedListWarning++;
   if (buildCounterInstanceGroupManagerAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed346();
+    o.data = buildUnnamed2129();
     o.message = "foo";
   }
   buildCounterInstanceGroupManagerAggregatedListWarning--;
@@ -5435,7 +5435,7 @@
   buildCounterInstanceGroupManagerAggregatedListWarning++;
   if (buildCounterInstanceGroupManagerAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed346(o.data);
+    checkUnnamed2129(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstanceGroupManagerAggregatedListWarning--;
@@ -5447,7 +5447,7 @@
   buildCounterInstanceGroupManagerAggregatedList++;
   if (buildCounterInstanceGroupManagerAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed345();
+    o.items = buildUnnamed2128();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -5462,7 +5462,7 @@
   buildCounterInstanceGroupManagerAggregatedList++;
   if (buildCounterInstanceGroupManagerAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed345(o.items);
+    checkUnnamed2128(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -5471,14 +5471,14 @@
   buildCounterInstanceGroupManagerAggregatedList--;
 }
 
-buildUnnamed347() {
+buildUnnamed2130() {
   var o = new core.List<api.InstanceGroupManager>();
   o.add(buildInstanceGroupManager());
   o.add(buildInstanceGroupManager());
   return o;
 }
 
-checkUnnamed347(core.List<api.InstanceGroupManager> o) {
+checkUnnamed2130(core.List<api.InstanceGroupManager> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupManager(o[0]);
   checkInstanceGroupManager(o[1]);
@@ -5506,14 +5506,14 @@
   buildCounterInstanceGroupManagerListWarningData--;
 }
 
-buildUnnamed348() {
+buildUnnamed2131() {
   var o = new core.List<api.InstanceGroupManagerListWarningData>();
   o.add(buildInstanceGroupManagerListWarningData());
   o.add(buildInstanceGroupManagerListWarningData());
   return o;
 }
 
-checkUnnamed348(core.List<api.InstanceGroupManagerListWarningData> o) {
+checkUnnamed2131(core.List<api.InstanceGroupManagerListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupManagerListWarningData(o[0]);
   checkInstanceGroupManagerListWarningData(o[1]);
@@ -5525,7 +5525,7 @@
   buildCounterInstanceGroupManagerListWarning++;
   if (buildCounterInstanceGroupManagerListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed348();
+    o.data = buildUnnamed2131();
     o.message = "foo";
   }
   buildCounterInstanceGroupManagerListWarning--;
@@ -5536,7 +5536,7 @@
   buildCounterInstanceGroupManagerListWarning++;
   if (buildCounterInstanceGroupManagerListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed348(o.data);
+    checkUnnamed2131(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstanceGroupManagerListWarning--;
@@ -5548,7 +5548,7 @@
   buildCounterInstanceGroupManagerList++;
   if (buildCounterInstanceGroupManagerList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed347();
+    o.items = buildUnnamed2130();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -5562,7 +5562,7 @@
   buildCounterInstanceGroupManagerList++;
   if (buildCounterInstanceGroupManagerList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed347(o.items);
+    checkUnnamed2130(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -5571,14 +5571,14 @@
   buildCounterInstanceGroupManagerList--;
 }
 
-buildUnnamed349() {
+buildUnnamed2132() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed349(core.List<core.String> o) {
+checkUnnamed2132(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5589,7 +5589,7 @@
   var o = new api.InstanceGroupManagersAbandonInstancesRequest();
   buildCounterInstanceGroupManagersAbandonInstancesRequest++;
   if (buildCounterInstanceGroupManagersAbandonInstancesRequest < 3) {
-    o.instances = buildUnnamed349();
+    o.instances = buildUnnamed2132();
   }
   buildCounterInstanceGroupManagersAbandonInstancesRequest--;
   return o;
@@ -5599,19 +5599,19 @@
     api.InstanceGroupManagersAbandonInstancesRequest o) {
   buildCounterInstanceGroupManagersAbandonInstancesRequest++;
   if (buildCounterInstanceGroupManagersAbandonInstancesRequest < 3) {
-    checkUnnamed349(o.instances);
+    checkUnnamed2132(o.instances);
   }
   buildCounterInstanceGroupManagersAbandonInstancesRequest--;
 }
 
-buildUnnamed350() {
+buildUnnamed2133() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed350(core.List<core.String> o) {
+checkUnnamed2133(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5622,7 +5622,7 @@
   var o = new api.InstanceGroupManagersDeleteInstancesRequest();
   buildCounterInstanceGroupManagersDeleteInstancesRequest++;
   if (buildCounterInstanceGroupManagersDeleteInstancesRequest < 3) {
-    o.instances = buildUnnamed350();
+    o.instances = buildUnnamed2133();
   }
   buildCounterInstanceGroupManagersDeleteInstancesRequest--;
   return o;
@@ -5632,19 +5632,19 @@
     api.InstanceGroupManagersDeleteInstancesRequest o) {
   buildCounterInstanceGroupManagersDeleteInstancesRequest++;
   if (buildCounterInstanceGroupManagersDeleteInstancesRequest < 3) {
-    checkUnnamed350(o.instances);
+    checkUnnamed2133(o.instances);
   }
   buildCounterInstanceGroupManagersDeleteInstancesRequest--;
 }
 
-buildUnnamed351() {
+buildUnnamed2134() {
   var o = new core.List<api.ManagedInstance>();
   o.add(buildManagedInstance());
   o.add(buildManagedInstance());
   return o;
 }
 
-checkUnnamed351(core.List<api.ManagedInstance> o) {
+checkUnnamed2134(core.List<api.ManagedInstance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedInstance(o[0]);
   checkManagedInstance(o[1]);
@@ -5655,7 +5655,7 @@
   var o = new api.InstanceGroupManagersListManagedInstancesResponse();
   buildCounterInstanceGroupManagersListManagedInstancesResponse++;
   if (buildCounterInstanceGroupManagersListManagedInstancesResponse < 3) {
-    o.managedInstances = buildUnnamed351();
+    o.managedInstances = buildUnnamed2134();
   }
   buildCounterInstanceGroupManagersListManagedInstancesResponse--;
   return o;
@@ -5665,19 +5665,19 @@
     api.InstanceGroupManagersListManagedInstancesResponse o) {
   buildCounterInstanceGroupManagersListManagedInstancesResponse++;
   if (buildCounterInstanceGroupManagersListManagedInstancesResponse < 3) {
-    checkUnnamed351(o.managedInstances);
+    checkUnnamed2134(o.managedInstances);
   }
   buildCounterInstanceGroupManagersListManagedInstancesResponse--;
 }
 
-buildUnnamed352() {
+buildUnnamed2135() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed352(core.List<core.String> o) {
+checkUnnamed2135(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5688,7 +5688,7 @@
   var o = new api.InstanceGroupManagersRecreateInstancesRequest();
   buildCounterInstanceGroupManagersRecreateInstancesRequest++;
   if (buildCounterInstanceGroupManagersRecreateInstancesRequest < 3) {
-    o.instances = buildUnnamed352();
+    o.instances = buildUnnamed2135();
   }
   buildCounterInstanceGroupManagersRecreateInstancesRequest--;
   return o;
@@ -5698,19 +5698,19 @@
     api.InstanceGroupManagersRecreateInstancesRequest o) {
   buildCounterInstanceGroupManagersRecreateInstancesRequest++;
   if (buildCounterInstanceGroupManagersRecreateInstancesRequest < 3) {
-    checkUnnamed352(o.instances);
+    checkUnnamed2135(o.instances);
   }
   buildCounterInstanceGroupManagersRecreateInstancesRequest--;
 }
 
-buildUnnamed353() {
+buildUnnamed2136() {
   var o = new core.List<api.InstanceGroupManager>();
   o.add(buildInstanceGroupManager());
   o.add(buildInstanceGroupManager());
   return o;
 }
 
-checkUnnamed353(core.List<api.InstanceGroupManager> o) {
+checkUnnamed2136(core.List<api.InstanceGroupManager> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupManager(o[0]);
   checkInstanceGroupManager(o[1]);
@@ -5738,14 +5738,14 @@
   buildCounterInstanceGroupManagersScopedListWarningData--;
 }
 
-buildUnnamed354() {
+buildUnnamed2137() {
   var o = new core.List<api.InstanceGroupManagersScopedListWarningData>();
   o.add(buildInstanceGroupManagersScopedListWarningData());
   o.add(buildInstanceGroupManagersScopedListWarningData());
   return o;
 }
 
-checkUnnamed354(core.List<api.InstanceGroupManagersScopedListWarningData> o) {
+checkUnnamed2137(core.List<api.InstanceGroupManagersScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupManagersScopedListWarningData(o[0]);
   checkInstanceGroupManagersScopedListWarningData(o[1]);
@@ -5757,7 +5757,7 @@
   buildCounterInstanceGroupManagersScopedListWarning++;
   if (buildCounterInstanceGroupManagersScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed354();
+    o.data = buildUnnamed2137();
     o.message = "foo";
   }
   buildCounterInstanceGroupManagersScopedListWarning--;
@@ -5769,7 +5769,7 @@
   buildCounterInstanceGroupManagersScopedListWarning++;
   if (buildCounterInstanceGroupManagersScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed354(o.data);
+    checkUnnamed2137(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstanceGroupManagersScopedListWarning--;
@@ -5780,7 +5780,7 @@
   var o = new api.InstanceGroupManagersScopedList();
   buildCounterInstanceGroupManagersScopedList++;
   if (buildCounterInstanceGroupManagersScopedList < 3) {
-    o.instanceGroupManagers = buildUnnamed353();
+    o.instanceGroupManagers = buildUnnamed2136();
     o.warning = buildInstanceGroupManagersScopedListWarning();
   }
   buildCounterInstanceGroupManagersScopedList--;
@@ -5790,7 +5790,7 @@
 checkInstanceGroupManagersScopedList(api.InstanceGroupManagersScopedList o) {
   buildCounterInstanceGroupManagersScopedList++;
   if (buildCounterInstanceGroupManagersScopedList < 3) {
-    checkUnnamed353(o.instanceGroupManagers);
+    checkUnnamed2136(o.instanceGroupManagers);
     checkInstanceGroupManagersScopedListWarning(o.warning);
   }
   buildCounterInstanceGroupManagersScopedList--;
@@ -5816,14 +5816,14 @@
   buildCounterInstanceGroupManagersSetInstanceTemplateRequest--;
 }
 
-buildUnnamed355() {
+buildUnnamed2138() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed355(core.List<core.String> o) {
+checkUnnamed2138(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5835,7 +5835,7 @@
   buildCounterInstanceGroupManagersSetTargetPoolsRequest++;
   if (buildCounterInstanceGroupManagersSetTargetPoolsRequest < 3) {
     o.fingerprint = "foo";
-    o.targetPools = buildUnnamed355();
+    o.targetPools = buildUnnamed2138();
   }
   buildCounterInstanceGroupManagersSetTargetPoolsRequest--;
   return o;
@@ -5846,19 +5846,19 @@
   buildCounterInstanceGroupManagersSetTargetPoolsRequest++;
   if (buildCounterInstanceGroupManagersSetTargetPoolsRequest < 3) {
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed355(o.targetPools);
+    checkUnnamed2138(o.targetPools);
   }
   buildCounterInstanceGroupManagersSetTargetPoolsRequest--;
 }
 
-buildUnnamed356() {
+buildUnnamed2139() {
   var o = new core.List<api.InstanceReference>();
   o.add(buildInstanceReference());
   o.add(buildInstanceReference());
   return o;
 }
 
-checkUnnamed356(core.List<api.InstanceReference> o) {
+checkUnnamed2139(core.List<api.InstanceReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceReference(o[0]);
   checkInstanceReference(o[1]);
@@ -5869,7 +5869,7 @@
   var o = new api.InstanceGroupsAddInstancesRequest();
   buildCounterInstanceGroupsAddInstancesRequest++;
   if (buildCounterInstanceGroupsAddInstancesRequest < 3) {
-    o.instances = buildUnnamed356();
+    o.instances = buildUnnamed2139();
   }
   buildCounterInstanceGroupsAddInstancesRequest--;
   return o;
@@ -5879,19 +5879,19 @@
     api.InstanceGroupsAddInstancesRequest o) {
   buildCounterInstanceGroupsAddInstancesRequest++;
   if (buildCounterInstanceGroupsAddInstancesRequest < 3) {
-    checkUnnamed356(o.instances);
+    checkUnnamed2139(o.instances);
   }
   buildCounterInstanceGroupsAddInstancesRequest--;
 }
 
-buildUnnamed357() {
+buildUnnamed2140() {
   var o = new core.List<api.InstanceWithNamedPorts>();
   o.add(buildInstanceWithNamedPorts());
   o.add(buildInstanceWithNamedPorts());
   return o;
 }
 
-checkUnnamed357(core.List<api.InstanceWithNamedPorts> o) {
+checkUnnamed2140(core.List<api.InstanceWithNamedPorts> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceWithNamedPorts(o[0]);
   checkInstanceWithNamedPorts(o[1]);
@@ -5919,14 +5919,14 @@
   buildCounterInstanceGroupsListInstancesWarningData--;
 }
 
-buildUnnamed358() {
+buildUnnamed2141() {
   var o = new core.List<api.InstanceGroupsListInstancesWarningData>();
   o.add(buildInstanceGroupsListInstancesWarningData());
   o.add(buildInstanceGroupsListInstancesWarningData());
   return o;
 }
 
-checkUnnamed358(core.List<api.InstanceGroupsListInstancesWarningData> o) {
+checkUnnamed2141(core.List<api.InstanceGroupsListInstancesWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupsListInstancesWarningData(o[0]);
   checkInstanceGroupsListInstancesWarningData(o[1]);
@@ -5938,7 +5938,7 @@
   buildCounterInstanceGroupsListInstancesWarning++;
   if (buildCounterInstanceGroupsListInstancesWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed358();
+    o.data = buildUnnamed2141();
     o.message = "foo";
   }
   buildCounterInstanceGroupsListInstancesWarning--;
@@ -5950,7 +5950,7 @@
   buildCounterInstanceGroupsListInstancesWarning++;
   if (buildCounterInstanceGroupsListInstancesWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed358(o.data);
+    checkUnnamed2141(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstanceGroupsListInstancesWarning--;
@@ -5962,7 +5962,7 @@
   buildCounterInstanceGroupsListInstances++;
   if (buildCounterInstanceGroupsListInstances < 3) {
     o.id = "foo";
-    o.items = buildUnnamed357();
+    o.items = buildUnnamed2140();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -5976,7 +5976,7 @@
   buildCounterInstanceGroupsListInstances++;
   if (buildCounterInstanceGroupsListInstances < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed357(o.items);
+    checkUnnamed2140(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -6005,14 +6005,14 @@
   buildCounterInstanceGroupsListInstancesRequest--;
 }
 
-buildUnnamed359() {
+buildUnnamed2142() {
   var o = new core.List<api.InstanceReference>();
   o.add(buildInstanceReference());
   o.add(buildInstanceReference());
   return o;
 }
 
-checkUnnamed359(core.List<api.InstanceReference> o) {
+checkUnnamed2142(core.List<api.InstanceReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceReference(o[0]);
   checkInstanceReference(o[1]);
@@ -6023,7 +6023,7 @@
   var o = new api.InstanceGroupsRemoveInstancesRequest();
   buildCounterInstanceGroupsRemoveInstancesRequest++;
   if (buildCounterInstanceGroupsRemoveInstancesRequest < 3) {
-    o.instances = buildUnnamed359();
+    o.instances = buildUnnamed2142();
   }
   buildCounterInstanceGroupsRemoveInstancesRequest--;
   return o;
@@ -6033,19 +6033,19 @@
     api.InstanceGroupsRemoveInstancesRequest o) {
   buildCounterInstanceGroupsRemoveInstancesRequest++;
   if (buildCounterInstanceGroupsRemoveInstancesRequest < 3) {
-    checkUnnamed359(o.instances);
+    checkUnnamed2142(o.instances);
   }
   buildCounterInstanceGroupsRemoveInstancesRequest--;
 }
 
-buildUnnamed360() {
+buildUnnamed2143() {
   var o = new core.List<api.InstanceGroup>();
   o.add(buildInstanceGroup());
   o.add(buildInstanceGroup());
   return o;
 }
 
-checkUnnamed360(core.List<api.InstanceGroup> o) {
+checkUnnamed2143(core.List<api.InstanceGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroup(o[0]);
   checkInstanceGroup(o[1]);
@@ -6073,14 +6073,14 @@
   buildCounterInstanceGroupsScopedListWarningData--;
 }
 
-buildUnnamed361() {
+buildUnnamed2144() {
   var o = new core.List<api.InstanceGroupsScopedListWarningData>();
   o.add(buildInstanceGroupsScopedListWarningData());
   o.add(buildInstanceGroupsScopedListWarningData());
   return o;
 }
 
-checkUnnamed361(core.List<api.InstanceGroupsScopedListWarningData> o) {
+checkUnnamed2144(core.List<api.InstanceGroupsScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupsScopedListWarningData(o[0]);
   checkInstanceGroupsScopedListWarningData(o[1]);
@@ -6092,7 +6092,7 @@
   buildCounterInstanceGroupsScopedListWarning++;
   if (buildCounterInstanceGroupsScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed361();
+    o.data = buildUnnamed2144();
     o.message = "foo";
   }
   buildCounterInstanceGroupsScopedListWarning--;
@@ -6103,7 +6103,7 @@
   buildCounterInstanceGroupsScopedListWarning++;
   if (buildCounterInstanceGroupsScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed361(o.data);
+    checkUnnamed2144(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstanceGroupsScopedListWarning--;
@@ -6114,7 +6114,7 @@
   var o = new api.InstanceGroupsScopedList();
   buildCounterInstanceGroupsScopedList++;
   if (buildCounterInstanceGroupsScopedList < 3) {
-    o.instanceGroups = buildUnnamed360();
+    o.instanceGroups = buildUnnamed2143();
     o.warning = buildInstanceGroupsScopedListWarning();
   }
   buildCounterInstanceGroupsScopedList--;
@@ -6124,20 +6124,20 @@
 checkInstanceGroupsScopedList(api.InstanceGroupsScopedList o) {
   buildCounterInstanceGroupsScopedList++;
   if (buildCounterInstanceGroupsScopedList < 3) {
-    checkUnnamed360(o.instanceGroups);
+    checkUnnamed2143(o.instanceGroups);
     checkInstanceGroupsScopedListWarning(o.warning);
   }
   buildCounterInstanceGroupsScopedList--;
 }
 
-buildUnnamed362() {
+buildUnnamed2145() {
   var o = new core.List<api.NamedPort>();
   o.add(buildNamedPort());
   o.add(buildNamedPort());
   return o;
 }
 
-checkUnnamed362(core.List<api.NamedPort> o) {
+checkUnnamed2145(core.List<api.NamedPort> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNamedPort(o[0]);
   checkNamedPort(o[1]);
@@ -6149,7 +6149,7 @@
   buildCounterInstanceGroupsSetNamedPortsRequest++;
   if (buildCounterInstanceGroupsSetNamedPortsRequest < 3) {
     o.fingerprint = "foo";
-    o.namedPorts = buildUnnamed362();
+    o.namedPorts = buildUnnamed2145();
   }
   buildCounterInstanceGroupsSetNamedPortsRequest--;
   return o;
@@ -6160,19 +6160,19 @@
   buildCounterInstanceGroupsSetNamedPortsRequest++;
   if (buildCounterInstanceGroupsSetNamedPortsRequest < 3) {
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed362(o.namedPorts);
+    checkUnnamed2145(o.namedPorts);
   }
   buildCounterInstanceGroupsSetNamedPortsRequest--;
 }
 
-buildUnnamed363() {
+buildUnnamed2146() {
   var o = new core.List<api.Instance>();
   o.add(buildInstance());
   o.add(buildInstance());
   return o;
 }
 
-checkUnnamed363(core.List<api.Instance> o) {
+checkUnnamed2146(core.List<api.Instance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstance(o[0]);
   checkInstance(o[1]);
@@ -6199,14 +6199,14 @@
   buildCounterInstanceListWarningData--;
 }
 
-buildUnnamed364() {
+buildUnnamed2147() {
   var o = new core.List<api.InstanceListWarningData>();
   o.add(buildInstanceListWarningData());
   o.add(buildInstanceListWarningData());
   return o;
 }
 
-checkUnnamed364(core.List<api.InstanceListWarningData> o) {
+checkUnnamed2147(core.List<api.InstanceListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceListWarningData(o[0]);
   checkInstanceListWarningData(o[1]);
@@ -6218,7 +6218,7 @@
   buildCounterInstanceListWarning++;
   if (buildCounterInstanceListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed364();
+    o.data = buildUnnamed2147();
     o.message = "foo";
   }
   buildCounterInstanceListWarning--;
@@ -6229,7 +6229,7 @@
   buildCounterInstanceListWarning++;
   if (buildCounterInstanceListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed364(o.data);
+    checkUnnamed2147(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstanceListWarning--;
@@ -6241,7 +6241,7 @@
   buildCounterInstanceList++;
   if (buildCounterInstanceList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed363();
+    o.items = buildUnnamed2146();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -6255,7 +6255,7 @@
   buildCounterInstanceList++;
   if (buildCounterInstanceList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed363(o.items);
+    checkUnnamed2146(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -6264,14 +6264,14 @@
   buildCounterInstanceList--;
 }
 
-buildUnnamed365() {
+buildUnnamed2148() {
   var o = new core.List<api.Reference>();
   o.add(buildReference());
   o.add(buildReference());
   return o;
 }
 
-checkUnnamed365(core.List<api.Reference> o) {
+checkUnnamed2148(core.List<api.Reference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReference(o[0]);
   checkReference(o[1]);
@@ -6298,14 +6298,14 @@
   buildCounterInstanceListReferrersWarningData--;
 }
 
-buildUnnamed366() {
+buildUnnamed2149() {
   var o = new core.List<api.InstanceListReferrersWarningData>();
   o.add(buildInstanceListReferrersWarningData());
   o.add(buildInstanceListReferrersWarningData());
   return o;
 }
 
-checkUnnamed366(core.List<api.InstanceListReferrersWarningData> o) {
+checkUnnamed2149(core.List<api.InstanceListReferrersWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceListReferrersWarningData(o[0]);
   checkInstanceListReferrersWarningData(o[1]);
@@ -6317,7 +6317,7 @@
   buildCounterInstanceListReferrersWarning++;
   if (buildCounterInstanceListReferrersWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed366();
+    o.data = buildUnnamed2149();
     o.message = "foo";
   }
   buildCounterInstanceListReferrersWarning--;
@@ -6328,7 +6328,7 @@
   buildCounterInstanceListReferrersWarning++;
   if (buildCounterInstanceListReferrersWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed366(o.data);
+    checkUnnamed2149(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstanceListReferrersWarning--;
@@ -6340,7 +6340,7 @@
   buildCounterInstanceListReferrers++;
   if (buildCounterInstanceListReferrers < 3) {
     o.id = "foo";
-    o.items = buildUnnamed365();
+    o.items = buildUnnamed2148();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -6354,7 +6354,7 @@
   buildCounterInstanceListReferrers++;
   if (buildCounterInstanceListReferrers < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed365(o.items);
+    checkUnnamed2148(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -6384,66 +6384,66 @@
   buildCounterInstanceMoveRequest--;
 }
 
-buildUnnamed367() {
+buildUnnamed2150() {
   var o = new core.List<api.AttachedDisk>();
   o.add(buildAttachedDisk());
   o.add(buildAttachedDisk());
   return o;
 }
 
-checkUnnamed367(core.List<api.AttachedDisk> o) {
+checkUnnamed2150(core.List<api.AttachedDisk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAttachedDisk(o[0]);
   checkAttachedDisk(o[1]);
 }
 
-buildUnnamed368() {
+buildUnnamed2151() {
   var o = new core.List<api.AcceleratorConfig>();
   o.add(buildAcceleratorConfig());
   o.add(buildAcceleratorConfig());
   return o;
 }
 
-checkUnnamed368(core.List<api.AcceleratorConfig> o) {
+checkUnnamed2151(core.List<api.AcceleratorConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAcceleratorConfig(o[0]);
   checkAcceleratorConfig(o[1]);
 }
 
-buildUnnamed369() {
+buildUnnamed2152() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed369(core.Map<core.String, core.String> o) {
+checkUnnamed2152(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed370() {
+buildUnnamed2153() {
   var o = new core.List<api.NetworkInterface>();
   o.add(buildNetworkInterface());
   o.add(buildNetworkInterface());
   return o;
 }
 
-checkUnnamed370(core.List<api.NetworkInterface> o) {
+checkUnnamed2153(core.List<api.NetworkInterface> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNetworkInterface(o[0]);
   checkNetworkInterface(o[1]);
 }
 
-buildUnnamed371() {
+buildUnnamed2154() {
   var o = new core.List<api.ServiceAccount>();
   o.add(buildServiceAccount());
   o.add(buildServiceAccount());
   return o;
 }
 
-checkUnnamed371(core.List<api.ServiceAccount> o) {
+checkUnnamed2154(core.List<api.ServiceAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServiceAccount(o[0]);
   checkServiceAccount(o[1]);
@@ -6456,15 +6456,15 @@
   if (buildCounterInstanceProperties < 3) {
     o.canIpForward = true;
     o.description = "foo";
-    o.disks = buildUnnamed367();
-    o.guestAccelerators = buildUnnamed368();
-    o.labels = buildUnnamed369();
+    o.disks = buildUnnamed2150();
+    o.guestAccelerators = buildUnnamed2151();
+    o.labels = buildUnnamed2152();
     o.machineType = "foo";
     o.metadata = buildMetadata();
     o.minCpuPlatform = "foo";
-    o.networkInterfaces = buildUnnamed370();
+    o.networkInterfaces = buildUnnamed2153();
     o.scheduling = buildScheduling();
-    o.serviceAccounts = buildUnnamed371();
+    o.serviceAccounts = buildUnnamed2154();
     o.tags = buildTags();
   }
   buildCounterInstanceProperties--;
@@ -6476,15 +6476,15 @@
   if (buildCounterInstanceProperties < 3) {
     unittest.expect(o.canIpForward, unittest.isTrue);
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed367(o.disks);
-    checkUnnamed368(o.guestAccelerators);
-    checkUnnamed369(o.labels);
+    checkUnnamed2150(o.disks);
+    checkUnnamed2151(o.guestAccelerators);
+    checkUnnamed2152(o.labels);
     unittest.expect(o.machineType, unittest.equals('foo'));
     checkMetadata(o.metadata);
     unittest.expect(o.minCpuPlatform, unittest.equals('foo'));
-    checkUnnamed370(o.networkInterfaces);
+    checkUnnamed2153(o.networkInterfaces);
     checkScheduling(o.scheduling);
-    checkUnnamed371(o.serviceAccounts);
+    checkUnnamed2154(o.serviceAccounts);
     checkTags(o.tags);
   }
   buildCounterInstanceProperties--;
@@ -6540,14 +6540,14 @@
   buildCounterInstanceTemplate--;
 }
 
-buildUnnamed372() {
+buildUnnamed2155() {
   var o = new core.List<api.InstanceTemplate>();
   o.add(buildInstanceTemplate());
   o.add(buildInstanceTemplate());
   return o;
 }
 
-checkUnnamed372(core.List<api.InstanceTemplate> o) {
+checkUnnamed2155(core.List<api.InstanceTemplate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceTemplate(o[0]);
   checkInstanceTemplate(o[1]);
@@ -6574,14 +6574,14 @@
   buildCounterInstanceTemplateListWarningData--;
 }
 
-buildUnnamed373() {
+buildUnnamed2156() {
   var o = new core.List<api.InstanceTemplateListWarningData>();
   o.add(buildInstanceTemplateListWarningData());
   o.add(buildInstanceTemplateListWarningData());
   return o;
 }
 
-checkUnnamed373(core.List<api.InstanceTemplateListWarningData> o) {
+checkUnnamed2156(core.List<api.InstanceTemplateListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceTemplateListWarningData(o[0]);
   checkInstanceTemplateListWarningData(o[1]);
@@ -6593,7 +6593,7 @@
   buildCounterInstanceTemplateListWarning++;
   if (buildCounterInstanceTemplateListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed373();
+    o.data = buildUnnamed2156();
     o.message = "foo";
   }
   buildCounterInstanceTemplateListWarning--;
@@ -6604,7 +6604,7 @@
   buildCounterInstanceTemplateListWarning++;
   if (buildCounterInstanceTemplateListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed373(o.data);
+    checkUnnamed2156(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstanceTemplateListWarning--;
@@ -6616,7 +6616,7 @@
   buildCounterInstanceTemplateList++;
   if (buildCounterInstanceTemplateList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed372();
+    o.items = buildUnnamed2155();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -6630,7 +6630,7 @@
   buildCounterInstanceTemplateList++;
   if (buildCounterInstanceTemplateList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed372(o.items);
+    checkUnnamed2155(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -6639,14 +6639,14 @@
   buildCounterInstanceTemplateList--;
 }
 
-buildUnnamed374() {
+buildUnnamed2157() {
   var o = new core.List<api.NamedPort>();
   o.add(buildNamedPort());
   o.add(buildNamedPort());
   return o;
 }
 
-checkUnnamed374(core.List<api.NamedPort> o) {
+checkUnnamed2157(core.List<api.NamedPort> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNamedPort(o[0]);
   checkNamedPort(o[1]);
@@ -6658,7 +6658,7 @@
   buildCounterInstanceWithNamedPorts++;
   if (buildCounterInstanceWithNamedPorts < 3) {
     o.instance = "foo";
-    o.namedPorts = buildUnnamed374();
+    o.namedPorts = buildUnnamed2157();
     o.status = "foo";
   }
   buildCounterInstanceWithNamedPorts--;
@@ -6669,20 +6669,20 @@
   buildCounterInstanceWithNamedPorts++;
   if (buildCounterInstanceWithNamedPorts < 3) {
     unittest.expect(o.instance, unittest.equals('foo'));
-    checkUnnamed374(o.namedPorts);
+    checkUnnamed2157(o.namedPorts);
     unittest.expect(o.status, unittest.equals('foo'));
   }
   buildCounterInstanceWithNamedPorts--;
 }
 
-buildUnnamed375() {
+buildUnnamed2158() {
   var o = new core.List<api.Instance>();
   o.add(buildInstance());
   o.add(buildInstance());
   return o;
 }
 
-checkUnnamed375(core.List<api.Instance> o) {
+checkUnnamed2158(core.List<api.Instance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstance(o[0]);
   checkInstance(o[1]);
@@ -6709,14 +6709,14 @@
   buildCounterInstancesScopedListWarningData--;
 }
 
-buildUnnamed376() {
+buildUnnamed2159() {
   var o = new core.List<api.InstancesScopedListWarningData>();
   o.add(buildInstancesScopedListWarningData());
   o.add(buildInstancesScopedListWarningData());
   return o;
 }
 
-checkUnnamed376(core.List<api.InstancesScopedListWarningData> o) {
+checkUnnamed2159(core.List<api.InstancesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstancesScopedListWarningData(o[0]);
   checkInstancesScopedListWarningData(o[1]);
@@ -6728,7 +6728,7 @@
   buildCounterInstancesScopedListWarning++;
   if (buildCounterInstancesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed376();
+    o.data = buildUnnamed2159();
     o.message = "foo";
   }
   buildCounterInstancesScopedListWarning--;
@@ -6739,7 +6739,7 @@
   buildCounterInstancesScopedListWarning++;
   if (buildCounterInstancesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed376(o.data);
+    checkUnnamed2159(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInstancesScopedListWarning--;
@@ -6750,7 +6750,7 @@
   var o = new api.InstancesScopedList();
   buildCounterInstancesScopedList++;
   if (buildCounterInstancesScopedList < 3) {
-    o.instances = buildUnnamed375();
+    o.instances = buildUnnamed2158();
     o.warning = buildInstancesScopedListWarning();
   }
   buildCounterInstancesScopedList--;
@@ -6760,20 +6760,20 @@
 checkInstancesScopedList(api.InstancesScopedList o) {
   buildCounterInstancesScopedList++;
   if (buildCounterInstancesScopedList < 3) {
-    checkUnnamed375(o.instances);
+    checkUnnamed2158(o.instances);
     checkInstancesScopedListWarning(o.warning);
   }
   buildCounterInstancesScopedList--;
 }
 
-buildUnnamed377() {
+buildUnnamed2160() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed377(core.Map<core.String, core.String> o) {
+checkUnnamed2160(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -6785,7 +6785,7 @@
   buildCounterInstancesSetLabelsRequest++;
   if (buildCounterInstancesSetLabelsRequest < 3) {
     o.labelFingerprint = "foo";
-    o.labels = buildUnnamed377();
+    o.labels = buildUnnamed2160();
   }
   buildCounterInstancesSetLabelsRequest--;
   return o;
@@ -6795,19 +6795,19 @@
   buildCounterInstancesSetLabelsRequest++;
   if (buildCounterInstancesSetLabelsRequest < 3) {
     unittest.expect(o.labelFingerprint, unittest.equals('foo'));
-    checkUnnamed377(o.labels);
+    checkUnnamed2160(o.labels);
   }
   buildCounterInstancesSetLabelsRequest--;
 }
 
-buildUnnamed378() {
+buildUnnamed2161() {
   var o = new core.List<api.AcceleratorConfig>();
   o.add(buildAcceleratorConfig());
   o.add(buildAcceleratorConfig());
   return o;
 }
 
-checkUnnamed378(core.List<api.AcceleratorConfig> o) {
+checkUnnamed2161(core.List<api.AcceleratorConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAcceleratorConfig(o[0]);
   checkAcceleratorConfig(o[1]);
@@ -6818,7 +6818,7 @@
   var o = new api.InstancesSetMachineResourcesRequest();
   buildCounterInstancesSetMachineResourcesRequest++;
   if (buildCounterInstancesSetMachineResourcesRequest < 3) {
-    o.guestAccelerators = buildUnnamed378();
+    o.guestAccelerators = buildUnnamed2161();
   }
   buildCounterInstancesSetMachineResourcesRequest--;
   return o;
@@ -6828,7 +6828,7 @@
     api.InstancesSetMachineResourcesRequest o) {
   buildCounterInstancesSetMachineResourcesRequest++;
   if (buildCounterInstancesSetMachineResourcesRequest < 3) {
-    checkUnnamed378(o.guestAccelerators);
+    checkUnnamed2161(o.guestAccelerators);
   }
   buildCounterInstancesSetMachineResourcesRequest--;
 }
@@ -6872,14 +6872,14 @@
   buildCounterInstancesSetMinCpuPlatformRequest--;
 }
 
-buildUnnamed379() {
+buildUnnamed2162() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed379(core.List<core.String> o) {
+checkUnnamed2162(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -6891,7 +6891,7 @@
   buildCounterInstancesSetServiceAccountRequest++;
   if (buildCounterInstancesSetServiceAccountRequest < 3) {
     o.email = "foo";
-    o.scopes = buildUnnamed379();
+    o.scopes = buildUnnamed2162();
   }
   buildCounterInstancesSetServiceAccountRequest--;
   return o;
@@ -6902,19 +6902,19 @@
   buildCounterInstancesSetServiceAccountRequest++;
   if (buildCounterInstancesSetServiceAccountRequest < 3) {
     unittest.expect(o.email, unittest.equals('foo'));
-    checkUnnamed379(o.scopes);
+    checkUnnamed2162(o.scopes);
   }
   buildCounterInstancesSetServiceAccountRequest--;
 }
 
-buildUnnamed380() {
+buildUnnamed2163() {
   var o = new core.List<api.CustomerEncryptionKeyProtectedDisk>();
   o.add(buildCustomerEncryptionKeyProtectedDisk());
   o.add(buildCustomerEncryptionKeyProtectedDisk());
   return o;
 }
 
-checkUnnamed380(core.List<api.CustomerEncryptionKeyProtectedDisk> o) {
+checkUnnamed2163(core.List<api.CustomerEncryptionKeyProtectedDisk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomerEncryptionKeyProtectedDisk(o[0]);
   checkCustomerEncryptionKeyProtectedDisk(o[1]);
@@ -6925,7 +6925,7 @@
   var o = new api.InstancesStartWithEncryptionKeyRequest();
   buildCounterInstancesStartWithEncryptionKeyRequest++;
   if (buildCounterInstancesStartWithEncryptionKeyRequest < 3) {
-    o.disks = buildUnnamed380();
+    o.disks = buildUnnamed2163();
   }
   buildCounterInstancesStartWithEncryptionKeyRequest--;
   return o;
@@ -6935,45 +6935,45 @@
     api.InstancesStartWithEncryptionKeyRequest o) {
   buildCounterInstancesStartWithEncryptionKeyRequest++;
   if (buildCounterInstancesStartWithEncryptionKeyRequest < 3) {
-    checkUnnamed380(o.disks);
+    checkUnnamed2163(o.disks);
   }
   buildCounterInstancesStartWithEncryptionKeyRequest--;
 }
 
-buildUnnamed381() {
+buildUnnamed2164() {
   var o = new core.List<api.InterconnectCircuitInfo>();
   o.add(buildInterconnectCircuitInfo());
   o.add(buildInterconnectCircuitInfo());
   return o;
 }
 
-checkUnnamed381(core.List<api.InterconnectCircuitInfo> o) {
+checkUnnamed2164(core.List<api.InterconnectCircuitInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnectCircuitInfo(o[0]);
   checkInterconnectCircuitInfo(o[1]);
 }
 
-buildUnnamed382() {
+buildUnnamed2165() {
   var o = new core.List<api.InterconnectOutageNotification>();
   o.add(buildInterconnectOutageNotification());
   o.add(buildInterconnectOutageNotification());
   return o;
 }
 
-checkUnnamed382(core.List<api.InterconnectOutageNotification> o) {
+checkUnnamed2165(core.List<api.InterconnectOutageNotification> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnectOutageNotification(o[0]);
   checkInterconnectOutageNotification(o[1]);
 }
 
-buildUnnamed383() {
+buildUnnamed2166() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed383(core.List<core.String> o) {
+checkUnnamed2166(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -6985,15 +6985,15 @@
   buildCounterInterconnect++;
   if (buildCounterInterconnect < 3) {
     o.adminEnabled = true;
-    o.circuitInfos = buildUnnamed381();
+    o.circuitInfos = buildUnnamed2164();
     o.creationTimestamp = "foo";
     o.customerName = "foo";
     o.description = "foo";
-    o.expectedOutages = buildUnnamed382();
+    o.expectedOutages = buildUnnamed2165();
     o.googleIpAddress = "foo";
     o.googleReferenceId = "foo";
     o.id = "foo";
-    o.interconnectAttachments = buildUnnamed383();
+    o.interconnectAttachments = buildUnnamed2166();
     o.interconnectType = "foo";
     o.kind = "foo";
     o.linkType = "foo";
@@ -7014,15 +7014,15 @@
   buildCounterInterconnect++;
   if (buildCounterInterconnect < 3) {
     unittest.expect(o.adminEnabled, unittest.isTrue);
-    checkUnnamed381(o.circuitInfos);
+    checkUnnamed2164(o.circuitInfos);
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.customerName, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed382(o.expectedOutages);
+    checkUnnamed2165(o.expectedOutages);
     unittest.expect(o.googleIpAddress, unittest.equals('foo'));
     unittest.expect(o.googleReferenceId, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed383(o.interconnectAttachments);
+    checkUnnamed2166(o.interconnectAttachments);
     unittest.expect(o.interconnectType, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.linkType, unittest.equals('foo'));
@@ -7083,14 +7083,14 @@
   buildCounterInterconnectAttachment--;
 }
 
-buildUnnamed384() {
+buildUnnamed2167() {
   var o = new core.Map<core.String, api.InterconnectAttachmentsScopedList>();
   o["x"] = buildInterconnectAttachmentsScopedList();
   o["y"] = buildInterconnectAttachmentsScopedList();
   return o;
 }
 
-checkUnnamed384(
+checkUnnamed2167(
     core.Map<core.String, api.InterconnectAttachmentsScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnectAttachmentsScopedList(o["x"]);
@@ -7119,14 +7119,14 @@
   buildCounterInterconnectAttachmentAggregatedListWarningData--;
 }
 
-buildUnnamed385() {
+buildUnnamed2168() {
   var o = new core.List<api.InterconnectAttachmentAggregatedListWarningData>();
   o.add(buildInterconnectAttachmentAggregatedListWarningData());
   o.add(buildInterconnectAttachmentAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed385(
+checkUnnamed2168(
     core.List<api.InterconnectAttachmentAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnectAttachmentAggregatedListWarningData(o[0]);
@@ -7139,7 +7139,7 @@
   buildCounterInterconnectAttachmentAggregatedListWarning++;
   if (buildCounterInterconnectAttachmentAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed385();
+    o.data = buildUnnamed2168();
     o.message = "foo";
   }
   buildCounterInterconnectAttachmentAggregatedListWarning--;
@@ -7151,7 +7151,7 @@
   buildCounterInterconnectAttachmentAggregatedListWarning++;
   if (buildCounterInterconnectAttachmentAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed385(o.data);
+    checkUnnamed2168(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInterconnectAttachmentAggregatedListWarning--;
@@ -7163,7 +7163,7 @@
   buildCounterInterconnectAttachmentAggregatedList++;
   if (buildCounterInterconnectAttachmentAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed384();
+    o.items = buildUnnamed2167();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -7178,7 +7178,7 @@
   buildCounterInterconnectAttachmentAggregatedList++;
   if (buildCounterInterconnectAttachmentAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed384(o.items);
+    checkUnnamed2167(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -7187,14 +7187,14 @@
   buildCounterInterconnectAttachmentAggregatedList--;
 }
 
-buildUnnamed386() {
+buildUnnamed2169() {
   var o = new core.List<api.InterconnectAttachment>();
   o.add(buildInterconnectAttachment());
   o.add(buildInterconnectAttachment());
   return o;
 }
 
-checkUnnamed386(core.List<api.InterconnectAttachment> o) {
+checkUnnamed2169(core.List<api.InterconnectAttachment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnectAttachment(o[0]);
   checkInterconnectAttachment(o[1]);
@@ -7222,14 +7222,14 @@
   buildCounterInterconnectAttachmentListWarningData--;
 }
 
-buildUnnamed387() {
+buildUnnamed2170() {
   var o = new core.List<api.InterconnectAttachmentListWarningData>();
   o.add(buildInterconnectAttachmentListWarningData());
   o.add(buildInterconnectAttachmentListWarningData());
   return o;
 }
 
-checkUnnamed387(core.List<api.InterconnectAttachmentListWarningData> o) {
+checkUnnamed2170(core.List<api.InterconnectAttachmentListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnectAttachmentListWarningData(o[0]);
   checkInterconnectAttachmentListWarningData(o[1]);
@@ -7241,7 +7241,7 @@
   buildCounterInterconnectAttachmentListWarning++;
   if (buildCounterInterconnectAttachmentListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed387();
+    o.data = buildUnnamed2170();
     o.message = "foo";
   }
   buildCounterInterconnectAttachmentListWarning--;
@@ -7253,7 +7253,7 @@
   buildCounterInterconnectAttachmentListWarning++;
   if (buildCounterInterconnectAttachmentListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed387(o.data);
+    checkUnnamed2170(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInterconnectAttachmentListWarning--;
@@ -7265,7 +7265,7 @@
   buildCounterInterconnectAttachmentList++;
   if (buildCounterInterconnectAttachmentList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed386();
+    o.items = buildUnnamed2169();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -7279,7 +7279,7 @@
   buildCounterInterconnectAttachmentList++;
   if (buildCounterInterconnectAttachmentList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed386(o.items);
+    checkUnnamed2169(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -7308,14 +7308,14 @@
   buildCounterInterconnectAttachmentPrivateInfo--;
 }
 
-buildUnnamed388() {
+buildUnnamed2171() {
   var o = new core.List<api.InterconnectAttachment>();
   o.add(buildInterconnectAttachment());
   o.add(buildInterconnectAttachment());
   return o;
 }
 
-checkUnnamed388(core.List<api.InterconnectAttachment> o) {
+checkUnnamed2171(core.List<api.InterconnectAttachment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnectAttachment(o[0]);
   checkInterconnectAttachment(o[1]);
@@ -7343,14 +7343,15 @@
   buildCounterInterconnectAttachmentsScopedListWarningData--;
 }
 
-buildUnnamed389() {
+buildUnnamed2172() {
   var o = new core.List<api.InterconnectAttachmentsScopedListWarningData>();
   o.add(buildInterconnectAttachmentsScopedListWarningData());
   o.add(buildInterconnectAttachmentsScopedListWarningData());
   return o;
 }
 
-checkUnnamed389(core.List<api.InterconnectAttachmentsScopedListWarningData> o) {
+checkUnnamed2172(
+    core.List<api.InterconnectAttachmentsScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnectAttachmentsScopedListWarningData(o[0]);
   checkInterconnectAttachmentsScopedListWarningData(o[1]);
@@ -7362,7 +7363,7 @@
   buildCounterInterconnectAttachmentsScopedListWarning++;
   if (buildCounterInterconnectAttachmentsScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed389();
+    o.data = buildUnnamed2172();
     o.message = "foo";
   }
   buildCounterInterconnectAttachmentsScopedListWarning--;
@@ -7374,7 +7375,7 @@
   buildCounterInterconnectAttachmentsScopedListWarning++;
   if (buildCounterInterconnectAttachmentsScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed389(o.data);
+    checkUnnamed2172(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInterconnectAttachmentsScopedListWarning--;
@@ -7385,7 +7386,7 @@
   var o = new api.InterconnectAttachmentsScopedList();
   buildCounterInterconnectAttachmentsScopedList++;
   if (buildCounterInterconnectAttachmentsScopedList < 3) {
-    o.interconnectAttachments = buildUnnamed388();
+    o.interconnectAttachments = buildUnnamed2171();
     o.warning = buildInterconnectAttachmentsScopedListWarning();
   }
   buildCounterInterconnectAttachmentsScopedList--;
@@ -7396,7 +7397,7 @@
     api.InterconnectAttachmentsScopedList o) {
   buildCounterInterconnectAttachmentsScopedList++;
   if (buildCounterInterconnectAttachmentsScopedList < 3) {
-    checkUnnamed388(o.interconnectAttachments);
+    checkUnnamed2171(o.interconnectAttachments);
     checkInterconnectAttachmentsScopedListWarning(o.warning);
   }
   buildCounterInterconnectAttachmentsScopedList--;
@@ -7425,14 +7426,14 @@
   buildCounterInterconnectCircuitInfo--;
 }
 
-buildUnnamed390() {
+buildUnnamed2173() {
   var o = new core.List<api.Interconnect>();
   o.add(buildInterconnect());
   o.add(buildInterconnect());
   return o;
 }
 
-checkUnnamed390(core.List<api.Interconnect> o) {
+checkUnnamed2173(core.List<api.Interconnect> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnect(o[0]);
   checkInterconnect(o[1]);
@@ -7459,14 +7460,14 @@
   buildCounterInterconnectListWarningData--;
 }
 
-buildUnnamed391() {
+buildUnnamed2174() {
   var o = new core.List<api.InterconnectListWarningData>();
   o.add(buildInterconnectListWarningData());
   o.add(buildInterconnectListWarningData());
   return o;
 }
 
-checkUnnamed391(core.List<api.InterconnectListWarningData> o) {
+checkUnnamed2174(core.List<api.InterconnectListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnectListWarningData(o[0]);
   checkInterconnectListWarningData(o[1]);
@@ -7478,7 +7479,7 @@
   buildCounterInterconnectListWarning++;
   if (buildCounterInterconnectListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed391();
+    o.data = buildUnnamed2174();
     o.message = "foo";
   }
   buildCounterInterconnectListWarning--;
@@ -7489,7 +7490,7 @@
   buildCounterInterconnectListWarning++;
   if (buildCounterInterconnectListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed391(o.data);
+    checkUnnamed2174(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInterconnectListWarning--;
@@ -7501,7 +7502,7 @@
   buildCounterInterconnectList++;
   if (buildCounterInterconnectList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed390();
+    o.items = buildUnnamed2173();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -7515,7 +7516,7 @@
   buildCounterInterconnectList++;
   if (buildCounterInterconnectList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed390(o.items);
+    checkUnnamed2173(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -7524,14 +7525,14 @@
   buildCounterInterconnectList--;
 }
 
-buildUnnamed392() {
+buildUnnamed2175() {
   var o = new core.List<api.InterconnectLocationRegionInfo>();
   o.add(buildInterconnectLocationRegionInfo());
   o.add(buildInterconnectLocationRegionInfo());
   return o;
 }
 
-checkUnnamed392(core.List<api.InterconnectLocationRegionInfo> o) {
+checkUnnamed2175(core.List<api.InterconnectLocationRegionInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnectLocationRegionInfo(o[0]);
   checkInterconnectLocationRegionInfo(o[1]);
@@ -7554,7 +7555,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.peeringdbFacilityId = "foo";
-    o.regionInfos = buildUnnamed392();
+    o.regionInfos = buildUnnamed2175();
     o.selfLink = "foo";
   }
   buildCounterInterconnectLocation--;
@@ -7576,20 +7577,20 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.peeringdbFacilityId, unittest.equals('foo'));
-    checkUnnamed392(o.regionInfos);
+    checkUnnamed2175(o.regionInfos);
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
   buildCounterInterconnectLocation--;
 }
 
-buildUnnamed393() {
+buildUnnamed2176() {
   var o = new core.List<api.InterconnectLocation>();
   o.add(buildInterconnectLocation());
   o.add(buildInterconnectLocation());
   return o;
 }
 
-checkUnnamed393(core.List<api.InterconnectLocation> o) {
+checkUnnamed2176(core.List<api.InterconnectLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnectLocation(o[0]);
   checkInterconnectLocation(o[1]);
@@ -7617,14 +7618,14 @@
   buildCounterInterconnectLocationListWarningData--;
 }
 
-buildUnnamed394() {
+buildUnnamed2177() {
   var o = new core.List<api.InterconnectLocationListWarningData>();
   o.add(buildInterconnectLocationListWarningData());
   o.add(buildInterconnectLocationListWarningData());
   return o;
 }
 
-checkUnnamed394(core.List<api.InterconnectLocationListWarningData> o) {
+checkUnnamed2177(core.List<api.InterconnectLocationListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterconnectLocationListWarningData(o[0]);
   checkInterconnectLocationListWarningData(o[1]);
@@ -7636,7 +7637,7 @@
   buildCounterInterconnectLocationListWarning++;
   if (buildCounterInterconnectLocationListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed394();
+    o.data = buildUnnamed2177();
     o.message = "foo";
   }
   buildCounterInterconnectLocationListWarning--;
@@ -7647,7 +7648,7 @@
   buildCounterInterconnectLocationListWarning++;
   if (buildCounterInterconnectLocationListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed394(o.data);
+    checkUnnamed2177(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterInterconnectLocationListWarning--;
@@ -7659,7 +7660,7 @@
   buildCounterInterconnectLocationList++;
   if (buildCounterInterconnectLocationList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed393();
+    o.items = buildUnnamed2176();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -7673,7 +7674,7 @@
   buildCounterInterconnectLocationList++;
   if (buildCounterInterconnectLocationList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed393(o.items);
+    checkUnnamed2176(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -7705,14 +7706,14 @@
   buildCounterInterconnectLocationRegionInfo--;
 }
 
-buildUnnamed395() {
+buildUnnamed2178() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed395(core.List<core.String> o) {
+checkUnnamed2178(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -7723,7 +7724,7 @@
   var o = new api.InterconnectOutageNotification();
   buildCounterInterconnectOutageNotification++;
   if (buildCounterInterconnectOutageNotification < 3) {
-    o.affectedCircuits = buildUnnamed395();
+    o.affectedCircuits = buildUnnamed2178();
     o.description = "foo";
     o.endTime = "foo";
     o.issueType = "foo";
@@ -7739,7 +7740,7 @@
 checkInterconnectOutageNotification(api.InterconnectOutageNotification o) {
   buildCounterInterconnectOutageNotification++;
   if (buildCounterInterconnectOutageNotification < 3) {
-    checkUnnamed395(o.affectedCircuits);
+    checkUnnamed2178(o.affectedCircuits);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.endTime, unittest.equals('foo'));
     unittest.expect(o.issueType, unittest.equals('foo'));
@@ -7795,14 +7796,14 @@
   buildCounterMachineTypeScratchDisks--;
 }
 
-buildUnnamed396() {
+buildUnnamed2179() {
   var o = new core.List<api.MachineTypeScratchDisks>();
   o.add(buildMachineTypeScratchDisks());
   o.add(buildMachineTypeScratchDisks());
   return o;
 }
 
-checkUnnamed396(core.List<api.MachineTypeScratchDisks> o) {
+checkUnnamed2179(core.List<api.MachineTypeScratchDisks> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMachineTypeScratchDisks(o[0]);
   checkMachineTypeScratchDisks(o[1]);
@@ -7825,7 +7826,7 @@
     o.maximumPersistentDisksSizeGb = "foo";
     o.memoryMb = 42;
     o.name = "foo";
-    o.scratchDisks = buildUnnamed396();
+    o.scratchDisks = buildUnnamed2179();
     o.selfLink = "foo";
     o.zone = "foo";
   }
@@ -7848,21 +7849,21 @@
     unittest.expect(o.maximumPersistentDisksSizeGb, unittest.equals('foo'));
     unittest.expect(o.memoryMb, unittest.equals(42));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed396(o.scratchDisks);
+    checkUnnamed2179(o.scratchDisks);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.zone, unittest.equals('foo'));
   }
   buildCounterMachineType--;
 }
 
-buildUnnamed397() {
+buildUnnamed2180() {
   var o = new core.Map<core.String, api.MachineTypesScopedList>();
   o["x"] = buildMachineTypesScopedList();
   o["y"] = buildMachineTypesScopedList();
   return o;
 }
 
-checkUnnamed397(core.Map<core.String, api.MachineTypesScopedList> o) {
+checkUnnamed2180(core.Map<core.String, api.MachineTypesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMachineTypesScopedList(o["x"]);
   checkMachineTypesScopedList(o["y"]);
@@ -7890,14 +7891,14 @@
   buildCounterMachineTypeAggregatedListWarningData--;
 }
 
-buildUnnamed398() {
+buildUnnamed2181() {
   var o = new core.List<api.MachineTypeAggregatedListWarningData>();
   o.add(buildMachineTypeAggregatedListWarningData());
   o.add(buildMachineTypeAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed398(core.List<api.MachineTypeAggregatedListWarningData> o) {
+checkUnnamed2181(core.List<api.MachineTypeAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMachineTypeAggregatedListWarningData(o[0]);
   checkMachineTypeAggregatedListWarningData(o[1]);
@@ -7909,7 +7910,7 @@
   buildCounterMachineTypeAggregatedListWarning++;
   if (buildCounterMachineTypeAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed398();
+    o.data = buildUnnamed2181();
     o.message = "foo";
   }
   buildCounterMachineTypeAggregatedListWarning--;
@@ -7920,7 +7921,7 @@
   buildCounterMachineTypeAggregatedListWarning++;
   if (buildCounterMachineTypeAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed398(o.data);
+    checkUnnamed2181(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterMachineTypeAggregatedListWarning--;
@@ -7932,7 +7933,7 @@
   buildCounterMachineTypeAggregatedList++;
   if (buildCounterMachineTypeAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed397();
+    o.items = buildUnnamed2180();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -7946,7 +7947,7 @@
   buildCounterMachineTypeAggregatedList++;
   if (buildCounterMachineTypeAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed397(o.items);
+    checkUnnamed2180(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -7955,14 +7956,14 @@
   buildCounterMachineTypeAggregatedList--;
 }
 
-buildUnnamed399() {
+buildUnnamed2182() {
   var o = new core.List<api.MachineType>();
   o.add(buildMachineType());
   o.add(buildMachineType());
   return o;
 }
 
-checkUnnamed399(core.List<api.MachineType> o) {
+checkUnnamed2182(core.List<api.MachineType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMachineType(o[0]);
   checkMachineType(o[1]);
@@ -7989,14 +7990,14 @@
   buildCounterMachineTypeListWarningData--;
 }
 
-buildUnnamed400() {
+buildUnnamed2183() {
   var o = new core.List<api.MachineTypeListWarningData>();
   o.add(buildMachineTypeListWarningData());
   o.add(buildMachineTypeListWarningData());
   return o;
 }
 
-checkUnnamed400(core.List<api.MachineTypeListWarningData> o) {
+checkUnnamed2183(core.List<api.MachineTypeListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMachineTypeListWarningData(o[0]);
   checkMachineTypeListWarningData(o[1]);
@@ -8008,7 +8009,7 @@
   buildCounterMachineTypeListWarning++;
   if (buildCounterMachineTypeListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed400();
+    o.data = buildUnnamed2183();
     o.message = "foo";
   }
   buildCounterMachineTypeListWarning--;
@@ -8019,7 +8020,7 @@
   buildCounterMachineTypeListWarning++;
   if (buildCounterMachineTypeListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed400(o.data);
+    checkUnnamed2183(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterMachineTypeListWarning--;
@@ -8031,7 +8032,7 @@
   buildCounterMachineTypeList++;
   if (buildCounterMachineTypeList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed399();
+    o.items = buildUnnamed2182();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -8045,7 +8046,7 @@
   buildCounterMachineTypeList++;
   if (buildCounterMachineTypeList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed399(o.items);
+    checkUnnamed2182(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -8054,14 +8055,14 @@
   buildCounterMachineTypeList--;
 }
 
-buildUnnamed401() {
+buildUnnamed2184() {
   var o = new core.List<api.MachineType>();
   o.add(buildMachineType());
   o.add(buildMachineType());
   return o;
 }
 
-checkUnnamed401(core.List<api.MachineType> o) {
+checkUnnamed2184(core.List<api.MachineType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMachineType(o[0]);
   checkMachineType(o[1]);
@@ -8089,14 +8090,14 @@
   buildCounterMachineTypesScopedListWarningData--;
 }
 
-buildUnnamed402() {
+buildUnnamed2185() {
   var o = new core.List<api.MachineTypesScopedListWarningData>();
   o.add(buildMachineTypesScopedListWarningData());
   o.add(buildMachineTypesScopedListWarningData());
   return o;
 }
 
-checkUnnamed402(core.List<api.MachineTypesScopedListWarningData> o) {
+checkUnnamed2185(core.List<api.MachineTypesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMachineTypesScopedListWarningData(o[0]);
   checkMachineTypesScopedListWarningData(o[1]);
@@ -8108,7 +8109,7 @@
   buildCounterMachineTypesScopedListWarning++;
   if (buildCounterMachineTypesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed402();
+    o.data = buildUnnamed2185();
     o.message = "foo";
   }
   buildCounterMachineTypesScopedListWarning--;
@@ -8119,7 +8120,7 @@
   buildCounterMachineTypesScopedListWarning++;
   if (buildCounterMachineTypesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed402(o.data);
+    checkUnnamed2185(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterMachineTypesScopedListWarning--;
@@ -8130,7 +8131,7 @@
   var o = new api.MachineTypesScopedList();
   buildCounterMachineTypesScopedList++;
   if (buildCounterMachineTypesScopedList < 3) {
-    o.machineTypes = buildUnnamed401();
+    o.machineTypes = buildUnnamed2184();
     o.warning = buildMachineTypesScopedListWarning();
   }
   buildCounterMachineTypesScopedList--;
@@ -8140,7 +8141,7 @@
 checkMachineTypesScopedList(api.MachineTypesScopedList o) {
   buildCounterMachineTypesScopedList++;
   if (buildCounterMachineTypesScopedList < 3) {
-    checkUnnamed401(o.machineTypes);
+    checkUnnamed2184(o.machineTypes);
     checkMachineTypesScopedListWarning(o.warning);
   }
   buildCounterMachineTypesScopedList--;
@@ -8197,14 +8198,14 @@
   buildCounterManagedInstanceLastAttemptErrorsErrors--;
 }
 
-buildUnnamed403() {
+buildUnnamed2186() {
   var o = new core.List<api.ManagedInstanceLastAttemptErrorsErrors>();
   o.add(buildManagedInstanceLastAttemptErrorsErrors());
   o.add(buildManagedInstanceLastAttemptErrorsErrors());
   return o;
 }
 
-checkUnnamed403(core.List<api.ManagedInstanceLastAttemptErrorsErrors> o) {
+checkUnnamed2186(core.List<api.ManagedInstanceLastAttemptErrorsErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedInstanceLastAttemptErrorsErrors(o[0]);
   checkManagedInstanceLastAttemptErrorsErrors(o[1]);
@@ -8215,7 +8216,7 @@
   var o = new api.ManagedInstanceLastAttemptErrors();
   buildCounterManagedInstanceLastAttemptErrors++;
   if (buildCounterManagedInstanceLastAttemptErrors < 3) {
-    o.errors = buildUnnamed403();
+    o.errors = buildUnnamed2186();
   }
   buildCounterManagedInstanceLastAttemptErrors--;
   return o;
@@ -8224,7 +8225,7 @@
 checkManagedInstanceLastAttemptErrors(api.ManagedInstanceLastAttemptErrors o) {
   buildCounterManagedInstanceLastAttemptErrors++;
   if (buildCounterManagedInstanceLastAttemptErrors < 3) {
-    checkUnnamed403(o.errors);
+    checkUnnamed2186(o.errors);
   }
   buildCounterManagedInstanceLastAttemptErrors--;
 }
@@ -8269,14 +8270,14 @@
   buildCounterMetadataItems--;
 }
 
-buildUnnamed404() {
+buildUnnamed2187() {
   var o = new core.List<api.MetadataItems>();
   o.add(buildMetadataItems());
   o.add(buildMetadataItems());
   return o;
 }
 
-checkUnnamed404(core.List<api.MetadataItems> o) {
+checkUnnamed2187(core.List<api.MetadataItems> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetadataItems(o[0]);
   checkMetadataItems(o[1]);
@@ -8288,7 +8289,7 @@
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
     o.fingerprint = "foo";
-    o.items = buildUnnamed404();
+    o.items = buildUnnamed2187();
     o.kind = "foo";
   }
   buildCounterMetadata--;
@@ -8299,7 +8300,7 @@
   buildCounterMetadata++;
   if (buildCounterMetadata < 3) {
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed404(o.items);
+    checkUnnamed2187(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterMetadata--;
@@ -8326,27 +8327,27 @@
   buildCounterNamedPort--;
 }
 
-buildUnnamed405() {
+buildUnnamed2188() {
   var o = new core.List<api.NetworkPeering>();
   o.add(buildNetworkPeering());
   o.add(buildNetworkPeering());
   return o;
 }
 
-checkUnnamed405(core.List<api.NetworkPeering> o) {
+checkUnnamed2188(core.List<api.NetworkPeering> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNetworkPeering(o[0]);
   checkNetworkPeering(o[1]);
 }
 
-buildUnnamed406() {
+buildUnnamed2189() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed406(core.List<core.String> o) {
+checkUnnamed2189(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -8365,10 +8366,10 @@
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.peerings = buildUnnamed405();
+    o.peerings = buildUnnamed2188();
     o.routingConfig = buildNetworkRoutingConfig();
     o.selfLink = "foo";
-    o.subnetworks = buildUnnamed406();
+    o.subnetworks = buildUnnamed2189();
   }
   buildCounterNetwork--;
   return o;
@@ -8385,35 +8386,35 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed405(o.peerings);
+    checkUnnamed2188(o.peerings);
     checkNetworkRoutingConfig(o.routingConfig);
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed406(o.subnetworks);
+    checkUnnamed2189(o.subnetworks);
   }
   buildCounterNetwork--;
 }
 
-buildUnnamed407() {
+buildUnnamed2190() {
   var o = new core.List<api.AccessConfig>();
   o.add(buildAccessConfig());
   o.add(buildAccessConfig());
   return o;
 }
 
-checkUnnamed407(core.List<api.AccessConfig> o) {
+checkUnnamed2190(core.List<api.AccessConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccessConfig(o[0]);
   checkAccessConfig(o[1]);
 }
 
-buildUnnamed408() {
+buildUnnamed2191() {
   var o = new core.List<api.AliasIpRange>();
   o.add(buildAliasIpRange());
   o.add(buildAliasIpRange());
   return o;
 }
 
-checkUnnamed408(core.List<api.AliasIpRange> o) {
+checkUnnamed2191(core.List<api.AliasIpRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAliasIpRange(o[0]);
   checkAliasIpRange(o[1]);
@@ -8424,8 +8425,8 @@
   var o = new api.NetworkInterface();
   buildCounterNetworkInterface++;
   if (buildCounterNetworkInterface < 3) {
-    o.accessConfigs = buildUnnamed407();
-    o.aliasIpRanges = buildUnnamed408();
+    o.accessConfigs = buildUnnamed2190();
+    o.aliasIpRanges = buildUnnamed2191();
     o.kind = "foo";
     o.name = "foo";
     o.network = "foo";
@@ -8439,8 +8440,8 @@
 checkNetworkInterface(api.NetworkInterface o) {
   buildCounterNetworkInterface++;
   if (buildCounterNetworkInterface < 3) {
-    checkUnnamed407(o.accessConfigs);
-    checkUnnamed408(o.aliasIpRanges);
+    checkUnnamed2190(o.accessConfigs);
+    checkUnnamed2191(o.aliasIpRanges);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.network, unittest.equals('foo'));
@@ -8450,14 +8451,14 @@
   buildCounterNetworkInterface--;
 }
 
-buildUnnamed409() {
+buildUnnamed2192() {
   var o = new core.List<api.Network>();
   o.add(buildNetwork());
   o.add(buildNetwork());
   return o;
 }
 
-checkUnnamed409(core.List<api.Network> o) {
+checkUnnamed2192(core.List<api.Network> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNetwork(o[0]);
   checkNetwork(o[1]);
@@ -8484,14 +8485,14 @@
   buildCounterNetworkListWarningData--;
 }
 
-buildUnnamed410() {
+buildUnnamed2193() {
   var o = new core.List<api.NetworkListWarningData>();
   o.add(buildNetworkListWarningData());
   o.add(buildNetworkListWarningData());
   return o;
 }
 
-checkUnnamed410(core.List<api.NetworkListWarningData> o) {
+checkUnnamed2193(core.List<api.NetworkListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNetworkListWarningData(o[0]);
   checkNetworkListWarningData(o[1]);
@@ -8503,7 +8504,7 @@
   buildCounterNetworkListWarning++;
   if (buildCounterNetworkListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed410();
+    o.data = buildUnnamed2193();
     o.message = "foo";
   }
   buildCounterNetworkListWarning--;
@@ -8514,7 +8515,7 @@
   buildCounterNetworkListWarning++;
   if (buildCounterNetworkListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed410(o.data);
+    checkUnnamed2193(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterNetworkListWarning--;
@@ -8526,7 +8527,7 @@
   buildCounterNetworkList++;
   if (buildCounterNetworkList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed409();
+    o.items = buildUnnamed2192();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -8540,7 +8541,7 @@
   buildCounterNetworkList++;
   if (buildCounterNetworkList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed409(o.items);
+    checkUnnamed2192(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -8660,14 +8661,14 @@
   buildCounterOperationErrorErrors--;
 }
 
-buildUnnamed411() {
+buildUnnamed2194() {
   var o = new core.List<api.OperationErrorErrors>();
   o.add(buildOperationErrorErrors());
   o.add(buildOperationErrorErrors());
   return o;
 }
 
-checkUnnamed411(core.List<api.OperationErrorErrors> o) {
+checkUnnamed2194(core.List<api.OperationErrorErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationErrorErrors(o[0]);
   checkOperationErrorErrors(o[1]);
@@ -8678,7 +8679,7 @@
   var o = new api.OperationError();
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    o.errors = buildUnnamed411();
+    o.errors = buildUnnamed2194();
   }
   buildCounterOperationError--;
   return o;
@@ -8687,7 +8688,7 @@
 checkOperationError(api.OperationError o) {
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    checkUnnamed411(o.errors);
+    checkUnnamed2194(o.errors);
   }
   buildCounterOperationError--;
 }
@@ -8713,14 +8714,14 @@
   buildCounterOperationWarningsData--;
 }
 
-buildUnnamed412() {
+buildUnnamed2195() {
   var o = new core.List<api.OperationWarningsData>();
   o.add(buildOperationWarningsData());
   o.add(buildOperationWarningsData());
   return o;
 }
 
-checkUnnamed412(core.List<api.OperationWarningsData> o) {
+checkUnnamed2195(core.List<api.OperationWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarningsData(o[0]);
   checkOperationWarningsData(o[1]);
@@ -8732,7 +8733,7 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed412();
+    o.data = buildUnnamed2195();
     o.message = "foo";
   }
   buildCounterOperationWarnings--;
@@ -8743,20 +8744,20 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed412(o.data);
+    checkUnnamed2195(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterOperationWarnings--;
 }
 
-buildUnnamed413() {
+buildUnnamed2196() {
   var o = new core.List<api.OperationWarnings>();
   o.add(buildOperationWarnings());
   o.add(buildOperationWarnings());
   return o;
 }
 
-checkUnnamed413(core.List<api.OperationWarnings> o) {
+checkUnnamed2196(core.List<api.OperationWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarnings(o[0]);
   checkOperationWarnings(o[1]);
@@ -8788,7 +8789,7 @@
     o.targetId = "foo";
     o.targetLink = "foo";
     o.user = "foo";
-    o.warnings = buildUnnamed413();
+    o.warnings = buildUnnamed2196();
     o.zone = "foo";
   }
   buildCounterOperation--;
@@ -8819,20 +8820,20 @@
     unittest.expect(o.targetId, unittest.equals('foo'));
     unittest.expect(o.targetLink, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed413(o.warnings);
+    checkUnnamed2196(o.warnings);
     unittest.expect(o.zone, unittest.equals('foo'));
   }
   buildCounterOperation--;
 }
 
-buildUnnamed414() {
+buildUnnamed2197() {
   var o = new core.Map<core.String, api.OperationsScopedList>();
   o["x"] = buildOperationsScopedList();
   o["y"] = buildOperationsScopedList();
   return o;
 }
 
-checkUnnamed414(core.Map<core.String, api.OperationsScopedList> o) {
+checkUnnamed2197(core.Map<core.String, api.OperationsScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationsScopedList(o["x"]);
   checkOperationsScopedList(o["y"]);
@@ -8860,14 +8861,14 @@
   buildCounterOperationAggregatedListWarningData--;
 }
 
-buildUnnamed415() {
+buildUnnamed2198() {
   var o = new core.List<api.OperationAggregatedListWarningData>();
   o.add(buildOperationAggregatedListWarningData());
   o.add(buildOperationAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed415(core.List<api.OperationAggregatedListWarningData> o) {
+checkUnnamed2198(core.List<api.OperationAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationAggregatedListWarningData(o[0]);
   checkOperationAggregatedListWarningData(o[1]);
@@ -8879,7 +8880,7 @@
   buildCounterOperationAggregatedListWarning++;
   if (buildCounterOperationAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed415();
+    o.data = buildUnnamed2198();
     o.message = "foo";
   }
   buildCounterOperationAggregatedListWarning--;
@@ -8890,7 +8891,7 @@
   buildCounterOperationAggregatedListWarning++;
   if (buildCounterOperationAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed415(o.data);
+    checkUnnamed2198(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterOperationAggregatedListWarning--;
@@ -8902,7 +8903,7 @@
   buildCounterOperationAggregatedList++;
   if (buildCounterOperationAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed414();
+    o.items = buildUnnamed2197();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -8916,7 +8917,7 @@
   buildCounterOperationAggregatedList++;
   if (buildCounterOperationAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed414(o.items);
+    checkUnnamed2197(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -8925,14 +8926,14 @@
   buildCounterOperationAggregatedList--;
 }
 
-buildUnnamed416() {
+buildUnnamed2199() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed416(core.List<api.Operation> o) {
+checkUnnamed2199(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -8959,14 +8960,14 @@
   buildCounterOperationListWarningData--;
 }
 
-buildUnnamed417() {
+buildUnnamed2200() {
   var o = new core.List<api.OperationListWarningData>();
   o.add(buildOperationListWarningData());
   o.add(buildOperationListWarningData());
   return o;
 }
 
-checkUnnamed417(core.List<api.OperationListWarningData> o) {
+checkUnnamed2200(core.List<api.OperationListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationListWarningData(o[0]);
   checkOperationListWarningData(o[1]);
@@ -8978,7 +8979,7 @@
   buildCounterOperationListWarning++;
   if (buildCounterOperationListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed417();
+    o.data = buildUnnamed2200();
     o.message = "foo";
   }
   buildCounterOperationListWarning--;
@@ -8989,7 +8990,7 @@
   buildCounterOperationListWarning++;
   if (buildCounterOperationListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed417(o.data);
+    checkUnnamed2200(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterOperationListWarning--;
@@ -9001,7 +9002,7 @@
   buildCounterOperationList++;
   if (buildCounterOperationList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed416();
+    o.items = buildUnnamed2199();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -9015,7 +9016,7 @@
   buildCounterOperationList++;
   if (buildCounterOperationList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed416(o.items);
+    checkUnnamed2199(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -9024,14 +9025,14 @@
   buildCounterOperationList--;
 }
 
-buildUnnamed418() {
+buildUnnamed2201() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed418(core.List<api.Operation> o) {
+checkUnnamed2201(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -9058,14 +9059,14 @@
   buildCounterOperationsScopedListWarningData--;
 }
 
-buildUnnamed419() {
+buildUnnamed2202() {
   var o = new core.List<api.OperationsScopedListWarningData>();
   o.add(buildOperationsScopedListWarningData());
   o.add(buildOperationsScopedListWarningData());
   return o;
 }
 
-checkUnnamed419(core.List<api.OperationsScopedListWarningData> o) {
+checkUnnamed2202(core.List<api.OperationsScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationsScopedListWarningData(o[0]);
   checkOperationsScopedListWarningData(o[1]);
@@ -9077,7 +9078,7 @@
   buildCounterOperationsScopedListWarning++;
   if (buildCounterOperationsScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed419();
+    o.data = buildUnnamed2202();
     o.message = "foo";
   }
   buildCounterOperationsScopedListWarning--;
@@ -9088,7 +9089,7 @@
   buildCounterOperationsScopedListWarning++;
   if (buildCounterOperationsScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed419(o.data);
+    checkUnnamed2202(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterOperationsScopedListWarning--;
@@ -9099,7 +9100,7 @@
   var o = new api.OperationsScopedList();
   buildCounterOperationsScopedList++;
   if (buildCounterOperationsScopedList < 3) {
-    o.operations = buildUnnamed418();
+    o.operations = buildUnnamed2201();
     o.warning = buildOperationsScopedListWarning();
   }
   buildCounterOperationsScopedList--;
@@ -9109,20 +9110,20 @@
 checkOperationsScopedList(api.OperationsScopedList o) {
   buildCounterOperationsScopedList++;
   if (buildCounterOperationsScopedList < 3) {
-    checkUnnamed418(o.operations);
+    checkUnnamed2201(o.operations);
     checkOperationsScopedListWarning(o.warning);
   }
   buildCounterOperationsScopedList--;
 }
 
-buildUnnamed420() {
+buildUnnamed2203() {
   var o = new core.List<api.PathRule>();
   o.add(buildPathRule());
   o.add(buildPathRule());
   return o;
 }
 
-checkUnnamed420(core.List<api.PathRule> o) {
+checkUnnamed2203(core.List<api.PathRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPathRule(o[0]);
   checkPathRule(o[1]);
@@ -9136,7 +9137,7 @@
     o.defaultService = "foo";
     o.description = "foo";
     o.name = "foo";
-    o.pathRules = buildUnnamed420();
+    o.pathRules = buildUnnamed2203();
   }
   buildCounterPathMatcher--;
   return o;
@@ -9148,19 +9149,19 @@
     unittest.expect(o.defaultService, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed420(o.pathRules);
+    checkUnnamed2203(o.pathRules);
   }
   buildCounterPathMatcher--;
 }
 
-buildUnnamed421() {
+buildUnnamed2204() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed421(core.List<core.String> o) {
+checkUnnamed2204(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -9171,7 +9172,7 @@
   var o = new api.PathRule();
   buildCounterPathRule++;
   if (buildCounterPathRule < 3) {
-    o.paths = buildUnnamed421();
+    o.paths = buildUnnamed2204();
     o.service = "foo";
   }
   buildCounterPathRule--;
@@ -9181,33 +9182,33 @@
 checkPathRule(api.PathRule o) {
   buildCounterPathRule++;
   if (buildCounterPathRule < 3) {
-    checkUnnamed421(o.paths);
+    checkUnnamed2204(o.paths);
     unittest.expect(o.service, unittest.equals('foo'));
   }
   buildCounterPathRule--;
 }
 
-buildUnnamed422() {
+buildUnnamed2205() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed422(core.List<core.String> o) {
+checkUnnamed2205(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed423() {
+buildUnnamed2206() {
   var o = new core.List<api.Quota>();
   o.add(buildQuota());
   o.add(buildQuota());
   return o;
 }
 
-checkUnnamed423(core.List<api.Quota> o) {
+checkUnnamed2206(core.List<api.Quota> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuota(o[0]);
   checkQuota(o[1]);
@@ -9222,11 +9223,11 @@
     o.creationTimestamp = "foo";
     o.defaultServiceAccount = "foo";
     o.description = "foo";
-    o.enabledFeatures = buildUnnamed422();
+    o.enabledFeatures = buildUnnamed2205();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.quotas = buildUnnamed423();
+    o.quotas = buildUnnamed2206();
     o.selfLink = "foo";
     o.usageExportLocation = buildUsageExportLocation();
     o.xpnProjectStatus = "foo";
@@ -9242,11 +9243,11 @@
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.defaultServiceAccount, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed422(o.enabledFeatures);
+    checkUnnamed2205(o.enabledFeatures);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed423(o.quotas);
+    checkUnnamed2206(o.quotas);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     checkUsageExportLocation(o.usageExportLocation);
     unittest.expect(o.xpnProjectStatus, unittest.equals('foo'));
@@ -9293,14 +9294,14 @@
   buildCounterProjectsEnableXpnResourceRequest--;
 }
 
-buildUnnamed424() {
+buildUnnamed2207() {
   var o = new core.List<api.XpnResourceId>();
   o.add(buildXpnResourceId());
   o.add(buildXpnResourceId());
   return o;
 }
 
-checkUnnamed424(core.List<api.XpnResourceId> o) {
+checkUnnamed2207(core.List<api.XpnResourceId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkXpnResourceId(o[0]);
   checkXpnResourceId(o[1]);
@@ -9313,7 +9314,7 @@
   if (buildCounterProjectsGetXpnResources < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed424();
+    o.resources = buildUnnamed2207();
   }
   buildCounterProjectsGetXpnResources--;
   return o;
@@ -9324,7 +9325,7 @@
   if (buildCounterProjectsGetXpnResources < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed424(o.resources);
+    checkUnnamed2207(o.resources);
   }
   buildCounterProjectsGetXpnResources--;
 }
@@ -9396,27 +9397,27 @@
   buildCounterReference--;
 }
 
-buildUnnamed425() {
+buildUnnamed2208() {
   var o = new core.List<api.Quota>();
   o.add(buildQuota());
   o.add(buildQuota());
   return o;
 }
 
-checkUnnamed425(core.List<api.Quota> o) {
+checkUnnamed2208(core.List<api.Quota> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuota(o[0]);
   checkQuota(o[1]);
 }
 
-buildUnnamed426() {
+buildUnnamed2209() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed426(core.List<core.String> o) {
+checkUnnamed2209(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -9433,10 +9434,10 @@
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.quotas = buildUnnamed425();
+    o.quotas = buildUnnamed2208();
     o.selfLink = "foo";
     o.status = "foo";
-    o.zones = buildUnnamed426();
+    o.zones = buildUnnamed2209();
   }
   buildCounterRegion--;
   return o;
@@ -9451,22 +9452,22 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed425(o.quotas);
+    checkUnnamed2208(o.quotas);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
-    checkUnnamed426(o.zones);
+    checkUnnamed2209(o.zones);
   }
   buildCounterRegion--;
 }
 
-buildUnnamed427() {
+buildUnnamed2210() {
   var o = new core.List<api.Autoscaler>();
   o.add(buildAutoscaler());
   o.add(buildAutoscaler());
   return o;
 }
 
-checkUnnamed427(core.List<api.Autoscaler> o) {
+checkUnnamed2210(core.List<api.Autoscaler> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAutoscaler(o[0]);
   checkAutoscaler(o[1]);
@@ -9493,14 +9494,14 @@
   buildCounterRegionAutoscalerListWarningData--;
 }
 
-buildUnnamed428() {
+buildUnnamed2211() {
   var o = new core.List<api.RegionAutoscalerListWarningData>();
   o.add(buildRegionAutoscalerListWarningData());
   o.add(buildRegionAutoscalerListWarningData());
   return o;
 }
 
-checkUnnamed428(core.List<api.RegionAutoscalerListWarningData> o) {
+checkUnnamed2211(core.List<api.RegionAutoscalerListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegionAutoscalerListWarningData(o[0]);
   checkRegionAutoscalerListWarningData(o[1]);
@@ -9512,7 +9513,7 @@
   buildCounterRegionAutoscalerListWarning++;
   if (buildCounterRegionAutoscalerListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed428();
+    o.data = buildUnnamed2211();
     o.message = "foo";
   }
   buildCounterRegionAutoscalerListWarning--;
@@ -9523,7 +9524,7 @@
   buildCounterRegionAutoscalerListWarning++;
   if (buildCounterRegionAutoscalerListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed428(o.data);
+    checkUnnamed2211(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterRegionAutoscalerListWarning--;
@@ -9535,7 +9536,7 @@
   buildCounterRegionAutoscalerList++;
   if (buildCounterRegionAutoscalerList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed427();
+    o.items = buildUnnamed2210();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -9549,7 +9550,7 @@
   buildCounterRegionAutoscalerList++;
   if (buildCounterRegionAutoscalerList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed427(o.items);
+    checkUnnamed2210(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -9558,14 +9559,14 @@
   buildCounterRegionAutoscalerList--;
 }
 
-buildUnnamed429() {
+buildUnnamed2212() {
   var o = new core.List<api.InstanceGroup>();
   o.add(buildInstanceGroup());
   o.add(buildInstanceGroup());
   return o;
 }
 
-checkUnnamed429(core.List<api.InstanceGroup> o) {
+checkUnnamed2212(core.List<api.InstanceGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroup(o[0]);
   checkInstanceGroup(o[1]);
@@ -9593,14 +9594,14 @@
   buildCounterRegionInstanceGroupListWarningData--;
 }
 
-buildUnnamed430() {
+buildUnnamed2213() {
   var o = new core.List<api.RegionInstanceGroupListWarningData>();
   o.add(buildRegionInstanceGroupListWarningData());
   o.add(buildRegionInstanceGroupListWarningData());
   return o;
 }
 
-checkUnnamed430(core.List<api.RegionInstanceGroupListWarningData> o) {
+checkUnnamed2213(core.List<api.RegionInstanceGroupListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegionInstanceGroupListWarningData(o[0]);
   checkRegionInstanceGroupListWarningData(o[1]);
@@ -9612,7 +9613,7 @@
   buildCounterRegionInstanceGroupListWarning++;
   if (buildCounterRegionInstanceGroupListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed430();
+    o.data = buildUnnamed2213();
     o.message = "foo";
   }
   buildCounterRegionInstanceGroupListWarning--;
@@ -9623,7 +9624,7 @@
   buildCounterRegionInstanceGroupListWarning++;
   if (buildCounterRegionInstanceGroupListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed430(o.data);
+    checkUnnamed2213(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterRegionInstanceGroupListWarning--;
@@ -9635,7 +9636,7 @@
   buildCounterRegionInstanceGroupList++;
   if (buildCounterRegionInstanceGroupList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed429();
+    o.items = buildUnnamed2212();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -9649,7 +9650,7 @@
   buildCounterRegionInstanceGroupList++;
   if (buildCounterRegionInstanceGroupList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed429(o.items);
+    checkUnnamed2212(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -9658,14 +9659,14 @@
   buildCounterRegionInstanceGroupList--;
 }
 
-buildUnnamed431() {
+buildUnnamed2214() {
   var o = new core.List<api.InstanceGroupManager>();
   o.add(buildInstanceGroupManager());
   o.add(buildInstanceGroupManager());
   return o;
 }
 
-checkUnnamed431(core.List<api.InstanceGroupManager> o) {
+checkUnnamed2214(core.List<api.InstanceGroupManager> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupManager(o[0]);
   checkInstanceGroupManager(o[1]);
@@ -9693,14 +9694,14 @@
   buildCounterRegionInstanceGroupManagerListWarningData--;
 }
 
-buildUnnamed432() {
+buildUnnamed2215() {
   var o = new core.List<api.RegionInstanceGroupManagerListWarningData>();
   o.add(buildRegionInstanceGroupManagerListWarningData());
   o.add(buildRegionInstanceGroupManagerListWarningData());
   return o;
 }
 
-checkUnnamed432(core.List<api.RegionInstanceGroupManagerListWarningData> o) {
+checkUnnamed2215(core.List<api.RegionInstanceGroupManagerListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegionInstanceGroupManagerListWarningData(o[0]);
   checkRegionInstanceGroupManagerListWarningData(o[1]);
@@ -9712,7 +9713,7 @@
   buildCounterRegionInstanceGroupManagerListWarning++;
   if (buildCounterRegionInstanceGroupManagerListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed432();
+    o.data = buildUnnamed2215();
     o.message = "foo";
   }
   buildCounterRegionInstanceGroupManagerListWarning--;
@@ -9724,7 +9725,7 @@
   buildCounterRegionInstanceGroupManagerListWarning++;
   if (buildCounterRegionInstanceGroupManagerListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed432(o.data);
+    checkUnnamed2215(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterRegionInstanceGroupManagerListWarning--;
@@ -9736,7 +9737,7 @@
   buildCounterRegionInstanceGroupManagerList++;
   if (buildCounterRegionInstanceGroupManagerList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed431();
+    o.items = buildUnnamed2214();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -9750,7 +9751,7 @@
   buildCounterRegionInstanceGroupManagerList++;
   if (buildCounterRegionInstanceGroupManagerList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed431(o.items);
+    checkUnnamed2214(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -9759,14 +9760,14 @@
   buildCounterRegionInstanceGroupManagerList--;
 }
 
-buildUnnamed433() {
+buildUnnamed2216() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed433(core.List<core.String> o) {
+checkUnnamed2216(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -9777,7 +9778,7 @@
   var o = new api.RegionInstanceGroupManagersAbandonInstancesRequest();
   buildCounterRegionInstanceGroupManagersAbandonInstancesRequest++;
   if (buildCounterRegionInstanceGroupManagersAbandonInstancesRequest < 3) {
-    o.instances = buildUnnamed433();
+    o.instances = buildUnnamed2216();
   }
   buildCounterRegionInstanceGroupManagersAbandonInstancesRequest--;
   return o;
@@ -9787,19 +9788,19 @@
     api.RegionInstanceGroupManagersAbandonInstancesRequest o) {
   buildCounterRegionInstanceGroupManagersAbandonInstancesRequest++;
   if (buildCounterRegionInstanceGroupManagersAbandonInstancesRequest < 3) {
-    checkUnnamed433(o.instances);
+    checkUnnamed2216(o.instances);
   }
   buildCounterRegionInstanceGroupManagersAbandonInstancesRequest--;
 }
 
-buildUnnamed434() {
+buildUnnamed2217() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed434(core.List<core.String> o) {
+checkUnnamed2217(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -9810,7 +9811,7 @@
   var o = new api.RegionInstanceGroupManagersDeleteInstancesRequest();
   buildCounterRegionInstanceGroupManagersDeleteInstancesRequest++;
   if (buildCounterRegionInstanceGroupManagersDeleteInstancesRequest < 3) {
-    o.instances = buildUnnamed434();
+    o.instances = buildUnnamed2217();
   }
   buildCounterRegionInstanceGroupManagersDeleteInstancesRequest--;
   return o;
@@ -9820,19 +9821,19 @@
     api.RegionInstanceGroupManagersDeleteInstancesRequest o) {
   buildCounterRegionInstanceGroupManagersDeleteInstancesRequest++;
   if (buildCounterRegionInstanceGroupManagersDeleteInstancesRequest < 3) {
-    checkUnnamed434(o.instances);
+    checkUnnamed2217(o.instances);
   }
   buildCounterRegionInstanceGroupManagersDeleteInstancesRequest--;
 }
 
-buildUnnamed435() {
+buildUnnamed2218() {
   var o = new core.List<api.ManagedInstance>();
   o.add(buildManagedInstance());
   o.add(buildManagedInstance());
   return o;
 }
 
-checkUnnamed435(core.List<api.ManagedInstance> o) {
+checkUnnamed2218(core.List<api.ManagedInstance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedInstance(o[0]);
   checkManagedInstance(o[1]);
@@ -9843,7 +9844,7 @@
   var o = new api.RegionInstanceGroupManagersListInstancesResponse();
   buildCounterRegionInstanceGroupManagersListInstancesResponse++;
   if (buildCounterRegionInstanceGroupManagersListInstancesResponse < 3) {
-    o.managedInstances = buildUnnamed435();
+    o.managedInstances = buildUnnamed2218();
   }
   buildCounterRegionInstanceGroupManagersListInstancesResponse--;
   return o;
@@ -9853,19 +9854,19 @@
     api.RegionInstanceGroupManagersListInstancesResponse o) {
   buildCounterRegionInstanceGroupManagersListInstancesResponse++;
   if (buildCounterRegionInstanceGroupManagersListInstancesResponse < 3) {
-    checkUnnamed435(o.managedInstances);
+    checkUnnamed2218(o.managedInstances);
   }
   buildCounterRegionInstanceGroupManagersListInstancesResponse--;
 }
 
-buildUnnamed436() {
+buildUnnamed2219() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed436(core.List<core.String> o) {
+checkUnnamed2219(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -9876,7 +9877,7 @@
   var o = new api.RegionInstanceGroupManagersRecreateRequest();
   buildCounterRegionInstanceGroupManagersRecreateRequest++;
   if (buildCounterRegionInstanceGroupManagersRecreateRequest < 3) {
-    o.instances = buildUnnamed436();
+    o.instances = buildUnnamed2219();
   }
   buildCounterRegionInstanceGroupManagersRecreateRequest--;
   return o;
@@ -9886,19 +9887,19 @@
     api.RegionInstanceGroupManagersRecreateRequest o) {
   buildCounterRegionInstanceGroupManagersRecreateRequest++;
   if (buildCounterRegionInstanceGroupManagersRecreateRequest < 3) {
-    checkUnnamed436(o.instances);
+    checkUnnamed2219(o.instances);
   }
   buildCounterRegionInstanceGroupManagersRecreateRequest--;
 }
 
-buildUnnamed437() {
+buildUnnamed2220() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed437(core.List<core.String> o) {
+checkUnnamed2220(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -9910,7 +9911,7 @@
   buildCounterRegionInstanceGroupManagersSetTargetPoolsRequest++;
   if (buildCounterRegionInstanceGroupManagersSetTargetPoolsRequest < 3) {
     o.fingerprint = "foo";
-    o.targetPools = buildUnnamed437();
+    o.targetPools = buildUnnamed2220();
   }
   buildCounterRegionInstanceGroupManagersSetTargetPoolsRequest--;
   return o;
@@ -9921,7 +9922,7 @@
   buildCounterRegionInstanceGroupManagersSetTargetPoolsRequest++;
   if (buildCounterRegionInstanceGroupManagersSetTargetPoolsRequest < 3) {
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed437(o.targetPools);
+    checkUnnamed2220(o.targetPools);
   }
   buildCounterRegionInstanceGroupManagersSetTargetPoolsRequest--;
 }
@@ -9946,14 +9947,14 @@
   buildCounterRegionInstanceGroupManagersSetTemplateRequest--;
 }
 
-buildUnnamed438() {
+buildUnnamed2221() {
   var o = new core.List<api.InstanceWithNamedPorts>();
   o.add(buildInstanceWithNamedPorts());
   o.add(buildInstanceWithNamedPorts());
   return o;
 }
 
-checkUnnamed438(core.List<api.InstanceWithNamedPorts> o) {
+checkUnnamed2221(core.List<api.InstanceWithNamedPorts> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceWithNamedPorts(o[0]);
   checkInstanceWithNamedPorts(o[1]);
@@ -9981,14 +9982,15 @@
   buildCounterRegionInstanceGroupsListInstancesWarningData--;
 }
 
-buildUnnamed439() {
+buildUnnamed2222() {
   var o = new core.List<api.RegionInstanceGroupsListInstancesWarningData>();
   o.add(buildRegionInstanceGroupsListInstancesWarningData());
   o.add(buildRegionInstanceGroupsListInstancesWarningData());
   return o;
 }
 
-checkUnnamed439(core.List<api.RegionInstanceGroupsListInstancesWarningData> o) {
+checkUnnamed2222(
+    core.List<api.RegionInstanceGroupsListInstancesWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegionInstanceGroupsListInstancesWarningData(o[0]);
   checkRegionInstanceGroupsListInstancesWarningData(o[1]);
@@ -10000,7 +10002,7 @@
   buildCounterRegionInstanceGroupsListInstancesWarning++;
   if (buildCounterRegionInstanceGroupsListInstancesWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed439();
+    o.data = buildUnnamed2222();
     o.message = "foo";
   }
   buildCounterRegionInstanceGroupsListInstancesWarning--;
@@ -10012,7 +10014,7 @@
   buildCounterRegionInstanceGroupsListInstancesWarning++;
   if (buildCounterRegionInstanceGroupsListInstancesWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed439(o.data);
+    checkUnnamed2222(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterRegionInstanceGroupsListInstancesWarning--;
@@ -10024,7 +10026,7 @@
   buildCounterRegionInstanceGroupsListInstances++;
   if (buildCounterRegionInstanceGroupsListInstances < 3) {
     o.id = "foo";
-    o.items = buildUnnamed438();
+    o.items = buildUnnamed2221();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -10039,7 +10041,7 @@
   buildCounterRegionInstanceGroupsListInstances++;
   if (buildCounterRegionInstanceGroupsListInstances < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed438(o.items);
+    checkUnnamed2221(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -10070,14 +10072,14 @@
   buildCounterRegionInstanceGroupsListInstancesRequest--;
 }
 
-buildUnnamed440() {
+buildUnnamed2223() {
   var o = new core.List<api.NamedPort>();
   o.add(buildNamedPort());
   o.add(buildNamedPort());
   return o;
 }
 
-checkUnnamed440(core.List<api.NamedPort> o) {
+checkUnnamed2223(core.List<api.NamedPort> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNamedPort(o[0]);
   checkNamedPort(o[1]);
@@ -10089,7 +10091,7 @@
   buildCounterRegionInstanceGroupsSetNamedPortsRequest++;
   if (buildCounterRegionInstanceGroupsSetNamedPortsRequest < 3) {
     o.fingerprint = "foo";
-    o.namedPorts = buildUnnamed440();
+    o.namedPorts = buildUnnamed2223();
   }
   buildCounterRegionInstanceGroupsSetNamedPortsRequest--;
   return o;
@@ -10100,19 +10102,19 @@
   buildCounterRegionInstanceGroupsSetNamedPortsRequest++;
   if (buildCounterRegionInstanceGroupsSetNamedPortsRequest < 3) {
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed440(o.namedPorts);
+    checkUnnamed2223(o.namedPorts);
   }
   buildCounterRegionInstanceGroupsSetNamedPortsRequest--;
 }
 
-buildUnnamed441() {
+buildUnnamed2224() {
   var o = new core.List<api.Region>();
   o.add(buildRegion());
   o.add(buildRegion());
   return o;
 }
 
-checkUnnamed441(core.List<api.Region> o) {
+checkUnnamed2224(core.List<api.Region> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegion(o[0]);
   checkRegion(o[1]);
@@ -10139,14 +10141,14 @@
   buildCounterRegionListWarningData--;
 }
 
-buildUnnamed442() {
+buildUnnamed2225() {
   var o = new core.List<api.RegionListWarningData>();
   o.add(buildRegionListWarningData());
   o.add(buildRegionListWarningData());
   return o;
 }
 
-checkUnnamed442(core.List<api.RegionListWarningData> o) {
+checkUnnamed2225(core.List<api.RegionListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegionListWarningData(o[0]);
   checkRegionListWarningData(o[1]);
@@ -10158,7 +10160,7 @@
   buildCounterRegionListWarning++;
   if (buildCounterRegionListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed442();
+    o.data = buildUnnamed2225();
     o.message = "foo";
   }
   buildCounterRegionListWarning--;
@@ -10169,7 +10171,7 @@
   buildCounterRegionListWarning++;
   if (buildCounterRegionListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed442(o.data);
+    checkUnnamed2225(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterRegionListWarning--;
@@ -10181,7 +10183,7 @@
   buildCounterRegionList++;
   if (buildCounterRegionList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed441();
+    o.items = buildUnnamed2224();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -10195,7 +10197,7 @@
   buildCounterRegionList++;
   if (buildCounterRegionList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed441(o.items);
+    checkUnnamed2224(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -10244,14 +10246,14 @@
   buildCounterResourceGroupReference--;
 }
 
-buildUnnamed443() {
+buildUnnamed2226() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed443(core.List<core.String> o) {
+checkUnnamed2226(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -10278,14 +10280,14 @@
   buildCounterRouteWarningsData--;
 }
 
-buildUnnamed444() {
+buildUnnamed2227() {
   var o = new core.List<api.RouteWarningsData>();
   o.add(buildRouteWarningsData());
   o.add(buildRouteWarningsData());
   return o;
 }
 
-checkUnnamed444(core.List<api.RouteWarningsData> o) {
+checkUnnamed2227(core.List<api.RouteWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRouteWarningsData(o[0]);
   checkRouteWarningsData(o[1]);
@@ -10297,7 +10299,7 @@
   buildCounterRouteWarnings++;
   if (buildCounterRouteWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed444();
+    o.data = buildUnnamed2227();
     o.message = "foo";
   }
   buildCounterRouteWarnings--;
@@ -10308,20 +10310,20 @@
   buildCounterRouteWarnings++;
   if (buildCounterRouteWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed444(o.data);
+    checkUnnamed2227(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterRouteWarnings--;
 }
 
-buildUnnamed445() {
+buildUnnamed2228() {
   var o = new core.List<api.RouteWarnings>();
   o.add(buildRouteWarnings());
   o.add(buildRouteWarnings());
   return o;
 }
 
-checkUnnamed445(core.List<api.RouteWarnings> o) {
+checkUnnamed2228(core.List<api.RouteWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRouteWarnings(o[0]);
   checkRouteWarnings(o[1]);
@@ -10347,8 +10349,8 @@
     o.nextHopVpnTunnel = "foo";
     o.priority = 42;
     o.selfLink = "foo";
-    o.tags = buildUnnamed443();
-    o.warnings = buildUnnamed445();
+    o.tags = buildUnnamed2226();
+    o.warnings = buildUnnamed2228();
   }
   buildCounterRoute--;
   return o;
@@ -10372,20 +10374,20 @@
     unittest.expect(o.nextHopVpnTunnel, unittest.equals('foo'));
     unittest.expect(o.priority, unittest.equals(42));
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed443(o.tags);
-    checkUnnamed445(o.warnings);
+    checkUnnamed2226(o.tags);
+    checkUnnamed2228(o.warnings);
   }
   buildCounterRoute--;
 }
 
-buildUnnamed446() {
+buildUnnamed2229() {
   var o = new core.List<api.Route>();
   o.add(buildRoute());
   o.add(buildRoute());
   return o;
 }
 
-checkUnnamed446(core.List<api.Route> o) {
+checkUnnamed2229(core.List<api.Route> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoute(o[0]);
   checkRoute(o[1]);
@@ -10412,14 +10414,14 @@
   buildCounterRouteListWarningData--;
 }
 
-buildUnnamed447() {
+buildUnnamed2230() {
   var o = new core.List<api.RouteListWarningData>();
   o.add(buildRouteListWarningData());
   o.add(buildRouteListWarningData());
   return o;
 }
 
-checkUnnamed447(core.List<api.RouteListWarningData> o) {
+checkUnnamed2230(core.List<api.RouteListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRouteListWarningData(o[0]);
   checkRouteListWarningData(o[1]);
@@ -10431,7 +10433,7 @@
   buildCounterRouteListWarning++;
   if (buildCounterRouteListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed447();
+    o.data = buildUnnamed2230();
     o.message = "foo";
   }
   buildCounterRouteListWarning--;
@@ -10442,7 +10444,7 @@
   buildCounterRouteListWarning++;
   if (buildCounterRouteListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed447(o.data);
+    checkUnnamed2230(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterRouteListWarning--;
@@ -10454,7 +10456,7 @@
   buildCounterRouteList++;
   if (buildCounterRouteList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed446();
+    o.items = buildUnnamed2229();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -10468,7 +10470,7 @@
   buildCounterRouteList++;
   if (buildCounterRouteList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed446(o.items);
+    checkUnnamed2229(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -10477,27 +10479,27 @@
   buildCounterRouteList--;
 }
 
-buildUnnamed448() {
+buildUnnamed2231() {
   var o = new core.List<api.RouterBgpPeer>();
   o.add(buildRouterBgpPeer());
   o.add(buildRouterBgpPeer());
   return o;
 }
 
-checkUnnamed448(core.List<api.RouterBgpPeer> o) {
+checkUnnamed2231(core.List<api.RouterBgpPeer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRouterBgpPeer(o[0]);
   checkRouterBgpPeer(o[1]);
 }
 
-buildUnnamed449() {
+buildUnnamed2232() {
   var o = new core.List<api.RouterInterface>();
   o.add(buildRouterInterface());
   o.add(buildRouterInterface());
   return o;
 }
 
-checkUnnamed449(core.List<api.RouterInterface> o) {
+checkUnnamed2232(core.List<api.RouterInterface> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRouterInterface(o[0]);
   checkRouterInterface(o[1]);
@@ -10509,11 +10511,11 @@
   buildCounterRouter++;
   if (buildCounterRouter < 3) {
     o.bgp = buildRouterBgp();
-    o.bgpPeers = buildUnnamed448();
+    o.bgpPeers = buildUnnamed2231();
     o.creationTimestamp = "foo";
     o.description = "foo";
     o.id = "foo";
-    o.interfaces = buildUnnamed449();
+    o.interfaces = buildUnnamed2232();
     o.kind = "foo";
     o.name = "foo";
     o.network = "foo";
@@ -10528,11 +10530,11 @@
   buildCounterRouter++;
   if (buildCounterRouter < 3) {
     checkRouterBgp(o.bgp);
-    checkUnnamed448(o.bgpPeers);
+    checkUnnamed2231(o.bgpPeers);
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed449(o.interfaces);
+    checkUnnamed2232(o.interfaces);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.network, unittest.equals('foo'));
@@ -10542,14 +10544,14 @@
   buildCounterRouter--;
 }
 
-buildUnnamed450() {
+buildUnnamed2233() {
   var o = new core.Map<core.String, api.RoutersScopedList>();
   o["x"] = buildRoutersScopedList();
   o["y"] = buildRoutersScopedList();
   return o;
 }
 
-checkUnnamed450(core.Map<core.String, api.RoutersScopedList> o) {
+checkUnnamed2233(core.Map<core.String, api.RoutersScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoutersScopedList(o["x"]);
   checkRoutersScopedList(o["y"]);
@@ -10576,14 +10578,14 @@
   buildCounterRouterAggregatedListWarningData--;
 }
 
-buildUnnamed451() {
+buildUnnamed2234() {
   var o = new core.List<api.RouterAggregatedListWarningData>();
   o.add(buildRouterAggregatedListWarningData());
   o.add(buildRouterAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed451(core.List<api.RouterAggregatedListWarningData> o) {
+checkUnnamed2234(core.List<api.RouterAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRouterAggregatedListWarningData(o[0]);
   checkRouterAggregatedListWarningData(o[1]);
@@ -10595,7 +10597,7 @@
   buildCounterRouterAggregatedListWarning++;
   if (buildCounterRouterAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed451();
+    o.data = buildUnnamed2234();
     o.message = "foo";
   }
   buildCounterRouterAggregatedListWarning--;
@@ -10606,7 +10608,7 @@
   buildCounterRouterAggregatedListWarning++;
   if (buildCounterRouterAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed451(o.data);
+    checkUnnamed2234(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterRouterAggregatedListWarning--;
@@ -10618,7 +10620,7 @@
   buildCounterRouterAggregatedList++;
   if (buildCounterRouterAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed450();
+    o.items = buildUnnamed2233();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -10632,7 +10634,7 @@
   buildCounterRouterAggregatedList++;
   if (buildCounterRouterAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed450(o.items);
+    checkUnnamed2233(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -10714,14 +10716,14 @@
   buildCounterRouterInterface--;
 }
 
-buildUnnamed452() {
+buildUnnamed2235() {
   var o = new core.List<api.Router>();
   o.add(buildRouter());
   o.add(buildRouter());
   return o;
 }
 
-checkUnnamed452(core.List<api.Router> o) {
+checkUnnamed2235(core.List<api.Router> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRouter(o[0]);
   checkRouter(o[1]);
@@ -10748,14 +10750,14 @@
   buildCounterRouterListWarningData--;
 }
 
-buildUnnamed453() {
+buildUnnamed2236() {
   var o = new core.List<api.RouterListWarningData>();
   o.add(buildRouterListWarningData());
   o.add(buildRouterListWarningData());
   return o;
 }
 
-checkUnnamed453(core.List<api.RouterListWarningData> o) {
+checkUnnamed2236(core.List<api.RouterListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRouterListWarningData(o[0]);
   checkRouterListWarningData(o[1]);
@@ -10767,7 +10769,7 @@
   buildCounterRouterListWarning++;
   if (buildCounterRouterListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed453();
+    o.data = buildUnnamed2236();
     o.message = "foo";
   }
   buildCounterRouterListWarning--;
@@ -10778,7 +10780,7 @@
   buildCounterRouterListWarning++;
   if (buildCounterRouterListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed453(o.data);
+    checkUnnamed2236(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterRouterListWarning--;
@@ -10790,7 +10792,7 @@
   buildCounterRouterList++;
   if (buildCounterRouterList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed452();
+    o.items = buildUnnamed2235();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -10804,7 +10806,7 @@
   buildCounterRouterList++;
   if (buildCounterRouterList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed452(o.items);
+    checkUnnamed2235(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -10813,40 +10815,40 @@
   buildCounterRouterList--;
 }
 
-buildUnnamed454() {
+buildUnnamed2237() {
   var o = new core.List<api.Route>();
   o.add(buildRoute());
   o.add(buildRoute());
   return o;
 }
 
-checkUnnamed454(core.List<api.Route> o) {
+checkUnnamed2237(core.List<api.Route> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoute(o[0]);
   checkRoute(o[1]);
 }
 
-buildUnnamed455() {
+buildUnnamed2238() {
   var o = new core.List<api.Route>();
   o.add(buildRoute());
   o.add(buildRoute());
   return o;
 }
 
-checkUnnamed455(core.List<api.Route> o) {
+checkUnnamed2238(core.List<api.Route> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoute(o[0]);
   checkRoute(o[1]);
 }
 
-buildUnnamed456() {
+buildUnnamed2239() {
   var o = new core.List<api.RouterStatusBgpPeerStatus>();
   o.add(buildRouterStatusBgpPeerStatus());
   o.add(buildRouterStatusBgpPeerStatus());
   return o;
 }
 
-checkUnnamed456(core.List<api.RouterStatusBgpPeerStatus> o) {
+checkUnnamed2239(core.List<api.RouterStatusBgpPeerStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRouterStatusBgpPeerStatus(o[0]);
   checkRouterStatusBgpPeerStatus(o[1]);
@@ -10857,9 +10859,9 @@
   var o = new api.RouterStatus();
   buildCounterRouterStatus++;
   if (buildCounterRouterStatus < 3) {
-    o.bestRoutes = buildUnnamed454();
-    o.bestRoutesForRouter = buildUnnamed455();
-    o.bgpPeerStatus = buildUnnamed456();
+    o.bestRoutes = buildUnnamed2237();
+    o.bestRoutesForRouter = buildUnnamed2238();
+    o.bgpPeerStatus = buildUnnamed2239();
     o.network = "foo";
   }
   buildCounterRouterStatus--;
@@ -10869,22 +10871,22 @@
 checkRouterStatus(api.RouterStatus o) {
   buildCounterRouterStatus++;
   if (buildCounterRouterStatus < 3) {
-    checkUnnamed454(o.bestRoutes);
-    checkUnnamed455(o.bestRoutesForRouter);
-    checkUnnamed456(o.bgpPeerStatus);
+    checkUnnamed2237(o.bestRoutes);
+    checkUnnamed2238(o.bestRoutesForRouter);
+    checkUnnamed2239(o.bgpPeerStatus);
     unittest.expect(o.network, unittest.equals('foo'));
   }
   buildCounterRouterStatus--;
 }
 
-buildUnnamed457() {
+buildUnnamed2240() {
   var o = new core.List<api.Route>();
   o.add(buildRoute());
   o.add(buildRoute());
   return o;
 }
 
-checkUnnamed457(core.List<api.Route> o) {
+checkUnnamed2240(core.List<api.Route> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoute(o[0]);
   checkRoute(o[1]);
@@ -10895,7 +10897,7 @@
   var o = new api.RouterStatusBgpPeerStatus();
   buildCounterRouterStatusBgpPeerStatus++;
   if (buildCounterRouterStatusBgpPeerStatus < 3) {
-    o.advertisedRoutes = buildUnnamed457();
+    o.advertisedRoutes = buildUnnamed2240();
     o.ipAddress = "foo";
     o.linkedVpnTunnel = "foo";
     o.name = "foo";
@@ -10913,7 +10915,7 @@
 checkRouterStatusBgpPeerStatus(api.RouterStatusBgpPeerStatus o) {
   buildCounterRouterStatusBgpPeerStatus++;
   if (buildCounterRouterStatusBgpPeerStatus < 3) {
-    checkUnnamed457(o.advertisedRoutes);
+    checkUnnamed2240(o.advertisedRoutes);
     unittest.expect(o.ipAddress, unittest.equals('foo'));
     unittest.expect(o.linkedVpnTunnel, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -10967,14 +10969,14 @@
   buildCounterRoutersPreviewResponse--;
 }
 
-buildUnnamed458() {
+buildUnnamed2241() {
   var o = new core.List<api.Router>();
   o.add(buildRouter());
   o.add(buildRouter());
   return o;
 }
 
-checkUnnamed458(core.List<api.Router> o) {
+checkUnnamed2241(core.List<api.Router> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRouter(o[0]);
   checkRouter(o[1]);
@@ -11001,14 +11003,14 @@
   buildCounterRoutersScopedListWarningData--;
 }
 
-buildUnnamed459() {
+buildUnnamed2242() {
   var o = new core.List<api.RoutersScopedListWarningData>();
   o.add(buildRoutersScopedListWarningData());
   o.add(buildRoutersScopedListWarningData());
   return o;
 }
 
-checkUnnamed459(core.List<api.RoutersScopedListWarningData> o) {
+checkUnnamed2242(core.List<api.RoutersScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoutersScopedListWarningData(o[0]);
   checkRoutersScopedListWarningData(o[1]);
@@ -11020,7 +11022,7 @@
   buildCounterRoutersScopedListWarning++;
   if (buildCounterRoutersScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed459();
+    o.data = buildUnnamed2242();
     o.message = "foo";
   }
   buildCounterRoutersScopedListWarning--;
@@ -11031,7 +11033,7 @@
   buildCounterRoutersScopedListWarning++;
   if (buildCounterRoutersScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed459(o.data);
+    checkUnnamed2242(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterRoutersScopedListWarning--;
@@ -11042,7 +11044,7 @@
   var o = new api.RoutersScopedList();
   buildCounterRoutersScopedList++;
   if (buildCounterRoutersScopedList < 3) {
-    o.routers = buildUnnamed458();
+    o.routers = buildUnnamed2241();
     o.warning = buildRoutersScopedListWarning();
   }
   buildCounterRoutersScopedList--;
@@ -11052,7 +11054,7 @@
 checkRoutersScopedList(api.RoutersScopedList o) {
   buildCounterRoutersScopedList++;
   if (buildCounterRoutersScopedList < 3) {
-    checkUnnamed458(o.routers);
+    checkUnnamed2241(o.routers);
     checkRoutersScopedListWarning(o.warning);
   }
   buildCounterRoutersScopedList--;
@@ -11135,14 +11137,14 @@
   buildCounterSerialPortOutput--;
 }
 
-buildUnnamed460() {
+buildUnnamed2243() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed460(core.List<core.String> o) {
+checkUnnamed2243(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -11154,7 +11156,7 @@
   buildCounterServiceAccount++;
   if (buildCounterServiceAccount < 3) {
     o.email = "foo";
-    o.scopes = buildUnnamed460();
+    o.scopes = buildUnnamed2243();
   }
   buildCounterServiceAccount--;
   return o;
@@ -11164,32 +11166,32 @@
   buildCounterServiceAccount++;
   if (buildCounterServiceAccount < 3) {
     unittest.expect(o.email, unittest.equals('foo'));
-    checkUnnamed460(o.scopes);
+    checkUnnamed2243(o.scopes);
   }
   buildCounterServiceAccount--;
 }
 
-buildUnnamed461() {
+buildUnnamed2244() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed461(core.Map<core.String, core.String> o) {
+checkUnnamed2244(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed462() {
+buildUnnamed2245() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed462(core.List<core.String> o) {
+checkUnnamed2245(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -11206,8 +11208,8 @@
     o.id = "foo";
     o.kind = "foo";
     o.labelFingerprint = "foo";
-    o.labels = buildUnnamed461();
-    o.licenses = buildUnnamed462();
+    o.labels = buildUnnamed2244();
+    o.licenses = buildUnnamed2245();
     o.name = "foo";
     o.selfLink = "foo";
     o.snapshotEncryptionKey = buildCustomerEncryptionKey();
@@ -11231,8 +11233,8 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.labelFingerprint, unittest.equals('foo'));
-    checkUnnamed461(o.labels);
-    checkUnnamed462(o.licenses);
+    checkUnnamed2244(o.labels);
+    checkUnnamed2245(o.licenses);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     checkCustomerEncryptionKey(o.snapshotEncryptionKey);
@@ -11246,14 +11248,14 @@
   buildCounterSnapshot--;
 }
 
-buildUnnamed463() {
+buildUnnamed2246() {
   var o = new core.List<api.Snapshot>();
   o.add(buildSnapshot());
   o.add(buildSnapshot());
   return o;
 }
 
-checkUnnamed463(core.List<api.Snapshot> o) {
+checkUnnamed2246(core.List<api.Snapshot> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSnapshot(o[0]);
   checkSnapshot(o[1]);
@@ -11280,14 +11282,14 @@
   buildCounterSnapshotListWarningData--;
 }
 
-buildUnnamed464() {
+buildUnnamed2247() {
   var o = new core.List<api.SnapshotListWarningData>();
   o.add(buildSnapshotListWarningData());
   o.add(buildSnapshotListWarningData());
   return o;
 }
 
-checkUnnamed464(core.List<api.SnapshotListWarningData> o) {
+checkUnnamed2247(core.List<api.SnapshotListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSnapshotListWarningData(o[0]);
   checkSnapshotListWarningData(o[1]);
@@ -11299,7 +11301,7 @@
   buildCounterSnapshotListWarning++;
   if (buildCounterSnapshotListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed464();
+    o.data = buildUnnamed2247();
     o.message = "foo";
   }
   buildCounterSnapshotListWarning--;
@@ -11310,7 +11312,7 @@
   buildCounterSnapshotListWarning++;
   if (buildCounterSnapshotListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed464(o.data);
+    checkUnnamed2247(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterSnapshotListWarning--;
@@ -11322,7 +11324,7 @@
   buildCounterSnapshotList++;
   if (buildCounterSnapshotList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed463();
+    o.items = buildUnnamed2246();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -11336,7 +11338,7 @@
   buildCounterSnapshotList++;
   if (buildCounterSnapshotList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed463(o.items);
+    checkUnnamed2246(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -11378,14 +11380,14 @@
   buildCounterSslCertificate--;
 }
 
-buildUnnamed465() {
+buildUnnamed2248() {
   var o = new core.List<api.SslCertificate>();
   o.add(buildSslCertificate());
   o.add(buildSslCertificate());
   return o;
 }
 
-checkUnnamed465(core.List<api.SslCertificate> o) {
+checkUnnamed2248(core.List<api.SslCertificate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSslCertificate(o[0]);
   checkSslCertificate(o[1]);
@@ -11412,14 +11414,14 @@
   buildCounterSslCertificateListWarningData--;
 }
 
-buildUnnamed466() {
+buildUnnamed2249() {
   var o = new core.List<api.SslCertificateListWarningData>();
   o.add(buildSslCertificateListWarningData());
   o.add(buildSslCertificateListWarningData());
   return o;
 }
 
-checkUnnamed466(core.List<api.SslCertificateListWarningData> o) {
+checkUnnamed2249(core.List<api.SslCertificateListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSslCertificateListWarningData(o[0]);
   checkSslCertificateListWarningData(o[1]);
@@ -11431,7 +11433,7 @@
   buildCounterSslCertificateListWarning++;
   if (buildCounterSslCertificateListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed466();
+    o.data = buildUnnamed2249();
     o.message = "foo";
   }
   buildCounterSslCertificateListWarning--;
@@ -11442,7 +11444,7 @@
   buildCounterSslCertificateListWarning++;
   if (buildCounterSslCertificateListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed466(o.data);
+    checkUnnamed2249(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterSslCertificateListWarning--;
@@ -11454,7 +11456,7 @@
   buildCounterSslCertificateList++;
   if (buildCounterSslCertificateList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed465();
+    o.items = buildUnnamed2248();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -11468,7 +11470,7 @@
   buildCounterSslCertificateList++;
   if (buildCounterSslCertificateList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed465(o.items);
+    checkUnnamed2248(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -11477,14 +11479,14 @@
   buildCounterSslCertificateList--;
 }
 
-buildUnnamed467() {
+buildUnnamed2250() {
   var o = new core.List<api.SubnetworkSecondaryRange>();
   o.add(buildSubnetworkSecondaryRange());
   o.add(buildSubnetworkSecondaryRange());
   return o;
 }
 
-checkUnnamed467(core.List<api.SubnetworkSecondaryRange> o) {
+checkUnnamed2250(core.List<api.SubnetworkSecondaryRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubnetworkSecondaryRange(o[0]);
   checkSubnetworkSecondaryRange(o[1]);
@@ -11505,7 +11507,7 @@
     o.network = "foo";
     o.privateIpGoogleAccess = true;
     o.region = "foo";
-    o.secondaryIpRanges = buildUnnamed467();
+    o.secondaryIpRanges = buildUnnamed2250();
     o.selfLink = "foo";
   }
   buildCounterSubnetwork--;
@@ -11525,20 +11527,20 @@
     unittest.expect(o.network, unittest.equals('foo'));
     unittest.expect(o.privateIpGoogleAccess, unittest.isTrue);
     unittest.expect(o.region, unittest.equals('foo'));
-    checkUnnamed467(o.secondaryIpRanges);
+    checkUnnamed2250(o.secondaryIpRanges);
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
   buildCounterSubnetwork--;
 }
 
-buildUnnamed468() {
+buildUnnamed2251() {
   var o = new core.Map<core.String, api.SubnetworksScopedList>();
   o["x"] = buildSubnetworksScopedList();
   o["y"] = buildSubnetworksScopedList();
   return o;
 }
 
-checkUnnamed468(core.Map<core.String, api.SubnetworksScopedList> o) {
+checkUnnamed2251(core.Map<core.String, api.SubnetworksScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubnetworksScopedList(o["x"]);
   checkSubnetworksScopedList(o["y"]);
@@ -11566,14 +11568,14 @@
   buildCounterSubnetworkAggregatedListWarningData--;
 }
 
-buildUnnamed469() {
+buildUnnamed2252() {
   var o = new core.List<api.SubnetworkAggregatedListWarningData>();
   o.add(buildSubnetworkAggregatedListWarningData());
   o.add(buildSubnetworkAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed469(core.List<api.SubnetworkAggregatedListWarningData> o) {
+checkUnnamed2252(core.List<api.SubnetworkAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubnetworkAggregatedListWarningData(o[0]);
   checkSubnetworkAggregatedListWarningData(o[1]);
@@ -11585,7 +11587,7 @@
   buildCounterSubnetworkAggregatedListWarning++;
   if (buildCounterSubnetworkAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed469();
+    o.data = buildUnnamed2252();
     o.message = "foo";
   }
   buildCounterSubnetworkAggregatedListWarning--;
@@ -11596,7 +11598,7 @@
   buildCounterSubnetworkAggregatedListWarning++;
   if (buildCounterSubnetworkAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed469(o.data);
+    checkUnnamed2252(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterSubnetworkAggregatedListWarning--;
@@ -11608,7 +11610,7 @@
   buildCounterSubnetworkAggregatedList++;
   if (buildCounterSubnetworkAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed468();
+    o.items = buildUnnamed2251();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -11622,7 +11624,7 @@
   buildCounterSubnetworkAggregatedList++;
   if (buildCounterSubnetworkAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed468(o.items);
+    checkUnnamed2251(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -11631,14 +11633,14 @@
   buildCounterSubnetworkAggregatedList--;
 }
 
-buildUnnamed470() {
+buildUnnamed2253() {
   var o = new core.List<api.Subnetwork>();
   o.add(buildSubnetwork());
   o.add(buildSubnetwork());
   return o;
 }
 
-checkUnnamed470(core.List<api.Subnetwork> o) {
+checkUnnamed2253(core.List<api.Subnetwork> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubnetwork(o[0]);
   checkSubnetwork(o[1]);
@@ -11665,14 +11667,14 @@
   buildCounterSubnetworkListWarningData--;
 }
 
-buildUnnamed471() {
+buildUnnamed2254() {
   var o = new core.List<api.SubnetworkListWarningData>();
   o.add(buildSubnetworkListWarningData());
   o.add(buildSubnetworkListWarningData());
   return o;
 }
 
-checkUnnamed471(core.List<api.SubnetworkListWarningData> o) {
+checkUnnamed2254(core.List<api.SubnetworkListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubnetworkListWarningData(o[0]);
   checkSubnetworkListWarningData(o[1]);
@@ -11684,7 +11686,7 @@
   buildCounterSubnetworkListWarning++;
   if (buildCounterSubnetworkListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed471();
+    o.data = buildUnnamed2254();
     o.message = "foo";
   }
   buildCounterSubnetworkListWarning--;
@@ -11695,7 +11697,7 @@
   buildCounterSubnetworkListWarning++;
   if (buildCounterSubnetworkListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed471(o.data);
+    checkUnnamed2254(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterSubnetworkListWarning--;
@@ -11707,7 +11709,7 @@
   buildCounterSubnetworkList++;
   if (buildCounterSubnetworkList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed470();
+    o.items = buildUnnamed2253();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -11721,7 +11723,7 @@
   buildCounterSubnetworkList++;
   if (buildCounterSubnetworkList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed470(o.items);
+    checkUnnamed2253(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -11771,14 +11773,14 @@
   buildCounterSubnetworksExpandIpCidrRangeRequest--;
 }
 
-buildUnnamed472() {
+buildUnnamed2255() {
   var o = new core.List<api.Subnetwork>();
   o.add(buildSubnetwork());
   o.add(buildSubnetwork());
   return o;
 }
 
-checkUnnamed472(core.List<api.Subnetwork> o) {
+checkUnnamed2255(core.List<api.Subnetwork> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubnetwork(o[0]);
   checkSubnetwork(o[1]);
@@ -11805,14 +11807,14 @@
   buildCounterSubnetworksScopedListWarningData--;
 }
 
-buildUnnamed473() {
+buildUnnamed2256() {
   var o = new core.List<api.SubnetworksScopedListWarningData>();
   o.add(buildSubnetworksScopedListWarningData());
   o.add(buildSubnetworksScopedListWarningData());
   return o;
 }
 
-checkUnnamed473(core.List<api.SubnetworksScopedListWarningData> o) {
+checkUnnamed2256(core.List<api.SubnetworksScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubnetworksScopedListWarningData(o[0]);
   checkSubnetworksScopedListWarningData(o[1]);
@@ -11824,7 +11826,7 @@
   buildCounterSubnetworksScopedListWarning++;
   if (buildCounterSubnetworksScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed473();
+    o.data = buildUnnamed2256();
     o.message = "foo";
   }
   buildCounterSubnetworksScopedListWarning--;
@@ -11835,7 +11837,7 @@
   buildCounterSubnetworksScopedListWarning++;
   if (buildCounterSubnetworksScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed473(o.data);
+    checkUnnamed2256(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterSubnetworksScopedListWarning--;
@@ -11846,7 +11848,7 @@
   var o = new api.SubnetworksScopedList();
   buildCounterSubnetworksScopedList++;
   if (buildCounterSubnetworksScopedList < 3) {
-    o.subnetworks = buildUnnamed472();
+    o.subnetworks = buildUnnamed2255();
     o.warning = buildSubnetworksScopedListWarning();
   }
   buildCounterSubnetworksScopedList--;
@@ -11856,7 +11858,7 @@
 checkSubnetworksScopedList(api.SubnetworksScopedList o) {
   buildCounterSubnetworksScopedList++;
   if (buildCounterSubnetworksScopedList < 3) {
-    checkUnnamed472(o.subnetworks);
+    checkUnnamed2255(o.subnetworks);
     checkSubnetworksScopedListWarning(o.warning);
   }
   buildCounterSubnetworksScopedList--;
@@ -11909,14 +11911,14 @@
   buildCounterTCPHealthCheck--;
 }
 
-buildUnnamed474() {
+buildUnnamed2257() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed474(core.List<core.String> o) {
+checkUnnamed2257(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -11928,7 +11930,7 @@
   buildCounterTags++;
   if (buildCounterTags < 3) {
     o.fingerprint = "foo";
-    o.items = buildUnnamed474();
+    o.items = buildUnnamed2257();
   }
   buildCounterTags--;
   return o;
@@ -11938,7 +11940,7 @@
   buildCounterTags++;
   if (buildCounterTags < 3) {
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed474(o.items);
+    checkUnnamed2257(o.items);
   }
   buildCounterTags--;
 }
@@ -11974,14 +11976,14 @@
   buildCounterTargetHttpProxy--;
 }
 
-buildUnnamed475() {
+buildUnnamed2258() {
   var o = new core.List<api.TargetHttpProxy>();
   o.add(buildTargetHttpProxy());
   o.add(buildTargetHttpProxy());
   return o;
 }
 
-checkUnnamed475(core.List<api.TargetHttpProxy> o) {
+checkUnnamed2258(core.List<api.TargetHttpProxy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetHttpProxy(o[0]);
   checkTargetHttpProxy(o[1]);
@@ -12008,14 +12010,14 @@
   buildCounterTargetHttpProxyListWarningData--;
 }
 
-buildUnnamed476() {
+buildUnnamed2259() {
   var o = new core.List<api.TargetHttpProxyListWarningData>();
   o.add(buildTargetHttpProxyListWarningData());
   o.add(buildTargetHttpProxyListWarningData());
   return o;
 }
 
-checkUnnamed476(core.List<api.TargetHttpProxyListWarningData> o) {
+checkUnnamed2259(core.List<api.TargetHttpProxyListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetHttpProxyListWarningData(o[0]);
   checkTargetHttpProxyListWarningData(o[1]);
@@ -12027,7 +12029,7 @@
   buildCounterTargetHttpProxyListWarning++;
   if (buildCounterTargetHttpProxyListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed476();
+    o.data = buildUnnamed2259();
     o.message = "foo";
   }
   buildCounterTargetHttpProxyListWarning--;
@@ -12038,7 +12040,7 @@
   buildCounterTargetHttpProxyListWarning++;
   if (buildCounterTargetHttpProxyListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed476(o.data);
+    checkUnnamed2259(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetHttpProxyListWarning--;
@@ -12050,7 +12052,7 @@
   buildCounterTargetHttpProxyList++;
   if (buildCounterTargetHttpProxyList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed475();
+    o.items = buildUnnamed2258();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -12064,7 +12066,7 @@
   buildCounterTargetHttpProxyList++;
   if (buildCounterTargetHttpProxyList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed475(o.items);
+    checkUnnamed2258(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -12073,14 +12075,14 @@
   buildCounterTargetHttpProxyList--;
 }
 
-buildUnnamed477() {
+buildUnnamed2260() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed477(core.List<core.String> o) {
+checkUnnamed2260(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -12091,7 +12093,7 @@
   var o = new api.TargetHttpsProxiesSetSslCertificatesRequest();
   buildCounterTargetHttpsProxiesSetSslCertificatesRequest++;
   if (buildCounterTargetHttpsProxiesSetSslCertificatesRequest < 3) {
-    o.sslCertificates = buildUnnamed477();
+    o.sslCertificates = buildUnnamed2260();
   }
   buildCounterTargetHttpsProxiesSetSslCertificatesRequest--;
   return o;
@@ -12101,19 +12103,19 @@
     api.TargetHttpsProxiesSetSslCertificatesRequest o) {
   buildCounterTargetHttpsProxiesSetSslCertificatesRequest++;
   if (buildCounterTargetHttpsProxiesSetSslCertificatesRequest < 3) {
-    checkUnnamed477(o.sslCertificates);
+    checkUnnamed2260(o.sslCertificates);
   }
   buildCounterTargetHttpsProxiesSetSslCertificatesRequest--;
 }
 
-buildUnnamed478() {
+buildUnnamed2261() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed478(core.List<core.String> o) {
+checkUnnamed2261(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -12130,7 +12132,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.selfLink = "foo";
-    o.sslCertificates = buildUnnamed478();
+    o.sslCertificates = buildUnnamed2261();
     o.urlMap = "foo";
   }
   buildCounterTargetHttpsProxy--;
@@ -12146,20 +12148,20 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed478(o.sslCertificates);
+    checkUnnamed2261(o.sslCertificates);
     unittest.expect(o.urlMap, unittest.equals('foo'));
   }
   buildCounterTargetHttpsProxy--;
 }
 
-buildUnnamed479() {
+buildUnnamed2262() {
   var o = new core.List<api.TargetHttpsProxy>();
   o.add(buildTargetHttpsProxy());
   o.add(buildTargetHttpsProxy());
   return o;
 }
 
-checkUnnamed479(core.List<api.TargetHttpsProxy> o) {
+checkUnnamed2262(core.List<api.TargetHttpsProxy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetHttpsProxy(o[0]);
   checkTargetHttpsProxy(o[1]);
@@ -12186,14 +12188,14 @@
   buildCounterTargetHttpsProxyListWarningData--;
 }
 
-buildUnnamed480() {
+buildUnnamed2263() {
   var o = new core.List<api.TargetHttpsProxyListWarningData>();
   o.add(buildTargetHttpsProxyListWarningData());
   o.add(buildTargetHttpsProxyListWarningData());
   return o;
 }
 
-checkUnnamed480(core.List<api.TargetHttpsProxyListWarningData> o) {
+checkUnnamed2263(core.List<api.TargetHttpsProxyListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetHttpsProxyListWarningData(o[0]);
   checkTargetHttpsProxyListWarningData(o[1]);
@@ -12205,7 +12207,7 @@
   buildCounterTargetHttpsProxyListWarning++;
   if (buildCounterTargetHttpsProxyListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed480();
+    o.data = buildUnnamed2263();
     o.message = "foo";
   }
   buildCounterTargetHttpsProxyListWarning--;
@@ -12216,7 +12218,7 @@
   buildCounterTargetHttpsProxyListWarning++;
   if (buildCounterTargetHttpsProxyListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed480(o.data);
+    checkUnnamed2263(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetHttpsProxyListWarning--;
@@ -12228,7 +12230,7 @@
   buildCounterTargetHttpsProxyList++;
   if (buildCounterTargetHttpsProxyList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed479();
+    o.items = buildUnnamed2262();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -12242,7 +12244,7 @@
   buildCounterTargetHttpsProxyList++;
   if (buildCounterTargetHttpsProxyList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed479(o.items);
+    checkUnnamed2262(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -12286,14 +12288,14 @@
   buildCounterTargetInstance--;
 }
 
-buildUnnamed481() {
+buildUnnamed2264() {
   var o = new core.Map<core.String, api.TargetInstancesScopedList>();
   o["x"] = buildTargetInstancesScopedList();
   o["y"] = buildTargetInstancesScopedList();
   return o;
 }
 
-checkUnnamed481(core.Map<core.String, api.TargetInstancesScopedList> o) {
+checkUnnamed2264(core.Map<core.String, api.TargetInstancesScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetInstancesScopedList(o["x"]);
   checkTargetInstancesScopedList(o["y"]);
@@ -12321,14 +12323,14 @@
   buildCounterTargetInstanceAggregatedListWarningData--;
 }
 
-buildUnnamed482() {
+buildUnnamed2265() {
   var o = new core.List<api.TargetInstanceAggregatedListWarningData>();
   o.add(buildTargetInstanceAggregatedListWarningData());
   o.add(buildTargetInstanceAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed482(core.List<api.TargetInstanceAggregatedListWarningData> o) {
+checkUnnamed2265(core.List<api.TargetInstanceAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetInstanceAggregatedListWarningData(o[0]);
   checkTargetInstanceAggregatedListWarningData(o[1]);
@@ -12340,7 +12342,7 @@
   buildCounterTargetInstanceAggregatedListWarning++;
   if (buildCounterTargetInstanceAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed482();
+    o.data = buildUnnamed2265();
     o.message = "foo";
   }
   buildCounterTargetInstanceAggregatedListWarning--;
@@ -12352,7 +12354,7 @@
   buildCounterTargetInstanceAggregatedListWarning++;
   if (buildCounterTargetInstanceAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed482(o.data);
+    checkUnnamed2265(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetInstanceAggregatedListWarning--;
@@ -12364,7 +12366,7 @@
   buildCounterTargetInstanceAggregatedList++;
   if (buildCounterTargetInstanceAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed481();
+    o.items = buildUnnamed2264();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -12378,7 +12380,7 @@
   buildCounterTargetInstanceAggregatedList++;
   if (buildCounterTargetInstanceAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed481(o.items);
+    checkUnnamed2264(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -12387,14 +12389,14 @@
   buildCounterTargetInstanceAggregatedList--;
 }
 
-buildUnnamed483() {
+buildUnnamed2266() {
   var o = new core.List<api.TargetInstance>();
   o.add(buildTargetInstance());
   o.add(buildTargetInstance());
   return o;
 }
 
-checkUnnamed483(core.List<api.TargetInstance> o) {
+checkUnnamed2266(core.List<api.TargetInstance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetInstance(o[0]);
   checkTargetInstance(o[1]);
@@ -12421,14 +12423,14 @@
   buildCounterTargetInstanceListWarningData--;
 }
 
-buildUnnamed484() {
+buildUnnamed2267() {
   var o = new core.List<api.TargetInstanceListWarningData>();
   o.add(buildTargetInstanceListWarningData());
   o.add(buildTargetInstanceListWarningData());
   return o;
 }
 
-checkUnnamed484(core.List<api.TargetInstanceListWarningData> o) {
+checkUnnamed2267(core.List<api.TargetInstanceListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetInstanceListWarningData(o[0]);
   checkTargetInstanceListWarningData(o[1]);
@@ -12440,7 +12442,7 @@
   buildCounterTargetInstanceListWarning++;
   if (buildCounterTargetInstanceListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed484();
+    o.data = buildUnnamed2267();
     o.message = "foo";
   }
   buildCounterTargetInstanceListWarning--;
@@ -12451,7 +12453,7 @@
   buildCounterTargetInstanceListWarning++;
   if (buildCounterTargetInstanceListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed484(o.data);
+    checkUnnamed2267(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetInstanceListWarning--;
@@ -12463,7 +12465,7 @@
   buildCounterTargetInstanceList++;
   if (buildCounterTargetInstanceList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed483();
+    o.items = buildUnnamed2266();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -12477,7 +12479,7 @@
   buildCounterTargetInstanceList++;
   if (buildCounterTargetInstanceList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed483(o.items);
+    checkUnnamed2266(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -12486,14 +12488,14 @@
   buildCounterTargetInstanceList--;
 }
 
-buildUnnamed485() {
+buildUnnamed2268() {
   var o = new core.List<api.TargetInstance>();
   o.add(buildTargetInstance());
   o.add(buildTargetInstance());
   return o;
 }
 
-checkUnnamed485(core.List<api.TargetInstance> o) {
+checkUnnamed2268(core.List<api.TargetInstance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetInstance(o[0]);
   checkTargetInstance(o[1]);
@@ -12521,14 +12523,14 @@
   buildCounterTargetInstancesScopedListWarningData--;
 }
 
-buildUnnamed486() {
+buildUnnamed2269() {
   var o = new core.List<api.TargetInstancesScopedListWarningData>();
   o.add(buildTargetInstancesScopedListWarningData());
   o.add(buildTargetInstancesScopedListWarningData());
   return o;
 }
 
-checkUnnamed486(core.List<api.TargetInstancesScopedListWarningData> o) {
+checkUnnamed2269(core.List<api.TargetInstancesScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetInstancesScopedListWarningData(o[0]);
   checkTargetInstancesScopedListWarningData(o[1]);
@@ -12540,7 +12542,7 @@
   buildCounterTargetInstancesScopedListWarning++;
   if (buildCounterTargetInstancesScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed486();
+    o.data = buildUnnamed2269();
     o.message = "foo";
   }
   buildCounterTargetInstancesScopedListWarning--;
@@ -12551,7 +12553,7 @@
   buildCounterTargetInstancesScopedListWarning++;
   if (buildCounterTargetInstancesScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed486(o.data);
+    checkUnnamed2269(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetInstancesScopedListWarning--;
@@ -12562,7 +12564,7 @@
   var o = new api.TargetInstancesScopedList();
   buildCounterTargetInstancesScopedList++;
   if (buildCounterTargetInstancesScopedList < 3) {
-    o.targetInstances = buildUnnamed485();
+    o.targetInstances = buildUnnamed2268();
     o.warning = buildTargetInstancesScopedListWarning();
   }
   buildCounterTargetInstancesScopedList--;
@@ -12572,33 +12574,33 @@
 checkTargetInstancesScopedList(api.TargetInstancesScopedList o) {
   buildCounterTargetInstancesScopedList++;
   if (buildCounterTargetInstancesScopedList < 3) {
-    checkUnnamed485(o.targetInstances);
+    checkUnnamed2268(o.targetInstances);
     checkTargetInstancesScopedListWarning(o.warning);
   }
   buildCounterTargetInstancesScopedList--;
 }
 
-buildUnnamed487() {
+buildUnnamed2270() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed487(core.List<core.String> o) {
+checkUnnamed2270(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed488() {
+buildUnnamed2271() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed488(core.List<core.String> o) {
+checkUnnamed2271(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -12613,9 +12615,9 @@
     o.creationTimestamp = "foo";
     o.description = "foo";
     o.failoverRatio = 42.0;
-    o.healthChecks = buildUnnamed487();
+    o.healthChecks = buildUnnamed2270();
     o.id = "foo";
-    o.instances = buildUnnamed488();
+    o.instances = buildUnnamed2271();
     o.kind = "foo";
     o.name = "foo";
     o.region = "foo";
@@ -12633,9 +12635,9 @@
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.failoverRatio, unittest.equals(42.0));
-    checkUnnamed487(o.healthChecks);
+    checkUnnamed2270(o.healthChecks);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed488(o.instances);
+    checkUnnamed2271(o.instances);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.region, unittest.equals('foo'));
@@ -12645,14 +12647,14 @@
   buildCounterTargetPool--;
 }
 
-buildUnnamed489() {
+buildUnnamed2272() {
   var o = new core.Map<core.String, api.TargetPoolsScopedList>();
   o["x"] = buildTargetPoolsScopedList();
   o["y"] = buildTargetPoolsScopedList();
   return o;
 }
 
-checkUnnamed489(core.Map<core.String, api.TargetPoolsScopedList> o) {
+checkUnnamed2272(core.Map<core.String, api.TargetPoolsScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetPoolsScopedList(o["x"]);
   checkTargetPoolsScopedList(o["y"]);
@@ -12680,14 +12682,14 @@
   buildCounterTargetPoolAggregatedListWarningData--;
 }
 
-buildUnnamed490() {
+buildUnnamed2273() {
   var o = new core.List<api.TargetPoolAggregatedListWarningData>();
   o.add(buildTargetPoolAggregatedListWarningData());
   o.add(buildTargetPoolAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed490(core.List<api.TargetPoolAggregatedListWarningData> o) {
+checkUnnamed2273(core.List<api.TargetPoolAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetPoolAggregatedListWarningData(o[0]);
   checkTargetPoolAggregatedListWarningData(o[1]);
@@ -12699,7 +12701,7 @@
   buildCounterTargetPoolAggregatedListWarning++;
   if (buildCounterTargetPoolAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed490();
+    o.data = buildUnnamed2273();
     o.message = "foo";
   }
   buildCounterTargetPoolAggregatedListWarning--;
@@ -12710,7 +12712,7 @@
   buildCounterTargetPoolAggregatedListWarning++;
   if (buildCounterTargetPoolAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed490(o.data);
+    checkUnnamed2273(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetPoolAggregatedListWarning--;
@@ -12722,7 +12724,7 @@
   buildCounterTargetPoolAggregatedList++;
   if (buildCounterTargetPoolAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed489();
+    o.items = buildUnnamed2272();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -12736,7 +12738,7 @@
   buildCounterTargetPoolAggregatedList++;
   if (buildCounterTargetPoolAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed489(o.items);
+    checkUnnamed2272(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -12745,14 +12747,14 @@
   buildCounterTargetPoolAggregatedList--;
 }
 
-buildUnnamed491() {
+buildUnnamed2274() {
   var o = new core.List<api.HealthStatus>();
   o.add(buildHealthStatus());
   o.add(buildHealthStatus());
   return o;
 }
 
-checkUnnamed491(core.List<api.HealthStatus> o) {
+checkUnnamed2274(core.List<api.HealthStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHealthStatus(o[0]);
   checkHealthStatus(o[1]);
@@ -12763,7 +12765,7 @@
   var o = new api.TargetPoolInstanceHealth();
   buildCounterTargetPoolInstanceHealth++;
   if (buildCounterTargetPoolInstanceHealth < 3) {
-    o.healthStatus = buildUnnamed491();
+    o.healthStatus = buildUnnamed2274();
     o.kind = "foo";
   }
   buildCounterTargetPoolInstanceHealth--;
@@ -12773,20 +12775,20 @@
 checkTargetPoolInstanceHealth(api.TargetPoolInstanceHealth o) {
   buildCounterTargetPoolInstanceHealth++;
   if (buildCounterTargetPoolInstanceHealth < 3) {
-    checkUnnamed491(o.healthStatus);
+    checkUnnamed2274(o.healthStatus);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTargetPoolInstanceHealth--;
 }
 
-buildUnnamed492() {
+buildUnnamed2275() {
   var o = new core.List<api.TargetPool>();
   o.add(buildTargetPool());
   o.add(buildTargetPool());
   return o;
 }
 
-checkUnnamed492(core.List<api.TargetPool> o) {
+checkUnnamed2275(core.List<api.TargetPool> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetPool(o[0]);
   checkTargetPool(o[1]);
@@ -12813,14 +12815,14 @@
   buildCounterTargetPoolListWarningData--;
 }
 
-buildUnnamed493() {
+buildUnnamed2276() {
   var o = new core.List<api.TargetPoolListWarningData>();
   o.add(buildTargetPoolListWarningData());
   o.add(buildTargetPoolListWarningData());
   return o;
 }
 
-checkUnnamed493(core.List<api.TargetPoolListWarningData> o) {
+checkUnnamed2276(core.List<api.TargetPoolListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetPoolListWarningData(o[0]);
   checkTargetPoolListWarningData(o[1]);
@@ -12832,7 +12834,7 @@
   buildCounterTargetPoolListWarning++;
   if (buildCounterTargetPoolListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed493();
+    o.data = buildUnnamed2276();
     o.message = "foo";
   }
   buildCounterTargetPoolListWarning--;
@@ -12843,7 +12845,7 @@
   buildCounterTargetPoolListWarning++;
   if (buildCounterTargetPoolListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed493(o.data);
+    checkUnnamed2276(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetPoolListWarning--;
@@ -12855,7 +12857,7 @@
   buildCounterTargetPoolList++;
   if (buildCounterTargetPoolList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed492();
+    o.items = buildUnnamed2275();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -12869,7 +12871,7 @@
   buildCounterTargetPoolList++;
   if (buildCounterTargetPoolList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed492(o.items);
+    checkUnnamed2275(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -12878,14 +12880,14 @@
   buildCounterTargetPoolList--;
 }
 
-buildUnnamed494() {
+buildUnnamed2277() {
   var o = new core.List<api.HealthCheckReference>();
   o.add(buildHealthCheckReference());
   o.add(buildHealthCheckReference());
   return o;
 }
 
-checkUnnamed494(core.List<api.HealthCheckReference> o) {
+checkUnnamed2277(core.List<api.HealthCheckReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHealthCheckReference(o[0]);
   checkHealthCheckReference(o[1]);
@@ -12896,7 +12898,7 @@
   var o = new api.TargetPoolsAddHealthCheckRequest();
   buildCounterTargetPoolsAddHealthCheckRequest++;
   if (buildCounterTargetPoolsAddHealthCheckRequest < 3) {
-    o.healthChecks = buildUnnamed494();
+    o.healthChecks = buildUnnamed2277();
   }
   buildCounterTargetPoolsAddHealthCheckRequest--;
   return o;
@@ -12905,19 +12907,19 @@
 checkTargetPoolsAddHealthCheckRequest(api.TargetPoolsAddHealthCheckRequest o) {
   buildCounterTargetPoolsAddHealthCheckRequest++;
   if (buildCounterTargetPoolsAddHealthCheckRequest < 3) {
-    checkUnnamed494(o.healthChecks);
+    checkUnnamed2277(o.healthChecks);
   }
   buildCounterTargetPoolsAddHealthCheckRequest--;
 }
 
-buildUnnamed495() {
+buildUnnamed2278() {
   var o = new core.List<api.InstanceReference>();
   o.add(buildInstanceReference());
   o.add(buildInstanceReference());
   return o;
 }
 
-checkUnnamed495(core.List<api.InstanceReference> o) {
+checkUnnamed2278(core.List<api.InstanceReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceReference(o[0]);
   checkInstanceReference(o[1]);
@@ -12928,7 +12930,7 @@
   var o = new api.TargetPoolsAddInstanceRequest();
   buildCounterTargetPoolsAddInstanceRequest++;
   if (buildCounterTargetPoolsAddInstanceRequest < 3) {
-    o.instances = buildUnnamed495();
+    o.instances = buildUnnamed2278();
   }
   buildCounterTargetPoolsAddInstanceRequest--;
   return o;
@@ -12937,19 +12939,19 @@
 checkTargetPoolsAddInstanceRequest(api.TargetPoolsAddInstanceRequest o) {
   buildCounterTargetPoolsAddInstanceRequest++;
   if (buildCounterTargetPoolsAddInstanceRequest < 3) {
-    checkUnnamed495(o.instances);
+    checkUnnamed2278(o.instances);
   }
   buildCounterTargetPoolsAddInstanceRequest--;
 }
 
-buildUnnamed496() {
+buildUnnamed2279() {
   var o = new core.List<api.HealthCheckReference>();
   o.add(buildHealthCheckReference());
   o.add(buildHealthCheckReference());
   return o;
 }
 
-checkUnnamed496(core.List<api.HealthCheckReference> o) {
+checkUnnamed2279(core.List<api.HealthCheckReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHealthCheckReference(o[0]);
   checkHealthCheckReference(o[1]);
@@ -12960,7 +12962,7 @@
   var o = new api.TargetPoolsRemoveHealthCheckRequest();
   buildCounterTargetPoolsRemoveHealthCheckRequest++;
   if (buildCounterTargetPoolsRemoveHealthCheckRequest < 3) {
-    o.healthChecks = buildUnnamed496();
+    o.healthChecks = buildUnnamed2279();
   }
   buildCounterTargetPoolsRemoveHealthCheckRequest--;
   return o;
@@ -12970,19 +12972,19 @@
     api.TargetPoolsRemoveHealthCheckRequest o) {
   buildCounterTargetPoolsRemoveHealthCheckRequest++;
   if (buildCounterTargetPoolsRemoveHealthCheckRequest < 3) {
-    checkUnnamed496(o.healthChecks);
+    checkUnnamed2279(o.healthChecks);
   }
   buildCounterTargetPoolsRemoveHealthCheckRequest--;
 }
 
-buildUnnamed497() {
+buildUnnamed2280() {
   var o = new core.List<api.InstanceReference>();
   o.add(buildInstanceReference());
   o.add(buildInstanceReference());
   return o;
 }
 
-checkUnnamed497(core.List<api.InstanceReference> o) {
+checkUnnamed2280(core.List<api.InstanceReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceReference(o[0]);
   checkInstanceReference(o[1]);
@@ -12993,7 +12995,7 @@
   var o = new api.TargetPoolsRemoveInstanceRequest();
   buildCounterTargetPoolsRemoveInstanceRequest++;
   if (buildCounterTargetPoolsRemoveInstanceRequest < 3) {
-    o.instances = buildUnnamed497();
+    o.instances = buildUnnamed2280();
   }
   buildCounterTargetPoolsRemoveInstanceRequest--;
   return o;
@@ -13002,19 +13004,19 @@
 checkTargetPoolsRemoveInstanceRequest(api.TargetPoolsRemoveInstanceRequest o) {
   buildCounterTargetPoolsRemoveInstanceRequest++;
   if (buildCounterTargetPoolsRemoveInstanceRequest < 3) {
-    checkUnnamed497(o.instances);
+    checkUnnamed2280(o.instances);
   }
   buildCounterTargetPoolsRemoveInstanceRequest--;
 }
 
-buildUnnamed498() {
+buildUnnamed2281() {
   var o = new core.List<api.TargetPool>();
   o.add(buildTargetPool());
   o.add(buildTargetPool());
   return o;
 }
 
-checkUnnamed498(core.List<api.TargetPool> o) {
+checkUnnamed2281(core.List<api.TargetPool> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetPool(o[0]);
   checkTargetPool(o[1]);
@@ -13041,14 +13043,14 @@
   buildCounterTargetPoolsScopedListWarningData--;
 }
 
-buildUnnamed499() {
+buildUnnamed2282() {
   var o = new core.List<api.TargetPoolsScopedListWarningData>();
   o.add(buildTargetPoolsScopedListWarningData());
   o.add(buildTargetPoolsScopedListWarningData());
   return o;
 }
 
-checkUnnamed499(core.List<api.TargetPoolsScopedListWarningData> o) {
+checkUnnamed2282(core.List<api.TargetPoolsScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetPoolsScopedListWarningData(o[0]);
   checkTargetPoolsScopedListWarningData(o[1]);
@@ -13060,7 +13062,7 @@
   buildCounterTargetPoolsScopedListWarning++;
   if (buildCounterTargetPoolsScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed499();
+    o.data = buildUnnamed2282();
     o.message = "foo";
   }
   buildCounterTargetPoolsScopedListWarning--;
@@ -13071,7 +13073,7 @@
   buildCounterTargetPoolsScopedListWarning++;
   if (buildCounterTargetPoolsScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed499(o.data);
+    checkUnnamed2282(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetPoolsScopedListWarning--;
@@ -13082,7 +13084,7 @@
   var o = new api.TargetPoolsScopedList();
   buildCounterTargetPoolsScopedList++;
   if (buildCounterTargetPoolsScopedList < 3) {
-    o.targetPools = buildUnnamed498();
+    o.targetPools = buildUnnamed2281();
     o.warning = buildTargetPoolsScopedListWarning();
   }
   buildCounterTargetPoolsScopedList--;
@@ -13092,7 +13094,7 @@
 checkTargetPoolsScopedList(api.TargetPoolsScopedList o) {
   buildCounterTargetPoolsScopedList++;
   if (buildCounterTargetPoolsScopedList < 3) {
-    checkUnnamed498(o.targetPools);
+    checkUnnamed2281(o.targetPools);
     checkTargetPoolsScopedListWarning(o.warning);
   }
   buildCounterTargetPoolsScopedList--;
@@ -13157,14 +13159,14 @@
   buildCounterTargetSslProxiesSetProxyHeaderRequest--;
 }
 
-buildUnnamed500() {
+buildUnnamed2283() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed500(core.List<core.String> o) {
+checkUnnamed2283(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -13175,7 +13177,7 @@
   var o = new api.TargetSslProxiesSetSslCertificatesRequest();
   buildCounterTargetSslProxiesSetSslCertificatesRequest++;
   if (buildCounterTargetSslProxiesSetSslCertificatesRequest < 3) {
-    o.sslCertificates = buildUnnamed500();
+    o.sslCertificates = buildUnnamed2283();
   }
   buildCounterTargetSslProxiesSetSslCertificatesRequest--;
   return o;
@@ -13185,19 +13187,19 @@
     api.TargetSslProxiesSetSslCertificatesRequest o) {
   buildCounterTargetSslProxiesSetSslCertificatesRequest++;
   if (buildCounterTargetSslProxiesSetSslCertificatesRequest < 3) {
-    checkUnnamed500(o.sslCertificates);
+    checkUnnamed2283(o.sslCertificates);
   }
   buildCounterTargetSslProxiesSetSslCertificatesRequest--;
 }
 
-buildUnnamed501() {
+buildUnnamed2284() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed501(core.List<core.String> o) {
+checkUnnamed2284(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -13216,7 +13218,7 @@
     o.proxyHeader = "foo";
     o.selfLink = "foo";
     o.service = "foo";
-    o.sslCertificates = buildUnnamed501();
+    o.sslCertificates = buildUnnamed2284();
   }
   buildCounterTargetSslProxy--;
   return o;
@@ -13233,19 +13235,19 @@
     unittest.expect(o.proxyHeader, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.service, unittest.equals('foo'));
-    checkUnnamed501(o.sslCertificates);
+    checkUnnamed2284(o.sslCertificates);
   }
   buildCounterTargetSslProxy--;
 }
 
-buildUnnamed502() {
+buildUnnamed2285() {
   var o = new core.List<api.TargetSslProxy>();
   o.add(buildTargetSslProxy());
   o.add(buildTargetSslProxy());
   return o;
 }
 
-checkUnnamed502(core.List<api.TargetSslProxy> o) {
+checkUnnamed2285(core.List<api.TargetSslProxy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetSslProxy(o[0]);
   checkTargetSslProxy(o[1]);
@@ -13272,14 +13274,14 @@
   buildCounterTargetSslProxyListWarningData--;
 }
 
-buildUnnamed503() {
+buildUnnamed2286() {
   var o = new core.List<api.TargetSslProxyListWarningData>();
   o.add(buildTargetSslProxyListWarningData());
   o.add(buildTargetSslProxyListWarningData());
   return o;
 }
 
-checkUnnamed503(core.List<api.TargetSslProxyListWarningData> o) {
+checkUnnamed2286(core.List<api.TargetSslProxyListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetSslProxyListWarningData(o[0]);
   checkTargetSslProxyListWarningData(o[1]);
@@ -13291,7 +13293,7 @@
   buildCounterTargetSslProxyListWarning++;
   if (buildCounterTargetSslProxyListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed503();
+    o.data = buildUnnamed2286();
     o.message = "foo";
   }
   buildCounterTargetSslProxyListWarning--;
@@ -13302,7 +13304,7 @@
   buildCounterTargetSslProxyListWarning++;
   if (buildCounterTargetSslProxyListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed503(o.data);
+    checkUnnamed2286(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetSslProxyListWarning--;
@@ -13314,7 +13316,7 @@
   buildCounterTargetSslProxyList++;
   if (buildCounterTargetSslProxyList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed502();
+    o.items = buildUnnamed2285();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -13328,7 +13330,7 @@
   buildCounterTargetSslProxyList++;
   if (buildCounterTargetSslProxyList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed502(o.items);
+    checkUnnamed2285(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -13410,14 +13412,14 @@
   buildCounterTargetTcpProxy--;
 }
 
-buildUnnamed504() {
+buildUnnamed2287() {
   var o = new core.List<api.TargetTcpProxy>();
   o.add(buildTargetTcpProxy());
   o.add(buildTargetTcpProxy());
   return o;
 }
 
-checkUnnamed504(core.List<api.TargetTcpProxy> o) {
+checkUnnamed2287(core.List<api.TargetTcpProxy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetTcpProxy(o[0]);
   checkTargetTcpProxy(o[1]);
@@ -13444,14 +13446,14 @@
   buildCounterTargetTcpProxyListWarningData--;
 }
 
-buildUnnamed505() {
+buildUnnamed2288() {
   var o = new core.List<api.TargetTcpProxyListWarningData>();
   o.add(buildTargetTcpProxyListWarningData());
   o.add(buildTargetTcpProxyListWarningData());
   return o;
 }
 
-checkUnnamed505(core.List<api.TargetTcpProxyListWarningData> o) {
+checkUnnamed2288(core.List<api.TargetTcpProxyListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetTcpProxyListWarningData(o[0]);
   checkTargetTcpProxyListWarningData(o[1]);
@@ -13463,7 +13465,7 @@
   buildCounterTargetTcpProxyListWarning++;
   if (buildCounterTargetTcpProxyListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed505();
+    o.data = buildUnnamed2288();
     o.message = "foo";
   }
   buildCounterTargetTcpProxyListWarning--;
@@ -13474,7 +13476,7 @@
   buildCounterTargetTcpProxyListWarning++;
   if (buildCounterTargetTcpProxyListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed505(o.data);
+    checkUnnamed2288(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetTcpProxyListWarning--;
@@ -13486,7 +13488,7 @@
   buildCounterTargetTcpProxyList++;
   if (buildCounterTargetTcpProxyList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed504();
+    o.items = buildUnnamed2287();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -13500,7 +13502,7 @@
   buildCounterTargetTcpProxyList++;
   if (buildCounterTargetTcpProxyList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed504(o.items);
+    checkUnnamed2287(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -13509,27 +13511,27 @@
   buildCounterTargetTcpProxyList--;
 }
 
-buildUnnamed506() {
+buildUnnamed2289() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed506(core.List<core.String> o) {
+checkUnnamed2289(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed507() {
+buildUnnamed2290() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed507(core.List<core.String> o) {
+checkUnnamed2290(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -13542,7 +13544,7 @@
   if (buildCounterTargetVpnGateway < 3) {
     o.creationTimestamp = "foo";
     o.description = "foo";
-    o.forwardingRules = buildUnnamed506();
+    o.forwardingRules = buildUnnamed2289();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
@@ -13550,7 +13552,7 @@
     o.region = "foo";
     o.selfLink = "foo";
     o.status = "foo";
-    o.tunnels = buildUnnamed507();
+    o.tunnels = buildUnnamed2290();
   }
   buildCounterTargetVpnGateway--;
   return o;
@@ -13561,7 +13563,7 @@
   if (buildCounterTargetVpnGateway < 3) {
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed506(o.forwardingRules);
+    checkUnnamed2289(o.forwardingRules);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -13569,19 +13571,19 @@
     unittest.expect(o.region, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
-    checkUnnamed507(o.tunnels);
+    checkUnnamed2290(o.tunnels);
   }
   buildCounterTargetVpnGateway--;
 }
 
-buildUnnamed508() {
+buildUnnamed2291() {
   var o = new core.Map<core.String, api.TargetVpnGatewaysScopedList>();
   o["x"] = buildTargetVpnGatewaysScopedList();
   o["y"] = buildTargetVpnGatewaysScopedList();
   return o;
 }
 
-checkUnnamed508(core.Map<core.String, api.TargetVpnGatewaysScopedList> o) {
+checkUnnamed2291(core.Map<core.String, api.TargetVpnGatewaysScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetVpnGatewaysScopedList(o["x"]);
   checkTargetVpnGatewaysScopedList(o["y"]);
@@ -13609,14 +13611,14 @@
   buildCounterTargetVpnGatewayAggregatedListWarningData--;
 }
 
-buildUnnamed509() {
+buildUnnamed2292() {
   var o = new core.List<api.TargetVpnGatewayAggregatedListWarningData>();
   o.add(buildTargetVpnGatewayAggregatedListWarningData());
   o.add(buildTargetVpnGatewayAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed509(core.List<api.TargetVpnGatewayAggregatedListWarningData> o) {
+checkUnnamed2292(core.List<api.TargetVpnGatewayAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetVpnGatewayAggregatedListWarningData(o[0]);
   checkTargetVpnGatewayAggregatedListWarningData(o[1]);
@@ -13628,7 +13630,7 @@
   buildCounterTargetVpnGatewayAggregatedListWarning++;
   if (buildCounterTargetVpnGatewayAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed509();
+    o.data = buildUnnamed2292();
     o.message = "foo";
   }
   buildCounterTargetVpnGatewayAggregatedListWarning--;
@@ -13640,7 +13642,7 @@
   buildCounterTargetVpnGatewayAggregatedListWarning++;
   if (buildCounterTargetVpnGatewayAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed509(o.data);
+    checkUnnamed2292(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetVpnGatewayAggregatedListWarning--;
@@ -13652,7 +13654,7 @@
   buildCounterTargetVpnGatewayAggregatedList++;
   if (buildCounterTargetVpnGatewayAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed508();
+    o.items = buildUnnamed2291();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -13666,7 +13668,7 @@
   buildCounterTargetVpnGatewayAggregatedList++;
   if (buildCounterTargetVpnGatewayAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed508(o.items);
+    checkUnnamed2291(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -13675,14 +13677,14 @@
   buildCounterTargetVpnGatewayAggregatedList--;
 }
 
-buildUnnamed510() {
+buildUnnamed2293() {
   var o = new core.List<api.TargetVpnGateway>();
   o.add(buildTargetVpnGateway());
   o.add(buildTargetVpnGateway());
   return o;
 }
 
-checkUnnamed510(core.List<api.TargetVpnGateway> o) {
+checkUnnamed2293(core.List<api.TargetVpnGateway> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetVpnGateway(o[0]);
   checkTargetVpnGateway(o[1]);
@@ -13709,14 +13711,14 @@
   buildCounterTargetVpnGatewayListWarningData--;
 }
 
-buildUnnamed511() {
+buildUnnamed2294() {
   var o = new core.List<api.TargetVpnGatewayListWarningData>();
   o.add(buildTargetVpnGatewayListWarningData());
   o.add(buildTargetVpnGatewayListWarningData());
   return o;
 }
 
-checkUnnamed511(core.List<api.TargetVpnGatewayListWarningData> o) {
+checkUnnamed2294(core.List<api.TargetVpnGatewayListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetVpnGatewayListWarningData(o[0]);
   checkTargetVpnGatewayListWarningData(o[1]);
@@ -13728,7 +13730,7 @@
   buildCounterTargetVpnGatewayListWarning++;
   if (buildCounterTargetVpnGatewayListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed511();
+    o.data = buildUnnamed2294();
     o.message = "foo";
   }
   buildCounterTargetVpnGatewayListWarning--;
@@ -13739,7 +13741,7 @@
   buildCounterTargetVpnGatewayListWarning++;
   if (buildCounterTargetVpnGatewayListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed511(o.data);
+    checkUnnamed2294(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetVpnGatewayListWarning--;
@@ -13751,7 +13753,7 @@
   buildCounterTargetVpnGatewayList++;
   if (buildCounterTargetVpnGatewayList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed510();
+    o.items = buildUnnamed2293();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -13765,7 +13767,7 @@
   buildCounterTargetVpnGatewayList++;
   if (buildCounterTargetVpnGatewayList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed510(o.items);
+    checkUnnamed2293(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -13774,14 +13776,14 @@
   buildCounterTargetVpnGatewayList--;
 }
 
-buildUnnamed512() {
+buildUnnamed2295() {
   var o = new core.List<api.TargetVpnGateway>();
   o.add(buildTargetVpnGateway());
   o.add(buildTargetVpnGateway());
   return o;
 }
 
-checkUnnamed512(core.List<api.TargetVpnGateway> o) {
+checkUnnamed2295(core.List<api.TargetVpnGateway> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetVpnGateway(o[0]);
   checkTargetVpnGateway(o[1]);
@@ -13809,14 +13811,14 @@
   buildCounterTargetVpnGatewaysScopedListWarningData--;
 }
 
-buildUnnamed513() {
+buildUnnamed2296() {
   var o = new core.List<api.TargetVpnGatewaysScopedListWarningData>();
   o.add(buildTargetVpnGatewaysScopedListWarningData());
   o.add(buildTargetVpnGatewaysScopedListWarningData());
   return o;
 }
 
-checkUnnamed513(core.List<api.TargetVpnGatewaysScopedListWarningData> o) {
+checkUnnamed2296(core.List<api.TargetVpnGatewaysScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetVpnGatewaysScopedListWarningData(o[0]);
   checkTargetVpnGatewaysScopedListWarningData(o[1]);
@@ -13828,7 +13830,7 @@
   buildCounterTargetVpnGatewaysScopedListWarning++;
   if (buildCounterTargetVpnGatewaysScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed513();
+    o.data = buildUnnamed2296();
     o.message = "foo";
   }
   buildCounterTargetVpnGatewaysScopedListWarning--;
@@ -13840,7 +13842,7 @@
   buildCounterTargetVpnGatewaysScopedListWarning++;
   if (buildCounterTargetVpnGatewaysScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed513(o.data);
+    checkUnnamed2296(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterTargetVpnGatewaysScopedListWarning--;
@@ -13851,7 +13853,7 @@
   var o = new api.TargetVpnGatewaysScopedList();
   buildCounterTargetVpnGatewaysScopedList++;
   if (buildCounterTargetVpnGatewaysScopedList < 3) {
-    o.targetVpnGateways = buildUnnamed512();
+    o.targetVpnGateways = buildUnnamed2295();
     o.warning = buildTargetVpnGatewaysScopedListWarning();
   }
   buildCounterTargetVpnGatewaysScopedList--;
@@ -13861,7 +13863,7 @@
 checkTargetVpnGatewaysScopedList(api.TargetVpnGatewaysScopedList o) {
   buildCounterTargetVpnGatewaysScopedList++;
   if (buildCounterTargetVpnGatewaysScopedList < 3) {
-    checkUnnamed512(o.targetVpnGateways);
+    checkUnnamed2295(o.targetVpnGateways);
     checkTargetVpnGatewaysScopedListWarning(o.warning);
   }
   buildCounterTargetVpnGatewaysScopedList--;
@@ -13892,40 +13894,40 @@
   buildCounterTestFailure--;
 }
 
-buildUnnamed514() {
+buildUnnamed2297() {
   var o = new core.List<api.HostRule>();
   o.add(buildHostRule());
   o.add(buildHostRule());
   return o;
 }
 
-checkUnnamed514(core.List<api.HostRule> o) {
+checkUnnamed2297(core.List<api.HostRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHostRule(o[0]);
   checkHostRule(o[1]);
 }
 
-buildUnnamed515() {
+buildUnnamed2298() {
   var o = new core.List<api.PathMatcher>();
   o.add(buildPathMatcher());
   o.add(buildPathMatcher());
   return o;
 }
 
-checkUnnamed515(core.List<api.PathMatcher> o) {
+checkUnnamed2298(core.List<api.PathMatcher> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPathMatcher(o[0]);
   checkPathMatcher(o[1]);
 }
 
-buildUnnamed516() {
+buildUnnamed2299() {
   var o = new core.List<api.UrlMapTest>();
   o.add(buildUrlMapTest());
   o.add(buildUrlMapTest());
   return o;
 }
 
-checkUnnamed516(core.List<api.UrlMapTest> o) {
+checkUnnamed2299(core.List<api.UrlMapTest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlMapTest(o[0]);
   checkUrlMapTest(o[1]);
@@ -13940,13 +13942,13 @@
     o.defaultService = "foo";
     o.description = "foo";
     o.fingerprint = "foo";
-    o.hostRules = buildUnnamed514();
+    o.hostRules = buildUnnamed2297();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.pathMatchers = buildUnnamed515();
+    o.pathMatchers = buildUnnamed2298();
     o.selfLink = "foo";
-    o.tests = buildUnnamed516();
+    o.tests = buildUnnamed2299();
   }
   buildCounterUrlMap--;
   return o;
@@ -13959,25 +13961,25 @@
     unittest.expect(o.defaultService, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed514(o.hostRules);
+    checkUnnamed2297(o.hostRules);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed515(o.pathMatchers);
+    checkUnnamed2298(o.pathMatchers);
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed516(o.tests);
+    checkUnnamed2299(o.tests);
   }
   buildCounterUrlMap--;
 }
 
-buildUnnamed517() {
+buildUnnamed2300() {
   var o = new core.List<api.UrlMap>();
   o.add(buildUrlMap());
   o.add(buildUrlMap());
   return o;
 }
 
-checkUnnamed517(core.List<api.UrlMap> o) {
+checkUnnamed2300(core.List<api.UrlMap> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlMap(o[0]);
   checkUrlMap(o[1]);
@@ -14004,14 +14006,14 @@
   buildCounterUrlMapListWarningData--;
 }
 
-buildUnnamed518() {
+buildUnnamed2301() {
   var o = new core.List<api.UrlMapListWarningData>();
   o.add(buildUrlMapListWarningData());
   o.add(buildUrlMapListWarningData());
   return o;
 }
 
-checkUnnamed518(core.List<api.UrlMapListWarningData> o) {
+checkUnnamed2301(core.List<api.UrlMapListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlMapListWarningData(o[0]);
   checkUrlMapListWarningData(o[1]);
@@ -14023,7 +14025,7 @@
   buildCounterUrlMapListWarning++;
   if (buildCounterUrlMapListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed518();
+    o.data = buildUnnamed2301();
     o.message = "foo";
   }
   buildCounterUrlMapListWarning--;
@@ -14034,7 +14036,7 @@
   buildCounterUrlMapListWarning++;
   if (buildCounterUrlMapListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed518(o.data);
+    checkUnnamed2301(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterUrlMapListWarning--;
@@ -14046,7 +14048,7 @@
   buildCounterUrlMapList++;
   if (buildCounterUrlMapList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed517();
+    o.items = buildUnnamed2300();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -14060,7 +14062,7 @@
   buildCounterUrlMapList++;
   if (buildCounterUrlMapList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed517(o.items);
+    checkUnnamed2300(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -14113,27 +14115,27 @@
   buildCounterUrlMapTest--;
 }
 
-buildUnnamed519() {
+buildUnnamed2302() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed519(core.List<core.String> o) {
+checkUnnamed2302(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed520() {
+buildUnnamed2303() {
   var o = new core.List<api.TestFailure>();
   o.add(buildTestFailure());
   o.add(buildTestFailure());
   return o;
 }
 
-checkUnnamed520(core.List<api.TestFailure> o) {
+checkUnnamed2303(core.List<api.TestFailure> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTestFailure(o[0]);
   checkTestFailure(o[1]);
@@ -14144,9 +14146,9 @@
   var o = new api.UrlMapValidationResult();
   buildCounterUrlMapValidationResult++;
   if (buildCounterUrlMapValidationResult < 3) {
-    o.loadErrors = buildUnnamed519();
+    o.loadErrors = buildUnnamed2302();
     o.loadSucceeded = true;
-    o.testFailures = buildUnnamed520();
+    o.testFailures = buildUnnamed2303();
     o.testPassed = true;
   }
   buildCounterUrlMapValidationResult--;
@@ -14156,9 +14158,9 @@
 checkUrlMapValidationResult(api.UrlMapValidationResult o) {
   buildCounterUrlMapValidationResult++;
   if (buildCounterUrlMapValidationResult < 3) {
-    checkUnnamed519(o.loadErrors);
+    checkUnnamed2302(o.loadErrors);
     unittest.expect(o.loadSucceeded, unittest.isTrue);
-    checkUnnamed520(o.testFailures);
+    checkUnnamed2303(o.testFailures);
     unittest.expect(o.testPassed, unittest.isTrue);
   }
   buildCounterUrlMapValidationResult--;
@@ -14223,27 +14225,27 @@
   buildCounterUsageExportLocation--;
 }
 
-buildUnnamed521() {
+buildUnnamed2304() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed521(core.List<core.String> o) {
+checkUnnamed2304(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed522() {
+buildUnnamed2305() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed522(core.List<core.String> o) {
+checkUnnamed2305(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -14260,11 +14262,11 @@
     o.id = "foo";
     o.ikeVersion = 42;
     o.kind = "foo";
-    o.localTrafficSelector = buildUnnamed521();
+    o.localTrafficSelector = buildUnnamed2304();
     o.name = "foo";
     o.peerIp = "foo";
     o.region = "foo";
-    o.remoteTrafficSelector = buildUnnamed522();
+    o.remoteTrafficSelector = buildUnnamed2305();
     o.router = "foo";
     o.selfLink = "foo";
     o.sharedSecret = "foo";
@@ -14285,11 +14287,11 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.ikeVersion, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed521(o.localTrafficSelector);
+    checkUnnamed2304(o.localTrafficSelector);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.peerIp, unittest.equals('foo'));
     unittest.expect(o.region, unittest.equals('foo'));
-    checkUnnamed522(o.remoteTrafficSelector);
+    checkUnnamed2305(o.remoteTrafficSelector);
     unittest.expect(o.router, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.sharedSecret, unittest.equals('foo'));
@@ -14300,14 +14302,14 @@
   buildCounterVpnTunnel--;
 }
 
-buildUnnamed523() {
+buildUnnamed2306() {
   var o = new core.Map<core.String, api.VpnTunnelsScopedList>();
   o["x"] = buildVpnTunnelsScopedList();
   o["y"] = buildVpnTunnelsScopedList();
   return o;
 }
 
-checkUnnamed523(core.Map<core.String, api.VpnTunnelsScopedList> o) {
+checkUnnamed2306(core.Map<core.String, api.VpnTunnelsScopedList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVpnTunnelsScopedList(o["x"]);
   checkVpnTunnelsScopedList(o["y"]);
@@ -14335,14 +14337,14 @@
   buildCounterVpnTunnelAggregatedListWarningData--;
 }
 
-buildUnnamed524() {
+buildUnnamed2307() {
   var o = new core.List<api.VpnTunnelAggregatedListWarningData>();
   o.add(buildVpnTunnelAggregatedListWarningData());
   o.add(buildVpnTunnelAggregatedListWarningData());
   return o;
 }
 
-checkUnnamed524(core.List<api.VpnTunnelAggregatedListWarningData> o) {
+checkUnnamed2307(core.List<api.VpnTunnelAggregatedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVpnTunnelAggregatedListWarningData(o[0]);
   checkVpnTunnelAggregatedListWarningData(o[1]);
@@ -14354,7 +14356,7 @@
   buildCounterVpnTunnelAggregatedListWarning++;
   if (buildCounterVpnTunnelAggregatedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed524();
+    o.data = buildUnnamed2307();
     o.message = "foo";
   }
   buildCounterVpnTunnelAggregatedListWarning--;
@@ -14365,7 +14367,7 @@
   buildCounterVpnTunnelAggregatedListWarning++;
   if (buildCounterVpnTunnelAggregatedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed524(o.data);
+    checkUnnamed2307(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterVpnTunnelAggregatedListWarning--;
@@ -14377,7 +14379,7 @@
   buildCounterVpnTunnelAggregatedList++;
   if (buildCounterVpnTunnelAggregatedList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed523();
+    o.items = buildUnnamed2306();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -14391,7 +14393,7 @@
   buildCounterVpnTunnelAggregatedList++;
   if (buildCounterVpnTunnelAggregatedList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed523(o.items);
+    checkUnnamed2306(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -14400,14 +14402,14 @@
   buildCounterVpnTunnelAggregatedList--;
 }
 
-buildUnnamed525() {
+buildUnnamed2308() {
   var o = new core.List<api.VpnTunnel>();
   o.add(buildVpnTunnel());
   o.add(buildVpnTunnel());
   return o;
 }
 
-checkUnnamed525(core.List<api.VpnTunnel> o) {
+checkUnnamed2308(core.List<api.VpnTunnel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVpnTunnel(o[0]);
   checkVpnTunnel(o[1]);
@@ -14434,14 +14436,14 @@
   buildCounterVpnTunnelListWarningData--;
 }
 
-buildUnnamed526() {
+buildUnnamed2309() {
   var o = new core.List<api.VpnTunnelListWarningData>();
   o.add(buildVpnTunnelListWarningData());
   o.add(buildVpnTunnelListWarningData());
   return o;
 }
 
-checkUnnamed526(core.List<api.VpnTunnelListWarningData> o) {
+checkUnnamed2309(core.List<api.VpnTunnelListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVpnTunnelListWarningData(o[0]);
   checkVpnTunnelListWarningData(o[1]);
@@ -14453,7 +14455,7 @@
   buildCounterVpnTunnelListWarning++;
   if (buildCounterVpnTunnelListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed526();
+    o.data = buildUnnamed2309();
     o.message = "foo";
   }
   buildCounterVpnTunnelListWarning--;
@@ -14464,7 +14466,7 @@
   buildCounterVpnTunnelListWarning++;
   if (buildCounterVpnTunnelListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed526(o.data);
+    checkUnnamed2309(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterVpnTunnelListWarning--;
@@ -14476,7 +14478,7 @@
   buildCounterVpnTunnelList++;
   if (buildCounterVpnTunnelList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed525();
+    o.items = buildUnnamed2308();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -14490,7 +14492,7 @@
   buildCounterVpnTunnelList++;
   if (buildCounterVpnTunnelList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed525(o.items);
+    checkUnnamed2308(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -14499,14 +14501,14 @@
   buildCounterVpnTunnelList--;
 }
 
-buildUnnamed527() {
+buildUnnamed2310() {
   var o = new core.List<api.VpnTunnel>();
   o.add(buildVpnTunnel());
   o.add(buildVpnTunnel());
   return o;
 }
 
-checkUnnamed527(core.List<api.VpnTunnel> o) {
+checkUnnamed2310(core.List<api.VpnTunnel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVpnTunnel(o[0]);
   checkVpnTunnel(o[1]);
@@ -14533,14 +14535,14 @@
   buildCounterVpnTunnelsScopedListWarningData--;
 }
 
-buildUnnamed528() {
+buildUnnamed2311() {
   var o = new core.List<api.VpnTunnelsScopedListWarningData>();
   o.add(buildVpnTunnelsScopedListWarningData());
   o.add(buildVpnTunnelsScopedListWarningData());
   return o;
 }
 
-checkUnnamed528(core.List<api.VpnTunnelsScopedListWarningData> o) {
+checkUnnamed2311(core.List<api.VpnTunnelsScopedListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVpnTunnelsScopedListWarningData(o[0]);
   checkVpnTunnelsScopedListWarningData(o[1]);
@@ -14552,7 +14554,7 @@
   buildCounterVpnTunnelsScopedListWarning++;
   if (buildCounterVpnTunnelsScopedListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed528();
+    o.data = buildUnnamed2311();
     o.message = "foo";
   }
   buildCounterVpnTunnelsScopedListWarning--;
@@ -14563,7 +14565,7 @@
   buildCounterVpnTunnelsScopedListWarning++;
   if (buildCounterVpnTunnelsScopedListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed528(o.data);
+    checkUnnamed2311(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterVpnTunnelsScopedListWarning--;
@@ -14574,7 +14576,7 @@
   var o = new api.VpnTunnelsScopedList();
   buildCounterVpnTunnelsScopedList++;
   if (buildCounterVpnTunnelsScopedList < 3) {
-    o.vpnTunnels = buildUnnamed527();
+    o.vpnTunnels = buildUnnamed2310();
     o.warning = buildVpnTunnelsScopedListWarning();
   }
   buildCounterVpnTunnelsScopedList--;
@@ -14584,20 +14586,20 @@
 checkVpnTunnelsScopedList(api.VpnTunnelsScopedList o) {
   buildCounterVpnTunnelsScopedList++;
   if (buildCounterVpnTunnelsScopedList < 3) {
-    checkUnnamed527(o.vpnTunnels);
+    checkUnnamed2310(o.vpnTunnels);
     checkVpnTunnelsScopedListWarning(o.warning);
   }
   buildCounterVpnTunnelsScopedList--;
 }
 
-buildUnnamed529() {
+buildUnnamed2312() {
   var o = new core.List<api.Project>();
   o.add(buildProject());
   o.add(buildProject());
   return o;
 }
 
-checkUnnamed529(core.List<api.Project> o) {
+checkUnnamed2312(core.List<api.Project> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProject(o[0]);
   checkProject(o[1]);
@@ -14624,14 +14626,14 @@
   buildCounterXpnHostListWarningData--;
 }
 
-buildUnnamed530() {
+buildUnnamed2313() {
   var o = new core.List<api.XpnHostListWarningData>();
   o.add(buildXpnHostListWarningData());
   o.add(buildXpnHostListWarningData());
   return o;
 }
 
-checkUnnamed530(core.List<api.XpnHostListWarningData> o) {
+checkUnnamed2313(core.List<api.XpnHostListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkXpnHostListWarningData(o[0]);
   checkXpnHostListWarningData(o[1]);
@@ -14643,7 +14645,7 @@
   buildCounterXpnHostListWarning++;
   if (buildCounterXpnHostListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed530();
+    o.data = buildUnnamed2313();
     o.message = "foo";
   }
   buildCounterXpnHostListWarning--;
@@ -14654,7 +14656,7 @@
   buildCounterXpnHostListWarning++;
   if (buildCounterXpnHostListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed530(o.data);
+    checkUnnamed2313(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterXpnHostListWarning--;
@@ -14666,7 +14668,7 @@
   buildCounterXpnHostList++;
   if (buildCounterXpnHostList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed529();
+    o.items = buildUnnamed2312();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -14680,7 +14682,7 @@
   buildCounterXpnHostList++;
   if (buildCounterXpnHostList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed529(o.items);
+    checkUnnamed2312(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -14710,14 +14712,14 @@
   buildCounterXpnResourceId--;
 }
 
-buildUnnamed531() {
+buildUnnamed2314() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed531(core.List<core.String> o) {
+checkUnnamed2314(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -14728,7 +14730,7 @@
   var o = new api.Zone();
   buildCounterZone++;
   if (buildCounterZone < 3) {
-    o.availableCpuPlatforms = buildUnnamed531();
+    o.availableCpuPlatforms = buildUnnamed2314();
     o.creationTimestamp = "foo";
     o.deprecated = buildDeprecationStatus();
     o.description = "foo";
@@ -14746,7 +14748,7 @@
 checkZone(api.Zone o) {
   buildCounterZone++;
   if (buildCounterZone < 3) {
-    checkUnnamed531(o.availableCpuPlatforms);
+    checkUnnamed2314(o.availableCpuPlatforms);
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     checkDeprecationStatus(o.deprecated);
     unittest.expect(o.description, unittest.equals('foo'));
@@ -14760,14 +14762,14 @@
   buildCounterZone--;
 }
 
-buildUnnamed532() {
+buildUnnamed2315() {
   var o = new core.List<api.Zone>();
   o.add(buildZone());
   o.add(buildZone());
   return o;
 }
 
-checkUnnamed532(core.List<api.Zone> o) {
+checkUnnamed2315(core.List<api.Zone> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkZone(o[0]);
   checkZone(o[1]);
@@ -14794,14 +14796,14 @@
   buildCounterZoneListWarningData--;
 }
 
-buildUnnamed533() {
+buildUnnamed2316() {
   var o = new core.List<api.ZoneListWarningData>();
   o.add(buildZoneListWarningData());
   o.add(buildZoneListWarningData());
   return o;
 }
 
-checkUnnamed533(core.List<api.ZoneListWarningData> o) {
+checkUnnamed2316(core.List<api.ZoneListWarningData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkZoneListWarningData(o[0]);
   checkZoneListWarningData(o[1]);
@@ -14813,7 +14815,7 @@
   buildCounterZoneListWarning++;
   if (buildCounterZoneListWarning < 3) {
     o.code = "foo";
-    o.data = buildUnnamed533();
+    o.data = buildUnnamed2316();
     o.message = "foo";
   }
   buildCounterZoneListWarning--;
@@ -14824,7 +14826,7 @@
   buildCounterZoneListWarning++;
   if (buildCounterZoneListWarning < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed533(o.data);
+    checkUnnamed2316(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterZoneListWarning--;
@@ -14836,7 +14838,7 @@
   buildCounterZoneList++;
   if (buildCounterZoneList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed532();
+    o.items = buildUnnamed2315();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -14850,7 +14852,7 @@
   buildCounterZoneList++;
   if (buildCounterZoneList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed532(o.items);
+    checkUnnamed2315(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -14859,14 +14861,14 @@
   buildCounterZoneList--;
 }
 
-buildUnnamed534() {
+buildUnnamed2317() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed534(core.Map<core.String, core.String> o) {
+checkUnnamed2317(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -14878,7 +14880,7 @@
   buildCounterZoneSetLabelsRequest++;
   if (buildCounterZoneSetLabelsRequest < 3) {
     o.labelFingerprint = "foo";
-    o.labels = buildUnnamed534();
+    o.labels = buildUnnamed2317();
   }
   buildCounterZoneSetLabelsRequest--;
   return o;
@@ -14888,7 +14890,7 @@
   buildCounterZoneSetLabelsRequest++;
   if (buildCounterZoneSetLabelsRequest < 3) {
     unittest.expect(o.labelFingerprint, unittest.equals('foo'));
-    checkUnnamed534(o.labels);
+    checkUnnamed2317(o.labels);
   }
   buildCounterZoneSetLabelsRequest--;
 }
@@ -18496,8 +18498,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AcceleratorTypeAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkAcceleratorTypeAggregatedList(response);
       })));
     });
@@ -18547,7 +18548,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_acceleratorType, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AcceleratorType response) {
+          .then(unittest.expectAsync1(((response) {
         checkAcceleratorType(response);
       })));
     });
@@ -18612,7 +18613,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AcceleratorTypeList response) {
+          .then(unittest.expectAsync1(((response) {
         checkAcceleratorTypeList(response);
       })));
     });
@@ -18677,7 +18678,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AddressAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkAddressAggregatedList(response);
       })));
     });
@@ -18730,7 +18731,7 @@
       res
           .delete(arg_project, arg_region, arg_address,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -18779,7 +18780,7 @@
       }), true);
       res
           .get(arg_project, arg_region, arg_address, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Address response) {
+          .then(unittest.expectAsync1(((response) {
         checkAddress(response);
       })));
     });
@@ -18835,7 +18836,7 @@
       res
           .insert(arg_request, arg_project, arg_region,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -18899,7 +18900,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AddressList response) {
+          .then(unittest.expectAsync1(((response) {
         checkAddressList(response);
       })));
     });
@@ -18964,7 +18965,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AutoscalerAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkAutoscalerAggregatedList(response);
       })));
     });
@@ -19017,7 +19018,7 @@
       res
           .delete(arg_project, arg_zone, arg_autoscaler,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -19066,7 +19067,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_autoscaler, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Autoscaler response) {
+          .then(unittest.expectAsync1(((response) {
         checkAutoscaler(response);
       })));
     });
@@ -19122,7 +19123,7 @@
       res
           .insert(arg_request, arg_project, arg_zone,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -19186,7 +19187,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AutoscalerList response) {
+          .then(unittest.expectAsync1(((response) {
         checkAutoscalerList(response);
       })));
     });
@@ -19247,7 +19248,7 @@
               autoscaler: arg_autoscaler,
               requestId: arg_requestId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -19308,7 +19309,7 @@
               autoscaler: arg_autoscaler,
               requestId: arg_requestId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -19363,7 +19364,7 @@
       res
           .delete(arg_project, arg_backendBucket,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -19412,7 +19413,7 @@
       }), true);
       res
           .get(arg_project, arg_backendBucket, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BackendBucket response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackendBucket(response);
       })));
     });
@@ -19468,7 +19469,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -19532,7 +19533,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BackendBucketList response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackendBucketList(response);
       })));
     });
@@ -19589,7 +19590,7 @@
       res
           .patch(arg_request, arg_project, arg_backendBucket,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -19646,7 +19647,7 @@
       res
           .update(arg_request, arg_project, arg_backendBucket,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -19712,8 +19713,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.BackendServiceAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackendServiceAggregatedList(response);
       })));
     });
@@ -19766,7 +19766,7 @@
       res
           .delete(arg_project, arg_backendService,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -19815,7 +19815,7 @@
       }), true);
       res
           .get(arg_project, arg_backendService, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BackendService response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackendService(response);
       })));
     });
@@ -19869,8 +19869,7 @@
       res
           .getHealth(arg_request, arg_project, arg_backendService,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.BackendServiceGroupHealth response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackendServiceGroupHealth(response);
       })));
     });
@@ -19926,7 +19925,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -19990,7 +19989,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BackendServiceList response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackendServiceList(response);
       })));
     });
@@ -20047,7 +20046,7 @@
       res
           .patch(arg_request, arg_project, arg_backendService,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -20104,7 +20103,7 @@
       res
           .update(arg_request, arg_project, arg_backendService,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -20169,7 +20168,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DiskTypeAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkDiskTypeAggregatedList(response);
       })));
     });
@@ -20218,7 +20217,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_diskType, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DiskType response) {
+          .then(unittest.expectAsync1(((response) {
         checkDiskType(response);
       })));
     });
@@ -20282,7 +20281,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DiskTypeList response) {
+          .then(unittest.expectAsync1(((response) {
         checkDiskTypeList(response);
       })));
     });
@@ -20347,7 +20346,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DiskAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkDiskAggregatedList(response);
       })));
     });
@@ -20409,7 +20408,7 @@
               guestFlush: arg_guestFlush,
               requestId: arg_requestId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -20462,7 +20461,7 @@
       res
           .delete(arg_project, arg_zone, arg_disk,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -20511,7 +20510,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_disk, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Disk response) {
+          .then(unittest.expectAsync1(((response) {
         checkDisk(response);
       })));
     });
@@ -20572,7 +20571,7 @@
               requestId: arg_requestId,
               sourceImage: arg_sourceImage,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -20636,7 +20635,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DiskList response) {
+          .then(unittest.expectAsync1(((response) {
         checkDiskList(response);
       })));
     });
@@ -20693,7 +20692,7 @@
       res
           .resize(arg_request, arg_project, arg_zone, arg_disk,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -20750,7 +20749,7 @@
       res
           .setLabels(arg_request, arg_project, arg_zone, arg_resource,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -20804,7 +20803,7 @@
       res
           .delete(arg_project, arg_firewall,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -20852,7 +20851,7 @@
       }), true);
       res
           .get(arg_project, arg_firewall, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Firewall response) {
+          .then(unittest.expectAsync1(((response) {
         checkFirewall(response);
       })));
     });
@@ -20907,7 +20906,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -20970,7 +20969,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FirewallList response) {
+          .then(unittest.expectAsync1(((response) {
         checkFirewallList(response);
       })));
     });
@@ -21026,7 +21025,7 @@
       res
           .patch(arg_request, arg_project, arg_firewall,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -21082,7 +21081,7 @@
       res
           .update(arg_request, arg_project, arg_firewall,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -21148,8 +21147,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ForwardingRuleAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkForwardingRuleAggregatedList(response);
       })));
     });
@@ -21203,7 +21201,7 @@
       res
           .delete(arg_project, arg_region, arg_forwardingRule,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -21254,7 +21252,7 @@
       res
           .get(arg_project, arg_region, arg_forwardingRule,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ForwardingRule response) {
+          .then(unittest.expectAsync1(((response) {
         checkForwardingRule(response);
       })));
     });
@@ -21311,7 +21309,7 @@
       res
           .insert(arg_request, arg_project, arg_region,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -21376,7 +21374,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ForwardingRuleList response) {
+          .then(unittest.expectAsync1(((response) {
         checkForwardingRuleList(response);
       })));
     });
@@ -21434,7 +21432,7 @@
       res
           .setTarget(arg_request, arg_project, arg_region, arg_forwardingRule,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -21489,7 +21487,7 @@
       res
           .delete(arg_project, arg_address,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -21538,7 +21536,7 @@
       }), true);
       res
           .get(arg_project, arg_address, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Address response) {
+          .then(unittest.expectAsync1(((response) {
         checkAddress(response);
       })));
     });
@@ -21594,7 +21592,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -21658,7 +21656,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AddressList response) {
+          .then(unittest.expectAsync1(((response) {
         checkAddressList(response);
       })));
     });
@@ -21713,7 +21711,7 @@
       res
           .delete(arg_project, arg_forwardingRule,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -21762,7 +21760,7 @@
       }), true);
       res
           .get(arg_project, arg_forwardingRule, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ForwardingRule response) {
+          .then(unittest.expectAsync1(((response) {
         checkForwardingRule(response);
       })));
     });
@@ -21818,7 +21816,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -21882,7 +21880,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ForwardingRuleList response) {
+          .then(unittest.expectAsync1(((response) {
         checkForwardingRuleList(response);
       })));
     });
@@ -21939,7 +21937,7 @@
       res
           .setTarget(arg_request, arg_project, arg_forwardingRule,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -22005,7 +22003,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperationAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperationAggregatedList(response);
       })));
     });
@@ -22101,7 +22099,7 @@
       }), true);
       res
           .get(arg_project, arg_operation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -22165,7 +22163,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperationList response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperationList(response);
       })));
     });
@@ -22219,7 +22217,7 @@
       res
           .delete(arg_project, arg_healthCheck,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -22267,7 +22265,7 @@
       }), true);
       res
           .get(arg_project, arg_healthCheck, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.HealthCheck response) {
+          .then(unittest.expectAsync1(((response) {
         checkHealthCheck(response);
       })));
     });
@@ -22322,7 +22320,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -22385,7 +22383,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.HealthCheckList response) {
+          .then(unittest.expectAsync1(((response) {
         checkHealthCheckList(response);
       })));
     });
@@ -22441,7 +22439,7 @@
       res
           .patch(arg_request, arg_project, arg_healthCheck,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -22497,7 +22495,7 @@
       res
           .update(arg_request, arg_project, arg_healthCheck,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -22552,7 +22550,7 @@
       res
           .delete(arg_project, arg_httpHealthCheck,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -22601,7 +22599,7 @@
       }), true);
       res
           .get(arg_project, arg_httpHealthCheck, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.HttpHealthCheck response) {
+          .then(unittest.expectAsync1(((response) {
         checkHttpHealthCheck(response);
       })));
     });
@@ -22657,7 +22655,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -22721,7 +22719,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.HttpHealthCheckList response) {
+          .then(unittest.expectAsync1(((response) {
         checkHttpHealthCheckList(response);
       })));
     });
@@ -22778,7 +22776,7 @@
       res
           .patch(arg_request, arg_project, arg_httpHealthCheck,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -22835,7 +22833,7 @@
       res
           .update(arg_request, arg_project, arg_httpHealthCheck,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -22890,7 +22888,7 @@
       res
           .delete(arg_project, arg_httpsHealthCheck,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -22939,7 +22937,7 @@
       }), true);
       res
           .get(arg_project, arg_httpsHealthCheck, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.HttpsHealthCheck response) {
+          .then(unittest.expectAsync1(((response) {
         checkHttpsHealthCheck(response);
       })));
     });
@@ -22995,7 +22993,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -23059,7 +23057,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.HttpsHealthCheckList response) {
+          .then(unittest.expectAsync1(((response) {
         checkHttpsHealthCheckList(response);
       })));
     });
@@ -23116,7 +23114,7 @@
       res
           .patch(arg_request, arg_project, arg_httpsHealthCheck,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -23173,7 +23171,7 @@
       res
           .update(arg_request, arg_project, arg_httpsHealthCheck,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -23227,7 +23225,7 @@
       res
           .delete(arg_project, arg_image,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -23283,7 +23281,7 @@
       res
           .deprecate(arg_request, arg_project, arg_image,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -23331,7 +23329,7 @@
       }), true);
       res
           .get(arg_project, arg_image, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Image response) {
+          .then(unittest.expectAsync1(((response) {
         checkImage(response);
       })));
     });
@@ -23379,7 +23377,7 @@
       }), true);
       res
           .getFromFamily(arg_project, arg_family, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Image response) {
+          .then(unittest.expectAsync1(((response) {
         checkImage(response);
       })));
     });
@@ -23439,7 +23437,7 @@
               forceCreate: arg_forceCreate,
               requestId: arg_requestId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -23502,7 +23500,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ImageList response) {
+          .then(unittest.expectAsync1(((response) {
         checkImageList(response);
       })));
     });
@@ -23555,7 +23553,7 @@
       res
           .setLabels(arg_request, arg_project, arg_resource,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -23617,7 +23615,7 @@
           .abandonInstances(
               arg_request, arg_project, arg_zone, arg_instanceGroupManager,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -23682,8 +23680,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.InstanceGroupManagerAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceGroupManagerAggregatedList(response);
       })));
     });
@@ -23737,7 +23734,7 @@
       res
           .delete(arg_project, arg_zone, arg_instanceGroupManager,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -23797,7 +23794,7 @@
           .deleteInstances(
               arg_request, arg_project, arg_zone, arg_instanceGroupManager,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -23848,7 +23845,7 @@
       res
           .get(arg_project, arg_zone, arg_instanceGroupManager,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceGroupManager response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceGroupManager(response);
       })));
     });
@@ -23905,7 +23902,7 @@
       res
           .insert(arg_request, arg_project, arg_zone,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -23970,7 +23967,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceGroupManagerList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceGroupManagerList(response);
       })));
     });
@@ -24037,9 +24034,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.InstanceGroupManagersListManagedInstancesResponse
-                  response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceGroupManagersListManagedInstancesResponse(response);
       })));
     });
@@ -24100,7 +24095,7 @@
           .recreateInstances(
               arg_request, arg_project, arg_zone, arg_instanceGroupManager,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -24157,7 +24152,7 @@
       res
           .resize(arg_project, arg_zone, arg_instanceGroupManager, arg_size,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -24218,7 +24213,7 @@
           .setInstanceTemplate(
               arg_request, arg_project, arg_zone, arg_instanceGroupManager,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -24278,7 +24273,7 @@
           .setTargetPools(
               arg_request, arg_project, arg_zone, arg_instanceGroupManager,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -24338,7 +24333,7 @@
       res
           .addInstances(arg_request, arg_project, arg_zone, arg_instanceGroup,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -24402,8 +24397,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.InstanceGroupAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceGroupAggregatedList(response);
       })));
     });
@@ -24457,7 +24451,7 @@
       res
           .delete(arg_project, arg_zone, arg_instanceGroup,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -24507,7 +24501,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_instanceGroup, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceGroup(response);
       })));
     });
@@ -24564,7 +24558,7 @@
       res
           .insert(arg_request, arg_project, arg_zone,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -24629,7 +24623,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceGroupList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceGroupList(response);
       })));
     });
@@ -24699,8 +24693,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.InstanceGroupsListInstances response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceGroupsListInstances(response);
       })));
     });
@@ -24759,7 +24752,7 @@
           .removeInstances(
               arg_request, arg_project, arg_zone, arg_instanceGroup,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -24817,7 +24810,7 @@
       res
           .setNamedPorts(arg_request, arg_project, arg_zone, arg_instanceGroup,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -24872,7 +24865,7 @@
       res
           .delete(arg_project, arg_instanceTemplate,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -24921,7 +24914,7 @@
       }), true);
       res
           .get(arg_project, arg_instanceTemplate, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceTemplate response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceTemplate(response);
       })));
     });
@@ -24977,7 +24970,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -25041,7 +25034,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceTemplateList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceTemplateList(response);
       })));
     });
@@ -25104,7 +25097,7 @@
           .addAccessConfig(arg_request, arg_project, arg_zone, arg_instance,
               arg_networkInterface,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -25167,7 +25160,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceAggregatedList(response);
       })));
     });
@@ -25224,7 +25217,7 @@
       res
           .attachDisk(arg_request, arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -25277,7 +25270,7 @@
       res
           .delete(arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -25337,7 +25330,7 @@
           .deleteAccessConfig(arg_project, arg_zone, arg_instance,
               arg_accessConfig, arg_networkInterface,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -25393,7 +25386,7 @@
       res
           .detachDisk(arg_project, arg_zone, arg_instance, arg_deviceName,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -25442,7 +25435,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Instance response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstance(response);
       })));
     });
@@ -25497,7 +25490,7 @@
       res
           .getSerialPortOutput(arg_project, arg_zone, arg_instance,
               port: arg_port, start_1: arg_start_1, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SerialPortOutput response) {
+          .then(unittest.expectAsync1(((response) {
         checkSerialPortOutput(response);
       })));
     });
@@ -25553,7 +25546,7 @@
       res
           .insert(arg_request, arg_project, arg_zone,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -25617,7 +25610,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceList(response);
       })));
     });
@@ -25682,7 +25675,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceListReferrers response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceListReferrers(response);
       })));
     });
@@ -25735,7 +25728,7 @@
       res
           .reset(arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -25793,7 +25786,7 @@
               deletionProtection: arg_deletionProtection,
               requestId: arg_requestId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -25853,7 +25846,7 @@
           .setDiskAutoDelete(arg_project, arg_zone, arg_instance,
               arg_autoDelete, arg_deviceName,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -25910,7 +25903,7 @@
       res
           .setLabels(arg_request, arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -25967,7 +25960,7 @@
       res
           .setMachineResources(arg_request, arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26024,7 +26017,7 @@
       res
           .setMachineType(arg_request, arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26081,7 +26074,7 @@
       res
           .setMetadata(arg_request, arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26138,7 +26131,7 @@
       res
           .setMinCpuPlatform(arg_request, arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26195,7 +26188,7 @@
       res
           .setScheduling(arg_request, arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26252,7 +26245,7 @@
       res
           .setServiceAccount(arg_request, arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26309,7 +26302,7 @@
       res
           .setTags(arg_request, arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26362,7 +26355,7 @@
       res
           .start(arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26420,7 +26413,7 @@
           .startWithEncryptionKey(
               arg_request, arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26473,7 +26466,7 @@
       res
           .stop(arg_project, arg_zone, arg_instance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26534,7 +26527,7 @@
           .updateAccessConfig(arg_request, arg_project, arg_zone, arg_instance,
               arg_networkInterface,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26601,8 +26594,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.InterconnectAttachmentAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInterconnectAttachmentAggregatedList(response);
       })));
     });
@@ -26656,7 +26648,7 @@
       res
           .delete(arg_project, arg_region, arg_interconnectAttachment,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26707,7 +26699,7 @@
       res
           .get(arg_project, arg_region, arg_interconnectAttachment,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InterconnectAttachment response) {
+          .then(unittest.expectAsync1(((response) {
         checkInterconnectAttachment(response);
       })));
     });
@@ -26764,7 +26756,7 @@
       res
           .insert(arg_request, arg_project, arg_region,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -26829,8 +26821,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.InterconnectAttachmentList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInterconnectAttachmentList(response);
       })));
     });
@@ -26881,7 +26872,7 @@
       }), true);
       res
           .get(arg_project, arg_interconnectLocation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InterconnectLocation response) {
+          .then(unittest.expectAsync1(((response) {
         checkInterconnectLocation(response);
       })));
     });
@@ -26945,7 +26936,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InterconnectLocationList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInterconnectLocationList(response);
       })));
     });
@@ -26999,7 +26990,7 @@
       res
           .delete(arg_project, arg_interconnect,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -27047,7 +27038,7 @@
       }), true);
       res
           .get(arg_project, arg_interconnect, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Interconnect response) {
+          .then(unittest.expectAsync1(((response) {
         checkInterconnect(response);
       })));
     });
@@ -27102,7 +27093,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -27165,7 +27156,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InterconnectList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInterconnectList(response);
       })));
     });
@@ -27221,7 +27212,7 @@
       res
           .patch(arg_request, arg_project, arg_interconnect,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -27271,7 +27262,7 @@
       }), true);
       res
           .get(arg_project, arg_license, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.License response) {
+          .then(unittest.expectAsync1(((response) {
         checkLicense(response);
       })));
     });
@@ -27336,8 +27327,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.MachineTypeAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkMachineTypeAggregatedList(response);
       })));
     });
@@ -27386,7 +27376,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_machineType, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MachineType response) {
+          .then(unittest.expectAsync1(((response) {
         checkMachineType(response);
       })));
     });
@@ -27450,7 +27440,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MachineTypeList response) {
+          .then(unittest.expectAsync1(((response) {
         checkMachineTypeList(response);
       })));
     });
@@ -27508,7 +27498,7 @@
       res
           .addPeering(arg_request, arg_project, arg_network,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -27560,7 +27550,7 @@
       res
           .delete(arg_project, arg_network,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -27608,7 +27598,7 @@
       }), true);
       res
           .get(arg_project, arg_network, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Network response) {
+          .then(unittest.expectAsync1(((response) {
         checkNetwork(response);
       })));
     });
@@ -27663,7 +27653,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -27726,7 +27716,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.NetworkList response) {
+          .then(unittest.expectAsync1(((response) {
         checkNetworkList(response);
       })));
     });
@@ -27782,7 +27772,7 @@
       res
           .patch(arg_request, arg_project, arg_network,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -27838,7 +27828,7 @@
       res
           .removePeering(arg_request, arg_project, arg_network,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -27890,7 +27880,7 @@
       res
           .switchToCustomMode(arg_project, arg_network,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -27943,7 +27933,7 @@
       res
           .disableXpnHost(arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -27998,7 +27988,7 @@
       res
           .disableXpnResource(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -28049,7 +28039,7 @@
       res
           .enableXpnHost(arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -28104,7 +28094,7 @@
       res
           .enableXpnResource(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -28151,7 +28141,7 @@
       }), true);
       res
           .get(arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
@@ -28198,7 +28188,7 @@
       }), true);
       res
           .getXpnHost(arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
@@ -28261,7 +28251,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProjectsGetXpnResources response) {
+          .then(unittest.expectAsync1(((response) {
         checkProjectsGetXpnResources(response);
       })));
     });
@@ -28328,7 +28318,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.XpnHostList response) {
+          .then(unittest.expectAsync1(((response) {
         checkXpnHostList(response);
       })));
     });
@@ -28383,7 +28373,7 @@
       res
           .moveDisk(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -28438,7 +28428,7 @@
       res
           .moveInstance(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -28493,7 +28483,7 @@
       res
           .setCommonInstanceMetadata(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -28548,7 +28538,7 @@
       res
           .setUsageExportBucket(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -28604,7 +28594,7 @@
       res
           .delete(arg_project, arg_region, arg_autoscaler,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -28654,7 +28644,7 @@
       }), true);
       res
           .get(arg_project, arg_region, arg_autoscaler, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Autoscaler response) {
+          .then(unittest.expectAsync1(((response) {
         checkAutoscaler(response);
       })));
     });
@@ -28711,7 +28701,7 @@
       res
           .insert(arg_request, arg_project, arg_region,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -28776,7 +28766,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RegionAutoscalerList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegionAutoscalerList(response);
       })));
     });
@@ -28838,7 +28828,7 @@
               autoscaler: arg_autoscaler,
               requestId: arg_requestId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -28900,7 +28890,7 @@
               autoscaler: arg_autoscaler,
               requestId: arg_requestId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -28956,7 +28946,7 @@
       res
           .delete(arg_project, arg_region, arg_backendService,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -29007,7 +28997,7 @@
       res
           .get(arg_project, arg_region, arg_backendService,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BackendService response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackendService(response);
       })));
     });
@@ -29062,8 +29052,7 @@
       res
           .getHealth(arg_request, arg_project, arg_region, arg_backendService,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.BackendServiceGroupHealth response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackendServiceGroupHealth(response);
       })));
     });
@@ -29120,7 +29109,7 @@
       res
           .insert(arg_request, arg_project, arg_region,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -29185,7 +29174,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BackendServiceList response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackendServiceList(response);
       })));
     });
@@ -29243,7 +29232,7 @@
       res
           .patch(arg_request, arg_project, arg_region, arg_backendService,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -29301,7 +29290,7 @@
       res
           .update(arg_request, arg_project, arg_region, arg_backendService,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -29367,7 +29356,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommitmentAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommitmentAggregatedList(response);
       })));
     });
@@ -29417,7 +29406,7 @@
       }), true);
       res
           .get(arg_project, arg_region, arg_commitment, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Commitment response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommitment(response);
       })));
     });
@@ -29474,7 +29463,7 @@
       res
           .insert(arg_request, arg_project, arg_region,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -29539,7 +29528,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommitmentList response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommitmentList(response);
       })));
     });
@@ -29603,7 +29592,7 @@
           .abandonInstances(
               arg_request, arg_project, arg_region, arg_instanceGroupManager,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -29657,7 +29646,7 @@
       res
           .delete(arg_project, arg_region, arg_instanceGroupManager,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -29719,7 +29708,7 @@
           .deleteInstances(
               arg_request, arg_project, arg_region, arg_instanceGroupManager,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -29770,7 +29759,7 @@
       res
           .get(arg_project, arg_region, arg_instanceGroupManager,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceGroupManager response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceGroupManager(response);
       })));
     });
@@ -29827,7 +29816,7 @@
       res
           .insert(arg_request, arg_project, arg_region,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -29892,8 +29881,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.RegionInstanceGroupManagerList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegionInstanceGroupManagerList(response);
       })));
     });
@@ -29961,8 +29949,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.RegionInstanceGroupManagersListInstancesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegionInstanceGroupManagersListInstancesResponse(response);
       })));
     });
@@ -30022,7 +30009,7 @@
           .recreateInstances(
               arg_request, arg_project, arg_region, arg_instanceGroupManager,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -30079,7 +30066,7 @@
       res
           .resize(arg_project, arg_region, arg_instanceGroupManager, arg_size,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -30140,7 +30127,7 @@
           .setInstanceTemplate(
               arg_request, arg_project, arg_region, arg_instanceGroupManager,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -30201,7 +30188,7 @@
           .setTargetPools(
               arg_request, arg_project, arg_region, arg_instanceGroupManager,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -30253,7 +30240,7 @@
       }), true);
       res
           .get(arg_project, arg_region, arg_instanceGroup, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceGroup(response);
       })));
     });
@@ -30318,7 +30305,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RegionInstanceGroupList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegionInstanceGroupList(response);
       })));
     });
@@ -30391,8 +30378,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.RegionInstanceGroupsListInstances response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegionInstanceGroupsListInstances(response);
       })));
     });
@@ -30452,7 +30438,7 @@
           .setNamedPorts(
               arg_request, arg_project, arg_region, arg_instanceGroup,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -30552,7 +30538,7 @@
       }), true);
       res
           .get(arg_project, arg_region, arg_operation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -30617,7 +30603,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperationList response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperationList(response);
       })));
     });
@@ -30667,7 +30653,7 @@
       }), true);
       res
           .get(arg_project, arg_region, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Region response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegion(response);
       })));
     });
@@ -30730,7 +30716,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RegionList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegionList(response);
       })));
     });
@@ -30795,7 +30781,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RouterAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRouterAggregatedList(response);
       })));
     });
@@ -30848,7 +30834,7 @@
       res
           .delete(arg_project, arg_region, arg_router,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -30897,7 +30883,7 @@
       }), true);
       res
           .get(arg_project, arg_region, arg_router, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Router response) {
+          .then(unittest.expectAsync1(((response) {
         checkRouter(response);
       })));
     });
@@ -30947,7 +30933,7 @@
       res
           .getRouterStatus(arg_project, arg_region, arg_router,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RouterStatusResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRouterStatusResponse(response);
       })));
     });
@@ -31003,7 +30989,7 @@
       res
           .insert(arg_request, arg_project, arg_region,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -31067,7 +31053,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RouterList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRouterList(response);
       })));
     });
@@ -31124,7 +31110,7 @@
       res
           .patch(arg_request, arg_project, arg_region, arg_router,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -31178,7 +31164,7 @@
       res
           .preview(arg_request, arg_project, arg_region, arg_router,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RoutersPreviewResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoutersPreviewResponse(response);
       })));
     });
@@ -31235,7 +31221,7 @@
       res
           .update(arg_request, arg_project, arg_region, arg_router,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -31289,7 +31275,7 @@
       res
           .delete(arg_project, arg_route,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -31337,7 +31323,7 @@
       }), true);
       res
           .get(arg_project, arg_route, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Route response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoute(response);
       })));
     });
@@ -31392,7 +31378,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -31455,7 +31441,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RouteList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRouteList(response);
       })));
     });
@@ -31509,7 +31495,7 @@
       res
           .delete(arg_project, arg_snapshot,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -31557,7 +31543,7 @@
       }), true);
       res
           .get(arg_project, arg_snapshot, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Snapshot response) {
+          .then(unittest.expectAsync1(((response) {
         checkSnapshot(response);
       })));
     });
@@ -31620,7 +31606,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SnapshotList response) {
+          .then(unittest.expectAsync1(((response) {
         checkSnapshotList(response);
       })));
     });
@@ -31673,7 +31659,7 @@
       res
           .setLabels(arg_request, arg_project, arg_resource,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -31728,7 +31714,7 @@
       res
           .delete(arg_project, arg_sslCertificate,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -31777,7 +31763,7 @@
       }), true);
       res
           .get(arg_project, arg_sslCertificate, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SslCertificate response) {
+          .then(unittest.expectAsync1(((response) {
         checkSslCertificate(response);
       })));
     });
@@ -31833,7 +31819,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -31897,7 +31883,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SslCertificateList response) {
+          .then(unittest.expectAsync1(((response) {
         checkSslCertificateList(response);
       })));
     });
@@ -31962,7 +31948,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SubnetworkAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubnetworkAggregatedList(response);
       })));
     });
@@ -32015,7 +32001,7 @@
       res
           .delete(arg_project, arg_region, arg_subnetwork,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -32073,7 +32059,7 @@
           .expandIpCidrRange(
               arg_request, arg_project, arg_region, arg_subnetwork,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -32122,7 +32108,7 @@
       }), true);
       res
           .get(arg_project, arg_region, arg_subnetwork, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subnetwork response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubnetwork(response);
       })));
     });
@@ -32178,7 +32164,7 @@
       res
           .insert(arg_request, arg_project, arg_region,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -32242,7 +32228,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SubnetworkList response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubnetworkList(response);
       })));
     });
@@ -32301,7 +32287,7 @@
           .setPrivateIpGoogleAccess(
               arg_request, arg_project, arg_region, arg_subnetwork,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -32356,7 +32342,7 @@
       res
           .delete(arg_project, arg_targetHttpProxy,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -32405,7 +32391,7 @@
       }), true);
       res
           .get(arg_project, arg_targetHttpProxy, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetHttpProxy response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetHttpProxy(response);
       })));
     });
@@ -32461,7 +32447,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -32525,7 +32511,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetHttpProxyList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetHttpProxyList(response);
       })));
     });
@@ -32582,7 +32568,7 @@
       res
           .setUrlMap(arg_request, arg_project, arg_targetHttpProxy,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -32637,7 +32623,7 @@
       res
           .delete(arg_project, arg_targetHttpsProxy,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -32686,7 +32672,7 @@
       }), true);
       res
           .get(arg_project, arg_targetHttpsProxy, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetHttpsProxy response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetHttpsProxy(response);
       })));
     });
@@ -32742,7 +32728,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -32806,7 +32792,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetHttpsProxyList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetHttpsProxyList(response);
       })));
     });
@@ -32864,7 +32850,7 @@
       res
           .setSslCertificates(arg_request, arg_project, arg_targetHttpsProxy,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -32921,7 +32907,7 @@
       res
           .setUrlMap(arg_request, arg_project, arg_targetHttpsProxy,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -32987,8 +32973,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.TargetInstanceAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetInstanceAggregatedList(response);
       })));
     });
@@ -33042,7 +33027,7 @@
       res
           .delete(arg_project, arg_zone, arg_targetInstance,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -33092,7 +33077,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_targetInstance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetInstance response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetInstance(response);
       })));
     });
@@ -33149,7 +33134,7 @@
       res
           .insert(arg_request, arg_project, arg_zone,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -33214,7 +33199,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetInstanceList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetInstanceList(response);
       })));
     });
@@ -33273,7 +33258,7 @@
       res
           .addHealthCheck(arg_request, arg_project, arg_region, arg_targetPool,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -33330,7 +33315,7 @@
       res
           .addInstance(arg_request, arg_project, arg_region, arg_targetPool,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -33393,7 +33378,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetPoolAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetPoolAggregatedList(response);
       })));
     });
@@ -33446,7 +33431,7 @@
       res
           .delete(arg_project, arg_region, arg_targetPool,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -33495,7 +33480,7 @@
       }), true);
       res
           .get(arg_project, arg_region, arg_targetPool, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetPool response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetPool(response);
       })));
     });
@@ -33549,7 +33534,7 @@
       res
           .getHealth(arg_request, arg_project, arg_region, arg_targetPool,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetPoolInstanceHealth response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetPoolInstanceHealth(response);
       })));
     });
@@ -33605,7 +33590,7 @@
       res
           .insert(arg_request, arg_project, arg_region,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -33669,7 +33654,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetPoolList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetPoolList(response);
       })));
     });
@@ -33727,7 +33712,7 @@
           .removeHealthCheck(
               arg_request, arg_project, arg_region, arg_targetPool,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -33784,7 +33769,7 @@
       res
           .removeInstance(arg_request, arg_project, arg_region, arg_targetPool,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -33846,7 +33831,7 @@
               failoverRatio: arg_failoverRatio,
               requestId: arg_requestId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -33901,7 +33886,7 @@
       res
           .delete(arg_project, arg_targetSslProxy,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -33950,7 +33935,7 @@
       }), true);
       res
           .get(arg_project, arg_targetSslProxy, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetSslProxy response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetSslProxy(response);
       })));
     });
@@ -34006,7 +33991,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -34070,7 +34055,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetSslProxyList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetSslProxyList(response);
       })));
     });
@@ -34128,7 +34113,7 @@
       res
           .setBackendService(arg_request, arg_project, arg_targetSslProxy,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -34185,7 +34170,7 @@
       res
           .setProxyHeader(arg_request, arg_project, arg_targetSslProxy,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -34243,7 +34228,7 @@
       res
           .setSslCertificates(arg_request, arg_project, arg_targetSslProxy,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -34298,7 +34283,7 @@
       res
           .delete(arg_project, arg_targetTcpProxy,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -34347,7 +34332,7 @@
       }), true);
       res
           .get(arg_project, arg_targetTcpProxy, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetTcpProxy response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetTcpProxy(response);
       })));
     });
@@ -34403,7 +34388,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -34467,7 +34452,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetTcpProxyList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetTcpProxyList(response);
       })));
     });
@@ -34525,7 +34510,7 @@
       res
           .setBackendService(arg_request, arg_project, arg_targetTcpProxy,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -34582,7 +34567,7 @@
       res
           .setProxyHeader(arg_request, arg_project, arg_targetTcpProxy,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -34648,8 +34633,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.TargetVpnGatewayAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetVpnGatewayAggregatedList(response);
       })));
     });
@@ -34703,7 +34687,7 @@
       res
           .delete(arg_project, arg_region, arg_targetVpnGateway,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -34754,7 +34738,7 @@
       res
           .get(arg_project, arg_region, arg_targetVpnGateway,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetVpnGateway response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetVpnGateway(response);
       })));
     });
@@ -34811,7 +34795,7 @@
       res
           .insert(arg_request, arg_project, arg_region,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -34876,7 +34860,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetVpnGatewayList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetVpnGatewayList(response);
       })));
     });
@@ -34930,7 +34914,7 @@
       res
           .delete(arg_project, arg_urlMap,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -34978,7 +34962,7 @@
       }), true);
       res
           .get(arg_project, arg_urlMap, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UrlMap response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlMap(response);
       })));
     });
@@ -35033,7 +35017,7 @@
       res
           .insert(arg_request, arg_project,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -35089,7 +35073,7 @@
       res
           .invalidateCache(arg_request, arg_project, arg_urlMap,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -35152,7 +35136,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UrlMapList response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlMapList(response);
       })));
     });
@@ -35208,7 +35192,7 @@
       res
           .patch(arg_request, arg_project, arg_urlMap,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -35264,7 +35248,7 @@
       res
           .update(arg_request, arg_project, arg_urlMap,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -35316,7 +35300,7 @@
       }), true);
       res
           .validate(arg_request, arg_project, arg_urlMap, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UrlMapsValidateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlMapsValidateResponse(response);
       })));
     });
@@ -35381,7 +35365,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VpnTunnelAggregatedList response) {
+          .then(unittest.expectAsync1(((response) {
         checkVpnTunnelAggregatedList(response);
       })));
     });
@@ -35434,7 +35418,7 @@
       res
           .delete(arg_project, arg_region, arg_vpnTunnel,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -35483,7 +35467,7 @@
       }), true);
       res
           .get(arg_project, arg_region, arg_vpnTunnel, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VpnTunnel response) {
+          .then(unittest.expectAsync1(((response) {
         checkVpnTunnel(response);
       })));
     });
@@ -35539,7 +35523,7 @@
       res
           .insert(arg_request, arg_project, arg_region,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -35603,7 +35587,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VpnTunnelList response) {
+          .then(unittest.expectAsync1(((response) {
         checkVpnTunnelList(response);
       })));
     });
@@ -35703,7 +35687,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_operation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -35768,7 +35752,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperationList response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperationList(response);
       })));
     });
@@ -35818,7 +35802,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Zone response) {
+          .then(unittest.expectAsync1(((response) {
         checkZone(response);
       })));
     });
@@ -35881,7 +35865,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ZoneList response) {
+          .then(unittest.expectAsync1(((response) {
         checkZoneList(response);
       })));
     });
diff --git a/generated/googleapis/test/container/v1_test.dart b/generated/googleapis/test/container/v1_test.dart
index d73947f..de326fe 100644
--- a/generated/googleapis/test/container/v1_test.dart
+++ b/generated/googleapis/test/container/v1_test.dart
@@ -172,53 +172,53 @@
   buildCounterClientCertificateConfig--;
 }
 
-buildUnnamed535() {
+buildUnnamed2854() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed535(core.List<core.String> o) {
+checkUnnamed2854(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed536() {
+buildUnnamed2855() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed536(core.List<core.String> o) {
+checkUnnamed2855(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed537() {
+buildUnnamed2856() {
   var o = new core.List<api.NodePool>();
   o.add(buildNodePool());
   o.add(buildNodePool());
   return o;
 }
 
-checkUnnamed537(core.List<api.NodePool> o) {
+checkUnnamed2856(core.List<api.NodePool> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNodePool(o[0]);
   checkNodePool(o[1]);
 }
 
-buildUnnamed538() {
+buildUnnamed2857() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed538(core.Map<core.String, core.String> o) {
+checkUnnamed2857(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -241,11 +241,11 @@
     o.expireTime = "foo";
     o.initialClusterVersion = "foo";
     o.initialNodeCount = 42;
-    o.instanceGroupUrls = buildUnnamed535();
+    o.instanceGroupUrls = buildUnnamed2854();
     o.ipAllocationPolicy = buildIPAllocationPolicy();
     o.labelFingerprint = "foo";
     o.legacyAbac = buildLegacyAbac();
-    o.locations = buildUnnamed536();
+    o.locations = buildUnnamed2855();
     o.loggingService = "foo";
     o.maintenancePolicy = buildMaintenancePolicy();
     o.masterAuth = buildMasterAuth();
@@ -256,8 +256,8 @@
     o.networkPolicy = buildNetworkPolicy();
     o.nodeConfig = buildNodeConfig();
     o.nodeIpv4CidrSize = 42;
-    o.nodePools = buildUnnamed537();
-    o.resourceLabels = buildUnnamed538();
+    o.nodePools = buildUnnamed2856();
+    o.resourceLabels = buildUnnamed2857();
     o.selfLink = "foo";
     o.servicesIpv4Cidr = "foo";
     o.status = "foo";
@@ -284,11 +284,11 @@
     unittest.expect(o.expireTime, unittest.equals('foo'));
     unittest.expect(o.initialClusterVersion, unittest.equals('foo'));
     unittest.expect(o.initialNodeCount, unittest.equals(42));
-    checkUnnamed535(o.instanceGroupUrls);
+    checkUnnamed2854(o.instanceGroupUrls);
     checkIPAllocationPolicy(o.ipAllocationPolicy);
     unittest.expect(o.labelFingerprint, unittest.equals('foo'));
     checkLegacyAbac(o.legacyAbac);
-    checkUnnamed536(o.locations);
+    checkUnnamed2855(o.locations);
     unittest.expect(o.loggingService, unittest.equals('foo'));
     checkMaintenancePolicy(o.maintenancePolicy);
     checkMasterAuth(o.masterAuth);
@@ -299,8 +299,8 @@
     checkNetworkPolicy(o.networkPolicy);
     checkNodeConfig(o.nodeConfig);
     unittest.expect(o.nodeIpv4CidrSize, unittest.equals(42));
-    checkUnnamed537(o.nodePools);
-    checkUnnamed538(o.resourceLabels);
+    checkUnnamed2856(o.nodePools);
+    checkUnnamed2857(o.resourceLabels);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.servicesIpv4Cidr, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
@@ -311,14 +311,14 @@
   buildCounterCluster--;
 }
 
-buildUnnamed539() {
+buildUnnamed2858() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed539(core.List<core.String> o) {
+checkUnnamed2858(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -331,7 +331,7 @@
   if (buildCounterClusterUpdate < 3) {
     o.desiredAddonsConfig = buildAddonsConfig();
     o.desiredImageType = "foo";
-    o.desiredLocations = buildUnnamed539();
+    o.desiredLocations = buildUnnamed2858();
     o.desiredMasterAuthorizedNetworksConfig =
         buildMasterAuthorizedNetworksConfig();
     o.desiredMasterVersion = "foo";
@@ -349,7 +349,7 @@
   if (buildCounterClusterUpdate < 3) {
     checkAddonsConfig(o.desiredAddonsConfig);
     unittest.expect(o.desiredImageType, unittest.equals('foo'));
-    checkUnnamed539(o.desiredLocations);
+    checkUnnamed2858(o.desiredLocations);
     checkMasterAuthorizedNetworksConfig(
         o.desiredMasterAuthorizedNetworksConfig);
     unittest.expect(o.desiredMasterVersion, unittest.equals('foo'));
@@ -565,27 +565,27 @@
   buildCounterLegacyAbac--;
 }
 
-buildUnnamed540() {
+buildUnnamed2859() {
   var o = new core.List<api.Cluster>();
   o.add(buildCluster());
   o.add(buildCluster());
   return o;
 }
 
-checkUnnamed540(core.List<api.Cluster> o) {
+checkUnnamed2859(core.List<api.Cluster> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCluster(o[0]);
   checkCluster(o[1]);
 }
 
-buildUnnamed541() {
+buildUnnamed2860() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed541(core.List<core.String> o) {
+checkUnnamed2860(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -596,8 +596,8 @@
   var o = new api.ListClustersResponse();
   buildCounterListClustersResponse++;
   if (buildCounterListClustersResponse < 3) {
-    o.clusters = buildUnnamed540();
-    o.missingZones = buildUnnamed541();
+    o.clusters = buildUnnamed2859();
+    o.missingZones = buildUnnamed2860();
   }
   buildCounterListClustersResponse--;
   return o;
@@ -606,20 +606,20 @@
 checkListClustersResponse(api.ListClustersResponse o) {
   buildCounterListClustersResponse++;
   if (buildCounterListClustersResponse < 3) {
-    checkUnnamed540(o.clusters);
-    checkUnnamed541(o.missingZones);
+    checkUnnamed2859(o.clusters);
+    checkUnnamed2860(o.missingZones);
   }
   buildCounterListClustersResponse--;
 }
 
-buildUnnamed542() {
+buildUnnamed2861() {
   var o = new core.List<api.NodePool>();
   o.add(buildNodePool());
   o.add(buildNodePool());
   return o;
 }
 
-checkUnnamed542(core.List<api.NodePool> o) {
+checkUnnamed2861(core.List<api.NodePool> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNodePool(o[0]);
   checkNodePool(o[1]);
@@ -630,7 +630,7 @@
   var o = new api.ListNodePoolsResponse();
   buildCounterListNodePoolsResponse++;
   if (buildCounterListNodePoolsResponse < 3) {
-    o.nodePools = buildUnnamed542();
+    o.nodePools = buildUnnamed2861();
   }
   buildCounterListNodePoolsResponse--;
   return o;
@@ -639,32 +639,32 @@
 checkListNodePoolsResponse(api.ListNodePoolsResponse o) {
   buildCounterListNodePoolsResponse++;
   if (buildCounterListNodePoolsResponse < 3) {
-    checkUnnamed542(o.nodePools);
+    checkUnnamed2861(o.nodePools);
   }
   buildCounterListNodePoolsResponse--;
 }
 
-buildUnnamed543() {
+buildUnnamed2862() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed543(core.List<core.String> o) {
+checkUnnamed2862(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed544() {
+buildUnnamed2863() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed544(core.List<api.Operation> o) {
+checkUnnamed2863(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -675,8 +675,8 @@
   var o = new api.ListOperationsResponse();
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
-    o.missingZones = buildUnnamed543();
-    o.operations = buildUnnamed544();
+    o.missingZones = buildUnnamed2862();
+    o.operations = buildUnnamed2863();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -685,8 +685,8 @@
 checkListOperationsResponse(api.ListOperationsResponse o) {
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
-    checkUnnamed543(o.missingZones);
-    checkUnnamed544(o.operations);
+    checkUnnamed2862(o.missingZones);
+    checkUnnamed2863(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
@@ -758,14 +758,14 @@
   buildCounterMasterAuth--;
 }
 
-buildUnnamed545() {
+buildUnnamed2864() {
   var o = new core.List<api.CidrBlock>();
   o.add(buildCidrBlock());
   o.add(buildCidrBlock());
   return o;
 }
 
-checkUnnamed545(core.List<api.CidrBlock> o) {
+checkUnnamed2864(core.List<api.CidrBlock> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCidrBlock(o[0]);
   checkCidrBlock(o[1]);
@@ -776,7 +776,7 @@
   var o = new api.MasterAuthorizedNetworksConfig();
   buildCounterMasterAuthorizedNetworksConfig++;
   if (buildCounterMasterAuthorizedNetworksConfig < 3) {
-    o.cidrBlocks = buildUnnamed545();
+    o.cidrBlocks = buildUnnamed2864();
     o.enabled = true;
   }
   buildCounterMasterAuthorizedNetworksConfig--;
@@ -786,7 +786,7 @@
 checkMasterAuthorizedNetworksConfig(api.MasterAuthorizedNetworksConfig o) {
   buildCounterMasterAuthorizedNetworksConfig++;
   if (buildCounterMasterAuthorizedNetworksConfig < 3) {
-    checkUnnamed545(o.cidrBlocks);
+    checkUnnamed2864(o.cidrBlocks);
     unittest.expect(o.enabled, unittest.isTrue);
   }
   buildCounterMasterAuthorizedNetworksConfig--;
@@ -832,66 +832,66 @@
   buildCounterNetworkPolicyConfig--;
 }
 
-buildUnnamed546() {
+buildUnnamed2865() {
   var o = new core.List<api.AcceleratorConfig>();
   o.add(buildAcceleratorConfig());
   o.add(buildAcceleratorConfig());
   return o;
 }
 
-checkUnnamed546(core.List<api.AcceleratorConfig> o) {
+checkUnnamed2865(core.List<api.AcceleratorConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAcceleratorConfig(o[0]);
   checkAcceleratorConfig(o[1]);
 }
 
-buildUnnamed547() {
+buildUnnamed2866() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed547(core.Map<core.String, core.String> o) {
+checkUnnamed2866(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed548() {
+buildUnnamed2867() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed548(core.Map<core.String, core.String> o) {
+checkUnnamed2867(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed549() {
+buildUnnamed2868() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed549(core.List<core.String> o) {
+checkUnnamed2868(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed550() {
+buildUnnamed2869() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed550(core.List<core.String> o) {
+checkUnnamed2869(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -902,18 +902,18 @@
   var o = new api.NodeConfig();
   buildCounterNodeConfig++;
   if (buildCounterNodeConfig < 3) {
-    o.accelerators = buildUnnamed546();
+    o.accelerators = buildUnnamed2865();
     o.diskSizeGb = 42;
     o.imageType = "foo";
-    o.labels = buildUnnamed547();
+    o.labels = buildUnnamed2866();
     o.localSsdCount = 42;
     o.machineType = "foo";
-    o.metadata = buildUnnamed548();
+    o.metadata = buildUnnamed2867();
     o.minCpuPlatform = "foo";
-    o.oauthScopes = buildUnnamed549();
+    o.oauthScopes = buildUnnamed2868();
     o.preemptible = true;
     o.serviceAccount = "foo";
-    o.tags = buildUnnamed550();
+    o.tags = buildUnnamed2869();
   }
   buildCounterNodeConfig--;
   return o;
@@ -922,18 +922,18 @@
 checkNodeConfig(api.NodeConfig o) {
   buildCounterNodeConfig++;
   if (buildCounterNodeConfig < 3) {
-    checkUnnamed546(o.accelerators);
+    checkUnnamed2865(o.accelerators);
     unittest.expect(o.diskSizeGb, unittest.equals(42));
     unittest.expect(o.imageType, unittest.equals('foo'));
-    checkUnnamed547(o.labels);
+    checkUnnamed2866(o.labels);
     unittest.expect(o.localSsdCount, unittest.equals(42));
     unittest.expect(o.machineType, unittest.equals('foo'));
-    checkUnnamed548(o.metadata);
+    checkUnnamed2867(o.metadata);
     unittest.expect(o.minCpuPlatform, unittest.equals('foo'));
-    checkUnnamed549(o.oauthScopes);
+    checkUnnamed2868(o.oauthScopes);
     unittest.expect(o.preemptible, unittest.isTrue);
     unittest.expect(o.serviceAccount, unittest.equals('foo'));
-    checkUnnamed550(o.tags);
+    checkUnnamed2869(o.tags);
   }
   buildCounterNodeConfig--;
 }
@@ -961,14 +961,14 @@
   buildCounterNodeManagement--;
 }
 
-buildUnnamed551() {
+buildUnnamed2870() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed551(core.List<core.String> o) {
+checkUnnamed2870(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -982,7 +982,7 @@
     o.autoscaling = buildNodePoolAutoscaling();
     o.config = buildNodeConfig();
     o.initialNodeCount = 42;
-    o.instanceGroupUrls = buildUnnamed551();
+    o.instanceGroupUrls = buildUnnamed2870();
     o.management = buildNodeManagement();
     o.name = "foo";
     o.selfLink = "foo";
@@ -1000,7 +1000,7 @@
     checkNodePoolAutoscaling(o.autoscaling);
     checkNodeConfig(o.config);
     unittest.expect(o.initialNodeCount, unittest.equals(42));
-    checkUnnamed551(o.instanceGroupUrls);
+    checkUnnamed2870(o.instanceGroupUrls);
     checkNodeManagement(o.management);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1086,40 +1086,40 @@
   buildCounterRollbackNodePoolUpgradeRequest--;
 }
 
-buildUnnamed552() {
+buildUnnamed2871() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed552(core.List<core.String> o) {
+checkUnnamed2871(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed553() {
+buildUnnamed2872() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed553(core.List<core.String> o) {
+checkUnnamed2872(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed554() {
+buildUnnamed2873() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed554(core.List<core.String> o) {
+checkUnnamed2873(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1132,9 +1132,9 @@
   if (buildCounterServerConfig < 3) {
     o.defaultClusterVersion = "foo";
     o.defaultImageType = "foo";
-    o.validImageTypes = buildUnnamed552();
-    o.validMasterVersions = buildUnnamed553();
-    o.validNodeVersions = buildUnnamed554();
+    o.validImageTypes = buildUnnamed2871();
+    o.validMasterVersions = buildUnnamed2872();
+    o.validNodeVersions = buildUnnamed2873();
   }
   buildCounterServerConfig--;
   return o;
@@ -1145,9 +1145,9 @@
   if (buildCounterServerConfig < 3) {
     unittest.expect(o.defaultClusterVersion, unittest.equals('foo'));
     unittest.expect(o.defaultImageType, unittest.equals('foo'));
-    checkUnnamed552(o.validImageTypes);
-    checkUnnamed553(o.validMasterVersions);
-    checkUnnamed554(o.validNodeVersions);
+    checkUnnamed2871(o.validImageTypes);
+    checkUnnamed2872(o.validMasterVersions);
+    checkUnnamed2873(o.validNodeVersions);
   }
   buildCounterServerConfig--;
 }
@@ -1171,14 +1171,14 @@
   buildCounterSetAddonsConfigRequest--;
 }
 
-buildUnnamed555() {
+buildUnnamed2874() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed555(core.Map<core.String, core.String> o) {
+checkUnnamed2874(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1190,7 +1190,7 @@
   buildCounterSetLabelsRequest++;
   if (buildCounterSetLabelsRequest < 3) {
     o.labelFingerprint = "foo";
-    o.resourceLabels = buildUnnamed555();
+    o.resourceLabels = buildUnnamed2874();
   }
   buildCounterSetLabelsRequest--;
   return o;
@@ -1200,7 +1200,7 @@
   buildCounterSetLabelsRequest++;
   if (buildCounterSetLabelsRequest < 3) {
     unittest.expect(o.labelFingerprint, unittest.equals('foo'));
-    checkUnnamed555(o.resourceLabels);
+    checkUnnamed2874(o.resourceLabels);
   }
   buildCounterSetLabelsRequest--;
 }
@@ -1224,14 +1224,14 @@
   buildCounterSetLegacyAbacRequest--;
 }
 
-buildUnnamed556() {
+buildUnnamed2875() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed556(core.List<core.String> o) {
+checkUnnamed2875(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1242,7 +1242,7 @@
   var o = new api.SetLocationsRequest();
   buildCounterSetLocationsRequest++;
   if (buildCounterSetLocationsRequest < 3) {
-    o.locations = buildUnnamed556();
+    o.locations = buildUnnamed2875();
   }
   buildCounterSetLocationsRequest--;
   return o;
@@ -1251,7 +1251,7 @@
 checkSetLocationsRequest(api.SetLocationsRequest o) {
   buildCounterSetLocationsRequest++;
   if (buildCounterSetLocationsRequest < 3) {
-    checkUnnamed556(o.locations);
+    checkUnnamed2875(o.locations);
   }
   buildCounterSetLocationsRequest--;
 }
@@ -1951,7 +1951,7 @@
       }), true);
       res
           .getServerconfig(arg_projectId, arg_zone, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ServerConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkServerConfig(response);
       })));
     });
@@ -2038,7 +2038,7 @@
       res
           .addons(arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2124,7 +2124,7 @@
           .completeIpRotation(
               arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2198,7 +2198,7 @@
       }), true);
       res
           .create(arg_request, arg_projectId, arg_zone, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2272,7 +2272,7 @@
       }), true);
       res
           .delete(arg_projectId, arg_zone, arg_clusterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2346,7 +2346,7 @@
       }), true);
       res
           .get(arg_projectId, arg_zone, arg_clusterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Cluster response) {
+          .then(unittest.expectAsync1(((response) {
         checkCluster(response);
       })));
     });
@@ -2431,7 +2431,7 @@
       res
           .legacyAbac(arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2501,7 +2501,7 @@
       }), true);
       res
           .list(arg_projectId, arg_zone, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListClustersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListClustersResponse(response);
       })));
     });
@@ -2586,7 +2586,7 @@
       res
           .locations(arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2671,7 +2671,7 @@
       res
           .logging(arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2756,7 +2756,7 @@
       res
           .master(arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2841,7 +2841,7 @@
       res
           .monitoring(arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2926,7 +2926,7 @@
       res
           .resourceLabels(arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3012,7 +3012,7 @@
           .setMaintenancePolicy(
               arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3097,7 +3097,7 @@
       res
           .setMasterAuth(arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3182,7 +3182,7 @@
       res
           .setNetworkPolicy(arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3267,7 +3267,7 @@
       res
           .startIpRotation(arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3346,7 +3346,7 @@
       res
           .update(arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3444,7 +3444,7 @@
           .autoscaling(arg_request, arg_projectId, arg_zone, arg_clusterId,
               arg_nodePoolId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3529,7 +3529,7 @@
       res
           .create(arg_request, arg_projectId, arg_zone, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3614,7 +3614,7 @@
       res
           .delete(arg_projectId, arg_zone, arg_clusterId, arg_nodePoolId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3699,7 +3699,7 @@
       res
           .get(arg_projectId, arg_zone, arg_clusterId, arg_nodePoolId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.NodePool response) {
+          .then(unittest.expectAsync1(((response) {
         checkNodePool(response);
       })));
     });
@@ -3779,7 +3779,7 @@
       }), true);
       res
           .list(arg_projectId, arg_zone, arg_clusterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListNodePoolsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListNodePoolsResponse(response);
       })));
     });
@@ -3875,7 +3875,7 @@
           .rollback(arg_request, arg_projectId, arg_zone, arg_clusterId,
               arg_nodePoolId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3971,7 +3971,7 @@
           .setManagement(arg_request, arg_projectId, arg_zone, arg_clusterId,
               arg_nodePoolId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4067,7 +4067,7 @@
           .setSize(arg_request, arg_projectId, arg_zone, arg_clusterId,
               arg_nodePoolId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4163,7 +4163,7 @@
           .update(arg_request, arg_projectId, arg_zone, arg_clusterId,
               arg_nodePoolId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4250,7 +4250,7 @@
       res
           .cancel(arg_request, arg_projectId, arg_zone, arg_operationId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4324,7 +4324,7 @@
       }), true);
       res
           .get(arg_projectId, arg_zone, arg_operationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4394,7 +4394,7 @@
       }), true);
       res
           .list(arg_projectId, arg_zone, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/content/v2_test.dart b/generated/googleapis/test/content/v2_test.dart
index e7510f4..f3ad186 100644
--- a/generated/googleapis/test/content/v2_test.dart
+++ b/generated/googleapis/test/content/v2_test.dart
@@ -50,40 +50,40 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2370() {
+buildUnnamed223() {
   var o = new core.List<api.AccountAdwordsLink>();
   o.add(buildAccountAdwordsLink());
   o.add(buildAccountAdwordsLink());
   return o;
 }
 
-checkUnnamed2370(core.List<api.AccountAdwordsLink> o) {
+checkUnnamed223(core.List<api.AccountAdwordsLink> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountAdwordsLink(o[0]);
   checkAccountAdwordsLink(o[1]);
 }
 
-buildUnnamed2371() {
+buildUnnamed224() {
   var o = new core.List<api.AccountUser>();
   o.add(buildAccountUser());
   o.add(buildAccountUser());
   return o;
 }
 
-checkUnnamed2371(core.List<api.AccountUser> o) {
+checkUnnamed224(core.List<api.AccountUser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountUser(o[0]);
   checkAccountUser(o[1]);
 }
 
-buildUnnamed2372() {
+buildUnnamed225() {
   var o = new core.List<api.AccountYouTubeChannelLink>();
   o.add(buildAccountYouTubeChannelLink());
   o.add(buildAccountYouTubeChannelLink());
   return o;
 }
 
-checkUnnamed2372(core.List<api.AccountYouTubeChannelLink> o) {
+checkUnnamed225(core.List<api.AccountYouTubeChannelLink> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountYouTubeChannelLink(o[0]);
   checkAccountYouTubeChannelLink(o[1]);
@@ -95,16 +95,16 @@
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
     o.adultContent = true;
-    o.adwordsLinks = buildUnnamed2370();
+    o.adwordsLinks = buildUnnamed223();
     o.googleMyBusinessLink = buildAccountGoogleMyBusinessLink();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
     o.reviewsUrl = "foo";
     o.sellerId = "foo";
-    o.users = buildUnnamed2371();
+    o.users = buildUnnamed224();
     o.websiteUrl = "foo";
-    o.youtubeChannelLinks = buildUnnamed2372();
+    o.youtubeChannelLinks = buildUnnamed225();
   }
   buildCounterAccount--;
   return o;
@@ -114,16 +114,16 @@
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
     unittest.expect(o.adultContent, unittest.isTrue);
-    checkUnnamed2370(o.adwordsLinks);
+    checkUnnamed223(o.adwordsLinks);
     checkAccountGoogleMyBusinessLink(o.googleMyBusinessLink);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.reviewsUrl, unittest.equals('foo'));
     unittest.expect(o.sellerId, unittest.equals('foo'));
-    checkUnnamed2371(o.users);
+    checkUnnamed224(o.users);
     unittest.expect(o.websiteUrl, unittest.equals('foo'));
-    checkUnnamed2372(o.youtubeChannelLinks);
+    checkUnnamed225(o.youtubeChannelLinks);
   }
   buildCounterAccount--;
 }
@@ -191,27 +191,27 @@
   buildCounterAccountIdentifier--;
 }
 
-buildUnnamed2373() {
+buildUnnamed226() {
   var o = new core.List<api.AccountStatusAccountLevelIssue>();
   o.add(buildAccountStatusAccountLevelIssue());
   o.add(buildAccountStatusAccountLevelIssue());
   return o;
 }
 
-checkUnnamed2373(core.List<api.AccountStatusAccountLevelIssue> o) {
+checkUnnamed226(core.List<api.AccountStatusAccountLevelIssue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountStatusAccountLevelIssue(o[0]);
   checkAccountStatusAccountLevelIssue(o[1]);
 }
 
-buildUnnamed2374() {
+buildUnnamed227() {
   var o = new core.List<api.AccountStatusDataQualityIssue>();
   o.add(buildAccountStatusDataQualityIssue());
   o.add(buildAccountStatusDataQualityIssue());
   return o;
 }
 
-checkUnnamed2374(core.List<api.AccountStatusDataQualityIssue> o) {
+checkUnnamed227(core.List<api.AccountStatusDataQualityIssue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountStatusDataQualityIssue(o[0]);
   checkAccountStatusDataQualityIssue(o[1]);
@@ -223,8 +223,8 @@
   buildCounterAccountStatus++;
   if (buildCounterAccountStatus < 3) {
     o.accountId = "foo";
-    o.accountLevelIssues = buildUnnamed2373();
-    o.dataQualityIssues = buildUnnamed2374();
+    o.accountLevelIssues = buildUnnamed226();
+    o.dataQualityIssues = buildUnnamed227();
     o.kind = "foo";
     o.websiteClaimed = true;
   }
@@ -236,8 +236,8 @@
   buildCounterAccountStatus++;
   if (buildCounterAccountStatus < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed2373(o.accountLevelIssues);
-    checkUnnamed2374(o.dataQualityIssues);
+    checkUnnamed226(o.accountLevelIssues);
+    checkUnnamed227(o.dataQualityIssues);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.websiteClaimed, unittest.isTrue);
   }
@@ -271,14 +271,14 @@
   buildCounterAccountStatusAccountLevelIssue--;
 }
 
-buildUnnamed2375() {
+buildUnnamed228() {
   var o = new core.List<api.AccountStatusExampleItem>();
   o.add(buildAccountStatusExampleItem());
   o.add(buildAccountStatusExampleItem());
   return o;
 }
 
-checkUnnamed2375(core.List<api.AccountStatusExampleItem> o) {
+checkUnnamed228(core.List<api.AccountStatusExampleItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountStatusExampleItem(o[0]);
   checkAccountStatusExampleItem(o[1]);
@@ -292,7 +292,7 @@
     o.country = "foo";
     o.detail = "foo";
     o.displayedValue = "foo";
-    o.exampleItems = buildUnnamed2375();
+    o.exampleItems = buildUnnamed228();
     o.id = "foo";
     o.lastChecked = "foo";
     o.location = "foo";
@@ -310,7 +310,7 @@
     unittest.expect(o.country, unittest.equals('foo'));
     unittest.expect(o.detail, unittest.equals('foo'));
     unittest.expect(o.displayedValue, unittest.equals('foo'));
-    checkUnnamed2375(o.exampleItems);
+    checkUnnamed228(o.exampleItems);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.lastChecked, unittest.equals('foo'));
     unittest.expect(o.location, unittest.equals('foo'));
@@ -348,14 +348,14 @@
   buildCounterAccountStatusExampleItem--;
 }
 
-buildUnnamed2376() {
+buildUnnamed229() {
   var o = new core.List<api.AccountTaxTaxRule>();
   o.add(buildAccountTaxTaxRule());
   o.add(buildAccountTaxTaxRule());
   return o;
 }
 
-checkUnnamed2376(core.List<api.AccountTaxTaxRule> o) {
+checkUnnamed229(core.List<api.AccountTaxTaxRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountTaxTaxRule(o[0]);
   checkAccountTaxTaxRule(o[1]);
@@ -368,7 +368,7 @@
   if (buildCounterAccountTax < 3) {
     o.accountId = "foo";
     o.kind = "foo";
-    o.rules = buildUnnamed2376();
+    o.rules = buildUnnamed229();
   }
   buildCounterAccountTax--;
   return o;
@@ -379,7 +379,7 @@
   if (buildCounterAccountTax < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2376(o.rules);
+    checkUnnamed229(o.rules);
   }
   buildCounterAccountTax--;
 }
@@ -453,14 +453,14 @@
   buildCounterAccountYouTubeChannelLink--;
 }
 
-buildUnnamed2377() {
+buildUnnamed230() {
   var o = new core.List<api.AccountIdentifier>();
   o.add(buildAccountIdentifier());
   o.add(buildAccountIdentifier());
   return o;
 }
 
-checkUnnamed2377(core.List<api.AccountIdentifier> o) {
+checkUnnamed230(core.List<api.AccountIdentifier> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountIdentifier(o[0]);
   checkAccountIdentifier(o[1]);
@@ -471,7 +471,7 @@
   var o = new api.AccountsAuthInfoResponse();
   buildCounterAccountsAuthInfoResponse++;
   if (buildCounterAccountsAuthInfoResponse < 3) {
-    o.accountIdentifiers = buildUnnamed2377();
+    o.accountIdentifiers = buildUnnamed230();
     o.kind = "foo";
   }
   buildCounterAccountsAuthInfoResponse--;
@@ -481,7 +481,7 @@
 checkAccountsAuthInfoResponse(api.AccountsAuthInfoResponse o) {
   buildCounterAccountsAuthInfoResponse++;
   if (buildCounterAccountsAuthInfoResponse < 3) {
-    checkUnnamed2377(o.accountIdentifiers);
+    checkUnnamed230(o.accountIdentifiers);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountsAuthInfoResponse--;
@@ -506,14 +506,14 @@
   buildCounterAccountsClaimWebsiteResponse--;
 }
 
-buildUnnamed2378() {
+buildUnnamed231() {
   var o = new core.List<api.AccountsCustomBatchRequestEntry>();
   o.add(buildAccountsCustomBatchRequestEntry());
   o.add(buildAccountsCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed2378(core.List<api.AccountsCustomBatchRequestEntry> o) {
+checkUnnamed231(core.List<api.AccountsCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountsCustomBatchRequestEntry(o[0]);
   checkAccountsCustomBatchRequestEntry(o[1]);
@@ -524,7 +524,7 @@
   var o = new api.AccountsCustomBatchRequest();
   buildCounterAccountsCustomBatchRequest++;
   if (buildCounterAccountsCustomBatchRequest < 3) {
-    o.entries = buildUnnamed2378();
+    o.entries = buildUnnamed231();
   }
   buildCounterAccountsCustomBatchRequest--;
   return o;
@@ -533,7 +533,7 @@
 checkAccountsCustomBatchRequest(api.AccountsCustomBatchRequest o) {
   buildCounterAccountsCustomBatchRequest++;
   if (buildCounterAccountsCustomBatchRequest < 3) {
-    checkUnnamed2378(o.entries);
+    checkUnnamed231(o.entries);
   }
   buildCounterAccountsCustomBatchRequest--;
 }
@@ -569,14 +569,14 @@
   buildCounterAccountsCustomBatchRequestEntry--;
 }
 
-buildUnnamed2379() {
+buildUnnamed232() {
   var o = new core.List<api.AccountsCustomBatchResponseEntry>();
   o.add(buildAccountsCustomBatchResponseEntry());
   o.add(buildAccountsCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed2379(core.List<api.AccountsCustomBatchResponseEntry> o) {
+checkUnnamed232(core.List<api.AccountsCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountsCustomBatchResponseEntry(o[0]);
   checkAccountsCustomBatchResponseEntry(o[1]);
@@ -587,7 +587,7 @@
   var o = new api.AccountsCustomBatchResponse();
   buildCounterAccountsCustomBatchResponse++;
   if (buildCounterAccountsCustomBatchResponse < 3) {
-    o.entries = buildUnnamed2379();
+    o.entries = buildUnnamed232();
     o.kind = "foo";
   }
   buildCounterAccountsCustomBatchResponse--;
@@ -597,7 +597,7 @@
 checkAccountsCustomBatchResponse(api.AccountsCustomBatchResponse o) {
   buildCounterAccountsCustomBatchResponse++;
   if (buildCounterAccountsCustomBatchResponse < 3) {
-    checkUnnamed2379(o.entries);
+    checkUnnamed232(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountsCustomBatchResponse--;
@@ -628,14 +628,14 @@
   buildCounterAccountsCustomBatchResponseEntry--;
 }
 
-buildUnnamed2380() {
+buildUnnamed233() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed2380(core.List<api.Account> o) {
+checkUnnamed233(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -648,7 +648,7 @@
   if (buildCounterAccountsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed2380();
+    o.resources = buildUnnamed233();
   }
   buildCounterAccountsListResponse--;
   return o;
@@ -659,19 +659,19 @@
   if (buildCounterAccountsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2380(o.resources);
+    checkUnnamed233(o.resources);
   }
   buildCounterAccountsListResponse--;
 }
 
-buildUnnamed2381() {
+buildUnnamed234() {
   var o = new core.List<api.AccountstatusesCustomBatchRequestEntry>();
   o.add(buildAccountstatusesCustomBatchRequestEntry());
   o.add(buildAccountstatusesCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed2381(core.List<api.AccountstatusesCustomBatchRequestEntry> o) {
+checkUnnamed234(core.List<api.AccountstatusesCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountstatusesCustomBatchRequestEntry(o[0]);
   checkAccountstatusesCustomBatchRequestEntry(o[1]);
@@ -682,7 +682,7 @@
   var o = new api.AccountstatusesCustomBatchRequest();
   buildCounterAccountstatusesCustomBatchRequest++;
   if (buildCounterAccountstatusesCustomBatchRequest < 3) {
-    o.entries = buildUnnamed2381();
+    o.entries = buildUnnamed234();
   }
   buildCounterAccountstatusesCustomBatchRequest--;
   return o;
@@ -692,7 +692,7 @@
     api.AccountstatusesCustomBatchRequest o) {
   buildCounterAccountstatusesCustomBatchRequest++;
   if (buildCounterAccountstatusesCustomBatchRequest < 3) {
-    checkUnnamed2381(o.entries);
+    checkUnnamed234(o.entries);
   }
   buildCounterAccountstatusesCustomBatchRequest--;
 }
@@ -723,14 +723,14 @@
   buildCounterAccountstatusesCustomBatchRequestEntry--;
 }
 
-buildUnnamed2382() {
+buildUnnamed235() {
   var o = new core.List<api.AccountstatusesCustomBatchResponseEntry>();
   o.add(buildAccountstatusesCustomBatchResponseEntry());
   o.add(buildAccountstatusesCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed2382(core.List<api.AccountstatusesCustomBatchResponseEntry> o) {
+checkUnnamed235(core.List<api.AccountstatusesCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountstatusesCustomBatchResponseEntry(o[0]);
   checkAccountstatusesCustomBatchResponseEntry(o[1]);
@@ -741,7 +741,7 @@
   var o = new api.AccountstatusesCustomBatchResponse();
   buildCounterAccountstatusesCustomBatchResponse++;
   if (buildCounterAccountstatusesCustomBatchResponse < 3) {
-    o.entries = buildUnnamed2382();
+    o.entries = buildUnnamed235();
     o.kind = "foo";
   }
   buildCounterAccountstatusesCustomBatchResponse--;
@@ -752,7 +752,7 @@
     api.AccountstatusesCustomBatchResponse o) {
   buildCounterAccountstatusesCustomBatchResponse++;
   if (buildCounterAccountstatusesCustomBatchResponse < 3) {
-    checkUnnamed2382(o.entries);
+    checkUnnamed235(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountstatusesCustomBatchResponse--;
@@ -782,14 +782,14 @@
   buildCounterAccountstatusesCustomBatchResponseEntry--;
 }
 
-buildUnnamed2383() {
+buildUnnamed236() {
   var o = new core.List<api.AccountStatus>();
   o.add(buildAccountStatus());
   o.add(buildAccountStatus());
   return o;
 }
 
-checkUnnamed2383(core.List<api.AccountStatus> o) {
+checkUnnamed236(core.List<api.AccountStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountStatus(o[0]);
   checkAccountStatus(o[1]);
@@ -802,7 +802,7 @@
   if (buildCounterAccountstatusesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed2383();
+    o.resources = buildUnnamed236();
   }
   buildCounterAccountstatusesListResponse--;
   return o;
@@ -813,19 +813,19 @@
   if (buildCounterAccountstatusesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2383(o.resources);
+    checkUnnamed236(o.resources);
   }
   buildCounterAccountstatusesListResponse--;
 }
 
-buildUnnamed2384() {
+buildUnnamed237() {
   var o = new core.List<api.AccounttaxCustomBatchRequestEntry>();
   o.add(buildAccounttaxCustomBatchRequestEntry());
   o.add(buildAccounttaxCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed2384(core.List<api.AccounttaxCustomBatchRequestEntry> o) {
+checkUnnamed237(core.List<api.AccounttaxCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccounttaxCustomBatchRequestEntry(o[0]);
   checkAccounttaxCustomBatchRequestEntry(o[1]);
@@ -836,7 +836,7 @@
   var o = new api.AccounttaxCustomBatchRequest();
   buildCounterAccounttaxCustomBatchRequest++;
   if (buildCounterAccounttaxCustomBatchRequest < 3) {
-    o.entries = buildUnnamed2384();
+    o.entries = buildUnnamed237();
   }
   buildCounterAccounttaxCustomBatchRequest--;
   return o;
@@ -845,7 +845,7 @@
 checkAccounttaxCustomBatchRequest(api.AccounttaxCustomBatchRequest o) {
   buildCounterAccounttaxCustomBatchRequest++;
   if (buildCounterAccounttaxCustomBatchRequest < 3) {
-    checkUnnamed2384(o.entries);
+    checkUnnamed237(o.entries);
   }
   buildCounterAccounttaxCustomBatchRequest--;
 }
@@ -878,14 +878,14 @@
   buildCounterAccounttaxCustomBatchRequestEntry--;
 }
 
-buildUnnamed2385() {
+buildUnnamed238() {
   var o = new core.List<api.AccounttaxCustomBatchResponseEntry>();
   o.add(buildAccounttaxCustomBatchResponseEntry());
   o.add(buildAccounttaxCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed2385(core.List<api.AccounttaxCustomBatchResponseEntry> o) {
+checkUnnamed238(core.List<api.AccounttaxCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccounttaxCustomBatchResponseEntry(o[0]);
   checkAccounttaxCustomBatchResponseEntry(o[1]);
@@ -896,7 +896,7 @@
   var o = new api.AccounttaxCustomBatchResponse();
   buildCounterAccounttaxCustomBatchResponse++;
   if (buildCounterAccounttaxCustomBatchResponse < 3) {
-    o.entries = buildUnnamed2385();
+    o.entries = buildUnnamed238();
     o.kind = "foo";
   }
   buildCounterAccounttaxCustomBatchResponse--;
@@ -906,7 +906,7 @@
 checkAccounttaxCustomBatchResponse(api.AccounttaxCustomBatchResponse o) {
   buildCounterAccounttaxCustomBatchResponse++;
   if (buildCounterAccounttaxCustomBatchResponse < 3) {
-    checkUnnamed2385(o.entries);
+    checkUnnamed238(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccounttaxCustomBatchResponse--;
@@ -938,14 +938,14 @@
   buildCounterAccounttaxCustomBatchResponseEntry--;
 }
 
-buildUnnamed2386() {
+buildUnnamed239() {
   var o = new core.List<api.AccountTax>();
   o.add(buildAccountTax());
   o.add(buildAccountTax());
   return o;
 }
 
-checkUnnamed2386(core.List<api.AccountTax> o) {
+checkUnnamed239(core.List<api.AccountTax> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountTax(o[0]);
   checkAccountTax(o[1]);
@@ -958,7 +958,7 @@
   if (buildCounterAccounttaxListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed2386();
+    o.resources = buildUnnamed239();
   }
   buildCounterAccounttaxListResponse--;
   return o;
@@ -969,7 +969,7 @@
   if (buildCounterAccounttaxListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2386(o.resources);
+    checkUnnamed239(o.resources);
   }
   buildCounterAccounttaxListResponse--;
 }
@@ -1003,14 +1003,14 @@
   buildCounterCarrierRate--;
 }
 
-buildUnnamed2387() {
+buildUnnamed240() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2387(core.List<core.String> o) {
+checkUnnamed240(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1023,7 +1023,7 @@
   if (buildCounterCarriersCarrier < 3) {
     o.country = "foo";
     o.name = "foo";
-    o.services = buildUnnamed2387();
+    o.services = buildUnnamed240();
   }
   buildCounterCarriersCarrier--;
   return o;
@@ -1034,32 +1034,32 @@
   if (buildCounterCarriersCarrier < 3) {
     unittest.expect(o.country, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2387(o.services);
+    checkUnnamed240(o.services);
   }
   buildCounterCarriersCarrier--;
 }
 
-buildUnnamed2388() {
+buildUnnamed241() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2388(core.List<core.String> o) {
+checkUnnamed241(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2389() {
+buildUnnamed242() {
   var o = new core.List<api.DatafeedTarget>();
   o.add(buildDatafeedTarget());
   o.add(buildDatafeedTarget());
   return o;
 }
 
-checkUnnamed2389(core.List<api.DatafeedTarget> o) {
+checkUnnamed242(core.List<api.DatafeedTarget> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedTarget(o[0]);
   checkDatafeedTarget(o[1]);
@@ -1077,11 +1077,11 @@
     o.fileName = "foo";
     o.format = buildDatafeedFormat();
     o.id = "foo";
-    o.intendedDestinations = buildUnnamed2388();
+    o.intendedDestinations = buildUnnamed241();
     o.kind = "foo";
     o.name = "foo";
     o.targetCountry = "foo";
-    o.targets = buildUnnamed2389();
+    o.targets = buildUnnamed242();
   }
   buildCounterDatafeed--;
   return o;
@@ -1097,11 +1097,11 @@
     unittest.expect(o.fileName, unittest.equals('foo'));
     checkDatafeedFormat(o.format);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2388(o.intendedDestinations);
+    checkUnnamed241(o.intendedDestinations);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.targetCountry, unittest.equals('foo'));
-    checkUnnamed2389(o.targets);
+    checkUnnamed242(o.targets);
   }
   buildCounterDatafeed--;
 }
@@ -1164,27 +1164,27 @@
   buildCounterDatafeedFormat--;
 }
 
-buildUnnamed2390() {
+buildUnnamed243() {
   var o = new core.List<api.DatafeedStatusError>();
   o.add(buildDatafeedStatusError());
   o.add(buildDatafeedStatusError());
   return o;
 }
 
-checkUnnamed2390(core.List<api.DatafeedStatusError> o) {
+checkUnnamed243(core.List<api.DatafeedStatusError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedStatusError(o[0]);
   checkDatafeedStatusError(o[1]);
 }
 
-buildUnnamed2391() {
+buildUnnamed244() {
   var o = new core.List<api.DatafeedStatusError>();
   o.add(buildDatafeedStatusError());
   o.add(buildDatafeedStatusError());
   return o;
 }
 
-checkUnnamed2391(core.List<api.DatafeedStatusError> o) {
+checkUnnamed244(core.List<api.DatafeedStatusError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedStatusError(o[0]);
   checkDatafeedStatusError(o[1]);
@@ -1197,14 +1197,14 @@
   if (buildCounterDatafeedStatus < 3) {
     o.country = "foo";
     o.datafeedId = "foo";
-    o.errors = buildUnnamed2390();
+    o.errors = buildUnnamed243();
     o.itemsTotal = "foo";
     o.itemsValid = "foo";
     o.kind = "foo";
     o.language = "foo";
     o.lastUploadDate = "foo";
     o.processingStatus = "foo";
-    o.warnings = buildUnnamed2391();
+    o.warnings = buildUnnamed244();
   }
   buildCounterDatafeedStatus--;
   return o;
@@ -1215,26 +1215,26 @@
   if (buildCounterDatafeedStatus < 3) {
     unittest.expect(o.country, unittest.equals('foo'));
     unittest.expect(o.datafeedId, unittest.equals('foo'));
-    checkUnnamed2390(o.errors);
+    checkUnnamed243(o.errors);
     unittest.expect(o.itemsTotal, unittest.equals('foo'));
     unittest.expect(o.itemsValid, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.language, unittest.equals('foo'));
     unittest.expect(o.lastUploadDate, unittest.equals('foo'));
     unittest.expect(o.processingStatus, unittest.equals('foo'));
-    checkUnnamed2391(o.warnings);
+    checkUnnamed244(o.warnings);
   }
   buildCounterDatafeedStatus--;
 }
 
-buildUnnamed2392() {
+buildUnnamed245() {
   var o = new core.List<api.DatafeedStatusExample>();
   o.add(buildDatafeedStatusExample());
   o.add(buildDatafeedStatusExample());
   return o;
 }
 
-checkUnnamed2392(core.List<api.DatafeedStatusExample> o) {
+checkUnnamed245(core.List<api.DatafeedStatusExample> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedStatusExample(o[0]);
   checkDatafeedStatusExample(o[1]);
@@ -1247,7 +1247,7 @@
   if (buildCounterDatafeedStatusError < 3) {
     o.code = "foo";
     o.count = "foo";
-    o.examples = buildUnnamed2392();
+    o.examples = buildUnnamed245();
     o.message = "foo";
   }
   buildCounterDatafeedStatusError--;
@@ -1259,7 +1259,7 @@
   if (buildCounterDatafeedStatusError < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
     unittest.expect(o.count, unittest.equals('foo'));
-    checkUnnamed2392(o.examples);
+    checkUnnamed245(o.examples);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterDatafeedStatusError--;
@@ -1288,27 +1288,27 @@
   buildCounterDatafeedStatusExample--;
 }
 
-buildUnnamed2393() {
+buildUnnamed246() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2393(core.List<core.String> o) {
+checkUnnamed246(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2394() {
+buildUnnamed247() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2394(core.List<core.String> o) {
+checkUnnamed247(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1320,8 +1320,8 @@
   buildCounterDatafeedTarget++;
   if (buildCounterDatafeedTarget < 3) {
     o.country = "foo";
-    o.excludedDestinations = buildUnnamed2393();
-    o.includedDestinations = buildUnnamed2394();
+    o.excludedDestinations = buildUnnamed246();
+    o.includedDestinations = buildUnnamed247();
     o.language = "foo";
   }
   buildCounterDatafeedTarget--;
@@ -1332,21 +1332,21 @@
   buildCounterDatafeedTarget++;
   if (buildCounterDatafeedTarget < 3) {
     unittest.expect(o.country, unittest.equals('foo'));
-    checkUnnamed2393(o.excludedDestinations);
-    checkUnnamed2394(o.includedDestinations);
+    checkUnnamed246(o.excludedDestinations);
+    checkUnnamed247(o.includedDestinations);
     unittest.expect(o.language, unittest.equals('foo'));
   }
   buildCounterDatafeedTarget--;
 }
 
-buildUnnamed2395() {
+buildUnnamed248() {
   var o = new core.List<api.DatafeedsCustomBatchRequestEntry>();
   o.add(buildDatafeedsCustomBatchRequestEntry());
   o.add(buildDatafeedsCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed2395(core.List<api.DatafeedsCustomBatchRequestEntry> o) {
+checkUnnamed248(core.List<api.DatafeedsCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedsCustomBatchRequestEntry(o[0]);
   checkDatafeedsCustomBatchRequestEntry(o[1]);
@@ -1357,7 +1357,7 @@
   var o = new api.DatafeedsCustomBatchRequest();
   buildCounterDatafeedsCustomBatchRequest++;
   if (buildCounterDatafeedsCustomBatchRequest < 3) {
-    o.entries = buildUnnamed2395();
+    o.entries = buildUnnamed248();
   }
   buildCounterDatafeedsCustomBatchRequest--;
   return o;
@@ -1366,7 +1366,7 @@
 checkDatafeedsCustomBatchRequest(api.DatafeedsCustomBatchRequest o) {
   buildCounterDatafeedsCustomBatchRequest++;
   if (buildCounterDatafeedsCustomBatchRequest < 3) {
-    checkUnnamed2395(o.entries);
+    checkUnnamed248(o.entries);
   }
   buildCounterDatafeedsCustomBatchRequest--;
 }
@@ -1398,14 +1398,14 @@
   buildCounterDatafeedsCustomBatchRequestEntry--;
 }
 
-buildUnnamed2396() {
+buildUnnamed249() {
   var o = new core.List<api.DatafeedsCustomBatchResponseEntry>();
   o.add(buildDatafeedsCustomBatchResponseEntry());
   o.add(buildDatafeedsCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed2396(core.List<api.DatafeedsCustomBatchResponseEntry> o) {
+checkUnnamed249(core.List<api.DatafeedsCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedsCustomBatchResponseEntry(o[0]);
   checkDatafeedsCustomBatchResponseEntry(o[1]);
@@ -1416,7 +1416,7 @@
   var o = new api.DatafeedsCustomBatchResponse();
   buildCounterDatafeedsCustomBatchResponse++;
   if (buildCounterDatafeedsCustomBatchResponse < 3) {
-    o.entries = buildUnnamed2396();
+    o.entries = buildUnnamed249();
     o.kind = "foo";
   }
   buildCounterDatafeedsCustomBatchResponse--;
@@ -1426,7 +1426,7 @@
 checkDatafeedsCustomBatchResponse(api.DatafeedsCustomBatchResponse o) {
   buildCounterDatafeedsCustomBatchResponse++;
   if (buildCounterDatafeedsCustomBatchResponse < 3) {
-    checkUnnamed2396(o.entries);
+    checkUnnamed249(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDatafeedsCustomBatchResponse--;
@@ -1456,14 +1456,14 @@
   buildCounterDatafeedsCustomBatchResponseEntry--;
 }
 
-buildUnnamed2397() {
+buildUnnamed250() {
   var o = new core.List<api.Datafeed>();
   o.add(buildDatafeed());
   o.add(buildDatafeed());
   return o;
 }
 
-checkUnnamed2397(core.List<api.Datafeed> o) {
+checkUnnamed250(core.List<api.Datafeed> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeed(o[0]);
   checkDatafeed(o[1]);
@@ -1476,7 +1476,7 @@
   if (buildCounterDatafeedsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed2397();
+    o.resources = buildUnnamed250();
   }
   buildCounterDatafeedsListResponse--;
   return o;
@@ -1487,19 +1487,19 @@
   if (buildCounterDatafeedsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2397(o.resources);
+    checkUnnamed250(o.resources);
   }
   buildCounterDatafeedsListResponse--;
 }
 
-buildUnnamed2398() {
+buildUnnamed251() {
   var o = new core.List<api.DatafeedstatusesCustomBatchRequestEntry>();
   o.add(buildDatafeedstatusesCustomBatchRequestEntry());
   o.add(buildDatafeedstatusesCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed2398(core.List<api.DatafeedstatusesCustomBatchRequestEntry> o) {
+checkUnnamed251(core.List<api.DatafeedstatusesCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedstatusesCustomBatchRequestEntry(o[0]);
   checkDatafeedstatusesCustomBatchRequestEntry(o[1]);
@@ -1510,7 +1510,7 @@
   var o = new api.DatafeedstatusesCustomBatchRequest();
   buildCounterDatafeedstatusesCustomBatchRequest++;
   if (buildCounterDatafeedstatusesCustomBatchRequest < 3) {
-    o.entries = buildUnnamed2398();
+    o.entries = buildUnnamed251();
   }
   buildCounterDatafeedstatusesCustomBatchRequest--;
   return o;
@@ -1520,7 +1520,7 @@
     api.DatafeedstatusesCustomBatchRequest o) {
   buildCounterDatafeedstatusesCustomBatchRequest++;
   if (buildCounterDatafeedstatusesCustomBatchRequest < 3) {
-    checkUnnamed2398(o.entries);
+    checkUnnamed251(o.entries);
   }
   buildCounterDatafeedstatusesCustomBatchRequest--;
 }
@@ -1555,14 +1555,14 @@
   buildCounterDatafeedstatusesCustomBatchRequestEntry--;
 }
 
-buildUnnamed2399() {
+buildUnnamed252() {
   var o = new core.List<api.DatafeedstatusesCustomBatchResponseEntry>();
   o.add(buildDatafeedstatusesCustomBatchResponseEntry());
   o.add(buildDatafeedstatusesCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed2399(core.List<api.DatafeedstatusesCustomBatchResponseEntry> o) {
+checkUnnamed252(core.List<api.DatafeedstatusesCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedstatusesCustomBatchResponseEntry(o[0]);
   checkDatafeedstatusesCustomBatchResponseEntry(o[1]);
@@ -1573,7 +1573,7 @@
   var o = new api.DatafeedstatusesCustomBatchResponse();
   buildCounterDatafeedstatusesCustomBatchResponse++;
   if (buildCounterDatafeedstatusesCustomBatchResponse < 3) {
-    o.entries = buildUnnamed2399();
+    o.entries = buildUnnamed252();
     o.kind = "foo";
   }
   buildCounterDatafeedstatusesCustomBatchResponse--;
@@ -1584,7 +1584,7 @@
     api.DatafeedstatusesCustomBatchResponse o) {
   buildCounterDatafeedstatusesCustomBatchResponse++;
   if (buildCounterDatafeedstatusesCustomBatchResponse < 3) {
-    checkUnnamed2399(o.entries);
+    checkUnnamed252(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDatafeedstatusesCustomBatchResponse--;
@@ -1614,14 +1614,14 @@
   buildCounterDatafeedstatusesCustomBatchResponseEntry--;
 }
 
-buildUnnamed2400() {
+buildUnnamed253() {
   var o = new core.List<api.DatafeedStatus>();
   o.add(buildDatafeedStatus());
   o.add(buildDatafeedStatus());
   return o;
 }
 
-checkUnnamed2400(core.List<api.DatafeedStatus> o) {
+checkUnnamed253(core.List<api.DatafeedStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatafeedStatus(o[0]);
   checkDatafeedStatus(o[1]);
@@ -1634,7 +1634,7 @@
   if (buildCounterDatafeedstatusesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed2400();
+    o.resources = buildUnnamed253();
   }
   buildCounterDatafeedstatusesListResponse--;
   return o;
@@ -1645,19 +1645,19 @@
   if (buildCounterDatafeedstatusesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2400(o.resources);
+    checkUnnamed253(o.resources);
   }
   buildCounterDatafeedstatusesListResponse--;
 }
 
-buildUnnamed2401() {
+buildUnnamed254() {
   var o = new core.List<api.HolidayCutoff>();
   o.add(buildHolidayCutoff());
   o.add(buildHolidayCutoff());
   return o;
 }
 
-checkUnnamed2401(core.List<api.HolidayCutoff> o) {
+checkUnnamed254(core.List<api.HolidayCutoff> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHolidayCutoff(o[0]);
   checkHolidayCutoff(o[1]);
@@ -1668,7 +1668,7 @@
   var o = new api.DeliveryTime();
   buildCounterDeliveryTime++;
   if (buildCounterDeliveryTime < 3) {
-    o.holidayCutoffs = buildUnnamed2401();
+    o.holidayCutoffs = buildUnnamed254();
     o.maxTransitTimeInDays = 42;
     o.minTransitTimeInDays = 42;
   }
@@ -1679,7 +1679,7 @@
 checkDeliveryTime(api.DeliveryTime o) {
   buildCounterDeliveryTime++;
   if (buildCounterDeliveryTime < 3) {
-    checkUnnamed2401(o.holidayCutoffs);
+    checkUnnamed254(o.holidayCutoffs);
     unittest.expect(o.maxTransitTimeInDays, unittest.equals(42));
     unittest.expect(o.minTransitTimeInDays, unittest.equals(42));
   }
@@ -1709,14 +1709,14 @@
   buildCounterError--;
 }
 
-buildUnnamed2402() {
+buildUnnamed255() {
   var o = new core.List<api.Error>();
   o.add(buildError());
   o.add(buildError());
   return o;
 }
 
-checkUnnamed2402(core.List<api.Error> o) {
+checkUnnamed255(core.List<api.Error> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkError(o[0]);
   checkError(o[1]);
@@ -1728,7 +1728,7 @@
   buildCounterErrors++;
   if (buildCounterErrors < 3) {
     o.code = 42;
-    o.errors = buildUnnamed2402();
+    o.errors = buildUnnamed255();
     o.message = "foo";
   }
   buildCounterErrors--;
@@ -1739,72 +1739,72 @@
   buildCounterErrors++;
   if (buildCounterErrors < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed2402(o.errors);
+    checkUnnamed255(o.errors);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterErrors--;
 }
 
-buildUnnamed2403() {
+buildUnnamed256() {
   var o = new core.List<api.LocationIdSet>();
   o.add(buildLocationIdSet());
   o.add(buildLocationIdSet());
   return o;
 }
 
-checkUnnamed2403(core.List<api.LocationIdSet> o) {
+checkUnnamed256(core.List<api.LocationIdSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocationIdSet(o[0]);
   checkLocationIdSet(o[1]);
 }
 
-buildUnnamed2404() {
+buildUnnamed257() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2404(core.List<core.String> o) {
+checkUnnamed257(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2405() {
+buildUnnamed258() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2405(core.List<core.String> o) {
+checkUnnamed258(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2406() {
+buildUnnamed259() {
   var o = new core.List<api.Price>();
   o.add(buildPrice());
   o.add(buildPrice());
   return o;
 }
 
-checkUnnamed2406(core.List<api.Price> o) {
+checkUnnamed259(core.List<api.Price> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPrice(o[0]);
   checkPrice(o[1]);
 }
 
-buildUnnamed2407() {
+buildUnnamed260() {
   var o = new core.List<api.Weight>();
   o.add(buildWeight());
   o.add(buildWeight());
   return o;
 }
 
-checkUnnamed2407(core.List<api.Weight> o) {
+checkUnnamed260(core.List<api.Weight> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWeight(o[0]);
   checkWeight(o[1]);
@@ -1815,11 +1815,11 @@
   var o = new api.Headers();
   buildCounterHeaders++;
   if (buildCounterHeaders < 3) {
-    o.locations = buildUnnamed2403();
-    o.numberOfItems = buildUnnamed2404();
-    o.postalCodeGroupNames = buildUnnamed2405();
-    o.prices = buildUnnamed2406();
-    o.weights = buildUnnamed2407();
+    o.locations = buildUnnamed256();
+    o.numberOfItems = buildUnnamed257();
+    o.postalCodeGroupNames = buildUnnamed258();
+    o.prices = buildUnnamed259();
+    o.weights = buildUnnamed260();
   }
   buildCounterHeaders--;
   return o;
@@ -1828,11 +1828,11 @@
 checkHeaders(api.Headers o) {
   buildCounterHeaders++;
   if (buildCounterHeaders < 3) {
-    checkUnnamed2403(o.locations);
-    checkUnnamed2404(o.numberOfItems);
-    checkUnnamed2405(o.postalCodeGroupNames);
-    checkUnnamed2406(o.prices);
-    checkUnnamed2407(o.weights);
+    checkUnnamed256(o.locations);
+    checkUnnamed257(o.numberOfItems);
+    checkUnnamed258(o.postalCodeGroupNames);
+    checkUnnamed259(o.prices);
+    checkUnnamed260(o.weights);
   }
   buildCounterHeaders--;
 }
@@ -1951,14 +1951,14 @@
   buildCounterInventory--;
 }
 
-buildUnnamed2408() {
+buildUnnamed261() {
   var o = new core.List<api.InventoryCustomBatchRequestEntry>();
   o.add(buildInventoryCustomBatchRequestEntry());
   o.add(buildInventoryCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed2408(core.List<api.InventoryCustomBatchRequestEntry> o) {
+checkUnnamed261(core.List<api.InventoryCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInventoryCustomBatchRequestEntry(o[0]);
   checkInventoryCustomBatchRequestEntry(o[1]);
@@ -1969,7 +1969,7 @@
   var o = new api.InventoryCustomBatchRequest();
   buildCounterInventoryCustomBatchRequest++;
   if (buildCounterInventoryCustomBatchRequest < 3) {
-    o.entries = buildUnnamed2408();
+    o.entries = buildUnnamed261();
   }
   buildCounterInventoryCustomBatchRequest--;
   return o;
@@ -1978,7 +1978,7 @@
 checkInventoryCustomBatchRequest(api.InventoryCustomBatchRequest o) {
   buildCounterInventoryCustomBatchRequest++;
   if (buildCounterInventoryCustomBatchRequest < 3) {
-    checkUnnamed2408(o.entries);
+    checkUnnamed261(o.entries);
   }
   buildCounterInventoryCustomBatchRequest--;
 }
@@ -2010,14 +2010,14 @@
   buildCounterInventoryCustomBatchRequestEntry--;
 }
 
-buildUnnamed2409() {
+buildUnnamed262() {
   var o = new core.List<api.InventoryCustomBatchResponseEntry>();
   o.add(buildInventoryCustomBatchResponseEntry());
   o.add(buildInventoryCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed2409(core.List<api.InventoryCustomBatchResponseEntry> o) {
+checkUnnamed262(core.List<api.InventoryCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInventoryCustomBatchResponseEntry(o[0]);
   checkInventoryCustomBatchResponseEntry(o[1]);
@@ -2028,7 +2028,7 @@
   var o = new api.InventoryCustomBatchResponse();
   buildCounterInventoryCustomBatchResponse++;
   if (buildCounterInventoryCustomBatchResponse < 3) {
-    o.entries = buildUnnamed2409();
+    o.entries = buildUnnamed262();
     o.kind = "foo";
   }
   buildCounterInventoryCustomBatchResponse--;
@@ -2038,7 +2038,7 @@
 checkInventoryCustomBatchResponse(api.InventoryCustomBatchResponse o) {
   buildCounterInventoryCustomBatchResponse++;
   if (buildCounterInventoryCustomBatchResponse < 3) {
-    checkUnnamed2409(o.entries);
+    checkUnnamed262(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterInventoryCustomBatchResponse--;
@@ -2143,14 +2143,14 @@
   buildCounterInventorySetResponse--;
 }
 
-buildUnnamed2410() {
+buildUnnamed263() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2410(core.List<core.String> o) {
+checkUnnamed263(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2161,7 +2161,7 @@
   var o = new api.LocationIdSet();
   buildCounterLocationIdSet++;
   if (buildCounterLocationIdSet < 3) {
-    o.locationIds = buildUnnamed2410();
+    o.locationIds = buildUnnamed263();
   }
   buildCounterLocationIdSet--;
   return o;
@@ -2170,7 +2170,7 @@
 checkLocationIdSet(api.LocationIdSet o) {
   buildCounterLocationIdSet++;
   if (buildCounterLocationIdSet < 3) {
-    checkUnnamed2410(o.locationIds);
+    checkUnnamed263(o.locationIds);
   }
   buildCounterLocationIdSet--;
 }
@@ -2198,53 +2198,53 @@
   buildCounterLoyaltyPoints--;
 }
 
-buildUnnamed2411() {
+buildUnnamed264() {
   var o = new core.List<api.OrderLineItem>();
   o.add(buildOrderLineItem());
   o.add(buildOrderLineItem());
   return o;
 }
 
-checkUnnamed2411(core.List<api.OrderLineItem> o) {
+checkUnnamed264(core.List<api.OrderLineItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderLineItem(o[0]);
   checkOrderLineItem(o[1]);
 }
 
-buildUnnamed2412() {
+buildUnnamed265() {
   var o = new core.List<api.OrderPromotion>();
   o.add(buildOrderPromotion());
   o.add(buildOrderPromotion());
   return o;
 }
 
-checkUnnamed2412(core.List<api.OrderPromotion> o) {
+checkUnnamed265(core.List<api.OrderPromotion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderPromotion(o[0]);
   checkOrderPromotion(o[1]);
 }
 
-buildUnnamed2413() {
+buildUnnamed266() {
   var o = new core.List<api.OrderRefund>();
   o.add(buildOrderRefund());
   o.add(buildOrderRefund());
   return o;
 }
 
-checkUnnamed2413(core.List<api.OrderRefund> o) {
+checkUnnamed266(core.List<api.OrderRefund> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderRefund(o[0]);
   checkOrderRefund(o[1]);
 }
 
-buildUnnamed2414() {
+buildUnnamed267() {
   var o = new core.List<api.OrderShipment>();
   o.add(buildOrderShipment());
   o.add(buildOrderShipment());
   return o;
 }
 
-checkUnnamed2414(core.List<api.OrderShipment> o) {
+checkUnnamed267(core.List<api.OrderShipment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderShipment(o[0]);
   checkOrderShipment(o[1]);
@@ -2261,16 +2261,16 @@
     o.deliveryDetails = buildOrderDeliveryDetails();
     o.id = "foo";
     o.kind = "foo";
-    o.lineItems = buildUnnamed2411();
+    o.lineItems = buildUnnamed264();
     o.merchantId = "foo";
     o.merchantOrderId = "foo";
     o.netAmount = buildPrice();
     o.paymentMethod = buildOrderPaymentMethod();
     o.paymentStatus = "foo";
     o.placedDate = "foo";
-    o.promotions = buildUnnamed2412();
-    o.refunds = buildUnnamed2413();
-    o.shipments = buildUnnamed2414();
+    o.promotions = buildUnnamed265();
+    o.refunds = buildUnnamed266();
+    o.shipments = buildUnnamed267();
     o.shippingCost = buildPrice();
     o.shippingCostTax = buildPrice();
     o.shippingOption = "foo";
@@ -2289,16 +2289,16 @@
     checkOrderDeliveryDetails(o.deliveryDetails);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2411(o.lineItems);
+    checkUnnamed264(o.lineItems);
     unittest.expect(o.merchantId, unittest.equals('foo'));
     unittest.expect(o.merchantOrderId, unittest.equals('foo'));
     checkPrice(o.netAmount);
     checkOrderPaymentMethod(o.paymentMethod);
     unittest.expect(o.paymentStatus, unittest.equals('foo'));
     unittest.expect(o.placedDate, unittest.equals('foo'));
-    checkUnnamed2412(o.promotions);
-    checkUnnamed2413(o.refunds);
-    checkUnnamed2414(o.shipments);
+    checkUnnamed265(o.promotions);
+    checkUnnamed266(o.refunds);
+    checkUnnamed267(o.shipments);
     checkPrice(o.shippingCost);
     checkPrice(o.shippingCostTax);
     unittest.expect(o.shippingOption, unittest.equals('foo'));
@@ -2307,27 +2307,27 @@
   buildCounterOrder--;
 }
 
-buildUnnamed2415() {
+buildUnnamed268() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2415(core.List<core.String> o) {
+checkUnnamed268(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2416() {
+buildUnnamed269() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2416(core.List<core.String> o) {
+checkUnnamed269(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2339,13 +2339,13 @@
   buildCounterOrderAddress++;
   if (buildCounterOrderAddress < 3) {
     o.country = "foo";
-    o.fullAddress = buildUnnamed2415();
+    o.fullAddress = buildUnnamed268();
     o.isPostOfficeBox = true;
     o.locality = "foo";
     o.postalCode = "foo";
     o.recipientName = "foo";
     o.region = "foo";
-    o.streetAddress = buildUnnamed2416();
+    o.streetAddress = buildUnnamed269();
   }
   buildCounterOrderAddress--;
   return o;
@@ -2355,13 +2355,13 @@
   buildCounterOrderAddress++;
   if (buildCounterOrderAddress < 3) {
     unittest.expect(o.country, unittest.equals('foo'));
-    checkUnnamed2415(o.fullAddress);
+    checkUnnamed268(o.fullAddress);
     unittest.expect(o.isPostOfficeBox, unittest.isTrue);
     unittest.expect(o.locality, unittest.equals('foo'));
     unittest.expect(o.postalCode, unittest.equals('foo'));
     unittest.expect(o.recipientName, unittest.equals('foo'));
     unittest.expect(o.region, unittest.equals('foo'));
-    checkUnnamed2416(o.streetAddress);
+    checkUnnamed269(o.streetAddress);
   }
   buildCounterOrderAddress--;
 }
@@ -2437,40 +2437,40 @@
   buildCounterOrderDeliveryDetails--;
 }
 
-buildUnnamed2417() {
+buildUnnamed270() {
   var o = new core.List<api.OrderMerchantProvidedAnnotation>();
   o.add(buildOrderMerchantProvidedAnnotation());
   o.add(buildOrderMerchantProvidedAnnotation());
   return o;
 }
 
-checkUnnamed2417(core.List<api.OrderMerchantProvidedAnnotation> o) {
+checkUnnamed270(core.List<api.OrderMerchantProvidedAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderMerchantProvidedAnnotation(o[0]);
   checkOrderMerchantProvidedAnnotation(o[1]);
 }
 
-buildUnnamed2418() {
+buildUnnamed271() {
   var o = new core.List<api.OrderCancellation>();
   o.add(buildOrderCancellation());
   o.add(buildOrderCancellation());
   return o;
 }
 
-checkUnnamed2418(core.List<api.OrderCancellation> o) {
+checkUnnamed271(core.List<api.OrderCancellation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderCancellation(o[0]);
   checkOrderCancellation(o[1]);
 }
 
-buildUnnamed2419() {
+buildUnnamed272() {
   var o = new core.List<api.OrderReturn>();
   o.add(buildOrderReturn());
   o.add(buildOrderReturn());
   return o;
 }
 
-checkUnnamed2419(core.List<api.OrderReturn> o) {
+checkUnnamed272(core.List<api.OrderReturn> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderReturn(o[0]);
   checkOrderReturn(o[1]);
@@ -2481,8 +2481,8 @@
   var o = new api.OrderLineItem();
   buildCounterOrderLineItem++;
   if (buildCounterOrderLineItem < 3) {
-    o.annotations = buildUnnamed2417();
-    o.cancellations = buildUnnamed2418();
+    o.annotations = buildUnnamed270();
+    o.cancellations = buildUnnamed271();
     o.id = "foo";
     o.price = buildPrice();
     o.product = buildOrderLineItemProduct();
@@ -2493,7 +2493,7 @@
     o.quantityReturned = 42;
     o.quantityShipped = 42;
     o.returnInfo = buildOrderLineItemReturnInfo();
-    o.returns = buildUnnamed2419();
+    o.returns = buildUnnamed272();
     o.shippingDetails = buildOrderLineItemShippingDetails();
     o.tax = buildPrice();
   }
@@ -2504,8 +2504,8 @@
 checkOrderLineItem(api.OrderLineItem o) {
   buildCounterOrderLineItem++;
   if (buildCounterOrderLineItem < 3) {
-    checkUnnamed2417(o.annotations);
-    checkUnnamed2418(o.cancellations);
+    checkUnnamed270(o.annotations);
+    checkUnnamed271(o.cancellations);
     unittest.expect(o.id, unittest.equals('foo'));
     checkPrice(o.price);
     checkOrderLineItemProduct(o.product);
@@ -2516,21 +2516,21 @@
     unittest.expect(o.quantityReturned, unittest.equals(42));
     unittest.expect(o.quantityShipped, unittest.equals(42));
     checkOrderLineItemReturnInfo(o.returnInfo);
-    checkUnnamed2419(o.returns);
+    checkUnnamed272(o.returns);
     checkOrderLineItemShippingDetails(o.shippingDetails);
     checkPrice(o.tax);
   }
   buildCounterOrderLineItem--;
 }
 
-buildUnnamed2420() {
+buildUnnamed273() {
   var o = new core.List<api.OrderLineItemProductVariantAttribute>();
   o.add(buildOrderLineItemProductVariantAttribute());
   o.add(buildOrderLineItemProductVariantAttribute());
   return o;
 }
 
-checkUnnamed2420(core.List<api.OrderLineItemProductVariantAttribute> o) {
+checkUnnamed273(core.List<api.OrderLineItemProductVariantAttribute> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderLineItemProductVariantAttribute(o[0]);
   checkOrderLineItemProductVariantAttribute(o[1]);
@@ -2555,7 +2555,7 @@
     o.shownImage = "foo";
     o.targetCountry = "foo";
     o.title = "foo";
-    o.variantAttributes = buildUnnamed2420();
+    o.variantAttributes = buildUnnamed273();
   }
   buildCounterOrderLineItemProduct--;
   return o;
@@ -2578,7 +2578,7 @@
     unittest.expect(o.shownImage, unittest.equals('foo'));
     unittest.expect(o.targetCountry, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
-    checkUnnamed2420(o.variantAttributes);
+    checkUnnamed273(o.variantAttributes);
   }
   buildCounterOrderLineItemProduct--;
 }
@@ -2727,14 +2727,14 @@
   buildCounterOrderPaymentMethod--;
 }
 
-buildUnnamed2421() {
+buildUnnamed274() {
   var o = new core.List<api.OrderPromotionBenefit>();
   o.add(buildOrderPromotionBenefit());
   o.add(buildOrderPromotionBenefit());
   return o;
 }
 
-checkUnnamed2421(core.List<api.OrderPromotionBenefit> o) {
+checkUnnamed274(core.List<api.OrderPromotionBenefit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderPromotionBenefit(o[0]);
   checkOrderPromotionBenefit(o[1]);
@@ -2745,7 +2745,7 @@
   var o = new api.OrderPromotion();
   buildCounterOrderPromotion++;
   if (buildCounterOrderPromotion < 3) {
-    o.benefits = buildUnnamed2421();
+    o.benefits = buildUnnamed274();
     o.effectiveDates = "foo";
     o.genericRedemptionCode = "foo";
     o.id = "foo";
@@ -2760,7 +2760,7 @@
 checkOrderPromotion(api.OrderPromotion o) {
   buildCounterOrderPromotion++;
   if (buildCounterOrderPromotion < 3) {
-    checkUnnamed2421(o.benefits);
+    checkUnnamed274(o.benefits);
     unittest.expect(o.effectiveDates, unittest.equals('foo'));
     unittest.expect(o.genericRedemptionCode, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
@@ -2771,14 +2771,14 @@
   buildCounterOrderPromotion--;
 }
 
-buildUnnamed2422() {
+buildUnnamed275() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2422(core.List<core.String> o) {
+checkUnnamed275(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2790,7 +2790,7 @@
   buildCounterOrderPromotionBenefit++;
   if (buildCounterOrderPromotionBenefit < 3) {
     o.discount = buildPrice();
-    o.offerIds = buildUnnamed2422();
+    o.offerIds = buildUnnamed275();
     o.subType = "foo";
     o.taxImpact = buildPrice();
     o.type = "foo";
@@ -2803,7 +2803,7 @@
   buildCounterOrderPromotionBenefit++;
   if (buildCounterOrderPromotionBenefit < 3) {
     checkPrice(o.discount);
-    checkUnnamed2422(o.offerIds);
+    checkUnnamed275(o.offerIds);
     unittest.expect(o.subType, unittest.equals('foo'));
     checkPrice(o.taxImpact);
     unittest.expect(o.type, unittest.equals('foo'));
@@ -2865,14 +2865,14 @@
   buildCounterOrderReturn--;
 }
 
-buildUnnamed2423() {
+buildUnnamed276() {
   var o = new core.List<api.OrderShipmentLineItemShipment>();
   o.add(buildOrderShipmentLineItemShipment());
   o.add(buildOrderShipmentLineItemShipment());
   return o;
 }
 
-checkUnnamed2423(core.List<api.OrderShipmentLineItemShipment> o) {
+checkUnnamed276(core.List<api.OrderShipmentLineItemShipment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderShipmentLineItemShipment(o[0]);
   checkOrderShipmentLineItemShipment(o[1]);
@@ -2887,7 +2887,7 @@
     o.creationDate = "foo";
     o.deliveryDate = "foo";
     o.id = "foo";
-    o.lineItems = buildUnnamed2423();
+    o.lineItems = buildUnnamed276();
     o.status = "foo";
     o.trackingId = "foo";
   }
@@ -2902,7 +2902,7 @@
     unittest.expect(o.creationDate, unittest.equals('foo'));
     unittest.expect(o.deliveryDate, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2423(o.lineItems);
+    checkUnnamed276(o.lineItems);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.trackingId, unittest.equals('foo'));
   }
@@ -3133,14 +3133,14 @@
   buildCounterOrdersCreateTestOrderResponse--;
 }
 
-buildUnnamed2424() {
+buildUnnamed277() {
   var o = new core.List<api.OrdersCustomBatchRequestEntry>();
   o.add(buildOrdersCustomBatchRequestEntry());
   o.add(buildOrdersCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed2424(core.List<api.OrdersCustomBatchRequestEntry> o) {
+checkUnnamed277(core.List<api.OrdersCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrdersCustomBatchRequestEntry(o[0]);
   checkOrdersCustomBatchRequestEntry(o[1]);
@@ -3151,7 +3151,7 @@
   var o = new api.OrdersCustomBatchRequest();
   buildCounterOrdersCustomBatchRequest++;
   if (buildCounterOrdersCustomBatchRequest < 3) {
-    o.entries = buildUnnamed2424();
+    o.entries = buildUnnamed277();
   }
   buildCounterOrdersCustomBatchRequest--;
   return o;
@@ -3160,7 +3160,7 @@
 checkOrdersCustomBatchRequest(api.OrdersCustomBatchRequest o) {
   buildCounterOrdersCustomBatchRequest++;
   if (buildCounterOrdersCustomBatchRequest < 3) {
-    checkUnnamed2424(o.entries);
+    checkUnnamed277(o.entries);
   }
   buildCounterOrdersCustomBatchRequest--;
 }
@@ -3430,14 +3430,14 @@
   buildCounterOrdersCustomBatchRequestEntryReturnRefundLineItem--;
 }
 
-buildUnnamed2425() {
+buildUnnamed278() {
   var o = new core.List<api.OrderMerchantProvidedAnnotation>();
   o.add(buildOrderMerchantProvidedAnnotation());
   o.add(buildOrderMerchantProvidedAnnotation());
   return o;
 }
 
-checkUnnamed2425(core.List<api.OrderMerchantProvidedAnnotation> o) {
+checkUnnamed278(core.List<api.OrderMerchantProvidedAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderMerchantProvidedAnnotation(o[0]);
   checkOrderMerchantProvidedAnnotation(o[1]);
@@ -3448,7 +3448,7 @@
   var o = new api.OrdersCustomBatchRequestEntrySetLineItemMetadata();
   buildCounterOrdersCustomBatchRequestEntrySetLineItemMetadata++;
   if (buildCounterOrdersCustomBatchRequestEntrySetLineItemMetadata < 3) {
-    o.annotations = buildUnnamed2425();
+    o.annotations = buildUnnamed278();
     o.lineItemId = "foo";
     o.productId = "foo";
   }
@@ -3460,27 +3460,27 @@
     api.OrdersCustomBatchRequestEntrySetLineItemMetadata o) {
   buildCounterOrdersCustomBatchRequestEntrySetLineItemMetadata++;
   if (buildCounterOrdersCustomBatchRequestEntrySetLineItemMetadata < 3) {
-    checkUnnamed2425(o.annotations);
+    checkUnnamed278(o.annotations);
     unittest.expect(o.lineItemId, unittest.equals('foo'));
     unittest.expect(o.productId, unittest.equals('foo'));
   }
   buildCounterOrdersCustomBatchRequestEntrySetLineItemMetadata--;
 }
 
-buildUnnamed2426() {
+buildUnnamed279() {
   var o = new core.List<api.OrderShipmentLineItemShipment>();
   o.add(buildOrderShipmentLineItemShipment());
   o.add(buildOrderShipmentLineItemShipment());
   return o;
 }
 
-checkUnnamed2426(core.List<api.OrderShipmentLineItemShipment> o) {
+checkUnnamed279(core.List<api.OrderShipmentLineItemShipment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderShipmentLineItemShipment(o[0]);
   checkOrderShipmentLineItemShipment(o[1]);
 }
 
-buildUnnamed2427() {
+buildUnnamed280() {
   var o = new core
       .List<api.OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo>();
   o.add(buildOrdersCustomBatchRequestEntryShipLineItemsShipmentInfo());
@@ -3488,7 +3488,7 @@
   return o;
 }
 
-checkUnnamed2427(
+checkUnnamed280(
     core.List<api.OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrdersCustomBatchRequestEntryShipLineItemsShipmentInfo(o[0]);
@@ -3501,9 +3501,9 @@
   buildCounterOrdersCustomBatchRequestEntryShipLineItems++;
   if (buildCounterOrdersCustomBatchRequestEntryShipLineItems < 3) {
     o.carrier = "foo";
-    o.lineItems = buildUnnamed2426();
+    o.lineItems = buildUnnamed279();
     o.shipmentId = "foo";
-    o.shipmentInfos = buildUnnamed2427();
+    o.shipmentInfos = buildUnnamed280();
     o.trackingId = "foo";
   }
   buildCounterOrdersCustomBatchRequestEntryShipLineItems--;
@@ -3515,9 +3515,9 @@
   buildCounterOrdersCustomBatchRequestEntryShipLineItems++;
   if (buildCounterOrdersCustomBatchRequestEntryShipLineItems < 3) {
     unittest.expect(o.carrier, unittest.equals('foo'));
-    checkUnnamed2426(o.lineItems);
+    checkUnnamed279(o.lineItems);
     unittest.expect(o.shipmentId, unittest.equals('foo'));
-    checkUnnamed2427(o.shipmentInfos);
+    checkUnnamed280(o.shipmentInfos);
     unittest.expect(o.trackingId, unittest.equals('foo'));
   }
   buildCounterOrdersCustomBatchRequestEntryShipLineItems--;
@@ -3602,14 +3602,14 @@
   buildCounterOrdersCustomBatchRequestEntryUpdateShipment--;
 }
 
-buildUnnamed2428() {
+buildUnnamed281() {
   var o = new core.List<api.OrdersCustomBatchResponseEntry>();
   o.add(buildOrdersCustomBatchResponseEntry());
   o.add(buildOrdersCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed2428(core.List<api.OrdersCustomBatchResponseEntry> o) {
+checkUnnamed281(core.List<api.OrdersCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrdersCustomBatchResponseEntry(o[0]);
   checkOrdersCustomBatchResponseEntry(o[1]);
@@ -3620,7 +3620,7 @@
   var o = new api.OrdersCustomBatchResponse();
   buildCounterOrdersCustomBatchResponse++;
   if (buildCounterOrdersCustomBatchResponse < 3) {
-    o.entries = buildUnnamed2428();
+    o.entries = buildUnnamed281();
     o.kind = "foo";
   }
   buildCounterOrdersCustomBatchResponse--;
@@ -3630,7 +3630,7 @@
 checkOrdersCustomBatchResponse(api.OrdersCustomBatchResponse o) {
   buildCounterOrdersCustomBatchResponse++;
   if (buildCounterOrdersCustomBatchResponse < 3) {
-    checkUnnamed2428(o.entries);
+    checkUnnamed281(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterOrdersCustomBatchResponse--;
@@ -3763,14 +3763,14 @@
   buildCounterOrdersInStoreRefundLineItemResponse--;
 }
 
-buildUnnamed2429() {
+buildUnnamed282() {
   var o = new core.List<api.Order>();
   o.add(buildOrder());
   o.add(buildOrder());
   return o;
 }
 
-checkUnnamed2429(core.List<api.Order> o) {
+checkUnnamed282(core.List<api.Order> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrder(o[0]);
   checkOrder(o[1]);
@@ -3783,7 +3783,7 @@
   if (buildCounterOrdersListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed2429();
+    o.resources = buildUnnamed282();
   }
   buildCounterOrdersListResponse--;
   return o;
@@ -3794,7 +3794,7 @@
   if (buildCounterOrdersListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2429(o.resources);
+    checkUnnamed282(o.resources);
   }
   buildCounterOrdersListResponse--;
 }
@@ -4007,14 +4007,14 @@
   buildCounterOrdersReturnRefundLineItemResponse--;
 }
 
-buildUnnamed2430() {
+buildUnnamed283() {
   var o = new core.List<api.OrderMerchantProvidedAnnotation>();
   o.add(buildOrderMerchantProvidedAnnotation());
   o.add(buildOrderMerchantProvidedAnnotation());
   return o;
 }
 
-checkUnnamed2430(core.List<api.OrderMerchantProvidedAnnotation> o) {
+checkUnnamed283(core.List<api.OrderMerchantProvidedAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderMerchantProvidedAnnotation(o[0]);
   checkOrderMerchantProvidedAnnotation(o[1]);
@@ -4025,7 +4025,7 @@
   var o = new api.OrdersSetLineItemMetadataRequest();
   buildCounterOrdersSetLineItemMetadataRequest++;
   if (buildCounterOrdersSetLineItemMetadataRequest < 3) {
-    o.annotations = buildUnnamed2430();
+    o.annotations = buildUnnamed283();
     o.lineItemId = "foo";
     o.operationId = "foo";
     o.productId = "foo";
@@ -4037,7 +4037,7 @@
 checkOrdersSetLineItemMetadataRequest(api.OrdersSetLineItemMetadataRequest o) {
   buildCounterOrdersSetLineItemMetadataRequest++;
   if (buildCounterOrdersSetLineItemMetadataRequest < 3) {
-    checkUnnamed2430(o.annotations);
+    checkUnnamed283(o.annotations);
     unittest.expect(o.lineItemId, unittest.equals('foo'));
     unittest.expect(o.operationId, unittest.equals('foo'));
     unittest.expect(o.productId, unittest.equals('foo'));
@@ -4067,20 +4067,20 @@
   buildCounterOrdersSetLineItemMetadataResponse--;
 }
 
-buildUnnamed2431() {
+buildUnnamed284() {
   var o = new core.List<api.OrderShipmentLineItemShipment>();
   o.add(buildOrderShipmentLineItemShipment());
   o.add(buildOrderShipmentLineItemShipment());
   return o;
 }
 
-checkUnnamed2431(core.List<api.OrderShipmentLineItemShipment> o) {
+checkUnnamed284(core.List<api.OrderShipmentLineItemShipment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderShipmentLineItemShipment(o[0]);
   checkOrderShipmentLineItemShipment(o[1]);
 }
 
-buildUnnamed2432() {
+buildUnnamed285() {
   var o = new core
       .List<api.OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo>();
   o.add(buildOrdersCustomBatchRequestEntryShipLineItemsShipmentInfo());
@@ -4088,7 +4088,7 @@
   return o;
 }
 
-checkUnnamed2432(
+checkUnnamed285(
     core.List<api.OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrdersCustomBatchRequestEntryShipLineItemsShipmentInfo(o[0]);
@@ -4101,10 +4101,10 @@
   buildCounterOrdersShipLineItemsRequest++;
   if (buildCounterOrdersShipLineItemsRequest < 3) {
     o.carrier = "foo";
-    o.lineItems = buildUnnamed2431();
+    o.lineItems = buildUnnamed284();
     o.operationId = "foo";
     o.shipmentId = "foo";
-    o.shipmentInfos = buildUnnamed2432();
+    o.shipmentInfos = buildUnnamed285();
     o.trackingId = "foo";
   }
   buildCounterOrdersShipLineItemsRequest--;
@@ -4115,10 +4115,10 @@
   buildCounterOrdersShipLineItemsRequest++;
   if (buildCounterOrdersShipLineItemsRequest < 3) {
     unittest.expect(o.carrier, unittest.equals('foo'));
-    checkUnnamed2431(o.lineItems);
+    checkUnnamed284(o.lineItems);
     unittest.expect(o.operationId, unittest.equals('foo'));
     unittest.expect(o.shipmentId, unittest.equals('foo'));
-    checkUnnamed2432(o.shipmentInfos);
+    checkUnnamed285(o.shipmentInfos);
     unittest.expect(o.trackingId, unittest.equals('foo'));
   }
   buildCounterOrdersShipLineItemsRequest--;
@@ -4287,14 +4287,14 @@
   buildCounterOrdersUpdateShipmentResponse--;
 }
 
-buildUnnamed2433() {
+buildUnnamed286() {
   var o = new core.List<api.PostalCodeRange>();
   o.add(buildPostalCodeRange());
   o.add(buildPostalCodeRange());
   return o;
 }
 
-checkUnnamed2433(core.List<api.PostalCodeRange> o) {
+checkUnnamed286(core.List<api.PostalCodeRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPostalCodeRange(o[0]);
   checkPostalCodeRange(o[1]);
@@ -4307,7 +4307,7 @@
   if (buildCounterPostalCodeGroup < 3) {
     o.country = "foo";
     o.name = "foo";
-    o.postalCodeRanges = buildUnnamed2433();
+    o.postalCodeRanges = buildUnnamed286();
   }
   buildCounterPostalCodeGroup--;
   return o;
@@ -4318,7 +4318,7 @@
   if (buildCounterPostalCodeGroup < 3) {
     unittest.expect(o.country, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2433(o.postalCodeRanges);
+    checkUnnamed286(o.postalCodeRanges);
   }
   buildCounterPostalCodeGroup--;
 }
@@ -4365,183 +4365,183 @@
   buildCounterPrice--;
 }
 
-buildUnnamed2434() {
+buildUnnamed287() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2434(core.List<core.String> o) {
+checkUnnamed287(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2435() {
+buildUnnamed288() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2435(core.List<core.String> o) {
+checkUnnamed288(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2436() {
+buildUnnamed289() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2436(core.List<core.String> o) {
+checkUnnamed289(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2437() {
+buildUnnamed290() {
   var o = new core.List<api.ProductAspect>();
   o.add(buildProductAspect());
   o.add(buildProductAspect());
   return o;
 }
 
-checkUnnamed2437(core.List<api.ProductAspect> o) {
+checkUnnamed290(core.List<api.ProductAspect> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductAspect(o[0]);
   checkProductAspect(o[1]);
 }
 
-buildUnnamed2438() {
+buildUnnamed291() {
   var o = new core.List<api.ProductCustomAttribute>();
   o.add(buildProductCustomAttribute());
   o.add(buildProductCustomAttribute());
   return o;
 }
 
-checkUnnamed2438(core.List<api.ProductCustomAttribute> o) {
+checkUnnamed291(core.List<api.ProductCustomAttribute> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductCustomAttribute(o[0]);
   checkProductCustomAttribute(o[1]);
 }
 
-buildUnnamed2439() {
+buildUnnamed292() {
   var o = new core.List<api.ProductCustomGroup>();
   o.add(buildProductCustomGroup());
   o.add(buildProductCustomGroup());
   return o;
 }
 
-checkUnnamed2439(core.List<api.ProductCustomGroup> o) {
+checkUnnamed292(core.List<api.ProductCustomGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductCustomGroup(o[0]);
   checkProductCustomGroup(o[1]);
 }
 
-buildUnnamed2440() {
+buildUnnamed293() {
   var o = new core.List<api.ProductDestination>();
   o.add(buildProductDestination());
   o.add(buildProductDestination());
   return o;
 }
 
-checkUnnamed2440(core.List<api.ProductDestination> o) {
+checkUnnamed293(core.List<api.ProductDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductDestination(o[0]);
   checkProductDestination(o[1]);
 }
 
-buildUnnamed2441() {
+buildUnnamed294() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2441(core.List<core.String> o) {
+checkUnnamed294(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2442() {
+buildUnnamed295() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2442(core.List<core.String> o) {
+checkUnnamed295(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2443() {
+buildUnnamed296() {
   var o = new core.List<api.ProductShipping>();
   o.add(buildProductShipping());
   o.add(buildProductShipping());
   return o;
 }
 
-checkUnnamed2443(core.List<api.ProductShipping> o) {
+checkUnnamed296(core.List<api.ProductShipping> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductShipping(o[0]);
   checkProductShipping(o[1]);
 }
 
-buildUnnamed2444() {
+buildUnnamed297() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2444(core.List<core.String> o) {
+checkUnnamed297(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2445() {
+buildUnnamed298() {
   var o = new core.List<api.ProductTax>();
   o.add(buildProductTax());
   o.add(buildProductTax());
   return o;
 }
 
-checkUnnamed2445(core.List<api.ProductTax> o) {
+checkUnnamed298(core.List<api.ProductTax> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductTax(o[0]);
   checkProductTax(o[1]);
 }
 
-buildUnnamed2446() {
+buildUnnamed299() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2446(core.List<core.String> o) {
+checkUnnamed299(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2447() {
+buildUnnamed300() {
   var o = new core.List<api.Error>();
   o.add(buildError());
   o.add(buildError());
   return o;
 }
 
-checkUnnamed2447(core.List<api.Error> o) {
+checkUnnamed300(core.List<api.Error> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkError(o[0]);
   checkError(o[1]);
@@ -4552,14 +4552,14 @@
   var o = new api.Product();
   buildCounterProduct++;
   if (buildCounterProduct < 3) {
-    o.additionalImageLinks = buildUnnamed2434();
-    o.additionalProductTypes = buildUnnamed2435();
+    o.additionalImageLinks = buildUnnamed287();
+    o.additionalProductTypes = buildUnnamed288();
     o.adult = true;
     o.adwordsGrouping = "foo";
-    o.adwordsLabels = buildUnnamed2436();
+    o.adwordsLabels = buildUnnamed289();
     o.adwordsRedirect = "foo";
     o.ageGroup = "foo";
-    o.aspects = buildUnnamed2437();
+    o.aspects = buildUnnamed290();
     o.availability = "foo";
     o.availabilityDate = "foo";
     o.brand = "foo";
@@ -4567,18 +4567,18 @@
     o.color = "foo";
     o.condition = "foo";
     o.contentLanguage = "foo";
-    o.customAttributes = buildUnnamed2438();
-    o.customGroups = buildUnnamed2439();
+    o.customAttributes = buildUnnamed291();
+    o.customGroups = buildUnnamed292();
     o.customLabel0 = "foo";
     o.customLabel1 = "foo";
     o.customLabel2 = "foo";
     o.customLabel3 = "foo";
     o.customLabel4 = "foo";
     o.description = "foo";
-    o.destinations = buildUnnamed2440();
+    o.destinations = buildUnnamed293();
     o.displayAdsId = "foo";
     o.displayAdsLink = "foo";
-    o.displayAdsSimilarIds = buildUnnamed2441();
+    o.displayAdsSimilarIds = buildUnnamed294();
     o.displayAdsTitle = "foo";
     o.displayAdsValue = 42.0;
     o.energyEfficiencyClass = "foo";
@@ -4606,11 +4606,11 @@
     o.pattern = "foo";
     o.price = buildPrice();
     o.productType = "foo";
-    o.promotionIds = buildUnnamed2442();
+    o.promotionIds = buildUnnamed295();
     o.salePrice = buildPrice();
     o.salePriceEffectiveDate = "foo";
     o.sellOnGoogleQuantity = "foo";
-    o.shipping = buildUnnamed2443();
+    o.shipping = buildUnnamed296();
     o.shippingHeight = buildProductShippingDimension();
     o.shippingLabel = "foo";
     o.shippingLength = buildProductShippingDimension();
@@ -4618,14 +4618,14 @@
     o.shippingWidth = buildProductShippingDimension();
     o.sizeSystem = "foo";
     o.sizeType = "foo";
-    o.sizes = buildUnnamed2444();
+    o.sizes = buildUnnamed297();
     o.targetCountry = "foo";
-    o.taxes = buildUnnamed2445();
+    o.taxes = buildUnnamed298();
     o.title = "foo";
     o.unitPricingBaseMeasure = buildProductUnitPricingBaseMeasure();
     o.unitPricingMeasure = buildProductUnitPricingMeasure();
-    o.validatedDestinations = buildUnnamed2446();
-    o.warnings = buildUnnamed2447();
+    o.validatedDestinations = buildUnnamed299();
+    o.warnings = buildUnnamed300();
   }
   buildCounterProduct--;
   return o;
@@ -4634,14 +4634,14 @@
 checkProduct(api.Product o) {
   buildCounterProduct++;
   if (buildCounterProduct < 3) {
-    checkUnnamed2434(o.additionalImageLinks);
-    checkUnnamed2435(o.additionalProductTypes);
+    checkUnnamed287(o.additionalImageLinks);
+    checkUnnamed288(o.additionalProductTypes);
     unittest.expect(o.adult, unittest.isTrue);
     unittest.expect(o.adwordsGrouping, unittest.equals('foo'));
-    checkUnnamed2436(o.adwordsLabels);
+    checkUnnamed289(o.adwordsLabels);
     unittest.expect(o.adwordsRedirect, unittest.equals('foo'));
     unittest.expect(o.ageGroup, unittest.equals('foo'));
-    checkUnnamed2437(o.aspects);
+    checkUnnamed290(o.aspects);
     unittest.expect(o.availability, unittest.equals('foo'));
     unittest.expect(o.availabilityDate, unittest.equals('foo'));
     unittest.expect(o.brand, unittest.equals('foo'));
@@ -4649,18 +4649,18 @@
     unittest.expect(o.color, unittest.equals('foo'));
     unittest.expect(o.condition, unittest.equals('foo'));
     unittest.expect(o.contentLanguage, unittest.equals('foo'));
-    checkUnnamed2438(o.customAttributes);
-    checkUnnamed2439(o.customGroups);
+    checkUnnamed291(o.customAttributes);
+    checkUnnamed292(o.customGroups);
     unittest.expect(o.customLabel0, unittest.equals('foo'));
     unittest.expect(o.customLabel1, unittest.equals('foo'));
     unittest.expect(o.customLabel2, unittest.equals('foo'));
     unittest.expect(o.customLabel3, unittest.equals('foo'));
     unittest.expect(o.customLabel4, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed2440(o.destinations);
+    checkUnnamed293(o.destinations);
     unittest.expect(o.displayAdsId, unittest.equals('foo'));
     unittest.expect(o.displayAdsLink, unittest.equals('foo'));
-    checkUnnamed2441(o.displayAdsSimilarIds);
+    checkUnnamed294(o.displayAdsSimilarIds);
     unittest.expect(o.displayAdsTitle, unittest.equals('foo'));
     unittest.expect(o.displayAdsValue, unittest.equals(42.0));
     unittest.expect(o.energyEfficiencyClass, unittest.equals('foo'));
@@ -4688,11 +4688,11 @@
     unittest.expect(o.pattern, unittest.equals('foo'));
     checkPrice(o.price);
     unittest.expect(o.productType, unittest.equals('foo'));
-    checkUnnamed2442(o.promotionIds);
+    checkUnnamed295(o.promotionIds);
     checkPrice(o.salePrice);
     unittest.expect(o.salePriceEffectiveDate, unittest.equals('foo'));
     unittest.expect(o.sellOnGoogleQuantity, unittest.equals('foo'));
-    checkUnnamed2443(o.shipping);
+    checkUnnamed296(o.shipping);
     checkProductShippingDimension(o.shippingHeight);
     unittest.expect(o.shippingLabel, unittest.equals('foo'));
     checkProductShippingDimension(o.shippingLength);
@@ -4700,14 +4700,14 @@
     checkProductShippingDimension(o.shippingWidth);
     unittest.expect(o.sizeSystem, unittest.equals('foo'));
     unittest.expect(o.sizeType, unittest.equals('foo'));
-    checkUnnamed2444(o.sizes);
+    checkUnnamed297(o.sizes);
     unittest.expect(o.targetCountry, unittest.equals('foo'));
-    checkUnnamed2445(o.taxes);
+    checkUnnamed298(o.taxes);
     unittest.expect(o.title, unittest.equals('foo'));
     checkProductUnitPricingBaseMeasure(o.unitPricingBaseMeasure);
     checkProductUnitPricingMeasure(o.unitPricingMeasure);
-    checkUnnamed2446(o.validatedDestinations);
-    checkUnnamed2447(o.warnings);
+    checkUnnamed299(o.validatedDestinations);
+    checkUnnamed300(o.warnings);
   }
   buildCounterProduct--;
 }
@@ -4760,14 +4760,14 @@
   buildCounterProductCustomAttribute--;
 }
 
-buildUnnamed2448() {
+buildUnnamed301() {
   var o = new core.List<api.ProductCustomAttribute>();
   o.add(buildProductCustomAttribute());
   o.add(buildProductCustomAttribute());
   return o;
 }
 
-checkUnnamed2448(core.List<api.ProductCustomAttribute> o) {
+checkUnnamed301(core.List<api.ProductCustomAttribute> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductCustomAttribute(o[0]);
   checkProductCustomAttribute(o[1]);
@@ -4778,7 +4778,7 @@
   var o = new api.ProductCustomGroup();
   buildCounterProductCustomGroup++;
   if (buildCounterProductCustomGroup < 3) {
-    o.attributes = buildUnnamed2448();
+    o.attributes = buildUnnamed301();
     o.name = "foo";
   }
   buildCounterProductCustomGroup--;
@@ -4788,7 +4788,7 @@
 checkProductCustomGroup(api.ProductCustomGroup o) {
   buildCounterProductCustomGroup++;
   if (buildCounterProductCustomGroup < 3) {
-    checkUnnamed2448(o.attributes);
+    checkUnnamed301(o.attributes);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterProductCustomGroup--;
@@ -4888,40 +4888,40 @@
   buildCounterProductShippingWeight--;
 }
 
-buildUnnamed2449() {
+buildUnnamed302() {
   var o = new core.List<api.ProductStatusDataQualityIssue>();
   o.add(buildProductStatusDataQualityIssue());
   o.add(buildProductStatusDataQualityIssue());
   return o;
 }
 
-checkUnnamed2449(core.List<api.ProductStatusDataQualityIssue> o) {
+checkUnnamed302(core.List<api.ProductStatusDataQualityIssue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductStatusDataQualityIssue(o[0]);
   checkProductStatusDataQualityIssue(o[1]);
 }
 
-buildUnnamed2450() {
+buildUnnamed303() {
   var o = new core.List<api.ProductStatusDestinationStatus>();
   o.add(buildProductStatusDestinationStatus());
   o.add(buildProductStatusDestinationStatus());
   return o;
 }
 
-checkUnnamed2450(core.List<api.ProductStatusDestinationStatus> o) {
+checkUnnamed303(core.List<api.ProductStatusDestinationStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductStatusDestinationStatus(o[0]);
   checkProductStatusDestinationStatus(o[1]);
 }
 
-buildUnnamed2451() {
+buildUnnamed304() {
   var o = new core.List<api.ProductStatusItemLevelIssue>();
   o.add(buildProductStatusItemLevelIssue());
   o.add(buildProductStatusItemLevelIssue());
   return o;
 }
 
-checkUnnamed2451(core.List<api.ProductStatusItemLevelIssue> o) {
+checkUnnamed304(core.List<api.ProductStatusItemLevelIssue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductStatusItemLevelIssue(o[0]);
   checkProductStatusItemLevelIssue(o[1]);
@@ -4933,10 +4933,10 @@
   buildCounterProductStatus++;
   if (buildCounterProductStatus < 3) {
     o.creationDate = "foo";
-    o.dataQualityIssues = buildUnnamed2449();
-    o.destinationStatuses = buildUnnamed2450();
+    o.dataQualityIssues = buildUnnamed302();
+    o.destinationStatuses = buildUnnamed303();
     o.googleExpirationDate = "foo";
-    o.itemLevelIssues = buildUnnamed2451();
+    o.itemLevelIssues = buildUnnamed304();
     o.kind = "foo";
     o.lastUpdateDate = "foo";
     o.link = "foo";
@@ -4952,10 +4952,10 @@
   buildCounterProductStatus++;
   if (buildCounterProductStatus < 3) {
     unittest.expect(o.creationDate, unittest.equals('foo'));
-    checkUnnamed2449(o.dataQualityIssues);
-    checkUnnamed2450(o.destinationStatuses);
+    checkUnnamed302(o.dataQualityIssues);
+    checkUnnamed303(o.destinationStatuses);
     unittest.expect(o.googleExpirationDate, unittest.equals('foo'));
-    checkUnnamed2451(o.itemLevelIssues);
+    checkUnnamed304(o.itemLevelIssues);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastUpdateDate, unittest.equals('foo'));
     unittest.expect(o.link, unittest.equals('foo'));
@@ -5122,14 +5122,14 @@
   buildCounterProductUnitPricingMeasure--;
 }
 
-buildUnnamed2452() {
+buildUnnamed305() {
   var o = new core.List<api.ProductsCustomBatchRequestEntry>();
   o.add(buildProductsCustomBatchRequestEntry());
   o.add(buildProductsCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed2452(core.List<api.ProductsCustomBatchRequestEntry> o) {
+checkUnnamed305(core.List<api.ProductsCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductsCustomBatchRequestEntry(o[0]);
   checkProductsCustomBatchRequestEntry(o[1]);
@@ -5140,7 +5140,7 @@
   var o = new api.ProductsCustomBatchRequest();
   buildCounterProductsCustomBatchRequest++;
   if (buildCounterProductsCustomBatchRequest < 3) {
-    o.entries = buildUnnamed2452();
+    o.entries = buildUnnamed305();
   }
   buildCounterProductsCustomBatchRequest--;
   return o;
@@ -5149,7 +5149,7 @@
 checkProductsCustomBatchRequest(api.ProductsCustomBatchRequest o) {
   buildCounterProductsCustomBatchRequest++;
   if (buildCounterProductsCustomBatchRequest < 3) {
-    checkUnnamed2452(o.entries);
+    checkUnnamed305(o.entries);
   }
   buildCounterProductsCustomBatchRequest--;
 }
@@ -5181,14 +5181,14 @@
   buildCounterProductsCustomBatchRequestEntry--;
 }
 
-buildUnnamed2453() {
+buildUnnamed306() {
   var o = new core.List<api.ProductsCustomBatchResponseEntry>();
   o.add(buildProductsCustomBatchResponseEntry());
   o.add(buildProductsCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed2453(core.List<api.ProductsCustomBatchResponseEntry> o) {
+checkUnnamed306(core.List<api.ProductsCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductsCustomBatchResponseEntry(o[0]);
   checkProductsCustomBatchResponseEntry(o[1]);
@@ -5199,7 +5199,7 @@
   var o = new api.ProductsCustomBatchResponse();
   buildCounterProductsCustomBatchResponse++;
   if (buildCounterProductsCustomBatchResponse < 3) {
-    o.entries = buildUnnamed2453();
+    o.entries = buildUnnamed306();
     o.kind = "foo";
   }
   buildCounterProductsCustomBatchResponse--;
@@ -5209,7 +5209,7 @@
 checkProductsCustomBatchResponse(api.ProductsCustomBatchResponse o) {
   buildCounterProductsCustomBatchResponse++;
   if (buildCounterProductsCustomBatchResponse < 3) {
-    checkUnnamed2453(o.entries);
+    checkUnnamed306(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterProductsCustomBatchResponse--;
@@ -5240,14 +5240,14 @@
   buildCounterProductsCustomBatchResponseEntry--;
 }
 
-buildUnnamed2454() {
+buildUnnamed307() {
   var o = new core.List<api.Product>();
   o.add(buildProduct());
   o.add(buildProduct());
   return o;
 }
 
-checkUnnamed2454(core.List<api.Product> o) {
+checkUnnamed307(core.List<api.Product> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProduct(o[0]);
   checkProduct(o[1]);
@@ -5260,7 +5260,7 @@
   if (buildCounterProductsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed2454();
+    o.resources = buildUnnamed307();
   }
   buildCounterProductsListResponse--;
   return o;
@@ -5271,19 +5271,19 @@
   if (buildCounterProductsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2454(o.resources);
+    checkUnnamed307(o.resources);
   }
   buildCounterProductsListResponse--;
 }
 
-buildUnnamed2455() {
+buildUnnamed308() {
   var o = new core.List<api.ProductstatusesCustomBatchRequestEntry>();
   o.add(buildProductstatusesCustomBatchRequestEntry());
   o.add(buildProductstatusesCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed2455(core.List<api.ProductstatusesCustomBatchRequestEntry> o) {
+checkUnnamed308(core.List<api.ProductstatusesCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductstatusesCustomBatchRequestEntry(o[0]);
   checkProductstatusesCustomBatchRequestEntry(o[1]);
@@ -5294,7 +5294,7 @@
   var o = new api.ProductstatusesCustomBatchRequest();
   buildCounterProductstatusesCustomBatchRequest++;
   if (buildCounterProductstatusesCustomBatchRequest < 3) {
-    o.entries = buildUnnamed2455();
+    o.entries = buildUnnamed308();
   }
   buildCounterProductstatusesCustomBatchRequest--;
   return o;
@@ -5304,7 +5304,7 @@
     api.ProductstatusesCustomBatchRequest o) {
   buildCounterProductstatusesCustomBatchRequest++;
   if (buildCounterProductstatusesCustomBatchRequest < 3) {
-    checkUnnamed2455(o.entries);
+    checkUnnamed308(o.entries);
   }
   buildCounterProductstatusesCustomBatchRequest--;
 }
@@ -5337,14 +5337,14 @@
   buildCounterProductstatusesCustomBatchRequestEntry--;
 }
 
-buildUnnamed2456() {
+buildUnnamed309() {
   var o = new core.List<api.ProductstatusesCustomBatchResponseEntry>();
   o.add(buildProductstatusesCustomBatchResponseEntry());
   o.add(buildProductstatusesCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed2456(core.List<api.ProductstatusesCustomBatchResponseEntry> o) {
+checkUnnamed309(core.List<api.ProductstatusesCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductstatusesCustomBatchResponseEntry(o[0]);
   checkProductstatusesCustomBatchResponseEntry(o[1]);
@@ -5355,7 +5355,7 @@
   var o = new api.ProductstatusesCustomBatchResponse();
   buildCounterProductstatusesCustomBatchResponse++;
   if (buildCounterProductstatusesCustomBatchResponse < 3) {
-    o.entries = buildUnnamed2456();
+    o.entries = buildUnnamed309();
     o.kind = "foo";
   }
   buildCounterProductstatusesCustomBatchResponse--;
@@ -5366,7 +5366,7 @@
     api.ProductstatusesCustomBatchResponse o) {
   buildCounterProductstatusesCustomBatchResponse++;
   if (buildCounterProductstatusesCustomBatchResponse < 3) {
-    checkUnnamed2456(o.entries);
+    checkUnnamed309(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterProductstatusesCustomBatchResponse--;
@@ -5398,14 +5398,14 @@
   buildCounterProductstatusesCustomBatchResponseEntry--;
 }
 
-buildUnnamed2457() {
+buildUnnamed310() {
   var o = new core.List<api.ProductStatus>();
   o.add(buildProductStatus());
   o.add(buildProductStatus());
   return o;
 }
 
-checkUnnamed2457(core.List<api.ProductStatus> o) {
+checkUnnamed310(core.List<api.ProductStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductStatus(o[0]);
   checkProductStatus(o[1]);
@@ -5418,7 +5418,7 @@
   if (buildCounterProductstatusesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed2457();
+    o.resources = buildUnnamed310();
   }
   buildCounterProductstatusesListResponse--;
   return o;
@@ -5429,45 +5429,45 @@
   if (buildCounterProductstatusesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2457(o.resources);
+    checkUnnamed310(o.resources);
   }
   buildCounterProductstatusesListResponse--;
 }
 
-buildUnnamed2458() {
+buildUnnamed311() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2458(core.List<core.String> o) {
+checkUnnamed311(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2459() {
+buildUnnamed312() {
   var o = new core.List<api.CarrierRate>();
   o.add(buildCarrierRate());
   o.add(buildCarrierRate());
   return o;
 }
 
-checkUnnamed2459(core.List<api.CarrierRate> o) {
+checkUnnamed312(core.List<api.CarrierRate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCarrierRate(o[0]);
   checkCarrierRate(o[1]);
 }
 
-buildUnnamed2460() {
+buildUnnamed313() {
   var o = new core.List<api.Table>();
   o.add(buildTable());
   o.add(buildTable());
   return o;
 }
 
-checkUnnamed2460(core.List<api.Table> o) {
+checkUnnamed313(core.List<api.Table> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTable(o[0]);
   checkTable(o[1]);
@@ -5478,11 +5478,11 @@
   var o = new api.RateGroup();
   buildCounterRateGroup++;
   if (buildCounterRateGroup < 3) {
-    o.applicableShippingLabels = buildUnnamed2458();
-    o.carrierRates = buildUnnamed2459();
+    o.applicableShippingLabels = buildUnnamed311();
+    o.carrierRates = buildUnnamed312();
     o.mainTable = buildTable();
     o.singleValue = buildValue();
-    o.subtables = buildUnnamed2460();
+    o.subtables = buildUnnamed313();
   }
   buildCounterRateGroup--;
   return o;
@@ -5491,23 +5491,23 @@
 checkRateGroup(api.RateGroup o) {
   buildCounterRateGroup++;
   if (buildCounterRateGroup < 3) {
-    checkUnnamed2458(o.applicableShippingLabels);
-    checkUnnamed2459(o.carrierRates);
+    checkUnnamed311(o.applicableShippingLabels);
+    checkUnnamed312(o.carrierRates);
     checkTable(o.mainTable);
     checkValue(o.singleValue);
-    checkUnnamed2460(o.subtables);
+    checkUnnamed313(o.subtables);
   }
   buildCounterRateGroup--;
 }
 
-buildUnnamed2461() {
+buildUnnamed314() {
   var o = new core.List<api.Value>();
   o.add(buildValue());
   o.add(buildValue());
   return o;
 }
 
-checkUnnamed2461(core.List<api.Value> o) {
+checkUnnamed314(core.List<api.Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValue(o[0]);
   checkValue(o[1]);
@@ -5518,7 +5518,7 @@
   var o = new api.Row();
   buildCounterRow++;
   if (buildCounterRow < 3) {
-    o.cells = buildUnnamed2461();
+    o.cells = buildUnnamed314();
   }
   buildCounterRow--;
   return o;
@@ -5527,19 +5527,19 @@
 checkRow(api.Row o) {
   buildCounterRow++;
   if (buildCounterRow < 3) {
-    checkUnnamed2461(o.cells);
+    checkUnnamed314(o.cells);
   }
   buildCounterRow--;
 }
 
-buildUnnamed2462() {
+buildUnnamed315() {
   var o = new core.List<api.RateGroup>();
   o.add(buildRateGroup());
   o.add(buildRateGroup());
   return o;
 }
 
-checkUnnamed2462(core.List<api.RateGroup> o) {
+checkUnnamed315(core.List<api.RateGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRateGroup(o[0]);
   checkRateGroup(o[1]);
@@ -5556,7 +5556,7 @@
     o.deliveryTime = buildDeliveryTime();
     o.minimumOrderValue = buildPrice();
     o.name = "foo";
-    o.rateGroups = buildUnnamed2462();
+    o.rateGroups = buildUnnamed315();
   }
   buildCounterService--;
   return o;
@@ -5571,32 +5571,32 @@
     checkDeliveryTime(o.deliveryTime);
     checkPrice(o.minimumOrderValue);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2462(o.rateGroups);
+    checkUnnamed315(o.rateGroups);
   }
   buildCounterService--;
 }
 
-buildUnnamed2463() {
+buildUnnamed316() {
   var o = new core.List<api.PostalCodeGroup>();
   o.add(buildPostalCodeGroup());
   o.add(buildPostalCodeGroup());
   return o;
 }
 
-checkUnnamed2463(core.List<api.PostalCodeGroup> o) {
+checkUnnamed316(core.List<api.PostalCodeGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPostalCodeGroup(o[0]);
   checkPostalCodeGroup(o[1]);
 }
 
-buildUnnamed2464() {
+buildUnnamed317() {
   var o = new core.List<api.Service>();
   o.add(buildService());
   o.add(buildService());
   return o;
 }
 
-checkUnnamed2464(core.List<api.Service> o) {
+checkUnnamed317(core.List<api.Service> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkService(o[0]);
   checkService(o[1]);
@@ -5608,8 +5608,8 @@
   buildCounterShippingSettings++;
   if (buildCounterShippingSettings < 3) {
     o.accountId = "foo";
-    o.postalCodeGroups = buildUnnamed2463();
-    o.services = buildUnnamed2464();
+    o.postalCodeGroups = buildUnnamed316();
+    o.services = buildUnnamed317();
   }
   buildCounterShippingSettings--;
   return o;
@@ -5619,20 +5619,20 @@
   buildCounterShippingSettings++;
   if (buildCounterShippingSettings < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed2463(o.postalCodeGroups);
-    checkUnnamed2464(o.services);
+    checkUnnamed316(o.postalCodeGroups);
+    checkUnnamed317(o.services);
   }
   buildCounterShippingSettings--;
 }
 
-buildUnnamed2465() {
+buildUnnamed318() {
   var o = new core.List<api.ShippingsettingsCustomBatchRequestEntry>();
   o.add(buildShippingsettingsCustomBatchRequestEntry());
   o.add(buildShippingsettingsCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed2465(core.List<api.ShippingsettingsCustomBatchRequestEntry> o) {
+checkUnnamed318(core.List<api.ShippingsettingsCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkShippingsettingsCustomBatchRequestEntry(o[0]);
   checkShippingsettingsCustomBatchRequestEntry(o[1]);
@@ -5643,7 +5643,7 @@
   var o = new api.ShippingsettingsCustomBatchRequest();
   buildCounterShippingsettingsCustomBatchRequest++;
   if (buildCounterShippingsettingsCustomBatchRequest < 3) {
-    o.entries = buildUnnamed2465();
+    o.entries = buildUnnamed318();
   }
   buildCounterShippingsettingsCustomBatchRequest--;
   return o;
@@ -5653,7 +5653,7 @@
     api.ShippingsettingsCustomBatchRequest o) {
   buildCounterShippingsettingsCustomBatchRequest++;
   if (buildCounterShippingsettingsCustomBatchRequest < 3) {
-    checkUnnamed2465(o.entries);
+    checkUnnamed318(o.entries);
   }
   buildCounterShippingsettingsCustomBatchRequest--;
 }
@@ -5686,14 +5686,14 @@
   buildCounterShippingsettingsCustomBatchRequestEntry--;
 }
 
-buildUnnamed2466() {
+buildUnnamed319() {
   var o = new core.List<api.ShippingsettingsCustomBatchResponseEntry>();
   o.add(buildShippingsettingsCustomBatchResponseEntry());
   o.add(buildShippingsettingsCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed2466(core.List<api.ShippingsettingsCustomBatchResponseEntry> o) {
+checkUnnamed319(core.List<api.ShippingsettingsCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkShippingsettingsCustomBatchResponseEntry(o[0]);
   checkShippingsettingsCustomBatchResponseEntry(o[1]);
@@ -5704,7 +5704,7 @@
   var o = new api.ShippingsettingsCustomBatchResponse();
   buildCounterShippingsettingsCustomBatchResponse++;
   if (buildCounterShippingsettingsCustomBatchResponse < 3) {
-    o.entries = buildUnnamed2466();
+    o.entries = buildUnnamed319();
     o.kind = "foo";
   }
   buildCounterShippingsettingsCustomBatchResponse--;
@@ -5715,7 +5715,7 @@
     api.ShippingsettingsCustomBatchResponse o) {
   buildCounterShippingsettingsCustomBatchResponse++;
   if (buildCounterShippingsettingsCustomBatchResponse < 3) {
-    checkUnnamed2466(o.entries);
+    checkUnnamed319(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterShippingsettingsCustomBatchResponse--;
@@ -5747,14 +5747,14 @@
   buildCounterShippingsettingsCustomBatchResponseEntry--;
 }
 
-buildUnnamed2467() {
+buildUnnamed320() {
   var o = new core.List<api.CarriersCarrier>();
   o.add(buildCarriersCarrier());
   o.add(buildCarriersCarrier());
   return o;
 }
 
-checkUnnamed2467(core.List<api.CarriersCarrier> o) {
+checkUnnamed320(core.List<api.CarriersCarrier> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCarriersCarrier(o[0]);
   checkCarriersCarrier(o[1]);
@@ -5765,7 +5765,7 @@
   var o = new api.ShippingsettingsGetSupportedCarriersResponse();
   buildCounterShippingsettingsGetSupportedCarriersResponse++;
   if (buildCounterShippingsettingsGetSupportedCarriersResponse < 3) {
-    o.carriers = buildUnnamed2467();
+    o.carriers = buildUnnamed320();
     o.kind = "foo";
   }
   buildCounterShippingsettingsGetSupportedCarriersResponse--;
@@ -5776,20 +5776,20 @@
     api.ShippingsettingsGetSupportedCarriersResponse o) {
   buildCounterShippingsettingsGetSupportedCarriersResponse++;
   if (buildCounterShippingsettingsGetSupportedCarriersResponse < 3) {
-    checkUnnamed2467(o.carriers);
+    checkUnnamed320(o.carriers);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterShippingsettingsGetSupportedCarriersResponse--;
 }
 
-buildUnnamed2468() {
+buildUnnamed321() {
   var o = new core.List<api.HolidaysHoliday>();
   o.add(buildHolidaysHoliday());
   o.add(buildHolidaysHoliday());
   return o;
 }
 
-checkUnnamed2468(core.List<api.HolidaysHoliday> o) {
+checkUnnamed321(core.List<api.HolidaysHoliday> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHolidaysHoliday(o[0]);
   checkHolidaysHoliday(o[1]);
@@ -5800,7 +5800,7 @@
   var o = new api.ShippingsettingsGetSupportedHolidaysResponse();
   buildCounterShippingsettingsGetSupportedHolidaysResponse++;
   if (buildCounterShippingsettingsGetSupportedHolidaysResponse < 3) {
-    o.holidays = buildUnnamed2468();
+    o.holidays = buildUnnamed321();
     o.kind = "foo";
   }
   buildCounterShippingsettingsGetSupportedHolidaysResponse--;
@@ -5811,20 +5811,20 @@
     api.ShippingsettingsGetSupportedHolidaysResponse o) {
   buildCounterShippingsettingsGetSupportedHolidaysResponse++;
   if (buildCounterShippingsettingsGetSupportedHolidaysResponse < 3) {
-    checkUnnamed2468(o.holidays);
+    checkUnnamed321(o.holidays);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterShippingsettingsGetSupportedHolidaysResponse--;
 }
 
-buildUnnamed2469() {
+buildUnnamed322() {
   var o = new core.List<api.ShippingSettings>();
   o.add(buildShippingSettings());
   o.add(buildShippingSettings());
   return o;
 }
 
-checkUnnamed2469(core.List<api.ShippingSettings> o) {
+checkUnnamed322(core.List<api.ShippingSettings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkShippingSettings(o[0]);
   checkShippingSettings(o[1]);
@@ -5837,7 +5837,7 @@
   if (buildCounterShippingsettingsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed2469();
+    o.resources = buildUnnamed322();
   }
   buildCounterShippingsettingsListResponse--;
   return o;
@@ -5848,19 +5848,19 @@
   if (buildCounterShippingsettingsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2469(o.resources);
+    checkUnnamed322(o.resources);
   }
   buildCounterShippingsettingsListResponse--;
 }
 
-buildUnnamed2470() {
+buildUnnamed323() {
   var o = new core.List<api.Row>();
   o.add(buildRow());
   o.add(buildRow());
   return o;
 }
 
-checkUnnamed2470(core.List<api.Row> o) {
+checkUnnamed323(core.List<api.Row> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRow(o[0]);
   checkRow(o[1]);
@@ -5874,7 +5874,7 @@
     o.columnHeaders = buildHeaders();
     o.name = "foo";
     o.rowHeaders = buildHeaders();
-    o.rows = buildUnnamed2470();
+    o.rows = buildUnnamed323();
   }
   buildCounterTable--;
   return o;
@@ -5886,32 +5886,32 @@
     checkHeaders(o.columnHeaders);
     unittest.expect(o.name, unittest.equals('foo'));
     checkHeaders(o.rowHeaders);
-    checkUnnamed2470(o.rows);
+    checkUnnamed323(o.rows);
   }
   buildCounterTable--;
 }
 
-buildUnnamed2471() {
+buildUnnamed324() {
   var o = new core.List<api.TestOrderLineItem>();
   o.add(buildTestOrderLineItem());
   o.add(buildTestOrderLineItem());
   return o;
 }
 
-checkUnnamed2471(core.List<api.TestOrderLineItem> o) {
+checkUnnamed324(core.List<api.TestOrderLineItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTestOrderLineItem(o[0]);
   checkTestOrderLineItem(o[1]);
 }
 
-buildUnnamed2472() {
+buildUnnamed325() {
   var o = new core.List<api.OrderPromotion>();
   o.add(buildOrderPromotion());
   o.add(buildOrderPromotion());
   return o;
 }
 
-checkUnnamed2472(core.List<api.OrderPromotion> o) {
+checkUnnamed325(core.List<api.OrderPromotion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderPromotion(o[0]);
   checkOrderPromotion(o[1]);
@@ -5924,11 +5924,11 @@
   if (buildCounterTestOrder < 3) {
     o.customer = buildTestOrderCustomer();
     o.kind = "foo";
-    o.lineItems = buildUnnamed2471();
+    o.lineItems = buildUnnamed324();
     o.notificationMode = "foo";
     o.paymentMethod = buildTestOrderPaymentMethod();
     o.predefinedDeliveryAddress = "foo";
-    o.promotions = buildUnnamed2472();
+    o.promotions = buildUnnamed325();
     o.shippingCost = buildPrice();
     o.shippingCostTax = buildPrice();
     o.shippingOption = "foo";
@@ -5942,11 +5942,11 @@
   if (buildCounterTestOrder < 3) {
     checkTestOrderCustomer(o.customer);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2471(o.lineItems);
+    checkUnnamed324(o.lineItems);
     unittest.expect(o.notificationMode, unittest.equals('foo'));
     checkTestOrderPaymentMethod(o.paymentMethod);
     unittest.expect(o.predefinedDeliveryAddress, unittest.equals('foo'));
-    checkUnnamed2472(o.promotions);
+    checkUnnamed325(o.promotions);
     checkPrice(o.shippingCost);
     checkPrice(o.shippingCostTax);
     unittest.expect(o.shippingOption, unittest.equals('foo'));
@@ -6004,14 +6004,14 @@
   buildCounterTestOrderLineItem--;
 }
 
-buildUnnamed2473() {
+buildUnnamed326() {
   var o = new core.List<api.OrderLineItemProductVariantAttribute>();
   o.add(buildOrderLineItemProductVariantAttribute());
   o.add(buildOrderLineItemProductVariantAttribute());
   return o;
 }
 
-checkUnnamed2473(core.List<api.OrderLineItemProductVariantAttribute> o) {
+checkUnnamed326(core.List<api.OrderLineItemProductVariantAttribute> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderLineItemProductVariantAttribute(o[0]);
   checkOrderLineItemProductVariantAttribute(o[1]);
@@ -6034,7 +6034,7 @@
     o.price = buildPrice();
     o.targetCountry = "foo";
     o.title = "foo";
-    o.variantAttributes = buildUnnamed2473();
+    o.variantAttributes = buildUnnamed326();
   }
   buildCounterTestOrderLineItemProduct--;
   return o;
@@ -6055,7 +6055,7 @@
     checkPrice(o.price);
     unittest.expect(o.targetCountry, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
-    checkUnnamed2473(o.variantAttributes);
+    checkUnnamed326(o.variantAttributes);
   }
   buildCounterTestOrderLineItemProduct--;
 }
@@ -6135,14 +6135,14 @@
   buildCounterWeight--;
 }
 
-buildUnnamed2474() {
+buildUnnamed327() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2474(core.List<core.String> o) {
+checkUnnamed327(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -7665,7 +7665,7 @@
       }), true);
       res
           .authinfo($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountsAuthInfoResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountsAuthInfoResponse(response);
       })));
     });
@@ -7717,8 +7717,7 @@
       res
           .claimwebsite(arg_merchantId, arg_accountId,
               overwrite: arg_overwrite, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AccountsClaimWebsiteResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountsClaimWebsiteResponse(response);
       })));
     });
@@ -7777,8 +7776,7 @@
       }), true);
       res
           .custombatch(arg_request, dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AccountsCustomBatchResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountsCustomBatchResponse(response);
       })));
     });
@@ -7878,7 +7876,7 @@
       }), true);
       res
           .get(arg_merchantId, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -7933,7 +7931,7 @@
       res
           .insert(arg_request, arg_merchantId,
               dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -7989,7 +7987,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountsListResponse(response);
       })));
     });
@@ -8045,7 +8043,7 @@
       res
           .patch(arg_request, arg_merchantId, arg_accountId,
               dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -8101,7 +8099,7 @@
       res
           .update(arg_request, arg_merchantId, arg_accountId,
               dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -8159,8 +8157,9 @@
             convert.JSON.encode(buildAccountstatusesCustomBatchResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.custombatch(arg_request, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.AccountstatusesCustomBatchResponse response) {
+      res
+          .custombatch(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkAccountstatusesCustomBatchResponse(response);
       })));
     });
@@ -8209,7 +8208,7 @@
       }), true);
       res
           .get(arg_merchantId, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountStatus response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountStatus(response);
       })));
     });
@@ -8266,8 +8265,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AccountstatusesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountstatusesListResponse(response);
       })));
     });
@@ -8328,8 +8326,7 @@
       }), true);
       res
           .custombatch(arg_request, dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AccounttaxCustomBatchResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccounttaxCustomBatchResponse(response);
       })));
     });
@@ -8377,7 +8374,7 @@
       }), true);
       res
           .get(arg_merchantId, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountTax response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountTax(response);
       })));
     });
@@ -8433,7 +8430,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccounttaxListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccounttaxListResponse(response);
       })));
     });
@@ -8489,7 +8486,7 @@
       res
           .patch(arg_request, arg_merchantId, arg_accountId,
               dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountTax response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountTax(response);
       })));
     });
@@ -8545,7 +8542,7 @@
       res
           .update(arg_request, arg_merchantId, arg_accountId,
               dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountTax response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountTax(response);
       })));
     });
@@ -8606,8 +8603,7 @@
       }), true);
       res
           .custombatch(arg_request, dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.DatafeedsCustomBatchResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatafeedsCustomBatchResponse(response);
       })));
     });
@@ -8705,7 +8701,7 @@
       }), true);
       res
           .get(arg_merchantId, arg_datafeedId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Datafeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatafeed(response);
       })));
     });
@@ -8760,7 +8756,7 @@
       res
           .insert(arg_request, arg_merchantId,
               dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Datafeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatafeed(response);
       })));
     });
@@ -8816,7 +8812,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DatafeedsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatafeedsListResponse(response);
       })));
     });
@@ -8872,7 +8868,7 @@
       res
           .patch(arg_request, arg_merchantId, arg_datafeedId,
               dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Datafeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatafeed(response);
       })));
     });
@@ -8928,7 +8924,7 @@
       res
           .update(arg_request, arg_merchantId, arg_datafeedId,
               dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Datafeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatafeed(response);
       })));
     });
@@ -8986,8 +8982,9 @@
             convert.JSON.encode(buildDatafeedstatusesCustomBatchResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.custombatch(arg_request, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.DatafeedstatusesCustomBatchResponse response) {
+      res
+          .custombatch(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkDatafeedstatusesCustomBatchResponse(response);
       })));
     });
@@ -9045,7 +9042,7 @@
               country: arg_country,
               language: arg_language,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DatafeedStatus response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatafeedStatus(response);
       })));
     });
@@ -9102,8 +9099,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.DatafeedstatusesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatafeedstatusesListResponse(response);
       })));
     });
@@ -9164,8 +9160,7 @@
       }), true);
       res
           .custombatch(arg_request, dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.InventoryCustomBatchResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInventoryCustomBatchResponse(response);
       })));
     });
@@ -9222,7 +9217,7 @@
       res
           .set(arg_request, arg_merchantId, arg_storeCode, arg_productId,
               dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InventorySetResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInventorySetResponse(response);
       })));
     });
@@ -9277,8 +9272,7 @@
       res
           .acknowledge(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.OrdersAcknowledgeResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersAcknowledgeResponse(response);
       })));
     });
@@ -9326,8 +9320,7 @@
       }), true);
       res
           .advancetestorder(arg_merchantId, arg_orderId, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersAdvanceTestOrderResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersAdvanceTestOrderResponse(response);
       })));
     });
@@ -9380,7 +9373,7 @@
       res
           .cancel(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrdersCancelResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersCancelResponse(response);
       })));
     });
@@ -9433,8 +9426,7 @@
       res
           .cancellineitem(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersCancelLineItemResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersCancelLineItemResponse(response);
       })));
     });
@@ -9485,8 +9477,7 @@
       }), true);
       res
           .createtestorder(arg_request, arg_merchantId, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersCreateTestOrderResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersCreateTestOrderResponse(response);
       })));
     });
@@ -9540,8 +9531,9 @@
         var resp = convert.JSON.encode(buildOrdersCustomBatchResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.custombatch(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.OrdersCustomBatchResponse response) {
+      res
+          .custombatch(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkOrdersCustomBatchResponse(response);
       })));
     });
@@ -9589,7 +9581,7 @@
       }), true);
       res
           .get(arg_merchantId, arg_orderId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Order response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrder(response);
       })));
     });
@@ -9639,8 +9631,7 @@
       res
           .getbymerchantorderid(arg_merchantId, arg_merchantOrderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersGetByMerchantOrderIdResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersGetByMerchantOrderIdResponse(response);
       })));
     });
@@ -9690,8 +9681,7 @@
       res
           .gettestordertemplate(arg_merchantId, arg_templateName,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersGetTestOrderTemplateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersGetTestOrderTemplateResponse(response);
       })));
     });
@@ -9745,8 +9735,7 @@
       res
           .instorerefundlineitem(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.OrdersInStoreRefundLineItemResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersInStoreRefundLineItemResponse(response);
       })));
     });
@@ -9761,7 +9750,7 @@
       var arg_pageToken = "foo";
       var arg_placedDateEnd = "foo";
       var arg_placedDateStart = "foo";
-      var arg_statuses = buildUnnamed2474();
+      var arg_statuses = buildUnnamed327();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -9821,7 +9810,7 @@
               placedDateStart: arg_placedDateStart,
               statuses: arg_statuses,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrdersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersListResponse(response);
       })));
     });
@@ -9874,7 +9863,7 @@
       res
           .refund(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrdersRefundResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersRefundResponse(response);
       })));
     });
@@ -9928,8 +9917,7 @@
       res
           .rejectreturnlineitem(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersRejectReturnLineItemResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersRejectReturnLineItemResponse(response);
       })));
     });
@@ -9982,8 +9970,7 @@
       res
           .returnlineitem(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersReturnLineItemResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersReturnLineItemResponse(response);
       })));
     });
@@ -10037,8 +10024,7 @@
       res
           .returnrefundlineitem(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersReturnRefundLineItemResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersReturnRefundLineItemResponse(response);
       })));
     });
@@ -10092,8 +10078,7 @@
       res
           .setlineitemmetadata(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersSetLineItemMetadataResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersSetLineItemMetadataResponse(response);
       })));
     });
@@ -10146,8 +10131,7 @@
       res
           .shiplineitems(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersShipLineItemsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersShipLineItemsResponse(response);
       })));
     });
@@ -10201,9 +10185,9 @@
       }), true);
       res
           .updatelineitemshippingdetails(
-              arg_request, arg_merchantId, arg_orderId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.OrdersUpdateLineItemShippingDetailsResponse response) {
+              arg_request, arg_merchantId, arg_orderId,
+              $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkOrdersUpdateLineItemShippingDetailsResponse(response);
       })));
     });
@@ -10257,8 +10241,7 @@
       res
           .updatemerchantorderid(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.OrdersUpdateMerchantOrderIdResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersUpdateMerchantOrderIdResponse(response);
       })));
     });
@@ -10311,8 +10294,7 @@
       res
           .updateshipment(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersUpdateShipmentResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersUpdateShipmentResponse(response);
       })));
     });
@@ -10373,8 +10355,7 @@
       }), true);
       res
           .custombatch(arg_request, dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ProductsCustomBatchResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkProductsCustomBatchResponse(response);
       })));
     });
@@ -10472,7 +10453,7 @@
       }), true);
       res
           .get(arg_merchantId, arg_productId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Product response) {
+          .then(unittest.expectAsync1(((response) {
         checkProduct(response);
       })));
     });
@@ -10527,7 +10508,7 @@
       res
           .insert(arg_request, arg_merchantId,
               dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Product response) {
+          .then(unittest.expectAsync1(((response) {
         checkProduct(response);
       })));
     });
@@ -10587,7 +10568,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProductsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkProductsListResponse(response);
       })));
     });
@@ -10651,8 +10632,7 @@
       res
           .custombatch(arg_request,
               includeAttributes: arg_includeAttributes, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ProductstatusesCustomBatchResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkProductstatusesCustomBatchResponse(response);
       })));
     });
@@ -10705,7 +10685,7 @@
       res
           .get(arg_merchantId, arg_productId,
               includeAttributes: arg_includeAttributes, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProductStatus response) {
+          .then(unittest.expectAsync1(((response) {
         checkProductStatus(response);
       })));
     });
@@ -10770,8 +10750,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ProductstatusesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkProductstatusesListResponse(response);
       })));
     });
@@ -10834,8 +10813,7 @@
       }), true);
       res
           .custombatch(arg_request, dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ShippingsettingsCustomBatchResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkShippingsettingsCustomBatchResponse(response);
       })));
     });
@@ -10884,7 +10862,7 @@
       }), true);
       res
           .get(arg_merchantId, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ShippingSettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkShippingSettings(response);
       })));
     });
@@ -10931,9 +10909,9 @@
             .encode(buildShippingsettingsGetSupportedCarriersResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getsupportedcarriers(arg_merchantId, $fields: arg_$fields).then(
-          unittest.expectAsync1(
-              ((api.ShippingsettingsGetSupportedCarriersResponse response) {
+      res
+          .getsupportedcarriers(arg_merchantId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkShippingsettingsGetSupportedCarriersResponse(response);
       })));
     });
@@ -10980,9 +10958,9 @@
             .encode(buildShippingsettingsGetSupportedHolidaysResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getsupportedholidays(arg_merchantId, $fields: arg_$fields).then(
-          unittest.expectAsync1(
-              ((api.ShippingsettingsGetSupportedHolidaysResponse response) {
+      res
+          .getsupportedholidays(arg_merchantId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkShippingsettingsGetSupportedHolidaysResponse(response);
       })));
     });
@@ -11039,8 +11017,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ShippingsettingsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkShippingsettingsListResponse(response);
       })));
     });
@@ -11097,7 +11074,7 @@
       res
           .patch(arg_request, arg_merchantId, arg_accountId,
               dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ShippingSettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkShippingSettings(response);
       })));
     });
@@ -11154,7 +11131,7 @@
       res
           .update(arg_request, arg_merchantId, arg_accountId,
               dryRun: arg_dryRun, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ShippingSettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkShippingSettings(response);
       })));
     });
diff --git a/generated/googleapis/test/content/v2sandbox_test.dart b/generated/googleapis/test/content/v2sandbox_test.dart
index 9afd41f..14bf563 100644
--- a/generated/googleapis/test/content/v2sandbox_test.dart
+++ b/generated/googleapis/test/content/v2sandbox_test.dart
@@ -73,14 +73,14 @@
   buildCounterError--;
 }
 
-buildUnnamed1344() {
+buildUnnamed878() {
   var o = new core.List<api.Error>();
   o.add(buildError());
   o.add(buildError());
   return o;
 }
 
-checkUnnamed1344(core.List<api.Error> o) {
+checkUnnamed878(core.List<api.Error> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkError(o[0]);
   checkError(o[1]);
@@ -92,7 +92,7 @@
   buildCounterErrors++;
   if (buildCounterErrors < 3) {
     o.code = 42;
-    o.errors = buildUnnamed1344();
+    o.errors = buildUnnamed878();
     o.message = "foo";
   }
   buildCounterErrors--;
@@ -103,59 +103,59 @@
   buildCounterErrors++;
   if (buildCounterErrors < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed1344(o.errors);
+    checkUnnamed878(o.errors);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterErrors--;
 }
 
-buildUnnamed1345() {
+buildUnnamed879() {
   var o = new core.List<api.OrderLineItem>();
   o.add(buildOrderLineItem());
   o.add(buildOrderLineItem());
   return o;
 }
 
-checkUnnamed1345(core.List<api.OrderLineItem> o) {
+checkUnnamed879(core.List<api.OrderLineItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderLineItem(o[0]);
   checkOrderLineItem(o[1]);
 }
 
-buildUnnamed1346() {
+buildUnnamed880() {
   var o = new core.List<api.OrderPromotion>();
   o.add(buildOrderPromotion());
   o.add(buildOrderPromotion());
   return o;
 }
 
-checkUnnamed1346(core.List<api.OrderPromotion> o) {
+checkUnnamed880(core.List<api.OrderPromotion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderPromotion(o[0]);
   checkOrderPromotion(o[1]);
 }
 
-buildUnnamed1347() {
+buildUnnamed881() {
   var o = new core.List<api.OrderRefund>();
   o.add(buildOrderRefund());
   o.add(buildOrderRefund());
   return o;
 }
 
-checkUnnamed1347(core.List<api.OrderRefund> o) {
+checkUnnamed881(core.List<api.OrderRefund> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderRefund(o[0]);
   checkOrderRefund(o[1]);
 }
 
-buildUnnamed1348() {
+buildUnnamed882() {
   var o = new core.List<api.OrderShipment>();
   o.add(buildOrderShipment());
   o.add(buildOrderShipment());
   return o;
 }
 
-checkUnnamed1348(core.List<api.OrderShipment> o) {
+checkUnnamed882(core.List<api.OrderShipment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderShipment(o[0]);
   checkOrderShipment(o[1]);
@@ -172,16 +172,16 @@
     o.deliveryDetails = buildOrderDeliveryDetails();
     o.id = "foo";
     o.kind = "foo";
-    o.lineItems = buildUnnamed1345();
+    o.lineItems = buildUnnamed879();
     o.merchantId = "foo";
     o.merchantOrderId = "foo";
     o.netAmount = buildPrice();
     o.paymentMethod = buildOrderPaymentMethod();
     o.paymentStatus = "foo";
     o.placedDate = "foo";
-    o.promotions = buildUnnamed1346();
-    o.refunds = buildUnnamed1347();
-    o.shipments = buildUnnamed1348();
+    o.promotions = buildUnnamed880();
+    o.refunds = buildUnnamed881();
+    o.shipments = buildUnnamed882();
     o.shippingCost = buildPrice();
     o.shippingCostTax = buildPrice();
     o.shippingOption = "foo";
@@ -200,16 +200,16 @@
     checkOrderDeliveryDetails(o.deliveryDetails);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1345(o.lineItems);
+    checkUnnamed879(o.lineItems);
     unittest.expect(o.merchantId, unittest.equals('foo'));
     unittest.expect(o.merchantOrderId, unittest.equals('foo'));
     checkPrice(o.netAmount);
     checkOrderPaymentMethod(o.paymentMethod);
     unittest.expect(o.paymentStatus, unittest.equals('foo'));
     unittest.expect(o.placedDate, unittest.equals('foo'));
-    checkUnnamed1346(o.promotions);
-    checkUnnamed1347(o.refunds);
-    checkUnnamed1348(o.shipments);
+    checkUnnamed880(o.promotions);
+    checkUnnamed881(o.refunds);
+    checkUnnamed882(o.shipments);
     checkPrice(o.shippingCost);
     checkPrice(o.shippingCostTax);
     unittest.expect(o.shippingOption, unittest.equals('foo'));
@@ -218,27 +218,27 @@
   buildCounterOrder--;
 }
 
-buildUnnamed1349() {
+buildUnnamed883() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1349(core.List<core.String> o) {
+checkUnnamed883(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1350() {
+buildUnnamed884() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1350(core.List<core.String> o) {
+checkUnnamed884(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -250,13 +250,13 @@
   buildCounterOrderAddress++;
   if (buildCounterOrderAddress < 3) {
     o.country = "foo";
-    o.fullAddress = buildUnnamed1349();
+    o.fullAddress = buildUnnamed883();
     o.isPostOfficeBox = true;
     o.locality = "foo";
     o.postalCode = "foo";
     o.recipientName = "foo";
     o.region = "foo";
-    o.streetAddress = buildUnnamed1350();
+    o.streetAddress = buildUnnamed884();
   }
   buildCounterOrderAddress--;
   return o;
@@ -266,13 +266,13 @@
   buildCounterOrderAddress++;
   if (buildCounterOrderAddress < 3) {
     unittest.expect(o.country, unittest.equals('foo'));
-    checkUnnamed1349(o.fullAddress);
+    checkUnnamed883(o.fullAddress);
     unittest.expect(o.isPostOfficeBox, unittest.isTrue);
     unittest.expect(o.locality, unittest.equals('foo'));
     unittest.expect(o.postalCode, unittest.equals('foo'));
     unittest.expect(o.recipientName, unittest.equals('foo'));
     unittest.expect(o.region, unittest.equals('foo'));
-    checkUnnamed1350(o.streetAddress);
+    checkUnnamed884(o.streetAddress);
   }
   buildCounterOrderAddress--;
 }
@@ -348,40 +348,40 @@
   buildCounterOrderDeliveryDetails--;
 }
 
-buildUnnamed1351() {
+buildUnnamed885() {
   var o = new core.List<api.OrderMerchantProvidedAnnotation>();
   o.add(buildOrderMerchantProvidedAnnotation());
   o.add(buildOrderMerchantProvidedAnnotation());
   return o;
 }
 
-checkUnnamed1351(core.List<api.OrderMerchantProvidedAnnotation> o) {
+checkUnnamed885(core.List<api.OrderMerchantProvidedAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderMerchantProvidedAnnotation(o[0]);
   checkOrderMerchantProvidedAnnotation(o[1]);
 }
 
-buildUnnamed1352() {
+buildUnnamed886() {
   var o = new core.List<api.OrderCancellation>();
   o.add(buildOrderCancellation());
   o.add(buildOrderCancellation());
   return o;
 }
 
-checkUnnamed1352(core.List<api.OrderCancellation> o) {
+checkUnnamed886(core.List<api.OrderCancellation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderCancellation(o[0]);
   checkOrderCancellation(o[1]);
 }
 
-buildUnnamed1353() {
+buildUnnamed887() {
   var o = new core.List<api.OrderReturn>();
   o.add(buildOrderReturn());
   o.add(buildOrderReturn());
   return o;
 }
 
-checkUnnamed1353(core.List<api.OrderReturn> o) {
+checkUnnamed887(core.List<api.OrderReturn> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderReturn(o[0]);
   checkOrderReturn(o[1]);
@@ -392,8 +392,8 @@
   var o = new api.OrderLineItem();
   buildCounterOrderLineItem++;
   if (buildCounterOrderLineItem < 3) {
-    o.annotations = buildUnnamed1351();
-    o.cancellations = buildUnnamed1352();
+    o.annotations = buildUnnamed885();
+    o.cancellations = buildUnnamed886();
     o.id = "foo";
     o.price = buildPrice();
     o.product = buildOrderLineItemProduct();
@@ -404,7 +404,7 @@
     o.quantityReturned = 42;
     o.quantityShipped = 42;
     o.returnInfo = buildOrderLineItemReturnInfo();
-    o.returns = buildUnnamed1353();
+    o.returns = buildUnnamed887();
     o.shippingDetails = buildOrderLineItemShippingDetails();
     o.tax = buildPrice();
   }
@@ -415,8 +415,8 @@
 checkOrderLineItem(api.OrderLineItem o) {
   buildCounterOrderLineItem++;
   if (buildCounterOrderLineItem < 3) {
-    checkUnnamed1351(o.annotations);
-    checkUnnamed1352(o.cancellations);
+    checkUnnamed885(o.annotations);
+    checkUnnamed886(o.cancellations);
     unittest.expect(o.id, unittest.equals('foo'));
     checkPrice(o.price);
     checkOrderLineItemProduct(o.product);
@@ -427,21 +427,21 @@
     unittest.expect(o.quantityReturned, unittest.equals(42));
     unittest.expect(o.quantityShipped, unittest.equals(42));
     checkOrderLineItemReturnInfo(o.returnInfo);
-    checkUnnamed1353(o.returns);
+    checkUnnamed887(o.returns);
     checkOrderLineItemShippingDetails(o.shippingDetails);
     checkPrice(o.tax);
   }
   buildCounterOrderLineItem--;
 }
 
-buildUnnamed1354() {
+buildUnnamed888() {
   var o = new core.List<api.OrderLineItemProductVariantAttribute>();
   o.add(buildOrderLineItemProductVariantAttribute());
   o.add(buildOrderLineItemProductVariantAttribute());
   return o;
 }
 
-checkUnnamed1354(core.List<api.OrderLineItemProductVariantAttribute> o) {
+checkUnnamed888(core.List<api.OrderLineItemProductVariantAttribute> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderLineItemProductVariantAttribute(o[0]);
   checkOrderLineItemProductVariantAttribute(o[1]);
@@ -466,7 +466,7 @@
     o.shownImage = "foo";
     o.targetCountry = "foo";
     o.title = "foo";
-    o.variantAttributes = buildUnnamed1354();
+    o.variantAttributes = buildUnnamed888();
   }
   buildCounterOrderLineItemProduct--;
   return o;
@@ -489,7 +489,7 @@
     unittest.expect(o.shownImage, unittest.equals('foo'));
     unittest.expect(o.targetCountry, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
-    checkUnnamed1354(o.variantAttributes);
+    checkUnnamed888(o.variantAttributes);
   }
   buildCounterOrderLineItemProduct--;
 }
@@ -638,14 +638,14 @@
   buildCounterOrderPaymentMethod--;
 }
 
-buildUnnamed1355() {
+buildUnnamed889() {
   var o = new core.List<api.OrderPromotionBenefit>();
   o.add(buildOrderPromotionBenefit());
   o.add(buildOrderPromotionBenefit());
   return o;
 }
 
-checkUnnamed1355(core.List<api.OrderPromotionBenefit> o) {
+checkUnnamed889(core.List<api.OrderPromotionBenefit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderPromotionBenefit(o[0]);
   checkOrderPromotionBenefit(o[1]);
@@ -656,7 +656,7 @@
   var o = new api.OrderPromotion();
   buildCounterOrderPromotion++;
   if (buildCounterOrderPromotion < 3) {
-    o.benefits = buildUnnamed1355();
+    o.benefits = buildUnnamed889();
     o.effectiveDates = "foo";
     o.genericRedemptionCode = "foo";
     o.id = "foo";
@@ -671,7 +671,7 @@
 checkOrderPromotion(api.OrderPromotion o) {
   buildCounterOrderPromotion++;
   if (buildCounterOrderPromotion < 3) {
-    checkUnnamed1355(o.benefits);
+    checkUnnamed889(o.benefits);
     unittest.expect(o.effectiveDates, unittest.equals('foo'));
     unittest.expect(o.genericRedemptionCode, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
@@ -682,14 +682,14 @@
   buildCounterOrderPromotion--;
 }
 
-buildUnnamed1356() {
+buildUnnamed890() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1356(core.List<core.String> o) {
+checkUnnamed890(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -701,7 +701,7 @@
   buildCounterOrderPromotionBenefit++;
   if (buildCounterOrderPromotionBenefit < 3) {
     o.discount = buildPrice();
-    o.offerIds = buildUnnamed1356();
+    o.offerIds = buildUnnamed890();
     o.subType = "foo";
     o.taxImpact = buildPrice();
     o.type = "foo";
@@ -714,7 +714,7 @@
   buildCounterOrderPromotionBenefit++;
   if (buildCounterOrderPromotionBenefit < 3) {
     checkPrice(o.discount);
-    checkUnnamed1356(o.offerIds);
+    checkUnnamed890(o.offerIds);
     unittest.expect(o.subType, unittest.equals('foo'));
     checkPrice(o.taxImpact);
     unittest.expect(o.type, unittest.equals('foo'));
@@ -776,14 +776,14 @@
   buildCounterOrderReturn--;
 }
 
-buildUnnamed1357() {
+buildUnnamed891() {
   var o = new core.List<api.OrderShipmentLineItemShipment>();
   o.add(buildOrderShipmentLineItemShipment());
   o.add(buildOrderShipmentLineItemShipment());
   return o;
 }
 
-checkUnnamed1357(core.List<api.OrderShipmentLineItemShipment> o) {
+checkUnnamed891(core.List<api.OrderShipmentLineItemShipment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderShipmentLineItemShipment(o[0]);
   checkOrderShipmentLineItemShipment(o[1]);
@@ -798,7 +798,7 @@
     o.creationDate = "foo";
     o.deliveryDate = "foo";
     o.id = "foo";
-    o.lineItems = buildUnnamed1357();
+    o.lineItems = buildUnnamed891();
     o.status = "foo";
     o.trackingId = "foo";
   }
@@ -813,7 +813,7 @@
     unittest.expect(o.creationDate, unittest.equals('foo'));
     unittest.expect(o.deliveryDate, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1357(o.lineItems);
+    checkUnnamed891(o.lineItems);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.trackingId, unittest.equals('foo'));
   }
@@ -1044,14 +1044,14 @@
   buildCounterOrdersCreateTestOrderResponse--;
 }
 
-buildUnnamed1358() {
+buildUnnamed892() {
   var o = new core.List<api.OrdersCustomBatchRequestEntry>();
   o.add(buildOrdersCustomBatchRequestEntry());
   o.add(buildOrdersCustomBatchRequestEntry());
   return o;
 }
 
-checkUnnamed1358(core.List<api.OrdersCustomBatchRequestEntry> o) {
+checkUnnamed892(core.List<api.OrdersCustomBatchRequestEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrdersCustomBatchRequestEntry(o[0]);
   checkOrdersCustomBatchRequestEntry(o[1]);
@@ -1062,7 +1062,7 @@
   var o = new api.OrdersCustomBatchRequest();
   buildCounterOrdersCustomBatchRequest++;
   if (buildCounterOrdersCustomBatchRequest < 3) {
-    o.entries = buildUnnamed1358();
+    o.entries = buildUnnamed892();
   }
   buildCounterOrdersCustomBatchRequest--;
   return o;
@@ -1071,7 +1071,7 @@
 checkOrdersCustomBatchRequest(api.OrdersCustomBatchRequest o) {
   buildCounterOrdersCustomBatchRequest++;
   if (buildCounterOrdersCustomBatchRequest < 3) {
-    checkUnnamed1358(o.entries);
+    checkUnnamed892(o.entries);
   }
   buildCounterOrdersCustomBatchRequest--;
 }
@@ -1341,14 +1341,14 @@
   buildCounterOrdersCustomBatchRequestEntryReturnRefundLineItem--;
 }
 
-buildUnnamed1359() {
+buildUnnamed893() {
   var o = new core.List<api.OrderMerchantProvidedAnnotation>();
   o.add(buildOrderMerchantProvidedAnnotation());
   o.add(buildOrderMerchantProvidedAnnotation());
   return o;
 }
 
-checkUnnamed1359(core.List<api.OrderMerchantProvidedAnnotation> o) {
+checkUnnamed893(core.List<api.OrderMerchantProvidedAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderMerchantProvidedAnnotation(o[0]);
   checkOrderMerchantProvidedAnnotation(o[1]);
@@ -1359,7 +1359,7 @@
   var o = new api.OrdersCustomBatchRequestEntrySetLineItemMetadata();
   buildCounterOrdersCustomBatchRequestEntrySetLineItemMetadata++;
   if (buildCounterOrdersCustomBatchRequestEntrySetLineItemMetadata < 3) {
-    o.annotations = buildUnnamed1359();
+    o.annotations = buildUnnamed893();
     o.lineItemId = "foo";
     o.productId = "foo";
   }
@@ -1371,27 +1371,27 @@
     api.OrdersCustomBatchRequestEntrySetLineItemMetadata o) {
   buildCounterOrdersCustomBatchRequestEntrySetLineItemMetadata++;
   if (buildCounterOrdersCustomBatchRequestEntrySetLineItemMetadata < 3) {
-    checkUnnamed1359(o.annotations);
+    checkUnnamed893(o.annotations);
     unittest.expect(o.lineItemId, unittest.equals('foo'));
     unittest.expect(o.productId, unittest.equals('foo'));
   }
   buildCounterOrdersCustomBatchRequestEntrySetLineItemMetadata--;
 }
 
-buildUnnamed1360() {
+buildUnnamed894() {
   var o = new core.List<api.OrderShipmentLineItemShipment>();
   o.add(buildOrderShipmentLineItemShipment());
   o.add(buildOrderShipmentLineItemShipment());
   return o;
 }
 
-checkUnnamed1360(core.List<api.OrderShipmentLineItemShipment> o) {
+checkUnnamed894(core.List<api.OrderShipmentLineItemShipment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderShipmentLineItemShipment(o[0]);
   checkOrderShipmentLineItemShipment(o[1]);
 }
 
-buildUnnamed1361() {
+buildUnnamed895() {
   var o = new core
       .List<api.OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo>();
   o.add(buildOrdersCustomBatchRequestEntryShipLineItemsShipmentInfo());
@@ -1399,7 +1399,7 @@
   return o;
 }
 
-checkUnnamed1361(
+checkUnnamed895(
     core.List<api.OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrdersCustomBatchRequestEntryShipLineItemsShipmentInfo(o[0]);
@@ -1412,9 +1412,9 @@
   buildCounterOrdersCustomBatchRequestEntryShipLineItems++;
   if (buildCounterOrdersCustomBatchRequestEntryShipLineItems < 3) {
     o.carrier = "foo";
-    o.lineItems = buildUnnamed1360();
+    o.lineItems = buildUnnamed894();
     o.shipmentId = "foo";
-    o.shipmentInfos = buildUnnamed1361();
+    o.shipmentInfos = buildUnnamed895();
     o.trackingId = "foo";
   }
   buildCounterOrdersCustomBatchRequestEntryShipLineItems--;
@@ -1426,9 +1426,9 @@
   buildCounterOrdersCustomBatchRequestEntryShipLineItems++;
   if (buildCounterOrdersCustomBatchRequestEntryShipLineItems < 3) {
     unittest.expect(o.carrier, unittest.equals('foo'));
-    checkUnnamed1360(o.lineItems);
+    checkUnnamed894(o.lineItems);
     unittest.expect(o.shipmentId, unittest.equals('foo'));
-    checkUnnamed1361(o.shipmentInfos);
+    checkUnnamed895(o.shipmentInfos);
     unittest.expect(o.trackingId, unittest.equals('foo'));
   }
   buildCounterOrdersCustomBatchRequestEntryShipLineItems--;
@@ -1513,14 +1513,14 @@
   buildCounterOrdersCustomBatchRequestEntryUpdateShipment--;
 }
 
-buildUnnamed1362() {
+buildUnnamed896() {
   var o = new core.List<api.OrdersCustomBatchResponseEntry>();
   o.add(buildOrdersCustomBatchResponseEntry());
   o.add(buildOrdersCustomBatchResponseEntry());
   return o;
 }
 
-checkUnnamed1362(core.List<api.OrdersCustomBatchResponseEntry> o) {
+checkUnnamed896(core.List<api.OrdersCustomBatchResponseEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrdersCustomBatchResponseEntry(o[0]);
   checkOrdersCustomBatchResponseEntry(o[1]);
@@ -1531,7 +1531,7 @@
   var o = new api.OrdersCustomBatchResponse();
   buildCounterOrdersCustomBatchResponse++;
   if (buildCounterOrdersCustomBatchResponse < 3) {
-    o.entries = buildUnnamed1362();
+    o.entries = buildUnnamed896();
     o.kind = "foo";
   }
   buildCounterOrdersCustomBatchResponse--;
@@ -1541,7 +1541,7 @@
 checkOrdersCustomBatchResponse(api.OrdersCustomBatchResponse o) {
   buildCounterOrdersCustomBatchResponse++;
   if (buildCounterOrdersCustomBatchResponse < 3) {
-    checkUnnamed1362(o.entries);
+    checkUnnamed896(o.entries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterOrdersCustomBatchResponse--;
@@ -1674,14 +1674,14 @@
   buildCounterOrdersInStoreRefundLineItemResponse--;
 }
 
-buildUnnamed1363() {
+buildUnnamed897() {
   var o = new core.List<api.Order>();
   o.add(buildOrder());
   o.add(buildOrder());
   return o;
 }
 
-checkUnnamed1363(core.List<api.Order> o) {
+checkUnnamed897(core.List<api.Order> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrder(o[0]);
   checkOrder(o[1]);
@@ -1694,7 +1694,7 @@
   if (buildCounterOrdersListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed1363();
+    o.resources = buildUnnamed897();
   }
   buildCounterOrdersListResponse--;
   return o;
@@ -1705,7 +1705,7 @@
   if (buildCounterOrdersListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1363(o.resources);
+    checkUnnamed897(o.resources);
   }
   buildCounterOrdersListResponse--;
 }
@@ -1918,14 +1918,14 @@
   buildCounterOrdersReturnRefundLineItemResponse--;
 }
 
-buildUnnamed1364() {
+buildUnnamed898() {
   var o = new core.List<api.OrderMerchantProvidedAnnotation>();
   o.add(buildOrderMerchantProvidedAnnotation());
   o.add(buildOrderMerchantProvidedAnnotation());
   return o;
 }
 
-checkUnnamed1364(core.List<api.OrderMerchantProvidedAnnotation> o) {
+checkUnnamed898(core.List<api.OrderMerchantProvidedAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderMerchantProvidedAnnotation(o[0]);
   checkOrderMerchantProvidedAnnotation(o[1]);
@@ -1936,7 +1936,7 @@
   var o = new api.OrdersSetLineItemMetadataRequest();
   buildCounterOrdersSetLineItemMetadataRequest++;
   if (buildCounterOrdersSetLineItemMetadataRequest < 3) {
-    o.annotations = buildUnnamed1364();
+    o.annotations = buildUnnamed898();
     o.lineItemId = "foo";
     o.operationId = "foo";
     o.productId = "foo";
@@ -1948,7 +1948,7 @@
 checkOrdersSetLineItemMetadataRequest(api.OrdersSetLineItemMetadataRequest o) {
   buildCounterOrdersSetLineItemMetadataRequest++;
   if (buildCounterOrdersSetLineItemMetadataRequest < 3) {
-    checkUnnamed1364(o.annotations);
+    checkUnnamed898(o.annotations);
     unittest.expect(o.lineItemId, unittest.equals('foo'));
     unittest.expect(o.operationId, unittest.equals('foo'));
     unittest.expect(o.productId, unittest.equals('foo'));
@@ -1978,20 +1978,20 @@
   buildCounterOrdersSetLineItemMetadataResponse--;
 }
 
-buildUnnamed1365() {
+buildUnnamed899() {
   var o = new core.List<api.OrderShipmentLineItemShipment>();
   o.add(buildOrderShipmentLineItemShipment());
   o.add(buildOrderShipmentLineItemShipment());
   return o;
 }
 
-checkUnnamed1365(core.List<api.OrderShipmentLineItemShipment> o) {
+checkUnnamed899(core.List<api.OrderShipmentLineItemShipment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderShipmentLineItemShipment(o[0]);
   checkOrderShipmentLineItemShipment(o[1]);
 }
 
-buildUnnamed1366() {
+buildUnnamed900() {
   var o = new core
       .List<api.OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo>();
   o.add(buildOrdersCustomBatchRequestEntryShipLineItemsShipmentInfo());
@@ -1999,7 +1999,7 @@
   return o;
 }
 
-checkUnnamed1366(
+checkUnnamed900(
     core.List<api.OrdersCustomBatchRequestEntryShipLineItemsShipmentInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrdersCustomBatchRequestEntryShipLineItemsShipmentInfo(o[0]);
@@ -2012,10 +2012,10 @@
   buildCounterOrdersShipLineItemsRequest++;
   if (buildCounterOrdersShipLineItemsRequest < 3) {
     o.carrier = "foo";
-    o.lineItems = buildUnnamed1365();
+    o.lineItems = buildUnnamed899();
     o.operationId = "foo";
     o.shipmentId = "foo";
-    o.shipmentInfos = buildUnnamed1366();
+    o.shipmentInfos = buildUnnamed900();
     o.trackingId = "foo";
   }
   buildCounterOrdersShipLineItemsRequest--;
@@ -2026,10 +2026,10 @@
   buildCounterOrdersShipLineItemsRequest++;
   if (buildCounterOrdersShipLineItemsRequest < 3) {
     unittest.expect(o.carrier, unittest.equals('foo'));
-    checkUnnamed1365(o.lineItems);
+    checkUnnamed899(o.lineItems);
     unittest.expect(o.operationId, unittest.equals('foo'));
     unittest.expect(o.shipmentId, unittest.equals('foo'));
-    checkUnnamed1366(o.shipmentInfos);
+    checkUnnamed900(o.shipmentInfos);
     unittest.expect(o.trackingId, unittest.equals('foo'));
   }
   buildCounterOrdersShipLineItemsRequest--;
@@ -2219,27 +2219,27 @@
   buildCounterPrice--;
 }
 
-buildUnnamed1367() {
+buildUnnamed901() {
   var o = new core.List<api.TestOrderLineItem>();
   o.add(buildTestOrderLineItem());
   o.add(buildTestOrderLineItem());
   return o;
 }
 
-checkUnnamed1367(core.List<api.TestOrderLineItem> o) {
+checkUnnamed901(core.List<api.TestOrderLineItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTestOrderLineItem(o[0]);
   checkTestOrderLineItem(o[1]);
 }
 
-buildUnnamed1368() {
+buildUnnamed902() {
   var o = new core.List<api.OrderPromotion>();
   o.add(buildOrderPromotion());
   o.add(buildOrderPromotion());
   return o;
 }
 
-checkUnnamed1368(core.List<api.OrderPromotion> o) {
+checkUnnamed902(core.List<api.OrderPromotion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderPromotion(o[0]);
   checkOrderPromotion(o[1]);
@@ -2252,11 +2252,11 @@
   if (buildCounterTestOrder < 3) {
     o.customer = buildTestOrderCustomer();
     o.kind = "foo";
-    o.lineItems = buildUnnamed1367();
+    o.lineItems = buildUnnamed901();
     o.notificationMode = "foo";
     o.paymentMethod = buildTestOrderPaymentMethod();
     o.predefinedDeliveryAddress = "foo";
-    o.promotions = buildUnnamed1368();
+    o.promotions = buildUnnamed902();
     o.shippingCost = buildPrice();
     o.shippingCostTax = buildPrice();
     o.shippingOption = "foo";
@@ -2270,11 +2270,11 @@
   if (buildCounterTestOrder < 3) {
     checkTestOrderCustomer(o.customer);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1367(o.lineItems);
+    checkUnnamed901(o.lineItems);
     unittest.expect(o.notificationMode, unittest.equals('foo'));
     checkTestOrderPaymentMethod(o.paymentMethod);
     unittest.expect(o.predefinedDeliveryAddress, unittest.equals('foo'));
-    checkUnnamed1368(o.promotions);
+    checkUnnamed902(o.promotions);
     checkPrice(o.shippingCost);
     checkPrice(o.shippingCostTax);
     unittest.expect(o.shippingOption, unittest.equals('foo'));
@@ -2332,14 +2332,14 @@
   buildCounterTestOrderLineItem--;
 }
 
-buildUnnamed1369() {
+buildUnnamed903() {
   var o = new core.List<api.OrderLineItemProductVariantAttribute>();
   o.add(buildOrderLineItemProductVariantAttribute());
   o.add(buildOrderLineItemProductVariantAttribute());
   return o;
 }
 
-checkUnnamed1369(core.List<api.OrderLineItemProductVariantAttribute> o) {
+checkUnnamed903(core.List<api.OrderLineItemProductVariantAttribute> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderLineItemProductVariantAttribute(o[0]);
   checkOrderLineItemProductVariantAttribute(o[1]);
@@ -2362,7 +2362,7 @@
     o.price = buildPrice();
     o.targetCountry = "foo";
     o.title = "foo";
-    o.variantAttributes = buildUnnamed1369();
+    o.variantAttributes = buildUnnamed903();
   }
   buildCounterTestOrderLineItemProduct--;
   return o;
@@ -2383,7 +2383,7 @@
     checkPrice(o.price);
     unittest.expect(o.targetCountry, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
-    checkUnnamed1369(o.variantAttributes);
+    checkUnnamed903(o.variantAttributes);
   }
   buildCounterTestOrderLineItemProduct--;
 }
@@ -2415,14 +2415,14 @@
   buildCounterTestOrderPaymentMethod--;
 }
 
-buildUnnamed1370() {
+buildUnnamed904() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1370(core.List<core.String> o) {
+checkUnnamed904(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3104,8 +3104,7 @@
       res
           .acknowledge(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.OrdersAcknowledgeResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersAcknowledgeResponse(response);
       })));
     });
@@ -3153,8 +3152,7 @@
       }), true);
       res
           .advancetestorder(arg_merchantId, arg_orderId, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersAdvanceTestOrderResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersAdvanceTestOrderResponse(response);
       })));
     });
@@ -3207,7 +3205,7 @@
       res
           .cancel(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrdersCancelResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersCancelResponse(response);
       })));
     });
@@ -3260,8 +3258,7 @@
       res
           .cancellineitem(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersCancelLineItemResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersCancelLineItemResponse(response);
       })));
     });
@@ -3312,8 +3309,7 @@
       }), true);
       res
           .createtestorder(arg_request, arg_merchantId, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersCreateTestOrderResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersCreateTestOrderResponse(response);
       })));
     });
@@ -3367,8 +3363,9 @@
         var resp = convert.JSON.encode(buildOrdersCustomBatchResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.custombatch(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.OrdersCustomBatchResponse response) {
+      res
+          .custombatch(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkOrdersCustomBatchResponse(response);
       })));
     });
@@ -3416,7 +3413,7 @@
       }), true);
       res
           .get(arg_merchantId, arg_orderId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Order response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrder(response);
       })));
     });
@@ -3466,8 +3463,7 @@
       res
           .getbymerchantorderid(arg_merchantId, arg_merchantOrderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersGetByMerchantOrderIdResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersGetByMerchantOrderIdResponse(response);
       })));
     });
@@ -3517,8 +3513,7 @@
       res
           .gettestordertemplate(arg_merchantId, arg_templateName,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersGetTestOrderTemplateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersGetTestOrderTemplateResponse(response);
       })));
     });
@@ -3572,8 +3567,7 @@
       res
           .instorerefundlineitem(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.OrdersInStoreRefundLineItemResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersInStoreRefundLineItemResponse(response);
       })));
     });
@@ -3588,7 +3582,7 @@
       var arg_pageToken = "foo";
       var arg_placedDateEnd = "foo";
       var arg_placedDateStart = "foo";
-      var arg_statuses = buildUnnamed1370();
+      var arg_statuses = buildUnnamed904();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3648,7 +3642,7 @@
               placedDateStart: arg_placedDateStart,
               statuses: arg_statuses,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrdersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersListResponse(response);
       })));
     });
@@ -3701,7 +3695,7 @@
       res
           .refund(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrdersRefundResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersRefundResponse(response);
       })));
     });
@@ -3755,8 +3749,7 @@
       res
           .rejectreturnlineitem(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersRejectReturnLineItemResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersRejectReturnLineItemResponse(response);
       })));
     });
@@ -3809,8 +3802,7 @@
       res
           .returnlineitem(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersReturnLineItemResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersReturnLineItemResponse(response);
       })));
     });
@@ -3864,8 +3856,7 @@
       res
           .returnrefundlineitem(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersReturnRefundLineItemResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersReturnRefundLineItemResponse(response);
       })));
     });
@@ -3919,8 +3910,7 @@
       res
           .setlineitemmetadata(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersSetLineItemMetadataResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersSetLineItemMetadataResponse(response);
       })));
     });
@@ -3973,8 +3963,7 @@
       res
           .shiplineitems(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersShipLineItemsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersShipLineItemsResponse(response);
       })));
     });
@@ -4028,9 +4017,9 @@
       }), true);
       res
           .updatelineitemshippingdetails(
-              arg_request, arg_merchantId, arg_orderId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.OrdersUpdateLineItemShippingDetailsResponse response) {
+              arg_request, arg_merchantId, arg_orderId,
+              $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkOrdersUpdateLineItemShippingDetailsResponse(response);
       })));
     });
@@ -4084,8 +4073,7 @@
       res
           .updatemerchantorderid(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.OrdersUpdateMerchantOrderIdResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersUpdateMerchantOrderIdResponse(response);
       })));
     });
@@ -4138,8 +4126,7 @@
       res
           .updateshipment(arg_request, arg_merchantId, arg_orderId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.OrdersUpdateShipmentResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersUpdateShipmentResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/customsearch/v1_test.dart b/generated/googleapis/test/customsearch/v1_test.dart
index ffcfcc7..ec9cd32 100644
--- a/generated/googleapis/test/customsearch/v1_test.dart
+++ b/generated/googleapis/test/customsearch/v1_test.dart
@@ -73,30 +73,30 @@
   buildCounterContextFacets--;
 }
 
-buildUnnamed2359() {
+buildUnnamed1584() {
   var o = new core.List<api.ContextFacets>();
   o.add(buildContextFacets());
   o.add(buildContextFacets());
   return o;
 }
 
-checkUnnamed2359(core.List<api.ContextFacets> o) {
+checkUnnamed1584(core.List<api.ContextFacets> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContextFacets(o[0]);
   checkContextFacets(o[1]);
 }
 
-buildUnnamed2360() {
+buildUnnamed1585() {
   var o = new core.List<core.List<api.ContextFacets>>();
-  o.add(buildUnnamed2359());
-  o.add(buildUnnamed2359());
+  o.add(buildUnnamed1584());
+  o.add(buildUnnamed1584());
   return o;
 }
 
-checkUnnamed2360(core.List<core.List<api.ContextFacets>> o) {
+checkUnnamed1585(core.List<core.List<api.ContextFacets>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2359(o[0]);
-  checkUnnamed2359(o[1]);
+  checkUnnamed1584(o[0]);
+  checkUnnamed1584(o[1]);
 }
 
 core.int buildCounterContext = 0;
@@ -104,7 +104,7 @@
   var o = new api.Context();
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    o.facets = buildUnnamed2360();
+    o.facets = buildUnnamed1585();
     o.title = "foo";
   }
   buildCounterContext--;
@@ -114,7 +114,7 @@
 checkContext(api.Context o) {
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    checkUnnamed2360(o.facets);
+    checkUnnamed1585(o.facets);
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterContext--;
@@ -145,14 +145,14 @@
   buildCounterPromotionBodyLines--;
 }
 
-buildUnnamed2361() {
+buildUnnamed1586() {
   var o = new core.List<api.PromotionBodyLines>();
   o.add(buildPromotionBodyLines());
   o.add(buildPromotionBodyLines());
   return o;
 }
 
-checkUnnamed2361(core.List<api.PromotionBodyLines> o) {
+checkUnnamed1586(core.List<api.PromotionBodyLines> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPromotionBodyLines(o[0]);
   checkPromotionBodyLines(o[1]);
@@ -186,7 +186,7 @@
   var o = new api.Promotion();
   buildCounterPromotion++;
   if (buildCounterPromotion < 3) {
-    o.bodyLines = buildUnnamed2361();
+    o.bodyLines = buildUnnamed1586();
     o.displayLink = "foo";
     o.htmlTitle = "foo";
     o.image = buildPromotionImage();
@@ -200,7 +200,7 @@
 checkPromotion(api.Promotion o) {
   buildCounterPromotion++;
   if (buildCounterPromotion < 3) {
-    checkUnnamed2361(o.bodyLines);
+    checkUnnamed1586(o.bodyLines);
     unittest.expect(o.displayLink, unittest.equals('foo'));
     unittest.expect(o.htmlTitle, unittest.equals('foo'));
     checkPromotionImage(o.image);
@@ -353,20 +353,20 @@
   buildCounterResultLabels--;
 }
 
-buildUnnamed2362() {
+buildUnnamed1587() {
   var o = new core.List<api.ResultLabels>();
   o.add(buildResultLabels());
   o.add(buildResultLabels());
   return o;
 }
 
-checkUnnamed2362(core.List<api.ResultLabels> o) {
+checkUnnamed1587(core.List<api.ResultLabels> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultLabels(o[0]);
   checkResultLabels(o[1]);
 }
 
-buildUnnamed2363() {
+buildUnnamed1588() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -381,7 +381,7 @@
   return o;
 }
 
-checkUnnamed2363(core.Map<core.String, core.Object> o) {
+checkUnnamed1588(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -395,32 +395,32 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2364() {
+buildUnnamed1589() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2363());
-  o.add(buildUnnamed2363());
+  o.add(buildUnnamed1588());
+  o.add(buildUnnamed1588());
   return o;
 }
 
-checkUnnamed2364(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1589(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2363(o[0]);
-  checkUnnamed2363(o[1]);
+  checkUnnamed1588(o[0]);
+  checkUnnamed1588(o[1]);
 }
 
-buildUnnamed2365() {
+buildUnnamed1590() {
   var o = new core
       .Map<core.String, core.List<core.Map<core.String, core.Object>>>();
-  o["x"] = buildUnnamed2364();
-  o["y"] = buildUnnamed2364();
+  o["x"] = buildUnnamed1589();
+  o["y"] = buildUnnamed1589();
   return o;
 }
 
-checkUnnamed2365(
+checkUnnamed1590(
     core.Map<core.String, core.List<core.Map<core.String, core.Object>>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2364(o["x"]);
-  checkUnnamed2364(o["y"]);
+  checkUnnamed1589(o["x"]);
+  checkUnnamed1589(o["y"]);
 }
 
 core.int buildCounterResult = 0;
@@ -437,10 +437,10 @@
     o.htmlTitle = "foo";
     o.image = buildResultImage();
     o.kind = "foo";
-    o.labels = buildUnnamed2362();
+    o.labels = buildUnnamed1587();
     o.link = "foo";
     o.mime = "foo";
-    o.pagemap = buildUnnamed2365();
+    o.pagemap = buildUnnamed1590();
     o.snippet = "foo";
     o.title = "foo";
   }
@@ -460,66 +460,66 @@
     unittest.expect(o.htmlTitle, unittest.equals('foo'));
     checkResultImage(o.image);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2362(o.labels);
+    checkUnnamed1587(o.labels);
     unittest.expect(o.link, unittest.equals('foo'));
     unittest.expect(o.mime, unittest.equals('foo'));
-    checkUnnamed2365(o.pagemap);
+    checkUnnamed1590(o.pagemap);
     unittest.expect(o.snippet, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterResult--;
 }
 
-buildUnnamed2366() {
+buildUnnamed1591() {
   var o = new core.List<api.Result>();
   o.add(buildResult());
   o.add(buildResult());
   return o;
 }
 
-checkUnnamed2366(core.List<api.Result> o) {
+checkUnnamed1591(core.List<api.Result> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResult(o[0]);
   checkResult(o[1]);
 }
 
-buildUnnamed2367() {
+buildUnnamed1592() {
   var o = new core.List<api.Promotion>();
   o.add(buildPromotion());
   o.add(buildPromotion());
   return o;
 }
 
-checkUnnamed2367(core.List<api.Promotion> o) {
+checkUnnamed1592(core.List<api.Promotion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPromotion(o[0]);
   checkPromotion(o[1]);
 }
 
-buildUnnamed2368() {
+buildUnnamed1593() {
   var o = new core.List<api.Query>();
   o.add(buildQuery());
   o.add(buildQuery());
   return o;
 }
 
-checkUnnamed2368(core.List<api.Query> o) {
+checkUnnamed1593(core.List<api.Query> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuery(o[0]);
   checkQuery(o[1]);
 }
 
-buildUnnamed2369() {
+buildUnnamed1594() {
   var o = new core.Map<core.String, core.List<api.Query>>();
-  o["x"] = buildUnnamed2368();
-  o["y"] = buildUnnamed2368();
+  o["x"] = buildUnnamed1593();
+  o["y"] = buildUnnamed1593();
   return o;
 }
 
-checkUnnamed2369(core.Map<core.String, core.List<api.Query>> o) {
+checkUnnamed1594(core.Map<core.String, core.List<api.Query>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2368(o["x"]);
-  checkUnnamed2368(o["y"]);
+  checkUnnamed1593(o["x"]);
+  checkUnnamed1593(o["y"]);
 }
 
 core.int buildCounterSearchSearchInformation = 0;
@@ -595,10 +595,10 @@
   buildCounterSearch++;
   if (buildCounterSearch < 3) {
     o.context = buildContext();
-    o.items = buildUnnamed2366();
+    o.items = buildUnnamed1591();
     o.kind = "foo";
-    o.promotions = buildUnnamed2367();
-    o.queries = buildUnnamed2369();
+    o.promotions = buildUnnamed1592();
+    o.queries = buildUnnamed1594();
     o.searchInformation = buildSearchSearchInformation();
     o.spelling = buildSearchSpelling();
     o.url = buildSearchUrl();
@@ -611,10 +611,10 @@
   buildCounterSearch++;
   if (buildCounterSearch < 3) {
     checkContext(o.context);
-    checkUnnamed2366(o.items);
+    checkUnnamed1591(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2367(o.promotions);
-    checkUnnamed2369(o.queries);
+    checkUnnamed1592(o.promotions);
+    checkUnnamed1594(o.queries);
     checkSearchSearchInformation(o.searchInformation);
     checkSearchSpelling(o.spelling);
     checkSearchUrl(o.url);
@@ -887,7 +887,7 @@
               sort: arg_sort,
               start: arg_start,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Search response) {
+          .then(unittest.expectAsync1(((response) {
         checkSearch(response);
       })));
     });
diff --git a/generated/googleapis/test/dataproc/v1_test.dart b/generated/googleapis/test/dataproc/v1_test.dart
index f72e4af..8633cdc 100644
--- a/generated/googleapis/test/dataproc/v1_test.dart
+++ b/generated/googleapis/test/dataproc/v1_test.dart
@@ -86,27 +86,27 @@
   buildCounterCancelJobRequest--;
 }
 
-buildUnnamed657() {
+buildUnnamed1363() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed657(core.Map<core.String, core.String> o) {
+checkUnnamed1363(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed658() {
+buildUnnamed1364() {
   var o = new core.List<api.ClusterStatus>();
   o.add(buildClusterStatus());
   o.add(buildClusterStatus());
   return o;
 }
 
-checkUnnamed658(core.List<api.ClusterStatus> o) {
+checkUnnamed1364(core.List<api.ClusterStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClusterStatus(o[0]);
   checkClusterStatus(o[1]);
@@ -120,11 +120,11 @@
     o.clusterName = "foo";
     o.clusterUuid = "foo";
     o.config = buildClusterConfig();
-    o.labels = buildUnnamed657();
+    o.labels = buildUnnamed1363();
     o.metrics = buildClusterMetrics();
     o.projectId = "foo";
     o.status = buildClusterStatus();
-    o.statusHistory = buildUnnamed658();
+    o.statusHistory = buildUnnamed1364();
   }
   buildCounterCluster--;
   return o;
@@ -136,23 +136,23 @@
     unittest.expect(o.clusterName, unittest.equals('foo'));
     unittest.expect(o.clusterUuid, unittest.equals('foo'));
     checkClusterConfig(o.config);
-    checkUnnamed657(o.labels);
+    checkUnnamed1363(o.labels);
     checkClusterMetrics(o.metrics);
     unittest.expect(o.projectId, unittest.equals('foo'));
     checkClusterStatus(o.status);
-    checkUnnamed658(o.statusHistory);
+    checkUnnamed1364(o.statusHistory);
   }
   buildCounterCluster--;
 }
 
-buildUnnamed659() {
+buildUnnamed1365() {
   var o = new core.List<api.NodeInitializationAction>();
   o.add(buildNodeInitializationAction());
   o.add(buildNodeInitializationAction());
   return o;
 }
 
-checkUnnamed659(core.List<api.NodeInitializationAction> o) {
+checkUnnamed1365(core.List<api.NodeInitializationAction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNodeInitializationAction(o[0]);
   checkNodeInitializationAction(o[1]);
@@ -165,7 +165,7 @@
   if (buildCounterClusterConfig < 3) {
     o.configBucket = "foo";
     o.gceClusterConfig = buildGceClusterConfig();
-    o.initializationActions = buildUnnamed659();
+    o.initializationActions = buildUnnamed1365();
     o.masterConfig = buildInstanceGroupConfig();
     o.secondaryWorkerConfig = buildInstanceGroupConfig();
     o.softwareConfig = buildSoftwareConfig();
@@ -180,7 +180,7 @@
   if (buildCounterClusterConfig < 3) {
     unittest.expect(o.configBucket, unittest.equals('foo'));
     checkGceClusterConfig(o.gceClusterConfig);
-    checkUnnamed659(o.initializationActions);
+    checkUnnamed1365(o.initializationActions);
     checkInstanceGroupConfig(o.masterConfig);
     checkInstanceGroupConfig(o.secondaryWorkerConfig);
     checkSoftwareConfig(o.softwareConfig);
@@ -189,27 +189,27 @@
   buildCounterClusterConfig--;
 }
 
-buildUnnamed660() {
+buildUnnamed1366() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed660(core.Map<core.String, core.String> o) {
+checkUnnamed1366(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed661() {
+buildUnnamed1367() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed661(core.Map<core.String, core.String> o) {
+checkUnnamed1367(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -220,8 +220,8 @@
   var o = new api.ClusterMetrics();
   buildCounterClusterMetrics++;
   if (buildCounterClusterMetrics < 3) {
-    o.hdfsMetrics = buildUnnamed660();
-    o.yarnMetrics = buildUnnamed661();
+    o.hdfsMetrics = buildUnnamed1366();
+    o.yarnMetrics = buildUnnamed1367();
   }
   buildCounterClusterMetrics--;
   return o;
@@ -230,46 +230,46 @@
 checkClusterMetrics(api.ClusterMetrics o) {
   buildCounterClusterMetrics++;
   if (buildCounterClusterMetrics < 3) {
-    checkUnnamed660(o.hdfsMetrics);
-    checkUnnamed661(o.yarnMetrics);
+    checkUnnamed1366(o.hdfsMetrics);
+    checkUnnamed1367(o.yarnMetrics);
   }
   buildCounterClusterMetrics--;
 }
 
-buildUnnamed662() {
+buildUnnamed1368() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed662(core.Map<core.String, core.String> o) {
+checkUnnamed1368(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed663() {
+buildUnnamed1369() {
   var o = new core.List<api.ClusterOperationStatus>();
   o.add(buildClusterOperationStatus());
   o.add(buildClusterOperationStatus());
   return o;
 }
 
-checkUnnamed663(core.List<api.ClusterOperationStatus> o) {
+checkUnnamed1369(core.List<api.ClusterOperationStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClusterOperationStatus(o[0]);
   checkClusterOperationStatus(o[1]);
 }
 
-buildUnnamed664() {
+buildUnnamed1370() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed664(core.List<core.String> o) {
+checkUnnamed1370(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -283,11 +283,11 @@
     o.clusterName = "foo";
     o.clusterUuid = "foo";
     o.description = "foo";
-    o.labels = buildUnnamed662();
+    o.labels = buildUnnamed1368();
     o.operationType = "foo";
     o.status = buildClusterOperationStatus();
-    o.statusHistory = buildUnnamed663();
-    o.warnings = buildUnnamed664();
+    o.statusHistory = buildUnnamed1369();
+    o.warnings = buildUnnamed1370();
   }
   buildCounterClusterOperationMetadata--;
   return o;
@@ -299,11 +299,11 @@
     unittest.expect(o.clusterName, unittest.equals('foo'));
     unittest.expect(o.clusterUuid, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed662(o.labels);
+    checkUnnamed1368(o.labels);
     unittest.expect(o.operationType, unittest.equals('foo'));
     checkClusterOperationStatus(o.status);
-    checkUnnamed663(o.statusHistory);
-    checkUnnamed664(o.warnings);
+    checkUnnamed1369(o.statusHistory);
+    checkUnnamed1370(o.warnings);
   }
   buildCounterClusterOperationMetadata--;
 }
@@ -428,40 +428,40 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed665() {
+buildUnnamed1371() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed665(core.Map<core.String, core.String> o) {
+checkUnnamed1371(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed666() {
+buildUnnamed1372() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed666(core.List<core.String> o) {
+checkUnnamed1372(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed667() {
+buildUnnamed1373() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed667(core.List<core.String> o) {
+checkUnnamed1373(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -473,12 +473,12 @@
   buildCounterGceClusterConfig++;
   if (buildCounterGceClusterConfig < 3) {
     o.internalIpOnly = true;
-    o.metadata = buildUnnamed665();
+    o.metadata = buildUnnamed1371();
     o.networkUri = "foo";
     o.serviceAccount = "foo";
-    o.serviceAccountScopes = buildUnnamed666();
+    o.serviceAccountScopes = buildUnnamed1372();
     o.subnetworkUri = "foo";
-    o.tags = buildUnnamed667();
+    o.tags = buildUnnamed1373();
     o.zoneUri = "foo";
   }
   buildCounterGceClusterConfig--;
@@ -489,77 +489,77 @@
   buildCounterGceClusterConfig++;
   if (buildCounterGceClusterConfig < 3) {
     unittest.expect(o.internalIpOnly, unittest.isTrue);
-    checkUnnamed665(o.metadata);
+    checkUnnamed1371(o.metadata);
     unittest.expect(o.networkUri, unittest.equals('foo'));
     unittest.expect(o.serviceAccount, unittest.equals('foo'));
-    checkUnnamed666(o.serviceAccountScopes);
+    checkUnnamed1372(o.serviceAccountScopes);
     unittest.expect(o.subnetworkUri, unittest.equals('foo'));
-    checkUnnamed667(o.tags);
+    checkUnnamed1373(o.tags);
     unittest.expect(o.zoneUri, unittest.equals('foo'));
   }
   buildCounterGceClusterConfig--;
 }
 
-buildUnnamed668() {
+buildUnnamed1374() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed668(core.List<core.String> o) {
+checkUnnamed1374(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed669() {
+buildUnnamed1375() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed669(core.List<core.String> o) {
+checkUnnamed1375(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed670() {
+buildUnnamed1376() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed670(core.List<core.String> o) {
+checkUnnamed1376(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed671() {
+buildUnnamed1377() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed671(core.List<core.String> o) {
+checkUnnamed1377(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed672() {
+buildUnnamed1378() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed672(core.Map<core.String, core.String> o) {
+checkUnnamed1378(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -570,14 +570,14 @@
   var o = new api.HadoopJob();
   buildCounterHadoopJob++;
   if (buildCounterHadoopJob < 3) {
-    o.archiveUris = buildUnnamed668();
-    o.args = buildUnnamed669();
-    o.fileUris = buildUnnamed670();
-    o.jarFileUris = buildUnnamed671();
+    o.archiveUris = buildUnnamed1374();
+    o.args = buildUnnamed1375();
+    o.fileUris = buildUnnamed1376();
+    o.jarFileUris = buildUnnamed1377();
     o.loggingConfig = buildLoggingConfig();
     o.mainClass = "foo";
     o.mainJarFileUri = "foo";
-    o.properties = buildUnnamed672();
+    o.properties = buildUnnamed1378();
   }
   buildCounterHadoopJob--;
   return o;
@@ -586,52 +586,52 @@
 checkHadoopJob(api.HadoopJob o) {
   buildCounterHadoopJob++;
   if (buildCounterHadoopJob < 3) {
-    checkUnnamed668(o.archiveUris);
-    checkUnnamed669(o.args);
-    checkUnnamed670(o.fileUris);
-    checkUnnamed671(o.jarFileUris);
+    checkUnnamed1374(o.archiveUris);
+    checkUnnamed1375(o.args);
+    checkUnnamed1376(o.fileUris);
+    checkUnnamed1377(o.jarFileUris);
     checkLoggingConfig(o.loggingConfig);
     unittest.expect(o.mainClass, unittest.equals('foo'));
     unittest.expect(o.mainJarFileUri, unittest.equals('foo'));
-    checkUnnamed672(o.properties);
+    checkUnnamed1378(o.properties);
   }
   buildCounterHadoopJob--;
 }
 
-buildUnnamed673() {
+buildUnnamed1379() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed673(core.List<core.String> o) {
+checkUnnamed1379(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed674() {
+buildUnnamed1380() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed674(core.Map<core.String, core.String> o) {
+checkUnnamed1380(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed675() {
+buildUnnamed1381() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed675(core.Map<core.String, core.String> o) {
+checkUnnamed1381(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -643,11 +643,11 @@
   buildCounterHiveJob++;
   if (buildCounterHiveJob < 3) {
     o.continueOnFailure = true;
-    o.jarFileUris = buildUnnamed673();
-    o.properties = buildUnnamed674();
+    o.jarFileUris = buildUnnamed1379();
+    o.properties = buildUnnamed1380();
     o.queryFileUri = "foo";
     o.queryList = buildQueryList();
-    o.scriptVariables = buildUnnamed675();
+    o.scriptVariables = buildUnnamed1381();
   }
   buildCounterHiveJob--;
   return o;
@@ -657,36 +657,36 @@
   buildCounterHiveJob++;
   if (buildCounterHiveJob < 3) {
     unittest.expect(o.continueOnFailure, unittest.isTrue);
-    checkUnnamed673(o.jarFileUris);
-    checkUnnamed674(o.properties);
+    checkUnnamed1379(o.jarFileUris);
+    checkUnnamed1380(o.properties);
     unittest.expect(o.queryFileUri, unittest.equals('foo'));
     checkQueryList(o.queryList);
-    checkUnnamed675(o.scriptVariables);
+    checkUnnamed1381(o.scriptVariables);
   }
   buildCounterHiveJob--;
 }
 
-buildUnnamed676() {
+buildUnnamed1382() {
   var o = new core.List<api.AcceleratorConfig>();
   o.add(buildAcceleratorConfig());
   o.add(buildAcceleratorConfig());
   return o;
 }
 
-checkUnnamed676(core.List<api.AcceleratorConfig> o) {
+checkUnnamed1382(core.List<api.AcceleratorConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAcceleratorConfig(o[0]);
   checkAcceleratorConfig(o[1]);
 }
 
-buildUnnamed677() {
+buildUnnamed1383() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed677(core.List<core.String> o) {
+checkUnnamed1383(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -697,10 +697,10 @@
   var o = new api.InstanceGroupConfig();
   buildCounterInstanceGroupConfig++;
   if (buildCounterInstanceGroupConfig < 3) {
-    o.accelerators = buildUnnamed676();
+    o.accelerators = buildUnnamed1382();
     o.diskConfig = buildDiskConfig();
     o.imageUri = "foo";
-    o.instanceNames = buildUnnamed677();
+    o.instanceNames = buildUnnamed1383();
     o.isPreemptible = true;
     o.machineTypeUri = "foo";
     o.managedGroupConfig = buildManagedGroupConfig();
@@ -713,10 +713,10 @@
 checkInstanceGroupConfig(api.InstanceGroupConfig o) {
   buildCounterInstanceGroupConfig++;
   if (buildCounterInstanceGroupConfig < 3) {
-    checkUnnamed676(o.accelerators);
+    checkUnnamed1382(o.accelerators);
     checkDiskConfig(o.diskConfig);
     unittest.expect(o.imageUri, unittest.equals('foo'));
-    checkUnnamed677(o.instanceNames);
+    checkUnnamed1383(o.instanceNames);
     unittest.expect(o.isPreemptible, unittest.isTrue);
     unittest.expect(o.machineTypeUri, unittest.equals('foo'));
     checkManagedGroupConfig(o.managedGroupConfig);
@@ -725,40 +725,40 @@
   buildCounterInstanceGroupConfig--;
 }
 
-buildUnnamed678() {
+buildUnnamed1384() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed678(core.Map<core.String, core.String> o) {
+checkUnnamed1384(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed679() {
+buildUnnamed1385() {
   var o = new core.List<api.JobStatus>();
   o.add(buildJobStatus());
   o.add(buildJobStatus());
   return o;
 }
 
-checkUnnamed679(core.List<api.JobStatus> o) {
+checkUnnamed1385(core.List<api.JobStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJobStatus(o[0]);
   checkJobStatus(o[1]);
 }
 
-buildUnnamed680() {
+buildUnnamed1386() {
   var o = new core.List<api.YarnApplication>();
   o.add(buildYarnApplication());
   o.add(buildYarnApplication());
   return o;
 }
 
-checkUnnamed680(core.List<api.YarnApplication> o) {
+checkUnnamed1386(core.List<api.YarnApplication> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkYarnApplication(o[0]);
   checkYarnApplication(o[1]);
@@ -773,7 +773,7 @@
     o.driverOutputResourceUri = "foo";
     o.hadoopJob = buildHadoopJob();
     o.hiveJob = buildHiveJob();
-    o.labels = buildUnnamed678();
+    o.labels = buildUnnamed1384();
     o.pigJob = buildPigJob();
     o.placement = buildJobPlacement();
     o.pysparkJob = buildPySparkJob();
@@ -782,8 +782,8 @@
     o.sparkJob = buildSparkJob();
     o.sparkSqlJob = buildSparkSqlJob();
     o.status = buildJobStatus();
-    o.statusHistory = buildUnnamed679();
-    o.yarnApplications = buildUnnamed680();
+    o.statusHistory = buildUnnamed1385();
+    o.yarnApplications = buildUnnamed1386();
   }
   buildCounterJob--;
   return o;
@@ -796,7 +796,7 @@
     unittest.expect(o.driverOutputResourceUri, unittest.equals('foo'));
     checkHadoopJob(o.hadoopJob);
     checkHiveJob(o.hiveJob);
-    checkUnnamed678(o.labels);
+    checkUnnamed1384(o.labels);
     checkPigJob(o.pigJob);
     checkJobPlacement(o.placement);
     checkPySparkJob(o.pysparkJob);
@@ -805,8 +805,8 @@
     checkSparkJob(o.sparkJob);
     checkSparkSqlJob(o.sparkSqlJob);
     checkJobStatus(o.status);
-    checkUnnamed679(o.statusHistory);
-    checkUnnamed680(o.yarnApplications);
+    checkUnnamed1385(o.statusHistory);
+    checkUnnamed1386(o.yarnApplications);
   }
   buildCounterJob--;
 }
@@ -897,14 +897,14 @@
   buildCounterJobStatus--;
 }
 
-buildUnnamed681() {
+buildUnnamed1387() {
   var o = new core.List<api.Cluster>();
   o.add(buildCluster());
   o.add(buildCluster());
   return o;
 }
 
-checkUnnamed681(core.List<api.Cluster> o) {
+checkUnnamed1387(core.List<api.Cluster> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCluster(o[0]);
   checkCluster(o[1]);
@@ -915,7 +915,7 @@
   var o = new api.ListClustersResponse();
   buildCounterListClustersResponse++;
   if (buildCounterListClustersResponse < 3) {
-    o.clusters = buildUnnamed681();
+    o.clusters = buildUnnamed1387();
     o.nextPageToken = "foo";
   }
   buildCounterListClustersResponse--;
@@ -925,20 +925,20 @@
 checkListClustersResponse(api.ListClustersResponse o) {
   buildCounterListClustersResponse++;
   if (buildCounterListClustersResponse < 3) {
-    checkUnnamed681(o.clusters);
+    checkUnnamed1387(o.clusters);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListClustersResponse--;
 }
 
-buildUnnamed682() {
+buildUnnamed1388() {
   var o = new core.List<api.Job>();
   o.add(buildJob());
   o.add(buildJob());
   return o;
 }
 
-checkUnnamed682(core.List<api.Job> o) {
+checkUnnamed1388(core.List<api.Job> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJob(o[0]);
   checkJob(o[1]);
@@ -949,7 +949,7 @@
   var o = new api.ListJobsResponse();
   buildCounterListJobsResponse++;
   if (buildCounterListJobsResponse < 3) {
-    o.jobs = buildUnnamed682();
+    o.jobs = buildUnnamed1388();
     o.nextPageToken = "foo";
   }
   buildCounterListJobsResponse--;
@@ -959,20 +959,20 @@
 checkListJobsResponse(api.ListJobsResponse o) {
   buildCounterListJobsResponse++;
   if (buildCounterListJobsResponse < 3) {
-    checkUnnamed682(o.jobs);
+    checkUnnamed1388(o.jobs);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListJobsResponse--;
 }
 
-buildUnnamed683() {
+buildUnnamed1389() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed683(core.List<api.Operation> o) {
+checkUnnamed1389(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -984,7 +984,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed683();
+    o.operations = buildUnnamed1389();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -994,19 +994,19 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed683(o.operations);
+    checkUnnamed1389(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed684() {
+buildUnnamed1390() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed684(core.Map<core.String, core.String> o) {
+checkUnnamed1390(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1017,7 +1017,7 @@
   var o = new api.LoggingConfig();
   buildCounterLoggingConfig++;
   if (buildCounterLoggingConfig < 3) {
-    o.driverLogLevels = buildUnnamed684();
+    o.driverLogLevels = buildUnnamed1390();
   }
   buildCounterLoggingConfig--;
   return o;
@@ -1026,7 +1026,7 @@
 checkLoggingConfig(api.LoggingConfig o) {
   buildCounterLoggingConfig++;
   if (buildCounterLoggingConfig < 3) {
-    checkUnnamed684(o.driverLogLevels);
+    checkUnnamed1390(o.driverLogLevels);
   }
   buildCounterLoggingConfig--;
 }
@@ -1073,7 +1073,7 @@
   buildCounterNodeInitializationAction--;
 }
 
-buildUnnamed685() {
+buildUnnamed1391() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1088,7 +1088,7 @@
   return o;
 }
 
-checkUnnamed685(core.Map<core.String, core.Object> o) {
+checkUnnamed1391(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1102,7 +1102,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed686() {
+buildUnnamed1392() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1117,7 +1117,7 @@
   return o;
 }
 
-checkUnnamed686(core.Map<core.String, core.Object> o) {
+checkUnnamed1392(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -1138,9 +1138,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed685();
+    o.metadata = buildUnnamed1391();
     o.name = "foo";
-    o.response = buildUnnamed686();
+    o.response = buildUnnamed1392();
   }
   buildCounterOperation--;
   return o;
@@ -1151,47 +1151,47 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed685(o.metadata);
+    checkUnnamed1391(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed686(o.response);
+    checkUnnamed1392(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed687() {
+buildUnnamed1393() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed687(core.List<core.String> o) {
+checkUnnamed1393(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed688() {
+buildUnnamed1394() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed688(core.Map<core.String, core.String> o) {
+checkUnnamed1394(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed689() {
+buildUnnamed1395() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed689(core.Map<core.String, core.String> o) {
+checkUnnamed1395(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1203,12 +1203,12 @@
   buildCounterPigJob++;
   if (buildCounterPigJob < 3) {
     o.continueOnFailure = true;
-    o.jarFileUris = buildUnnamed687();
+    o.jarFileUris = buildUnnamed1393();
     o.loggingConfig = buildLoggingConfig();
-    o.properties = buildUnnamed688();
+    o.properties = buildUnnamed1394();
     o.queryFileUri = "foo";
     o.queryList = buildQueryList();
-    o.scriptVariables = buildUnnamed689();
+    o.scriptVariables = buildUnnamed1395();
   }
   buildCounterPigJob--;
   return o;
@@ -1218,89 +1218,89 @@
   buildCounterPigJob++;
   if (buildCounterPigJob < 3) {
     unittest.expect(o.continueOnFailure, unittest.isTrue);
-    checkUnnamed687(o.jarFileUris);
+    checkUnnamed1393(o.jarFileUris);
     checkLoggingConfig(o.loggingConfig);
-    checkUnnamed688(o.properties);
+    checkUnnamed1394(o.properties);
     unittest.expect(o.queryFileUri, unittest.equals('foo'));
     checkQueryList(o.queryList);
-    checkUnnamed689(o.scriptVariables);
+    checkUnnamed1395(o.scriptVariables);
   }
   buildCounterPigJob--;
 }
 
-buildUnnamed690() {
+buildUnnamed1396() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed690(core.List<core.String> o) {
+checkUnnamed1396(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed691() {
+buildUnnamed1397() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed691(core.List<core.String> o) {
+checkUnnamed1397(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed692() {
+buildUnnamed1398() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed692(core.List<core.String> o) {
+checkUnnamed1398(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed693() {
+buildUnnamed1399() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed693(core.List<core.String> o) {
+checkUnnamed1399(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed694() {
+buildUnnamed1400() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed694(core.Map<core.String, core.String> o) {
+checkUnnamed1400(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed695() {
+buildUnnamed1401() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed695(core.List<core.String> o) {
+checkUnnamed1401(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1311,14 +1311,14 @@
   var o = new api.PySparkJob();
   buildCounterPySparkJob++;
   if (buildCounterPySparkJob < 3) {
-    o.archiveUris = buildUnnamed690();
-    o.args = buildUnnamed691();
-    o.fileUris = buildUnnamed692();
-    o.jarFileUris = buildUnnamed693();
+    o.archiveUris = buildUnnamed1396();
+    o.args = buildUnnamed1397();
+    o.fileUris = buildUnnamed1398();
+    o.jarFileUris = buildUnnamed1399();
     o.loggingConfig = buildLoggingConfig();
     o.mainPythonFileUri = "foo";
-    o.properties = buildUnnamed694();
-    o.pythonFileUris = buildUnnamed695();
+    o.properties = buildUnnamed1400();
+    o.pythonFileUris = buildUnnamed1401();
   }
   buildCounterPySparkJob--;
   return o;
@@ -1327,26 +1327,26 @@
 checkPySparkJob(api.PySparkJob o) {
   buildCounterPySparkJob++;
   if (buildCounterPySparkJob < 3) {
-    checkUnnamed690(o.archiveUris);
-    checkUnnamed691(o.args);
-    checkUnnamed692(o.fileUris);
-    checkUnnamed693(o.jarFileUris);
+    checkUnnamed1396(o.archiveUris);
+    checkUnnamed1397(o.args);
+    checkUnnamed1398(o.fileUris);
+    checkUnnamed1399(o.jarFileUris);
     checkLoggingConfig(o.loggingConfig);
     unittest.expect(o.mainPythonFileUri, unittest.equals('foo'));
-    checkUnnamed694(o.properties);
-    checkUnnamed695(o.pythonFileUris);
+    checkUnnamed1400(o.properties);
+    checkUnnamed1401(o.pythonFileUris);
   }
   buildCounterPySparkJob--;
 }
 
-buildUnnamed696() {
+buildUnnamed1402() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed696(core.List<core.String> o) {
+checkUnnamed1402(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1357,7 +1357,7 @@
   var o = new api.QueryList();
   buildCounterQueryList++;
   if (buildCounterQueryList < 3) {
-    o.queries = buildUnnamed696();
+    o.queries = buildUnnamed1402();
   }
   buildCounterQueryList--;
   return o;
@@ -1366,19 +1366,19 @@
 checkQueryList(api.QueryList o) {
   buildCounterQueryList++;
   if (buildCounterQueryList < 3) {
-    checkUnnamed696(o.queries);
+    checkUnnamed1402(o.queries);
   }
   buildCounterQueryList--;
 }
 
-buildUnnamed697() {
+buildUnnamed1403() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed697(core.Map<core.String, core.String> o) {
+checkUnnamed1403(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1390,7 +1390,7 @@
   buildCounterSoftwareConfig++;
   if (buildCounterSoftwareConfig < 3) {
     o.imageVersion = "foo";
-    o.properties = buildUnnamed697();
+    o.properties = buildUnnamed1403();
   }
   buildCounterSoftwareConfig--;
   return o;
@@ -1400,71 +1400,71 @@
   buildCounterSoftwareConfig++;
   if (buildCounterSoftwareConfig < 3) {
     unittest.expect(o.imageVersion, unittest.equals('foo'));
-    checkUnnamed697(o.properties);
+    checkUnnamed1403(o.properties);
   }
   buildCounterSoftwareConfig--;
 }
 
-buildUnnamed698() {
+buildUnnamed1404() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed698(core.List<core.String> o) {
+checkUnnamed1404(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed699() {
+buildUnnamed1405() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed699(core.List<core.String> o) {
+checkUnnamed1405(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed700() {
+buildUnnamed1406() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed700(core.List<core.String> o) {
+checkUnnamed1406(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed701() {
+buildUnnamed1407() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed701(core.List<core.String> o) {
+checkUnnamed1407(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed702() {
+buildUnnamed1408() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed702(core.Map<core.String, core.String> o) {
+checkUnnamed1408(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1475,14 +1475,14 @@
   var o = new api.SparkJob();
   buildCounterSparkJob++;
   if (buildCounterSparkJob < 3) {
-    o.archiveUris = buildUnnamed698();
-    o.args = buildUnnamed699();
-    o.fileUris = buildUnnamed700();
-    o.jarFileUris = buildUnnamed701();
+    o.archiveUris = buildUnnamed1404();
+    o.args = buildUnnamed1405();
+    o.fileUris = buildUnnamed1406();
+    o.jarFileUris = buildUnnamed1407();
     o.loggingConfig = buildLoggingConfig();
     o.mainClass = "foo";
     o.mainJarFileUri = "foo";
-    o.properties = buildUnnamed702();
+    o.properties = buildUnnamed1408();
   }
   buildCounterSparkJob--;
   return o;
@@ -1491,52 +1491,52 @@
 checkSparkJob(api.SparkJob o) {
   buildCounterSparkJob++;
   if (buildCounterSparkJob < 3) {
-    checkUnnamed698(o.archiveUris);
-    checkUnnamed699(o.args);
-    checkUnnamed700(o.fileUris);
-    checkUnnamed701(o.jarFileUris);
+    checkUnnamed1404(o.archiveUris);
+    checkUnnamed1405(o.args);
+    checkUnnamed1406(o.fileUris);
+    checkUnnamed1407(o.jarFileUris);
     checkLoggingConfig(o.loggingConfig);
     unittest.expect(o.mainClass, unittest.equals('foo'));
     unittest.expect(o.mainJarFileUri, unittest.equals('foo'));
-    checkUnnamed702(o.properties);
+    checkUnnamed1408(o.properties);
   }
   buildCounterSparkJob--;
 }
 
-buildUnnamed703() {
+buildUnnamed1409() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed703(core.List<core.String> o) {
+checkUnnamed1409(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed704() {
+buildUnnamed1410() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed704(core.Map<core.String, core.String> o) {
+checkUnnamed1410(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed705() {
+buildUnnamed1411() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed705(core.Map<core.String, core.String> o) {
+checkUnnamed1411(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1547,12 +1547,12 @@
   var o = new api.SparkSqlJob();
   buildCounterSparkSqlJob++;
   if (buildCounterSparkSqlJob < 3) {
-    o.jarFileUris = buildUnnamed703();
+    o.jarFileUris = buildUnnamed1409();
     o.loggingConfig = buildLoggingConfig();
-    o.properties = buildUnnamed704();
+    o.properties = buildUnnamed1410();
     o.queryFileUri = "foo";
     o.queryList = buildQueryList();
-    o.scriptVariables = buildUnnamed705();
+    o.scriptVariables = buildUnnamed1411();
   }
   buildCounterSparkSqlJob--;
   return o;
@@ -1561,17 +1561,17 @@
 checkSparkSqlJob(api.SparkSqlJob o) {
   buildCounterSparkSqlJob++;
   if (buildCounterSparkSqlJob < 3) {
-    checkUnnamed703(o.jarFileUris);
+    checkUnnamed1409(o.jarFileUris);
     checkLoggingConfig(o.loggingConfig);
-    checkUnnamed704(o.properties);
+    checkUnnamed1410(o.properties);
     unittest.expect(o.queryFileUri, unittest.equals('foo'));
     checkQueryList(o.queryList);
-    checkUnnamed705(o.scriptVariables);
+    checkUnnamed1411(o.scriptVariables);
   }
   buildCounterSparkSqlJob--;
 }
 
-buildUnnamed706() {
+buildUnnamed1412() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1586,7 +1586,7 @@
   return o;
 }
 
-checkUnnamed706(core.Map<core.String, core.Object> o) {
+checkUnnamed1412(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1600,17 +1600,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed707() {
+buildUnnamed1413() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed706());
-  o.add(buildUnnamed706());
+  o.add(buildUnnamed1412());
+  o.add(buildUnnamed1412());
   return o;
 }
 
-checkUnnamed707(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1413(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed706(o[0]);
-  checkUnnamed706(o[1]);
+  checkUnnamed1412(o[0]);
+  checkUnnamed1412(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1619,7 +1619,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed707();
+    o.details = buildUnnamed1413();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1630,7 +1630,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed707(o.details);
+    checkUnnamed1413(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -2047,7 +2047,7 @@
       }), true);
       res
           .create(arg_request, arg_projectId, arg_region, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2125,7 +2125,7 @@
       res
           .delete(arg_projectId, arg_region, arg_clusterName,
               clusterUuid: arg_clusterUuid, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2210,7 +2210,7 @@
       res
           .diagnose(arg_request, arg_projectId, arg_region, arg_clusterName,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2284,7 +2284,7 @@
       }), true);
       res
           .get(arg_projectId, arg_region, arg_clusterName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Cluster response) {
+          .then(unittest.expectAsync1(((response) {
         checkCluster(response);
       })));
     });
@@ -2366,7 +2366,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListClustersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListClustersResponse(response);
       })));
     });
@@ -2453,7 +2453,7 @@
               gracefulDecommissionTimeout: arg_gracefulDecommissionTimeout,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2540,7 +2540,7 @@
       res
           .cancel(arg_request, arg_projectId, arg_region, arg_jobId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -2614,7 +2614,7 @@
       }), true);
       res
           .delete(arg_projectId, arg_region, arg_jobId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2688,7 +2688,7 @@
       }), true);
       res
           .get(arg_projectId, arg_region, arg_jobId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -2778,7 +2778,7 @@
               filter: arg_filter,
               jobStateMatcher: arg_jobStateMatcher,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListJobsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListJobsResponse(response);
       })));
     });
@@ -2860,7 +2860,7 @@
       res
           .patch(arg_request, arg_projectId, arg_region, arg_jobId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -2934,7 +2934,7 @@
       }), true);
       res
           .submit(arg_request, arg_projectId, arg_region, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -2988,7 +2988,7 @@
       }), true);
       res
           .cancel(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3040,7 +3040,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3092,7 +3092,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3156,7 +3156,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/datastore/v1_test.dart b/generated/googleapis/test/datastore/v1_test.dart
index 881b05b..4c89344 100644
--- a/generated/googleapis/test/datastore/v1_test.dart
+++ b/generated/googleapis/test/datastore/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed568() {
+buildUnnamed1547() {
   var o = new core.List<api.Key>();
   o.add(buildKey());
   o.add(buildKey());
   return o;
 }
 
-checkUnnamed568(core.List<api.Key> o) {
+checkUnnamed1547(core.List<api.Key> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkKey(o[0]);
   checkKey(o[1]);
@@ -68,7 +68,7 @@
   var o = new api.AllocateIdsRequest();
   buildCounterAllocateIdsRequest++;
   if (buildCounterAllocateIdsRequest < 3) {
-    o.keys = buildUnnamed568();
+    o.keys = buildUnnamed1547();
   }
   buildCounterAllocateIdsRequest--;
   return o;
@@ -77,19 +77,19 @@
 checkAllocateIdsRequest(api.AllocateIdsRequest o) {
   buildCounterAllocateIdsRequest++;
   if (buildCounterAllocateIdsRequest < 3) {
-    checkUnnamed568(o.keys);
+    checkUnnamed1547(o.keys);
   }
   buildCounterAllocateIdsRequest--;
 }
 
-buildUnnamed569() {
+buildUnnamed1548() {
   var o = new core.List<api.Key>();
   o.add(buildKey());
   o.add(buildKey());
   return o;
 }
 
-checkUnnamed569(core.List<api.Key> o) {
+checkUnnamed1548(core.List<api.Key> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkKey(o[0]);
   checkKey(o[1]);
@@ -100,7 +100,7 @@
   var o = new api.AllocateIdsResponse();
   buildCounterAllocateIdsResponse++;
   if (buildCounterAllocateIdsResponse < 3) {
-    o.keys = buildUnnamed569();
+    o.keys = buildUnnamed1548();
   }
   buildCounterAllocateIdsResponse--;
   return o;
@@ -109,19 +109,19 @@
 checkAllocateIdsResponse(api.AllocateIdsResponse o) {
   buildCounterAllocateIdsResponse++;
   if (buildCounterAllocateIdsResponse < 3) {
-    checkUnnamed569(o.keys);
+    checkUnnamed1548(o.keys);
   }
   buildCounterAllocateIdsResponse--;
 }
 
-buildUnnamed570() {
+buildUnnamed1549() {
   var o = new core.List<api.Value>();
   o.add(buildValue());
   o.add(buildValue());
   return o;
 }
 
-checkUnnamed570(core.List<api.Value> o) {
+checkUnnamed1549(core.List<api.Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValue(o[0]);
   checkValue(o[1]);
@@ -132,7 +132,7 @@
   var o = new api.ArrayValue();
   buildCounterArrayValue++;
   if (buildCounterArrayValue < 3) {
-    o.values = buildUnnamed570();
+    o.values = buildUnnamed1549();
   }
   buildCounterArrayValue--;
   return o;
@@ -141,7 +141,7 @@
 checkArrayValue(api.ArrayValue o) {
   buildCounterArrayValue++;
   if (buildCounterArrayValue < 3) {
-    checkUnnamed570(o.values);
+    checkUnnamed1549(o.values);
   }
   buildCounterArrayValue--;
 }
@@ -184,14 +184,14 @@
   buildCounterBeginTransactionResponse--;
 }
 
-buildUnnamed571() {
+buildUnnamed1550() {
   var o = new core.List<api.Mutation>();
   o.add(buildMutation());
   o.add(buildMutation());
   return o;
 }
 
-checkUnnamed571(core.List<api.Mutation> o) {
+checkUnnamed1550(core.List<api.Mutation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMutation(o[0]);
   checkMutation(o[1]);
@@ -203,7 +203,7 @@
   buildCounterCommitRequest++;
   if (buildCounterCommitRequest < 3) {
     o.mode = "foo";
-    o.mutations = buildUnnamed571();
+    o.mutations = buildUnnamed1550();
     o.transaction = "foo";
   }
   buildCounterCommitRequest--;
@@ -214,20 +214,20 @@
   buildCounterCommitRequest++;
   if (buildCounterCommitRequest < 3) {
     unittest.expect(o.mode, unittest.equals('foo'));
-    checkUnnamed571(o.mutations);
+    checkUnnamed1550(o.mutations);
     unittest.expect(o.transaction, unittest.equals('foo'));
   }
   buildCounterCommitRequest--;
 }
 
-buildUnnamed572() {
+buildUnnamed1551() {
   var o = new core.List<api.MutationResult>();
   o.add(buildMutationResult());
   o.add(buildMutationResult());
   return o;
 }
 
-checkUnnamed572(core.List<api.MutationResult> o) {
+checkUnnamed1551(core.List<api.MutationResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMutationResult(o[0]);
   checkMutationResult(o[1]);
@@ -239,7 +239,7 @@
   buildCounterCommitResponse++;
   if (buildCounterCommitResponse < 3) {
     o.indexUpdates = 42;
-    o.mutationResults = buildUnnamed572();
+    o.mutationResults = buildUnnamed1551();
   }
   buildCounterCommitResponse--;
   return o;
@@ -249,19 +249,19 @@
   buildCounterCommitResponse++;
   if (buildCounterCommitResponse < 3) {
     unittest.expect(o.indexUpdates, unittest.equals(42));
-    checkUnnamed572(o.mutationResults);
+    checkUnnamed1551(o.mutationResults);
   }
   buildCounterCommitResponse--;
 }
 
-buildUnnamed573() {
+buildUnnamed1552() {
   var o = new core.List<api.Filter>();
   o.add(buildFilter());
   o.add(buildFilter());
   return o;
 }
 
-checkUnnamed573(core.List<api.Filter> o) {
+checkUnnamed1552(core.List<api.Filter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilter(o[0]);
   checkFilter(o[1]);
@@ -272,7 +272,7 @@
   var o = new api.CompositeFilter();
   buildCounterCompositeFilter++;
   if (buildCounterCompositeFilter < 3) {
-    o.filters = buildUnnamed573();
+    o.filters = buildUnnamed1552();
     o.op = "foo";
   }
   buildCounterCompositeFilter--;
@@ -282,7 +282,7 @@
 checkCompositeFilter(api.CompositeFilter o) {
   buildCounterCompositeFilter++;
   if (buildCounterCompositeFilter < 3) {
-    checkUnnamed573(o.filters);
+    checkUnnamed1552(o.filters);
     unittest.expect(o.op, unittest.equals('foo'));
   }
   buildCounterCompositeFilter--;
@@ -303,14 +303,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed574() {
+buildUnnamed1553() {
   var o = new core.Map<core.String, api.Value>();
   o["x"] = buildValue();
   o["y"] = buildValue();
   return o;
 }
 
-checkUnnamed574(core.Map<core.String, api.Value> o) {
+checkUnnamed1553(core.Map<core.String, api.Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValue(o["x"]);
   checkValue(o["y"]);
@@ -322,7 +322,7 @@
   buildCounterEntity++;
   if (buildCounterEntity < 3) {
     o.key = buildKey();
-    o.properties = buildUnnamed574();
+    o.properties = buildUnnamed1553();
   }
   buildCounterEntity--;
   return o;
@@ -332,7 +332,7 @@
   buildCounterEntity++;
   if (buildCounterEntity < 3) {
     checkKey(o.key);
-    checkUnnamed574(o.properties);
+    checkUnnamed1553(o.properties);
   }
   buildCounterEntity--;
 }
@@ -381,14 +381,14 @@
   buildCounterFilter--;
 }
 
-buildUnnamed575() {
+buildUnnamed1554() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed575(core.Map<core.String, core.String> o) {
+checkUnnamed1554(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -400,7 +400,7 @@
   buildCounterGoogleDatastoreAdminV1beta1CommonMetadata++;
   if (buildCounterGoogleDatastoreAdminV1beta1CommonMetadata < 3) {
     o.endTime = "foo";
-    o.labels = buildUnnamed575();
+    o.labels = buildUnnamed1554();
     o.operationType = "foo";
     o.startTime = "foo";
     o.state = "foo";
@@ -414,7 +414,7 @@
   buildCounterGoogleDatastoreAdminV1beta1CommonMetadata++;
   if (buildCounterGoogleDatastoreAdminV1beta1CommonMetadata < 3) {
     unittest.expect(o.endTime, unittest.equals('foo'));
-    checkUnnamed575(o.labels);
+    checkUnnamed1554(o.labels);
     unittest.expect(o.operationType, unittest.equals('foo'));
     unittest.expect(o.startTime, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
@@ -422,27 +422,27 @@
   buildCounterGoogleDatastoreAdminV1beta1CommonMetadata--;
 }
 
-buildUnnamed576() {
+buildUnnamed1555() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed576(core.List<core.String> o) {
+checkUnnamed1555(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed577() {
+buildUnnamed1556() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed577(core.List<core.String> o) {
+checkUnnamed1556(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -453,8 +453,8 @@
   var o = new api.GoogleDatastoreAdminV1beta1EntityFilter();
   buildCounterGoogleDatastoreAdminV1beta1EntityFilter++;
   if (buildCounterGoogleDatastoreAdminV1beta1EntityFilter < 3) {
-    o.kinds = buildUnnamed576();
-    o.namespaceIds = buildUnnamed577();
+    o.kinds = buildUnnamed1555();
+    o.namespaceIds = buildUnnamed1556();
   }
   buildCounterGoogleDatastoreAdminV1beta1EntityFilter--;
   return o;
@@ -464,8 +464,8 @@
     api.GoogleDatastoreAdminV1beta1EntityFilter o) {
   buildCounterGoogleDatastoreAdminV1beta1EntityFilter++;
   if (buildCounterGoogleDatastoreAdminV1beta1EntityFilter < 3) {
-    checkUnnamed576(o.kinds);
-    checkUnnamed577(o.namespaceIds);
+    checkUnnamed1555(o.kinds);
+    checkUnnamed1556(o.namespaceIds);
   }
   buildCounterGoogleDatastoreAdminV1beta1EntityFilter--;
 }
@@ -568,14 +568,14 @@
   buildCounterGoogleDatastoreAdminV1beta1Progress--;
 }
 
-buildUnnamed578() {
+buildUnnamed1557() {
   var o = new core.List<api.GoogleLongrunningOperation>();
   o.add(buildGoogleLongrunningOperation());
   o.add(buildGoogleLongrunningOperation());
   return o;
 }
 
-checkUnnamed578(core.List<api.GoogleLongrunningOperation> o) {
+checkUnnamed1557(core.List<api.GoogleLongrunningOperation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleLongrunningOperation(o[0]);
   checkGoogleLongrunningOperation(o[1]);
@@ -587,7 +587,7 @@
   buildCounterGoogleLongrunningListOperationsResponse++;
   if (buildCounterGoogleLongrunningListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed578();
+    o.operations = buildUnnamed1557();
   }
   buildCounterGoogleLongrunningListOperationsResponse--;
   return o;
@@ -598,12 +598,12 @@
   buildCounterGoogleLongrunningListOperationsResponse++;
   if (buildCounterGoogleLongrunningListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed578(o.operations);
+    checkUnnamed1557(o.operations);
   }
   buildCounterGoogleLongrunningListOperationsResponse--;
 }
 
-buildUnnamed579() {
+buildUnnamed1558() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -618,7 +618,7 @@
   return o;
 }
 
-checkUnnamed579(core.Map<core.String, core.Object> o) {
+checkUnnamed1558(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -632,7 +632,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed580() {
+buildUnnamed1559() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -647,7 +647,7 @@
   return o;
 }
 
-checkUnnamed580(core.Map<core.String, core.Object> o) {
+checkUnnamed1559(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -668,9 +668,9 @@
   if (buildCounterGoogleLongrunningOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed579();
+    o.metadata = buildUnnamed1558();
     o.name = "foo";
-    o.response = buildUnnamed580();
+    o.response = buildUnnamed1559();
   }
   buildCounterGoogleLongrunningOperation--;
   return o;
@@ -681,34 +681,34 @@
   if (buildCounterGoogleLongrunningOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed579(o.metadata);
+    checkUnnamed1558(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed580(o.response);
+    checkUnnamed1559(o.response);
   }
   buildCounterGoogleLongrunningOperation--;
 }
 
-buildUnnamed581() {
+buildUnnamed1560() {
   var o = new core.Map<core.String, api.GqlQueryParameter>();
   o["x"] = buildGqlQueryParameter();
   o["y"] = buildGqlQueryParameter();
   return o;
 }
 
-checkUnnamed581(core.Map<core.String, api.GqlQueryParameter> o) {
+checkUnnamed1560(core.Map<core.String, api.GqlQueryParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGqlQueryParameter(o["x"]);
   checkGqlQueryParameter(o["y"]);
 }
 
-buildUnnamed582() {
+buildUnnamed1561() {
   var o = new core.List<api.GqlQueryParameter>();
   o.add(buildGqlQueryParameter());
   o.add(buildGqlQueryParameter());
   return o;
 }
 
-checkUnnamed582(core.List<api.GqlQueryParameter> o) {
+checkUnnamed1561(core.List<api.GqlQueryParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGqlQueryParameter(o[0]);
   checkGqlQueryParameter(o[1]);
@@ -720,8 +720,8 @@
   buildCounterGqlQuery++;
   if (buildCounterGqlQuery < 3) {
     o.allowLiterals = true;
-    o.namedBindings = buildUnnamed581();
-    o.positionalBindings = buildUnnamed582();
+    o.namedBindings = buildUnnamed1560();
+    o.positionalBindings = buildUnnamed1561();
     o.queryString = "foo";
   }
   buildCounterGqlQuery--;
@@ -732,8 +732,8 @@
   buildCounterGqlQuery++;
   if (buildCounterGqlQuery < 3) {
     unittest.expect(o.allowLiterals, unittest.isTrue);
-    checkUnnamed581(o.namedBindings);
-    checkUnnamed582(o.positionalBindings);
+    checkUnnamed1560(o.namedBindings);
+    checkUnnamed1561(o.positionalBindings);
     unittest.expect(o.queryString, unittest.equals('foo'));
   }
   buildCounterGqlQuery--;
@@ -760,14 +760,14 @@
   buildCounterGqlQueryParameter--;
 }
 
-buildUnnamed583() {
+buildUnnamed1562() {
   var o = new core.List<api.PathElement>();
   o.add(buildPathElement());
   o.add(buildPathElement());
   return o;
 }
 
-checkUnnamed583(core.List<api.PathElement> o) {
+checkUnnamed1562(core.List<api.PathElement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPathElement(o[0]);
   checkPathElement(o[1]);
@@ -779,7 +779,7 @@
   buildCounterKey++;
   if (buildCounterKey < 3) {
     o.partitionId = buildPartitionId();
-    o.path = buildUnnamed583();
+    o.path = buildUnnamed1562();
   }
   buildCounterKey--;
   return o;
@@ -789,7 +789,7 @@
   buildCounterKey++;
   if (buildCounterKey < 3) {
     checkPartitionId(o.partitionId);
-    checkUnnamed583(o.path);
+    checkUnnamed1562(o.path);
   }
   buildCounterKey--;
 }
@@ -834,14 +834,14 @@
   buildCounterLatLng--;
 }
 
-buildUnnamed584() {
+buildUnnamed1563() {
   var o = new core.List<api.Key>();
   o.add(buildKey());
   o.add(buildKey());
   return o;
 }
 
-checkUnnamed584(core.List<api.Key> o) {
+checkUnnamed1563(core.List<api.Key> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkKey(o[0]);
   checkKey(o[1]);
@@ -852,7 +852,7 @@
   var o = new api.LookupRequest();
   buildCounterLookupRequest++;
   if (buildCounterLookupRequest < 3) {
-    o.keys = buildUnnamed584();
+    o.keys = buildUnnamed1563();
     o.readOptions = buildReadOptions();
   }
   buildCounterLookupRequest--;
@@ -862,46 +862,46 @@
 checkLookupRequest(api.LookupRequest o) {
   buildCounterLookupRequest++;
   if (buildCounterLookupRequest < 3) {
-    checkUnnamed584(o.keys);
+    checkUnnamed1563(o.keys);
     checkReadOptions(o.readOptions);
   }
   buildCounterLookupRequest--;
 }
 
-buildUnnamed585() {
+buildUnnamed1564() {
   var o = new core.List<api.Key>();
   o.add(buildKey());
   o.add(buildKey());
   return o;
 }
 
-checkUnnamed585(core.List<api.Key> o) {
+checkUnnamed1564(core.List<api.Key> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkKey(o[0]);
   checkKey(o[1]);
 }
 
-buildUnnamed586() {
+buildUnnamed1565() {
   var o = new core.List<api.EntityResult>();
   o.add(buildEntityResult());
   o.add(buildEntityResult());
   return o;
 }
 
-checkUnnamed586(core.List<api.EntityResult> o) {
+checkUnnamed1565(core.List<api.EntityResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityResult(o[0]);
   checkEntityResult(o[1]);
 }
 
-buildUnnamed587() {
+buildUnnamed1566() {
   var o = new core.List<api.EntityResult>();
   o.add(buildEntityResult());
   o.add(buildEntityResult());
   return o;
 }
 
-checkUnnamed587(core.List<api.EntityResult> o) {
+checkUnnamed1566(core.List<api.EntityResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityResult(o[0]);
   checkEntityResult(o[1]);
@@ -912,9 +912,9 @@
   var o = new api.LookupResponse();
   buildCounterLookupResponse++;
   if (buildCounterLookupResponse < 3) {
-    o.deferred = buildUnnamed585();
-    o.found = buildUnnamed586();
-    o.missing = buildUnnamed587();
+    o.deferred = buildUnnamed1564();
+    o.found = buildUnnamed1565();
+    o.missing = buildUnnamed1566();
   }
   buildCounterLookupResponse--;
   return o;
@@ -923,9 +923,9 @@
 checkLookupResponse(api.LookupResponse o) {
   buildCounterLookupResponse++;
   if (buildCounterLookupResponse < 3) {
-    checkUnnamed585(o.deferred);
-    checkUnnamed586(o.found);
-    checkUnnamed587(o.missing);
+    checkUnnamed1564(o.deferred);
+    checkUnnamed1565(o.found);
+    checkUnnamed1566(o.missing);
   }
   buildCounterLookupResponse--;
 }
@@ -1106,53 +1106,53 @@
   buildCounterPropertyReference--;
 }
 
-buildUnnamed588() {
+buildUnnamed1567() {
   var o = new core.List<api.PropertyReference>();
   o.add(buildPropertyReference());
   o.add(buildPropertyReference());
   return o;
 }
 
-checkUnnamed588(core.List<api.PropertyReference> o) {
+checkUnnamed1567(core.List<api.PropertyReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPropertyReference(o[0]);
   checkPropertyReference(o[1]);
 }
 
-buildUnnamed589() {
+buildUnnamed1568() {
   var o = new core.List<api.KindExpression>();
   o.add(buildKindExpression());
   o.add(buildKindExpression());
   return o;
 }
 
-checkUnnamed589(core.List<api.KindExpression> o) {
+checkUnnamed1568(core.List<api.KindExpression> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkKindExpression(o[0]);
   checkKindExpression(o[1]);
 }
 
-buildUnnamed590() {
+buildUnnamed1569() {
   var o = new core.List<api.PropertyOrder>();
   o.add(buildPropertyOrder());
   o.add(buildPropertyOrder());
   return o;
 }
 
-checkUnnamed590(core.List<api.PropertyOrder> o) {
+checkUnnamed1569(core.List<api.PropertyOrder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPropertyOrder(o[0]);
   checkPropertyOrder(o[1]);
 }
 
-buildUnnamed591() {
+buildUnnamed1570() {
   var o = new core.List<api.Projection>();
   o.add(buildProjection());
   o.add(buildProjection());
   return o;
 }
 
-checkUnnamed591(core.List<api.Projection> o) {
+checkUnnamed1570(core.List<api.Projection> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProjection(o[0]);
   checkProjection(o[1]);
@@ -1163,14 +1163,14 @@
   var o = new api.Query();
   buildCounterQuery++;
   if (buildCounterQuery < 3) {
-    o.distinctOn = buildUnnamed588();
+    o.distinctOn = buildUnnamed1567();
     o.endCursor = "foo";
     o.filter = buildFilter();
-    o.kind = buildUnnamed589();
+    o.kind = buildUnnamed1568();
     o.limit = 42;
     o.offset = 42;
-    o.order = buildUnnamed590();
-    o.projection = buildUnnamed591();
+    o.order = buildUnnamed1569();
+    o.projection = buildUnnamed1570();
     o.startCursor = "foo";
   }
   buildCounterQuery--;
@@ -1180,27 +1180,27 @@
 checkQuery(api.Query o) {
   buildCounterQuery++;
   if (buildCounterQuery < 3) {
-    checkUnnamed588(o.distinctOn);
+    checkUnnamed1567(o.distinctOn);
     unittest.expect(o.endCursor, unittest.equals('foo'));
     checkFilter(o.filter);
-    checkUnnamed589(o.kind);
+    checkUnnamed1568(o.kind);
     unittest.expect(o.limit, unittest.equals(42));
     unittest.expect(o.offset, unittest.equals(42));
-    checkUnnamed590(o.order);
-    checkUnnamed591(o.projection);
+    checkUnnamed1569(o.order);
+    checkUnnamed1570(o.projection);
     unittest.expect(o.startCursor, unittest.equals('foo'));
   }
   buildCounterQuery--;
 }
 
-buildUnnamed592() {
+buildUnnamed1571() {
   var o = new core.List<api.EntityResult>();
   o.add(buildEntityResult());
   o.add(buildEntityResult());
   return o;
 }
 
-checkUnnamed592(core.List<api.EntityResult> o) {
+checkUnnamed1571(core.List<api.EntityResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityResult(o[0]);
   checkEntityResult(o[1]);
@@ -1213,7 +1213,7 @@
   if (buildCounterQueryResultBatch < 3) {
     o.endCursor = "foo";
     o.entityResultType = "foo";
-    o.entityResults = buildUnnamed592();
+    o.entityResults = buildUnnamed1571();
     o.moreResults = "foo";
     o.skippedCursor = "foo";
     o.skippedResults = 42;
@@ -1228,7 +1228,7 @@
   if (buildCounterQueryResultBatch < 3) {
     unittest.expect(o.endCursor, unittest.equals('foo'));
     unittest.expect(o.entityResultType, unittest.equals('foo'));
-    checkUnnamed592(o.entityResults);
+    checkUnnamed1571(o.entityResults);
     unittest.expect(o.moreResults, unittest.equals('foo'));
     unittest.expect(o.skippedCursor, unittest.equals('foo'));
     unittest.expect(o.skippedResults, unittest.equals(42));
@@ -1292,14 +1292,14 @@
   buildCounterReadWrite--;
 }
 
-buildUnnamed593() {
+buildUnnamed1572() {
   var o = new core.List<api.Key>();
   o.add(buildKey());
   o.add(buildKey());
   return o;
 }
 
-checkUnnamed593(core.List<api.Key> o) {
+checkUnnamed1572(core.List<api.Key> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkKey(o[0]);
   checkKey(o[1]);
@@ -1311,7 +1311,7 @@
   buildCounterReserveIdsRequest++;
   if (buildCounterReserveIdsRequest < 3) {
     o.databaseId = "foo";
-    o.keys = buildUnnamed593();
+    o.keys = buildUnnamed1572();
   }
   buildCounterReserveIdsRequest--;
   return o;
@@ -1321,7 +1321,7 @@
   buildCounterReserveIdsRequest++;
   if (buildCounterReserveIdsRequest < 3) {
     unittest.expect(o.databaseId, unittest.equals('foo'));
-    checkUnnamed593(o.keys);
+    checkUnnamed1572(o.keys);
   }
   buildCounterReserveIdsRequest--;
 }
@@ -1421,7 +1421,7 @@
   buildCounterRunQueryResponse--;
 }
 
-buildUnnamed594() {
+buildUnnamed1573() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1436,7 +1436,7 @@
   return o;
 }
 
-checkUnnamed594(core.Map<core.String, core.Object> o) {
+checkUnnamed1573(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1450,17 +1450,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed595() {
+buildUnnamed1574() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed594());
-  o.add(buildUnnamed594());
+  o.add(buildUnnamed1573());
+  o.add(buildUnnamed1573());
   return o;
 }
 
-checkUnnamed595(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1574(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed594(o[0]);
-  checkUnnamed594(o[1]);
+  checkUnnamed1573(o[0]);
+  checkUnnamed1573(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1469,7 +1469,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed595();
+    o.details = buildUnnamed1574();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1480,7 +1480,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed595(o.details);
+    checkUnnamed1574(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -2014,7 +2014,7 @@
       }), true);
       res
           .allocateIds(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AllocateIdsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAllocateIdsResponse(response);
       })));
     });
@@ -2077,7 +2077,7 @@
       }), true);
       res
           .beginTransaction(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BeginTransactionResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBeginTransactionResponse(response);
       })));
     });
@@ -2140,7 +2140,7 @@
       }), true);
       res
           .commit(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommitResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommitResponse(response);
       })));
     });
@@ -2203,7 +2203,7 @@
       }), true);
       res
           .lookup(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LookupResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLookupResponse(response);
       })));
     });
@@ -2266,7 +2266,7 @@
       }), true);
       res
           .reserveIds(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReserveIdsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkReserveIdsResponse(response);
       })));
     });
@@ -2329,7 +2329,7 @@
       }), true);
       res
           .rollback(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RollbackResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRollbackResponse(response);
       })));
     });
@@ -2392,7 +2392,7 @@
       }), true);
       res
           .runQuery(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RunQueryResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRunQueryResponse(response);
       })));
     });
@@ -2446,7 +2446,7 @@
       }), true);
       res
           .cancel(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2498,7 +2498,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2548,8 +2548,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -2614,8 +2615,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleLongrunningListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningListOperationsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/deploymentmanager/v2_test.dart b/generated/googleapis/test/deploymentmanager/v2_test.dart
index 57334d6..d23e0d4 100644
--- a/generated/googleapis/test/deploymentmanager/v2_test.dart
+++ b/generated/googleapis/test/deploymentmanager/v2_test.dart
@@ -50,27 +50,27 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed96() {
+buildUnnamed393() {
   var o = new core.List<api.AuditLogConfig>();
   o.add(buildAuditLogConfig());
   o.add(buildAuditLogConfig());
   return o;
 }
 
-checkUnnamed96(core.List<api.AuditLogConfig> o) {
+checkUnnamed393(core.List<api.AuditLogConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditLogConfig(o[0]);
   checkAuditLogConfig(o[1]);
 }
 
-buildUnnamed97() {
+buildUnnamed394() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed97(core.List<core.String> o) {
+checkUnnamed394(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -81,8 +81,8 @@
   var o = new api.AuditConfig();
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    o.auditLogConfigs = buildUnnamed96();
-    o.exemptedMembers = buildUnnamed97();
+    o.auditLogConfigs = buildUnnamed393();
+    o.exemptedMembers = buildUnnamed394();
     o.service = "foo";
   }
   buildCounterAuditConfig--;
@@ -92,21 +92,21 @@
 checkAuditConfig(api.AuditConfig o) {
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    checkUnnamed96(o.auditLogConfigs);
-    checkUnnamed97(o.exemptedMembers);
+    checkUnnamed393(o.auditLogConfigs);
+    checkUnnamed394(o.exemptedMembers);
     unittest.expect(o.service, unittest.equals('foo'));
   }
   buildCounterAuditConfig--;
 }
 
-buildUnnamed98() {
+buildUnnamed395() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed98(core.List<core.String> o) {
+checkUnnamed395(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -117,7 +117,7 @@
   var o = new api.AuditLogConfig();
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    o.exemptedMembers = buildUnnamed98();
+    o.exemptedMembers = buildUnnamed395();
     o.logType = "foo";
   }
   buildCounterAuditLogConfig--;
@@ -127,7 +127,7 @@
 checkAuditLogConfig(api.AuditLogConfig o) {
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    checkUnnamed98(o.exemptedMembers);
+    checkUnnamed395(o.exemptedMembers);
     unittest.expect(o.logType, unittest.equals('foo'));
   }
   buildCounterAuditLogConfig--;
@@ -152,14 +152,14 @@
   buildCounterAuthorizationLoggingOptions--;
 }
 
-buildUnnamed99() {
+buildUnnamed396() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed99(core.List<core.String> o) {
+checkUnnamed396(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -171,7 +171,7 @@
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
     o.condition = buildExpr();
-    o.members = buildUnnamed99();
+    o.members = buildUnnamed396();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -182,20 +182,20 @@
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
     checkExpr(o.condition);
-    checkUnnamed99(o.members);
+    checkUnnamed396(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
 }
 
-buildUnnamed100() {
+buildUnnamed397() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed100(core.List<core.String> o) {
+checkUnnamed397(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -211,7 +211,7 @@
     o.svc = "foo";
     o.sys = "foo";
     o.value = "foo";
-    o.values = buildUnnamed100();
+    o.values = buildUnnamed397();
   }
   buildCounterCondition--;
   return o;
@@ -225,7 +225,7 @@
     unittest.expect(o.svc, unittest.equals('foo'));
     unittest.expect(o.sys, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
-    checkUnnamed100(o.values);
+    checkUnnamed397(o.values);
   }
   buildCounterCondition--;
 }
@@ -249,14 +249,14 @@
   buildCounterConfigFile--;
 }
 
-buildUnnamed101() {
+buildUnnamed398() {
   var o = new core.List<api.DeploymentLabelEntry>();
   o.add(buildDeploymentLabelEntry());
   o.add(buildDeploymentLabelEntry());
   return o;
 }
 
-checkUnnamed101(core.List<api.DeploymentLabelEntry> o) {
+checkUnnamed398(core.List<api.DeploymentLabelEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeploymentLabelEntry(o[0]);
   checkDeploymentLabelEntry(o[1]);
@@ -271,7 +271,7 @@
     o.fingerprint = "foo";
     o.id = "foo";
     o.insertTime = "foo";
-    o.labels = buildUnnamed101();
+    o.labels = buildUnnamed398();
     o.manifest = "foo";
     o.name = "foo";
     o.operation = buildOperation();
@@ -290,7 +290,7 @@
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.insertTime, unittest.equals('foo'));
-    checkUnnamed101(o.labels);
+    checkUnnamed398(o.labels);
     unittest.expect(o.manifest, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     checkOperation(o.operation);
@@ -322,14 +322,14 @@
   buildCounterDeploymentLabelEntry--;
 }
 
-buildUnnamed102() {
+buildUnnamed399() {
   var o = new core.List<api.DeploymentUpdateLabelEntry>();
   o.add(buildDeploymentUpdateLabelEntry());
   o.add(buildDeploymentUpdateLabelEntry());
   return o;
 }
 
-checkUnnamed102(core.List<api.DeploymentUpdateLabelEntry> o) {
+checkUnnamed399(core.List<api.DeploymentUpdateLabelEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeploymentUpdateLabelEntry(o[0]);
   checkDeploymentUpdateLabelEntry(o[1]);
@@ -341,7 +341,7 @@
   buildCounterDeploymentUpdate++;
   if (buildCounterDeploymentUpdate < 3) {
     o.description = "foo";
-    o.labels = buildUnnamed102();
+    o.labels = buildUnnamed399();
     o.manifest = "foo";
   }
   buildCounterDeploymentUpdate--;
@@ -352,7 +352,7 @@
   buildCounterDeploymentUpdate++;
   if (buildCounterDeploymentUpdate < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed102(o.labels);
+    checkUnnamed399(o.labels);
     unittest.expect(o.manifest, unittest.equals('foo'));
   }
   buildCounterDeploymentUpdate--;
@@ -398,14 +398,14 @@
   buildCounterDeploymentsCancelPreviewRequest--;
 }
 
-buildUnnamed103() {
+buildUnnamed400() {
   var o = new core.List<api.Deployment>();
   o.add(buildDeployment());
   o.add(buildDeployment());
   return o;
 }
 
-checkUnnamed103(core.List<api.Deployment> o) {
+checkUnnamed400(core.List<api.Deployment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeployment(o[0]);
   checkDeployment(o[1]);
@@ -416,7 +416,7 @@
   var o = new api.DeploymentsListResponse();
   buildCounterDeploymentsListResponse++;
   if (buildCounterDeploymentsListResponse < 3) {
-    o.deployments = buildUnnamed103();
+    o.deployments = buildUnnamed400();
     o.nextPageToken = "foo";
   }
   buildCounterDeploymentsListResponse--;
@@ -426,7 +426,7 @@
 checkDeploymentsListResponse(api.DeploymentsListResponse o) {
   buildCounterDeploymentsListResponse++;
   if (buildCounterDeploymentsListResponse < 3) {
-    checkUnnamed103(o.deployments);
+    checkUnnamed400(o.deployments);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterDeploymentsListResponse--;
@@ -581,14 +581,14 @@
   buildCounterLogConfigDataAccessOptions--;
 }
 
-buildUnnamed104() {
+buildUnnamed401() {
   var o = new core.List<api.ImportFile>();
   o.add(buildImportFile());
   o.add(buildImportFile());
   return o;
 }
 
-checkUnnamed104(core.List<api.ImportFile> o) {
+checkUnnamed401(core.List<api.ImportFile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImportFile(o[0]);
   checkImportFile(o[1]);
@@ -602,7 +602,7 @@
     o.config = buildConfigFile();
     o.expandedConfig = "foo";
     o.id = "foo";
-    o.imports = buildUnnamed104();
+    o.imports = buildUnnamed401();
     o.insertTime = "foo";
     o.layout = "foo";
     o.name = "foo";
@@ -618,7 +618,7 @@
     checkConfigFile(o.config);
     unittest.expect(o.expandedConfig, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed104(o.imports);
+    checkUnnamed401(o.imports);
     unittest.expect(o.insertTime, unittest.equals('foo'));
     unittest.expect(o.layout, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -627,14 +627,14 @@
   buildCounterManifest--;
 }
 
-buildUnnamed105() {
+buildUnnamed402() {
   var o = new core.List<api.Manifest>();
   o.add(buildManifest());
   o.add(buildManifest());
   return o;
 }
 
-checkUnnamed105(core.List<api.Manifest> o) {
+checkUnnamed402(core.List<api.Manifest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManifest(o[0]);
   checkManifest(o[1]);
@@ -645,7 +645,7 @@
   var o = new api.ManifestsListResponse();
   buildCounterManifestsListResponse++;
   if (buildCounterManifestsListResponse < 3) {
-    o.manifests = buildUnnamed105();
+    o.manifests = buildUnnamed402();
     o.nextPageToken = "foo";
   }
   buildCounterManifestsListResponse--;
@@ -655,7 +655,7 @@
 checkManifestsListResponse(api.ManifestsListResponse o) {
   buildCounterManifestsListResponse++;
   if (buildCounterManifestsListResponse < 3) {
-    checkUnnamed105(o.manifests);
+    checkUnnamed402(o.manifests);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterManifestsListResponse--;
@@ -684,14 +684,14 @@
   buildCounterOperationErrorErrors--;
 }
 
-buildUnnamed106() {
+buildUnnamed403() {
   var o = new core.List<api.OperationErrorErrors>();
   o.add(buildOperationErrorErrors());
   o.add(buildOperationErrorErrors());
   return o;
 }
 
-checkUnnamed106(core.List<api.OperationErrorErrors> o) {
+checkUnnamed403(core.List<api.OperationErrorErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationErrorErrors(o[0]);
   checkOperationErrorErrors(o[1]);
@@ -702,7 +702,7 @@
   var o = new api.OperationError();
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    o.errors = buildUnnamed106();
+    o.errors = buildUnnamed403();
   }
   buildCounterOperationError--;
   return o;
@@ -711,7 +711,7 @@
 checkOperationError(api.OperationError o) {
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    checkUnnamed106(o.errors);
+    checkUnnamed403(o.errors);
   }
   buildCounterOperationError--;
 }
@@ -737,14 +737,14 @@
   buildCounterOperationWarningsData--;
 }
 
-buildUnnamed107() {
+buildUnnamed404() {
   var o = new core.List<api.OperationWarningsData>();
   o.add(buildOperationWarningsData());
   o.add(buildOperationWarningsData());
   return o;
 }
 
-checkUnnamed107(core.List<api.OperationWarningsData> o) {
+checkUnnamed404(core.List<api.OperationWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarningsData(o[0]);
   checkOperationWarningsData(o[1]);
@@ -756,7 +756,7 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed107();
+    o.data = buildUnnamed404();
     o.message = "foo";
   }
   buildCounterOperationWarnings--;
@@ -767,20 +767,20 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed107(o.data);
+    checkUnnamed404(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterOperationWarnings--;
 }
 
-buildUnnamed108() {
+buildUnnamed405() {
   var o = new core.List<api.OperationWarnings>();
   o.add(buildOperationWarnings());
   o.add(buildOperationWarnings());
   return o;
 }
 
-checkUnnamed108(core.List<api.OperationWarnings> o) {
+checkUnnamed405(core.List<api.OperationWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarnings(o[0]);
   checkOperationWarnings(o[1]);
@@ -812,7 +812,7 @@
     o.targetId = "foo";
     o.targetLink = "foo";
     o.user = "foo";
-    o.warnings = buildUnnamed108();
+    o.warnings = buildUnnamed405();
     o.zone = "foo";
   }
   buildCounterOperation--;
@@ -843,20 +843,20 @@
     unittest.expect(o.targetId, unittest.equals('foo'));
     unittest.expect(o.targetLink, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed108(o.warnings);
+    checkUnnamed405(o.warnings);
     unittest.expect(o.zone, unittest.equals('foo'));
   }
   buildCounterOperation--;
 }
 
-buildUnnamed109() {
+buildUnnamed406() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed109(core.List<api.Operation> o) {
+checkUnnamed406(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -868,7 +868,7 @@
   buildCounterOperationsListResponse++;
   if (buildCounterOperationsListResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed109();
+    o.operations = buildUnnamed406();
   }
   buildCounterOperationsListResponse--;
   return o;
@@ -878,45 +878,45 @@
   buildCounterOperationsListResponse++;
   if (buildCounterOperationsListResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed109(o.operations);
+    checkUnnamed406(o.operations);
   }
   buildCounterOperationsListResponse--;
 }
 
-buildUnnamed110() {
+buildUnnamed407() {
   var o = new core.List<api.AuditConfig>();
   o.add(buildAuditConfig());
   o.add(buildAuditConfig());
   return o;
 }
 
-checkUnnamed110(core.List<api.AuditConfig> o) {
+checkUnnamed407(core.List<api.AuditConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditConfig(o[0]);
   checkAuditConfig(o[1]);
 }
 
-buildUnnamed111() {
+buildUnnamed408() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed111(core.List<api.Binding> o) {
+checkUnnamed408(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
 }
 
-buildUnnamed112() {
+buildUnnamed409() {
   var o = new core.List<api.Rule>();
   o.add(buildRule());
   o.add(buildRule());
   return o;
 }
 
-checkUnnamed112(core.List<api.Rule> o) {
+checkUnnamed409(core.List<api.Rule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRule(o[0]);
   checkRule(o[1]);
@@ -927,11 +927,11 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.auditConfigs = buildUnnamed110();
-    o.bindings = buildUnnamed111();
+    o.auditConfigs = buildUnnamed407();
+    o.bindings = buildUnnamed408();
     o.etag = "foo";
     o.iamOwned = true;
-    o.rules = buildUnnamed112();
+    o.rules = buildUnnamed409();
     o.version = 42;
   }
   buildCounterPolicy--;
@@ -941,11 +941,11 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed110(o.auditConfigs);
-    checkUnnamed111(o.bindings);
+    checkUnnamed407(o.auditConfigs);
+    checkUnnamed408(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.iamOwned, unittest.isTrue);
-    checkUnnamed112(o.rules);
+    checkUnnamed409(o.rules);
     unittest.expect(o.version, unittest.equals(42));
   }
   buildCounterPolicy--;
@@ -972,14 +972,14 @@
   buildCounterResourceWarningsData--;
 }
 
-buildUnnamed113() {
+buildUnnamed410() {
   var o = new core.List<api.ResourceWarningsData>();
   o.add(buildResourceWarningsData());
   o.add(buildResourceWarningsData());
   return o;
 }
 
-checkUnnamed113(core.List<api.ResourceWarningsData> o) {
+checkUnnamed410(core.List<api.ResourceWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceWarningsData(o[0]);
   checkResourceWarningsData(o[1]);
@@ -991,7 +991,7 @@
   buildCounterResourceWarnings++;
   if (buildCounterResourceWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed113();
+    o.data = buildUnnamed410();
     o.message = "foo";
   }
   buildCounterResourceWarnings--;
@@ -1002,20 +1002,20 @@
   buildCounterResourceWarnings++;
   if (buildCounterResourceWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed113(o.data);
+    checkUnnamed410(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterResourceWarnings--;
 }
 
-buildUnnamed114() {
+buildUnnamed411() {
   var o = new core.List<api.ResourceWarnings>();
   o.add(buildResourceWarnings());
   o.add(buildResourceWarnings());
   return o;
 }
 
-checkUnnamed114(core.List<api.ResourceWarnings> o) {
+checkUnnamed411(core.List<api.ResourceWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceWarnings(o[0]);
   checkResourceWarnings(o[1]);
@@ -1037,7 +1037,7 @@
     o.update = buildResourceUpdate();
     o.updateTime = "foo";
     o.url = "foo";
-    o.warnings = buildUnnamed114();
+    o.warnings = buildUnnamed411();
   }
   buildCounterResource--;
   return o;
@@ -1057,7 +1057,7 @@
     checkResourceUpdate(o.update);
     unittest.expect(o.updateTime, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
-    checkUnnamed114(o.warnings);
+    checkUnnamed411(o.warnings);
   }
   buildCounterResource--;
 }
@@ -1104,14 +1104,14 @@
   buildCounterResourceUpdateErrorErrors--;
 }
 
-buildUnnamed115() {
+buildUnnamed412() {
   var o = new core.List<api.ResourceUpdateErrorErrors>();
   o.add(buildResourceUpdateErrorErrors());
   o.add(buildResourceUpdateErrorErrors());
   return o;
 }
 
-checkUnnamed115(core.List<api.ResourceUpdateErrorErrors> o) {
+checkUnnamed412(core.List<api.ResourceUpdateErrorErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceUpdateErrorErrors(o[0]);
   checkResourceUpdateErrorErrors(o[1]);
@@ -1122,7 +1122,7 @@
   var o = new api.ResourceUpdateError();
   buildCounterResourceUpdateError++;
   if (buildCounterResourceUpdateError < 3) {
-    o.errors = buildUnnamed115();
+    o.errors = buildUnnamed412();
   }
   buildCounterResourceUpdateError--;
   return o;
@@ -1131,7 +1131,7 @@
 checkResourceUpdateError(api.ResourceUpdateError o) {
   buildCounterResourceUpdateError++;
   if (buildCounterResourceUpdateError < 3) {
-    checkUnnamed115(o.errors);
+    checkUnnamed412(o.errors);
   }
   buildCounterResourceUpdateError--;
 }
@@ -1157,14 +1157,14 @@
   buildCounterResourceUpdateWarningsData--;
 }
 
-buildUnnamed116() {
+buildUnnamed413() {
   var o = new core.List<api.ResourceUpdateWarningsData>();
   o.add(buildResourceUpdateWarningsData());
   o.add(buildResourceUpdateWarningsData());
   return o;
 }
 
-checkUnnamed116(core.List<api.ResourceUpdateWarningsData> o) {
+checkUnnamed413(core.List<api.ResourceUpdateWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceUpdateWarningsData(o[0]);
   checkResourceUpdateWarningsData(o[1]);
@@ -1176,7 +1176,7 @@
   buildCounterResourceUpdateWarnings++;
   if (buildCounterResourceUpdateWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed116();
+    o.data = buildUnnamed413();
     o.message = "foo";
   }
   buildCounterResourceUpdateWarnings--;
@@ -1187,20 +1187,20 @@
   buildCounterResourceUpdateWarnings++;
   if (buildCounterResourceUpdateWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed116(o.data);
+    checkUnnamed413(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterResourceUpdateWarnings--;
 }
 
-buildUnnamed117() {
+buildUnnamed414() {
   var o = new core.List<api.ResourceUpdateWarnings>();
   o.add(buildResourceUpdateWarnings());
   o.add(buildResourceUpdateWarnings());
   return o;
 }
 
-checkUnnamed117(core.List<api.ResourceUpdateWarnings> o) {
+checkUnnamed414(core.List<api.ResourceUpdateWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceUpdateWarnings(o[0]);
   checkResourceUpdateWarnings(o[1]);
@@ -1218,7 +1218,7 @@
     o.manifest = "foo";
     o.properties = "foo";
     o.state = "foo";
-    o.warnings = buildUnnamed117();
+    o.warnings = buildUnnamed414();
   }
   buildCounterResourceUpdate--;
   return o;
@@ -1234,19 +1234,19 @@
     unittest.expect(o.manifest, unittest.equals('foo'));
     unittest.expect(o.properties, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
-    checkUnnamed117(o.warnings);
+    checkUnnamed414(o.warnings);
   }
   buildCounterResourceUpdate--;
 }
 
-buildUnnamed118() {
+buildUnnamed415() {
   var o = new core.List<api.Resource>();
   o.add(buildResource());
   o.add(buildResource());
   return o;
 }
 
-checkUnnamed118(core.List<api.Resource> o) {
+checkUnnamed415(core.List<api.Resource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResource(o[0]);
   checkResource(o[1]);
@@ -1258,7 +1258,7 @@
   buildCounterResourcesListResponse++;
   if (buildCounterResourcesListResponse < 3) {
     o.nextPageToken = "foo";
-    o.resources = buildUnnamed118();
+    o.resources = buildUnnamed415();
   }
   buildCounterResourcesListResponse--;
   return o;
@@ -1268,71 +1268,71 @@
   buildCounterResourcesListResponse++;
   if (buildCounterResourcesListResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed118(o.resources);
+    checkUnnamed415(o.resources);
   }
   buildCounterResourcesListResponse--;
 }
 
-buildUnnamed119() {
+buildUnnamed416() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed119(core.List<api.Condition> o) {
+checkUnnamed416(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
 }
 
-buildUnnamed120() {
+buildUnnamed417() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed120(core.List<core.String> o) {
+checkUnnamed417(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed121() {
+buildUnnamed418() {
   var o = new core.List<api.LogConfig>();
   o.add(buildLogConfig());
   o.add(buildLogConfig());
   return o;
 }
 
-checkUnnamed121(core.List<api.LogConfig> o) {
+checkUnnamed418(core.List<api.LogConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogConfig(o[0]);
   checkLogConfig(o[1]);
 }
 
-buildUnnamed122() {
+buildUnnamed419() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed122(core.List<core.String> o) {
+checkUnnamed419(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed123() {
+buildUnnamed420() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed123(core.List<core.String> o) {
+checkUnnamed420(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1344,12 +1344,12 @@
   buildCounterRule++;
   if (buildCounterRule < 3) {
     o.action = "foo";
-    o.conditions = buildUnnamed119();
+    o.conditions = buildUnnamed416();
     o.description = "foo";
-    o.ins = buildUnnamed120();
-    o.logConfigs = buildUnnamed121();
-    o.notIns = buildUnnamed122();
-    o.permissions = buildUnnamed123();
+    o.ins = buildUnnamed417();
+    o.logConfigs = buildUnnamed418();
+    o.notIns = buildUnnamed419();
+    o.permissions = buildUnnamed420();
   }
   buildCounterRule--;
   return o;
@@ -1359,24 +1359,24 @@
   buildCounterRule++;
   if (buildCounterRule < 3) {
     unittest.expect(o.action, unittest.equals('foo'));
-    checkUnnamed119(o.conditions);
+    checkUnnamed416(o.conditions);
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed120(o.ins);
-    checkUnnamed121(o.logConfigs);
-    checkUnnamed122(o.notIns);
-    checkUnnamed123(o.permissions);
+    checkUnnamed417(o.ins);
+    checkUnnamed418(o.logConfigs);
+    checkUnnamed419(o.notIns);
+    checkUnnamed420(o.permissions);
   }
   buildCounterRule--;
 }
 
-buildUnnamed124() {
+buildUnnamed421() {
   var o = new core.List<api.ImportFile>();
   o.add(buildImportFile());
   o.add(buildImportFile());
   return o;
 }
 
-checkUnnamed124(core.List<api.ImportFile> o) {
+checkUnnamed421(core.List<api.ImportFile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImportFile(o[0]);
   checkImportFile(o[1]);
@@ -1388,7 +1388,7 @@
   buildCounterTargetConfiguration++;
   if (buildCounterTargetConfiguration < 3) {
     o.config = buildConfigFile();
-    o.imports = buildUnnamed124();
+    o.imports = buildUnnamed421();
   }
   buildCounterTargetConfiguration--;
   return o;
@@ -1398,19 +1398,19 @@
   buildCounterTargetConfiguration++;
   if (buildCounterTargetConfiguration < 3) {
     checkConfigFile(o.config);
-    checkUnnamed124(o.imports);
+    checkUnnamed421(o.imports);
   }
   buildCounterTargetConfiguration--;
 }
 
-buildUnnamed125() {
+buildUnnamed422() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed125(core.List<core.String> o) {
+checkUnnamed422(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1421,7 +1421,7 @@
   var o = new api.TestPermissionsRequest();
   buildCounterTestPermissionsRequest++;
   if (buildCounterTestPermissionsRequest < 3) {
-    o.permissions = buildUnnamed125();
+    o.permissions = buildUnnamed422();
   }
   buildCounterTestPermissionsRequest--;
   return o;
@@ -1430,19 +1430,19 @@
 checkTestPermissionsRequest(api.TestPermissionsRequest o) {
   buildCounterTestPermissionsRequest++;
   if (buildCounterTestPermissionsRequest < 3) {
-    checkUnnamed125(o.permissions);
+    checkUnnamed422(o.permissions);
   }
   buildCounterTestPermissionsRequest--;
 }
 
-buildUnnamed126() {
+buildUnnamed423() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed126(core.List<core.String> o) {
+checkUnnamed423(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1453,7 +1453,7 @@
   var o = new api.TestPermissionsResponse();
   buildCounterTestPermissionsResponse++;
   if (buildCounterTestPermissionsResponse < 3) {
-    o.permissions = buildUnnamed126();
+    o.permissions = buildUnnamed423();
   }
   buildCounterTestPermissionsResponse--;
   return o;
@@ -1462,7 +1462,7 @@
 checkTestPermissionsResponse(api.TestPermissionsResponse o) {
   buildCounterTestPermissionsResponse++;
   if (buildCounterTestPermissionsResponse < 3) {
-    checkUnnamed126(o.permissions);
+    checkUnnamed423(o.permissions);
   }
   buildCounterTestPermissionsResponse--;
 }
@@ -1494,14 +1494,14 @@
   buildCounterType--;
 }
 
-buildUnnamed127() {
+buildUnnamed424() {
   var o = new core.List<api.Type>();
   o.add(buildType());
   o.add(buildType());
   return o;
 }
 
-checkUnnamed127(core.List<api.Type> o) {
+checkUnnamed424(core.List<api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o[0]);
   checkType(o[1]);
@@ -1513,7 +1513,7 @@
   buildCounterTypesListResponse++;
   if (buildCounterTypesListResponse < 3) {
     o.nextPageToken = "foo";
-    o.types = buildUnnamed127();
+    o.types = buildUnnamed424();
   }
   buildCounterTypesListResponse--;
   return o;
@@ -1523,7 +1523,7 @@
   buildCounterTypesListResponse++;
   if (buildCounterTypesListResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed127(o.types);
+    checkUnnamed424(o.types);
   }
   buildCounterTypesListResponse--;
 }
@@ -1931,7 +1931,7 @@
       res
           .cancelPreview(arg_request, arg_project, arg_deployment,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1984,7 +1984,7 @@
       res
           .delete(arg_project, arg_deployment,
               deletePolicy: arg_deletePolicy, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2033,7 +2033,7 @@
       }), true);
       res
           .get(arg_project, arg_deployment, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Deployment response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeployment(response);
       })));
     });
@@ -2082,7 +2082,7 @@
       }), true);
       res
           .getIamPolicy(arg_project, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -2138,7 +2138,7 @@
       res
           .insert(arg_request, arg_project,
               preview: arg_preview, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2202,7 +2202,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DeploymentsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeploymentsListResponse(response);
       })));
     });
@@ -2268,7 +2268,7 @@
               deletePolicy: arg_deletePolicy,
               preview: arg_preview,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2322,7 +2322,7 @@
       res
           .setIamPolicy(arg_request, arg_project, arg_resource,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -2375,7 +2375,7 @@
       }), true);
       res
           .stop(arg_request, arg_project, arg_deployment, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2429,7 +2429,7 @@
       res
           .testIamPermissions(arg_request, arg_project, arg_resource,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TestPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestPermissionsResponse(response);
       })));
     });
@@ -2495,7 +2495,7 @@
               deletePolicy: arg_deletePolicy,
               preview: arg_preview,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2547,7 +2547,7 @@
       }), true);
       res
           .get(arg_project, arg_deployment, arg_manifest, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Manifest response) {
+          .then(unittest.expectAsync1(((response) {
         checkManifest(response);
       })));
     });
@@ -2612,7 +2612,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManifestsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkManifestsListResponse(response);
       })));
     });
@@ -2663,7 +2663,7 @@
       }), true);
       res
           .get(arg_project, arg_operation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2727,7 +2727,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperationsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperationsListResponse(response);
       })));
     });
@@ -2779,7 +2779,7 @@
       }), true);
       res
           .get(arg_project, arg_deployment, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Resource response) {
+          .then(unittest.expectAsync1(((response) {
         checkResource(response);
       })));
     });
@@ -2844,7 +2844,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ResourcesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkResourcesListResponse(response);
       })));
     });
@@ -2909,7 +2909,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TypesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTypesListResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/dfareporting/v2_8_test.dart b/generated/googleapis/test/dfareporting/v2_8_test.dart
index d97ed96..b2f2fe6 100644
--- a/generated/googleapis/test/dfareporting/v2_8_test.dart
+++ b/generated/googleapis/test/dfareporting/v2_8_test.dart
@@ -50,27 +50,27 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed1539() {
+buildUnnamed3134() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1539(core.List<core.String> o) {
+checkUnnamed3134(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1540() {
+buildUnnamed3135() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1540(core.List<core.String> o) {
+checkUnnamed3135(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -81,12 +81,12 @@
   var o = new api.Account();
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    o.accountPermissionIds = buildUnnamed1539();
+    o.accountPermissionIds = buildUnnamed3134();
     o.accountProfile = "foo";
     o.active = true;
     o.activeAdsLimitTier = "foo";
     o.activeViewOptOut = true;
-    o.availablePermissionIds = buildUnnamed1540();
+    o.availablePermissionIds = buildUnnamed3135();
     o.countryId = "foo";
     o.currencyId = "foo";
     o.defaultCreativeSizeId = "foo";
@@ -108,12 +108,12 @@
 checkAccount(api.Account o) {
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    checkUnnamed1539(o.accountPermissionIds);
+    checkUnnamed3134(o.accountPermissionIds);
     unittest.expect(o.accountProfile, unittest.equals('foo'));
     unittest.expect(o.active, unittest.isTrue);
     unittest.expect(o.activeAdsLimitTier, unittest.equals('foo'));
     unittest.expect(o.activeViewOptOut, unittest.isTrue);
-    checkUnnamed1540(o.availablePermissionIds);
+    checkUnnamed3135(o.availablePermissionIds);
     unittest.expect(o.countryId, unittest.equals('foo'));
     unittest.expect(o.currencyId, unittest.equals('foo'));
     unittest.expect(o.defaultCreativeSizeId, unittest.equals('foo'));
@@ -158,14 +158,14 @@
   buildCounterAccountActiveAdSummary--;
 }
 
-buildUnnamed1541() {
+buildUnnamed3136() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1541(core.List<core.String> o) {
+checkUnnamed3136(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -176,7 +176,7 @@
   var o = new api.AccountPermission();
   buildCounterAccountPermission++;
   if (buildCounterAccountPermission < 3) {
-    o.accountProfiles = buildUnnamed1541();
+    o.accountProfiles = buildUnnamed3136();
     o.id = "foo";
     o.kind = "foo";
     o.level = "foo";
@@ -190,7 +190,7 @@
 checkAccountPermission(api.AccountPermission o) {
   buildCounterAccountPermission++;
   if (buildCounterAccountPermission < 3) {
-    checkUnnamed1541(o.accountProfiles);
+    checkUnnamed3136(o.accountProfiles);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.level, unittest.equals('foo'));
@@ -223,14 +223,14 @@
   buildCounterAccountPermissionGroup--;
 }
 
-buildUnnamed1542() {
+buildUnnamed3137() {
   var o = new core.List<api.AccountPermissionGroup>();
   o.add(buildAccountPermissionGroup());
   o.add(buildAccountPermissionGroup());
   return o;
 }
 
-checkUnnamed1542(core.List<api.AccountPermissionGroup> o) {
+checkUnnamed3137(core.List<api.AccountPermissionGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountPermissionGroup(o[0]);
   checkAccountPermissionGroup(o[1]);
@@ -241,7 +241,7 @@
   var o = new api.AccountPermissionGroupsListResponse();
   buildCounterAccountPermissionGroupsListResponse++;
   if (buildCounterAccountPermissionGroupsListResponse < 3) {
-    o.accountPermissionGroups = buildUnnamed1542();
+    o.accountPermissionGroups = buildUnnamed3137();
     o.kind = "foo";
   }
   buildCounterAccountPermissionGroupsListResponse--;
@@ -252,20 +252,20 @@
     api.AccountPermissionGroupsListResponse o) {
   buildCounterAccountPermissionGroupsListResponse++;
   if (buildCounterAccountPermissionGroupsListResponse < 3) {
-    checkUnnamed1542(o.accountPermissionGroups);
+    checkUnnamed3137(o.accountPermissionGroups);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountPermissionGroupsListResponse--;
 }
 
-buildUnnamed1543() {
+buildUnnamed3138() {
   var o = new core.List<api.AccountPermission>();
   o.add(buildAccountPermission());
   o.add(buildAccountPermission());
   return o;
 }
 
-checkUnnamed1543(core.List<api.AccountPermission> o) {
+checkUnnamed3138(core.List<api.AccountPermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountPermission(o[0]);
   checkAccountPermission(o[1]);
@@ -276,7 +276,7 @@
   var o = new api.AccountPermissionsListResponse();
   buildCounterAccountPermissionsListResponse++;
   if (buildCounterAccountPermissionsListResponse < 3) {
-    o.accountPermissions = buildUnnamed1543();
+    o.accountPermissions = buildUnnamed3138();
     o.kind = "foo";
   }
   buildCounterAccountPermissionsListResponse--;
@@ -286,7 +286,7 @@
 checkAccountPermissionsListResponse(api.AccountPermissionsListResponse o) {
   buildCounterAccountPermissionsListResponse++;
   if (buildCounterAccountPermissionsListResponse < 3) {
-    checkUnnamed1543(o.accountPermissions);
+    checkUnnamed3138(o.accountPermissions);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountPermissionsListResponse--;
@@ -341,14 +341,14 @@
   buildCounterAccountUserProfile--;
 }
 
-buildUnnamed1544() {
+buildUnnamed3139() {
   var o = new core.List<api.AccountUserProfile>();
   o.add(buildAccountUserProfile());
   o.add(buildAccountUserProfile());
   return o;
 }
 
-checkUnnamed1544(core.List<api.AccountUserProfile> o) {
+checkUnnamed3139(core.List<api.AccountUserProfile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountUserProfile(o[0]);
   checkAccountUserProfile(o[1]);
@@ -359,7 +359,7 @@
   var o = new api.AccountUserProfilesListResponse();
   buildCounterAccountUserProfilesListResponse++;
   if (buildCounterAccountUserProfilesListResponse < 3) {
-    o.accountUserProfiles = buildUnnamed1544();
+    o.accountUserProfiles = buildUnnamed3139();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -370,21 +370,21 @@
 checkAccountUserProfilesListResponse(api.AccountUserProfilesListResponse o) {
   buildCounterAccountUserProfilesListResponse++;
   if (buildCounterAccountUserProfilesListResponse < 3) {
-    checkUnnamed1544(o.accountUserProfiles);
+    checkUnnamed3139(o.accountUserProfiles);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAccountUserProfilesListResponse--;
 }
 
-buildUnnamed1545() {
+buildUnnamed3140() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed1545(core.List<api.Account> o) {
+checkUnnamed3140(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -395,7 +395,7 @@
   var o = new api.AccountsListResponse();
   buildCounterAccountsListResponse++;
   if (buildCounterAccountsListResponse < 3) {
-    o.accounts = buildUnnamed1545();
+    o.accounts = buildUnnamed3140();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -406,34 +406,34 @@
 checkAccountsListResponse(api.AccountsListResponse o) {
   buildCounterAccountsListResponse++;
   if (buildCounterAccountsListResponse < 3) {
-    checkUnnamed1545(o.accounts);
+    checkUnnamed3140(o.accounts);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAccountsListResponse--;
 }
 
-buildUnnamed1546() {
+buildUnnamed3141() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed1546(core.List<api.DimensionValue> o) {
+checkUnnamed3141(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed1547() {
+buildUnnamed3142() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1547(core.List<core.String> o) {
+checkUnnamed3142(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -444,9 +444,9 @@
   var o = new api.Activities();
   buildCounterActivities++;
   if (buildCounterActivities < 3) {
-    o.filters = buildUnnamed1546();
+    o.filters = buildUnnamed3141();
     o.kind = "foo";
-    o.metricNames = buildUnnamed1547();
+    o.metricNames = buildUnnamed3142();
   }
   buildCounterActivities--;
   return o;
@@ -455,47 +455,47 @@
 checkActivities(api.Activities o) {
   buildCounterActivities++;
   if (buildCounterActivities < 3) {
-    checkUnnamed1546(o.filters);
+    checkUnnamed3141(o.filters);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1547(o.metricNames);
+    checkUnnamed3142(o.metricNames);
   }
   buildCounterActivities--;
 }
 
-buildUnnamed1548() {
+buildUnnamed3143() {
   var o = new core.List<api.CreativeGroupAssignment>();
   o.add(buildCreativeGroupAssignment());
   o.add(buildCreativeGroupAssignment());
   return o;
 }
 
-checkUnnamed1548(core.List<api.CreativeGroupAssignment> o) {
+checkUnnamed3143(core.List<api.CreativeGroupAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeGroupAssignment(o[0]);
   checkCreativeGroupAssignment(o[1]);
 }
 
-buildUnnamed1549() {
+buildUnnamed3144() {
   var o = new core.List<api.EventTagOverride>();
   o.add(buildEventTagOverride());
   o.add(buildEventTagOverride());
   return o;
 }
 
-checkUnnamed1549(core.List<api.EventTagOverride> o) {
+checkUnnamed3144(core.List<api.EventTagOverride> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventTagOverride(o[0]);
   checkEventTagOverride(o[1]);
 }
 
-buildUnnamed1550() {
+buildUnnamed3145() {
   var o = new core.List<api.PlacementAssignment>();
   o.add(buildPlacementAssignment());
   o.add(buildPlacementAssignment());
   return o;
 }
 
-checkUnnamed1550(core.List<api.PlacementAssignment> o) {
+checkUnnamed3145(core.List<api.PlacementAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacementAssignment(o[0]);
   checkPlacementAssignment(o[1]);
@@ -519,7 +519,7 @@
     o.comments = "foo";
     o.compatibility = "foo";
     o.createInfo = buildLastModifiedInfo();
-    o.creativeGroupAssignments = buildUnnamed1548();
+    o.creativeGroupAssignments = buildUnnamed3143();
     o.creativeRotation = buildCreativeRotation();
     o.dayPartTargeting = buildDayPartTargeting();
     o.defaultClickThroughEventTagProperties =
@@ -527,7 +527,7 @@
     o.deliverySchedule = buildDeliverySchedule();
     o.dynamicClickTracker = true;
     o.endTime = core.DateTime.parse("2002-02-27T14:01:02");
-    o.eventTagOverrides = buildUnnamed1549();
+    o.eventTagOverrides = buildUnnamed3144();
     o.geoTargeting = buildGeoTargeting();
     o.id = "foo";
     o.idDimensionValue = buildDimensionValue();
@@ -536,7 +536,7 @@
     o.languageTargeting = buildLanguageTargeting();
     o.lastModifiedInfo = buildLastModifiedInfo();
     o.name = "foo";
-    o.placementAssignments = buildUnnamed1550();
+    o.placementAssignments = buildUnnamed3145();
     o.remarketingListExpression = buildListTargetingExpression();
     o.size = buildSize();
     o.sslCompliant = true;
@@ -567,7 +567,7 @@
     unittest.expect(o.comments, unittest.equals('foo'));
     unittest.expect(o.compatibility, unittest.equals('foo'));
     checkLastModifiedInfo(o.createInfo);
-    checkUnnamed1548(o.creativeGroupAssignments);
+    checkUnnamed3143(o.creativeGroupAssignments);
     checkCreativeRotation(o.creativeRotation);
     checkDayPartTargeting(o.dayPartTargeting);
     checkDefaultClickThroughEventTagProperties(
@@ -576,7 +576,7 @@
     unittest.expect(o.dynamicClickTracker, unittest.isTrue);
     unittest.expect(
         o.endTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed1549(o.eventTagOverrides);
+    checkUnnamed3144(o.eventTagOverrides);
     checkGeoTargeting(o.geoTargeting);
     unittest.expect(o.id, unittest.equals('foo'));
     checkDimensionValue(o.idDimensionValue);
@@ -585,7 +585,7 @@
     checkLanguageTargeting(o.languageTargeting);
     checkLastModifiedInfo(o.lastModifiedInfo);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1550(o.placementAssignments);
+    checkUnnamed3145(o.placementAssignments);
     checkListTargetingExpression(o.remarketingListExpression);
     checkSize(o.size);
     unittest.expect(o.sslCompliant, unittest.isTrue);
@@ -658,14 +658,14 @@
   buildCounterAdSlot--;
 }
 
-buildUnnamed1551() {
+buildUnnamed3146() {
   var o = new core.List<api.Ad>();
   o.add(buildAd());
   o.add(buildAd());
   return o;
 }
 
-checkUnnamed1551(core.List<api.Ad> o) {
+checkUnnamed3146(core.List<api.Ad> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAd(o[0]);
   checkAd(o[1]);
@@ -676,7 +676,7 @@
   var o = new api.AdsListResponse();
   buildCounterAdsListResponse++;
   if (buildCounterAdsListResponse < 3) {
-    o.ads = buildUnnamed1551();
+    o.ads = buildUnnamed3146();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -687,7 +687,7 @@
 checkAdsListResponse(api.AdsListResponse o) {
   buildCounterAdsListResponse++;
   if (buildCounterAdsListResponse < 3) {
-    checkUnnamed1551(o.ads);
+    checkUnnamed3146(o.ads);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -767,14 +767,14 @@
   buildCounterAdvertiserGroup--;
 }
 
-buildUnnamed1552() {
+buildUnnamed3147() {
   var o = new core.List<api.AdvertiserGroup>();
   o.add(buildAdvertiserGroup());
   o.add(buildAdvertiserGroup());
   return o;
 }
 
-checkUnnamed1552(core.List<api.AdvertiserGroup> o) {
+checkUnnamed3147(core.List<api.AdvertiserGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdvertiserGroup(o[0]);
   checkAdvertiserGroup(o[1]);
@@ -785,7 +785,7 @@
   var o = new api.AdvertiserGroupsListResponse();
   buildCounterAdvertiserGroupsListResponse++;
   if (buildCounterAdvertiserGroupsListResponse < 3) {
-    o.advertiserGroups = buildUnnamed1552();
+    o.advertiserGroups = buildUnnamed3147();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -796,21 +796,21 @@
 checkAdvertiserGroupsListResponse(api.AdvertiserGroupsListResponse o) {
   buildCounterAdvertiserGroupsListResponse++;
   if (buildCounterAdvertiserGroupsListResponse < 3) {
-    checkUnnamed1552(o.advertiserGroups);
+    checkUnnamed3147(o.advertiserGroups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAdvertiserGroupsListResponse--;
 }
 
-buildUnnamed1553() {
+buildUnnamed3148() {
   var o = new core.List<api.Advertiser>();
   o.add(buildAdvertiser());
   o.add(buildAdvertiser());
   return o;
 }
 
-checkUnnamed1553(core.List<api.Advertiser> o) {
+checkUnnamed3148(core.List<api.Advertiser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdvertiser(o[0]);
   checkAdvertiser(o[1]);
@@ -821,7 +821,7 @@
   var o = new api.AdvertisersListResponse();
   buildCounterAdvertisersListResponse++;
   if (buildCounterAdvertisersListResponse < 3) {
-    o.advertisers = buildUnnamed1553();
+    o.advertisers = buildUnnamed3148();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -832,7 +832,7 @@
 checkAdvertisersListResponse(api.AdvertisersListResponse o) {
   buildCounterAdvertisersListResponse++;
   if (buildCounterAdvertisersListResponse < 3) {
-    checkUnnamed1553(o.advertisers);
+    checkUnnamed3148(o.advertisers);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -862,14 +862,14 @@
   buildCounterAudienceSegment--;
 }
 
-buildUnnamed1554() {
+buildUnnamed3149() {
   var o = new core.List<api.AudienceSegment>();
   o.add(buildAudienceSegment());
   o.add(buildAudienceSegment());
   return o;
 }
 
-checkUnnamed1554(core.List<api.AudienceSegment> o) {
+checkUnnamed3149(core.List<api.AudienceSegment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAudienceSegment(o[0]);
   checkAudienceSegment(o[1]);
@@ -880,7 +880,7 @@
   var o = new api.AudienceSegmentGroup();
   buildCounterAudienceSegmentGroup++;
   if (buildCounterAudienceSegmentGroup < 3) {
-    o.audienceSegments = buildUnnamed1554();
+    o.audienceSegments = buildUnnamed3149();
     o.id = "foo";
     o.name = "foo";
   }
@@ -891,7 +891,7 @@
 checkAudienceSegmentGroup(api.AudienceSegmentGroup o) {
   buildCounterAudienceSegmentGroup++;
   if (buildCounterAudienceSegmentGroup < 3) {
-    checkUnnamed1554(o.audienceSegments);
+    checkUnnamed3149(o.audienceSegments);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
   }
@@ -927,14 +927,14 @@
   buildCounterBrowser--;
 }
 
-buildUnnamed1555() {
+buildUnnamed3150() {
   var o = new core.List<api.Browser>();
   o.add(buildBrowser());
   o.add(buildBrowser());
   return o;
 }
 
-checkUnnamed1555(core.List<api.Browser> o) {
+checkUnnamed3150(core.List<api.Browser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBrowser(o[0]);
   checkBrowser(o[1]);
@@ -945,7 +945,7 @@
   var o = new api.BrowsersListResponse();
   buildCounterBrowsersListResponse++;
   if (buildCounterBrowsersListResponse < 3) {
-    o.browsers = buildUnnamed1555();
+    o.browsers = buildUnnamed3150();
     o.kind = "foo";
   }
   buildCounterBrowsersListResponse--;
@@ -955,72 +955,72 @@
 checkBrowsersListResponse(api.BrowsersListResponse o) {
   buildCounterBrowsersListResponse++;
   if (buildCounterBrowsersListResponse < 3) {
-    checkUnnamed1555(o.browsers);
+    checkUnnamed3150(o.browsers);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBrowsersListResponse--;
 }
 
-buildUnnamed1556() {
+buildUnnamed3151() {
   var o = new core.List<api.CreativeOptimizationConfiguration>();
   o.add(buildCreativeOptimizationConfiguration());
   o.add(buildCreativeOptimizationConfiguration());
   return o;
 }
 
-checkUnnamed1556(core.List<api.CreativeOptimizationConfiguration> o) {
+checkUnnamed3151(core.List<api.CreativeOptimizationConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeOptimizationConfiguration(o[0]);
   checkCreativeOptimizationConfiguration(o[1]);
 }
 
-buildUnnamed1557() {
+buildUnnamed3152() {
   var o = new core.List<api.AudienceSegmentGroup>();
   o.add(buildAudienceSegmentGroup());
   o.add(buildAudienceSegmentGroup());
   return o;
 }
 
-checkUnnamed1557(core.List<api.AudienceSegmentGroup> o) {
+checkUnnamed3152(core.List<api.AudienceSegmentGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAudienceSegmentGroup(o[0]);
   checkAudienceSegmentGroup(o[1]);
 }
 
-buildUnnamed1558() {
+buildUnnamed3153() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1558(core.List<core.String> o) {
+checkUnnamed3153(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1559() {
+buildUnnamed3154() {
   var o = new core.List<api.EventTagOverride>();
   o.add(buildEventTagOverride());
   o.add(buildEventTagOverride());
   return o;
 }
 
-checkUnnamed1559(core.List<api.EventTagOverride> o) {
+checkUnnamed3154(core.List<api.EventTagOverride> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventTagOverride(o[0]);
   checkEventTagOverride(o[1]);
 }
 
-buildUnnamed1560() {
+buildUnnamed3155() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1560(core.List<core.String> o) {
+checkUnnamed3155(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1033,23 +1033,23 @@
   if (buildCounterCampaign < 3) {
     o.accountId = "foo";
     o.adBlockingConfiguration = buildAdBlockingConfiguration();
-    o.additionalCreativeOptimizationConfigurations = buildUnnamed1556();
+    o.additionalCreativeOptimizationConfigurations = buildUnnamed3151();
     o.advertiserGroupId = "foo";
     o.advertiserId = "foo";
     o.advertiserIdDimensionValue = buildDimensionValue();
     o.archived = true;
-    o.audienceSegmentGroups = buildUnnamed1557();
+    o.audienceSegmentGroups = buildUnnamed3152();
     o.billingInvoiceCode = "foo";
     o.clickThroughUrlSuffixProperties = buildClickThroughUrlSuffixProperties();
     o.comment = "foo";
     o.createInfo = buildLastModifiedInfo();
-    o.creativeGroupIds = buildUnnamed1558();
+    o.creativeGroupIds = buildUnnamed3153();
     o.creativeOptimizationConfiguration =
         buildCreativeOptimizationConfiguration();
     o.defaultClickThroughEventTagProperties =
         buildDefaultClickThroughEventTagProperties();
     o.endDate = core.DateTime.parse("2002-02-27T14:01:02Z");
-    o.eventTagOverrides = buildUnnamed1559();
+    o.eventTagOverrides = buildUnnamed3154();
     o.externalId = "foo";
     o.id = "foo";
     o.idDimensionValue = buildDimensionValue();
@@ -1060,7 +1060,7 @@
     o.nielsenOcrEnabled = true;
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.subaccountId = "foo";
-    o.traffickerEmails = buildUnnamed1560();
+    o.traffickerEmails = buildUnnamed3155();
   }
   buildCounterCampaign--;
   return o;
@@ -1071,23 +1071,23 @@
   if (buildCounterCampaign < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     checkAdBlockingConfiguration(o.adBlockingConfiguration);
-    checkUnnamed1556(o.additionalCreativeOptimizationConfigurations);
+    checkUnnamed3151(o.additionalCreativeOptimizationConfigurations);
     unittest.expect(o.advertiserGroupId, unittest.equals('foo'));
     unittest.expect(o.advertiserId, unittest.equals('foo'));
     checkDimensionValue(o.advertiserIdDimensionValue);
     unittest.expect(o.archived, unittest.isTrue);
-    checkUnnamed1557(o.audienceSegmentGroups);
+    checkUnnamed3152(o.audienceSegmentGroups);
     unittest.expect(o.billingInvoiceCode, unittest.equals('foo'));
     checkClickThroughUrlSuffixProperties(o.clickThroughUrlSuffixProperties);
     unittest.expect(o.comment, unittest.equals('foo'));
     checkLastModifiedInfo(o.createInfo);
-    checkUnnamed1558(o.creativeGroupIds);
+    checkUnnamed3153(o.creativeGroupIds);
     checkCreativeOptimizationConfiguration(o.creativeOptimizationConfiguration);
     checkDefaultClickThroughEventTagProperties(
         o.defaultClickThroughEventTagProperties);
     unittest.expect(
         o.endDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
-    checkUnnamed1559(o.eventTagOverrides);
+    checkUnnamed3154(o.eventTagOverrides);
     unittest.expect(o.externalId, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkDimensionValue(o.idDimensionValue);
@@ -1099,7 +1099,7 @@
     unittest.expect(o.startDate,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.subaccountId, unittest.equals('foo'));
-    checkUnnamed1560(o.traffickerEmails);
+    checkUnnamed3155(o.traffickerEmails);
   }
   buildCounterCampaign--;
 }
@@ -1125,14 +1125,14 @@
   buildCounterCampaignCreativeAssociation--;
 }
 
-buildUnnamed1561() {
+buildUnnamed3156() {
   var o = new core.List<api.CampaignCreativeAssociation>();
   o.add(buildCampaignCreativeAssociation());
   o.add(buildCampaignCreativeAssociation());
   return o;
 }
 
-checkUnnamed1561(core.List<api.CampaignCreativeAssociation> o) {
+checkUnnamed3156(core.List<api.CampaignCreativeAssociation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCampaignCreativeAssociation(o[0]);
   checkCampaignCreativeAssociation(o[1]);
@@ -1143,7 +1143,7 @@
   var o = new api.CampaignCreativeAssociationsListResponse();
   buildCounterCampaignCreativeAssociationsListResponse++;
   if (buildCounterCampaignCreativeAssociationsListResponse < 3) {
-    o.campaignCreativeAssociations = buildUnnamed1561();
+    o.campaignCreativeAssociations = buildUnnamed3156();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1155,21 +1155,21 @@
     api.CampaignCreativeAssociationsListResponse o) {
   buildCounterCampaignCreativeAssociationsListResponse++;
   if (buildCounterCampaignCreativeAssociationsListResponse < 3) {
-    checkUnnamed1561(o.campaignCreativeAssociations);
+    checkUnnamed3156(o.campaignCreativeAssociations);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCampaignCreativeAssociationsListResponse--;
 }
 
-buildUnnamed1562() {
+buildUnnamed3157() {
   var o = new core.List<api.Campaign>();
   o.add(buildCampaign());
   o.add(buildCampaign());
   return o;
 }
 
-checkUnnamed1562(core.List<api.Campaign> o) {
+checkUnnamed3157(core.List<api.Campaign> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCampaign(o[0]);
   checkCampaign(o[1]);
@@ -1180,7 +1180,7 @@
   var o = new api.CampaignsListResponse();
   buildCounterCampaignsListResponse++;
   if (buildCounterCampaignsListResponse < 3) {
-    o.campaigns = buildUnnamed1562();
+    o.campaigns = buildUnnamed3157();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1191,7 +1191,7 @@
 checkCampaignsListResponse(api.CampaignsListResponse o) {
   buildCounterCampaignsListResponse++;
   if (buildCounterCampaignsListResponse < 3) {
-    checkUnnamed1562(o.campaigns);
+    checkUnnamed3157(o.campaigns);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1244,14 +1244,14 @@
   buildCounterChangeLog--;
 }
 
-buildUnnamed1563() {
+buildUnnamed3158() {
   var o = new core.List<api.ChangeLog>();
   o.add(buildChangeLog());
   o.add(buildChangeLog());
   return o;
 }
 
-checkUnnamed1563(core.List<api.ChangeLog> o) {
+checkUnnamed3158(core.List<api.ChangeLog> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChangeLog(o[0]);
   checkChangeLog(o[1]);
@@ -1262,7 +1262,7 @@
   var o = new api.ChangeLogsListResponse();
   buildCounterChangeLogsListResponse++;
   if (buildCounterChangeLogsListResponse < 3) {
-    o.changeLogs = buildUnnamed1563();
+    o.changeLogs = buildUnnamed3158();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1273,21 +1273,21 @@
 checkChangeLogsListResponse(api.ChangeLogsListResponse o) {
   buildCounterChangeLogsListResponse++;
   if (buildCounterChangeLogsListResponse < 3) {
-    checkUnnamed1563(o.changeLogs);
+    checkUnnamed3158(o.changeLogs);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterChangeLogsListResponse--;
 }
 
-buildUnnamed1564() {
+buildUnnamed3159() {
   var o = new core.List<api.City>();
   o.add(buildCity());
   o.add(buildCity());
   return o;
 }
 
-checkUnnamed1564(core.List<api.City> o) {
+checkUnnamed3159(core.List<api.City> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCity(o[0]);
   checkCity(o[1]);
@@ -1298,7 +1298,7 @@
   var o = new api.CitiesListResponse();
   buildCounterCitiesListResponse++;
   if (buildCounterCitiesListResponse < 3) {
-    o.cities = buildUnnamed1564();
+    o.cities = buildUnnamed3159();
     o.kind = "foo";
   }
   buildCounterCitiesListResponse--;
@@ -1308,7 +1308,7 @@
 checkCitiesListResponse(api.CitiesListResponse o) {
   buildCounterCitiesListResponse++;
   if (buildCounterCitiesListResponse < 3) {
-    checkUnnamed1564(o.cities);
+    checkUnnamed3159(o.cities);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCitiesListResponse--;
@@ -1439,14 +1439,14 @@
   buildCounterCompanionClickThroughOverride--;
 }
 
-buildUnnamed1565() {
+buildUnnamed3160() {
   var o = new core.List<api.Size>();
   o.add(buildSize());
   o.add(buildSize());
   return o;
 }
 
-checkUnnamed1565(core.List<api.Size> o) {
+checkUnnamed3160(core.List<api.Size> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSize(o[0]);
   checkSize(o[1]);
@@ -1458,7 +1458,7 @@
   buildCounterCompanionSetting++;
   if (buildCounterCompanionSetting < 3) {
     o.companionsDisabled = true;
-    o.enabledSizes = buildUnnamed1565();
+    o.enabledSizes = buildUnnamed3160();
     o.imageOnly = true;
     o.kind = "foo";
   }
@@ -1470,7 +1470,7 @@
   buildCounterCompanionSetting++;
   if (buildCounterCompanionSetting < 3) {
     unittest.expect(o.companionsDisabled, unittest.isTrue);
-    checkUnnamed1565(o.enabledSizes);
+    checkUnnamed3160(o.enabledSizes);
     unittest.expect(o.imageOnly, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
@@ -1534,14 +1534,14 @@
   buildCounterConnectionType--;
 }
 
-buildUnnamed1566() {
+buildUnnamed3161() {
   var o = new core.List<api.ConnectionType>();
   o.add(buildConnectionType());
   o.add(buildConnectionType());
   return o;
 }
 
-checkUnnamed1566(core.List<api.ConnectionType> o) {
+checkUnnamed3161(core.List<api.ConnectionType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConnectionType(o[0]);
   checkConnectionType(o[1]);
@@ -1552,7 +1552,7 @@
   var o = new api.ConnectionTypesListResponse();
   buildCounterConnectionTypesListResponse++;
   if (buildCounterConnectionTypesListResponse < 3) {
-    o.connectionTypes = buildUnnamed1566();
+    o.connectionTypes = buildUnnamed3161();
     o.kind = "foo";
   }
   buildCounterConnectionTypesListResponse--;
@@ -1562,20 +1562,20 @@
 checkConnectionTypesListResponse(api.ConnectionTypesListResponse o) {
   buildCounterConnectionTypesListResponse++;
   if (buildCounterConnectionTypesListResponse < 3) {
-    checkUnnamed1566(o.connectionTypes);
+    checkUnnamed3161(o.connectionTypes);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterConnectionTypesListResponse--;
 }
 
-buildUnnamed1567() {
+buildUnnamed3162() {
   var o = new core.List<api.ContentCategory>();
   o.add(buildContentCategory());
   o.add(buildContentCategory());
   return o;
 }
 
-checkUnnamed1567(core.List<api.ContentCategory> o) {
+checkUnnamed3162(core.List<api.ContentCategory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContentCategory(o[0]);
   checkContentCategory(o[1]);
@@ -1586,7 +1586,7 @@
   var o = new api.ContentCategoriesListResponse();
   buildCounterContentCategoriesListResponse++;
   if (buildCounterContentCategoriesListResponse < 3) {
-    o.contentCategories = buildUnnamed1567();
+    o.contentCategories = buildUnnamed3162();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1597,7 +1597,7 @@
 checkContentCategoriesListResponse(api.ContentCategoriesListResponse o) {
   buildCounterContentCategoriesListResponse++;
   if (buildCounterContentCategoriesListResponse < 3) {
-    checkUnnamed1567(o.contentCategories);
+    checkUnnamed3162(o.contentCategories);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1629,27 +1629,27 @@
   buildCounterContentCategory--;
 }
 
-buildUnnamed1568() {
+buildUnnamed3163() {
   var o = new core.List<api.CustomFloodlightVariable>();
   o.add(buildCustomFloodlightVariable());
   o.add(buildCustomFloodlightVariable());
   return o;
 }
 
-checkUnnamed1568(core.List<api.CustomFloodlightVariable> o) {
+checkUnnamed3163(core.List<api.CustomFloodlightVariable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomFloodlightVariable(o[0]);
   checkCustomFloodlightVariable(o[1]);
 }
 
-buildUnnamed1569() {
+buildUnnamed3164() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1569(core.List<core.String> o) {
+checkUnnamed3164(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1661,9 +1661,9 @@
   buildCounterConversion++;
   if (buildCounterConversion < 3) {
     o.childDirectedTreatment = true;
-    o.customVariables = buildUnnamed1568();
+    o.customVariables = buildUnnamed3163();
     o.encryptedUserId = "foo";
-    o.encryptedUserIdCandidates = buildUnnamed1569();
+    o.encryptedUserIdCandidates = buildUnnamed3164();
     o.floodlightActivityId = "foo";
     o.floodlightConfigurationId = "foo";
     o.gclid = "foo";
@@ -1683,9 +1683,9 @@
   buildCounterConversion++;
   if (buildCounterConversion < 3) {
     unittest.expect(o.childDirectedTreatment, unittest.isTrue);
-    checkUnnamed1568(o.customVariables);
+    checkUnnamed3163(o.customVariables);
     unittest.expect(o.encryptedUserId, unittest.equals('foo'));
-    checkUnnamed1569(o.encryptedUserIdCandidates);
+    checkUnnamed3164(o.encryptedUserIdCandidates);
     unittest.expect(o.floodlightActivityId, unittest.equals('foo'));
     unittest.expect(o.floodlightConfigurationId, unittest.equals('foo'));
     unittest.expect(o.gclid, unittest.equals('foo'));
@@ -1723,14 +1723,14 @@
   buildCounterConversionError--;
 }
 
-buildUnnamed1570() {
+buildUnnamed3165() {
   var o = new core.List<api.ConversionError>();
   o.add(buildConversionError());
   o.add(buildConversionError());
   return o;
 }
 
-checkUnnamed1570(core.List<api.ConversionError> o) {
+checkUnnamed3165(core.List<api.ConversionError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConversionError(o[0]);
   checkConversionError(o[1]);
@@ -1742,7 +1742,7 @@
   buildCounterConversionStatus++;
   if (buildCounterConversionStatus < 3) {
     o.conversion = buildConversion();
-    o.errors = buildUnnamed1570();
+    o.errors = buildUnnamed3165();
     o.kind = "foo";
   }
   buildCounterConversionStatus--;
@@ -1753,20 +1753,20 @@
   buildCounterConversionStatus++;
   if (buildCounterConversionStatus < 3) {
     checkConversion(o.conversion);
-    checkUnnamed1570(o.errors);
+    checkUnnamed3165(o.errors);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterConversionStatus--;
 }
 
-buildUnnamed1571() {
+buildUnnamed3166() {
   var o = new core.List<api.Conversion>();
   o.add(buildConversion());
   o.add(buildConversion());
   return o;
 }
 
-checkUnnamed1571(core.List<api.Conversion> o) {
+checkUnnamed3166(core.List<api.Conversion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConversion(o[0]);
   checkConversion(o[1]);
@@ -1777,7 +1777,7 @@
   var o = new api.ConversionsBatchInsertRequest();
   buildCounterConversionsBatchInsertRequest++;
   if (buildCounterConversionsBatchInsertRequest < 3) {
-    o.conversions = buildUnnamed1571();
+    o.conversions = buildUnnamed3166();
     o.encryptionInfo = buildEncryptionInfo();
     o.kind = "foo";
   }
@@ -1788,21 +1788,21 @@
 checkConversionsBatchInsertRequest(api.ConversionsBatchInsertRequest o) {
   buildCounterConversionsBatchInsertRequest++;
   if (buildCounterConversionsBatchInsertRequest < 3) {
-    checkUnnamed1571(o.conversions);
+    checkUnnamed3166(o.conversions);
     checkEncryptionInfo(o.encryptionInfo);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterConversionsBatchInsertRequest--;
 }
 
-buildUnnamed1572() {
+buildUnnamed3167() {
   var o = new core.List<api.ConversionStatus>();
   o.add(buildConversionStatus());
   o.add(buildConversionStatus());
   return o;
 }
 
-checkUnnamed1572(core.List<api.ConversionStatus> o) {
+checkUnnamed3167(core.List<api.ConversionStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConversionStatus(o[0]);
   checkConversionStatus(o[1]);
@@ -1815,7 +1815,7 @@
   if (buildCounterConversionsBatchInsertResponse < 3) {
     o.hasFailures = true;
     o.kind = "foo";
-    o.status = buildUnnamed1572();
+    o.status = buildUnnamed3167();
   }
   buildCounterConversionsBatchInsertResponse--;
   return o;
@@ -1826,19 +1826,19 @@
   if (buildCounterConversionsBatchInsertResponse < 3) {
     unittest.expect(o.hasFailures, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1572(o.status);
+    checkUnnamed3167(o.status);
   }
   buildCounterConversionsBatchInsertResponse--;
 }
 
-buildUnnamed1573() {
+buildUnnamed3168() {
   var o = new core.List<api.Conversion>();
   o.add(buildConversion());
   o.add(buildConversion());
   return o;
 }
 
-checkUnnamed1573(core.List<api.Conversion> o) {
+checkUnnamed3168(core.List<api.Conversion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConversion(o[0]);
   checkConversion(o[1]);
@@ -1849,7 +1849,7 @@
   var o = new api.ConversionsBatchUpdateRequest();
   buildCounterConversionsBatchUpdateRequest++;
   if (buildCounterConversionsBatchUpdateRequest < 3) {
-    o.conversions = buildUnnamed1573();
+    o.conversions = buildUnnamed3168();
     o.encryptionInfo = buildEncryptionInfo();
     o.kind = "foo";
   }
@@ -1860,21 +1860,21 @@
 checkConversionsBatchUpdateRequest(api.ConversionsBatchUpdateRequest o) {
   buildCounterConversionsBatchUpdateRequest++;
   if (buildCounterConversionsBatchUpdateRequest < 3) {
-    checkUnnamed1573(o.conversions);
+    checkUnnamed3168(o.conversions);
     checkEncryptionInfo(o.encryptionInfo);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterConversionsBatchUpdateRequest--;
 }
 
-buildUnnamed1574() {
+buildUnnamed3169() {
   var o = new core.List<api.ConversionStatus>();
   o.add(buildConversionStatus());
   o.add(buildConversionStatus());
   return o;
 }
 
-checkUnnamed1574(core.List<api.ConversionStatus> o) {
+checkUnnamed3169(core.List<api.ConversionStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConversionStatus(o[0]);
   checkConversionStatus(o[1]);
@@ -1887,7 +1887,7 @@
   if (buildCounterConversionsBatchUpdateResponse < 3) {
     o.hasFailures = true;
     o.kind = "foo";
-    o.status = buildUnnamed1574();
+    o.status = buildUnnamed3169();
   }
   buildCounterConversionsBatchUpdateResponse--;
   return o;
@@ -1898,19 +1898,19 @@
   if (buildCounterConversionsBatchUpdateResponse < 3) {
     unittest.expect(o.hasFailures, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1574(o.status);
+    checkUnnamed3169(o.status);
   }
   buildCounterConversionsBatchUpdateResponse--;
 }
 
-buildUnnamed1575() {
+buildUnnamed3170() {
   var o = new core.List<api.Country>();
   o.add(buildCountry());
   o.add(buildCountry());
   return o;
 }
 
-checkUnnamed1575(core.List<api.Country> o) {
+checkUnnamed3170(core.List<api.Country> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCountry(o[0]);
   checkCountry(o[1]);
@@ -1921,7 +1921,7 @@
   var o = new api.CountriesListResponse();
   buildCounterCountriesListResponse++;
   if (buildCounterCountriesListResponse < 3) {
-    o.countries = buildUnnamed1575();
+    o.countries = buildUnnamed3170();
     o.kind = "foo";
   }
   buildCounterCountriesListResponse--;
@@ -1931,7 +1931,7 @@
 checkCountriesListResponse(api.CountriesListResponse o) {
   buildCounterCountriesListResponse++;
   if (buildCounterCountriesListResponse < 3) {
-    checkUnnamed1575(o.countries);
+    checkUnnamed3170(o.countries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCountriesListResponse--;
@@ -1964,157 +1964,157 @@
   buildCounterCountry--;
 }
 
-buildUnnamed1576() {
+buildUnnamed3171() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1576(core.List<core.String> o) {
+checkUnnamed3171(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1577() {
+buildUnnamed3172() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1577(core.List<core.String> o) {
+checkUnnamed3172(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1578() {
+buildUnnamed3173() {
   var o = new core.List<api.ClickTag>();
   o.add(buildClickTag());
   o.add(buildClickTag());
   return o;
 }
 
-checkUnnamed1578(core.List<api.ClickTag> o) {
+checkUnnamed3173(core.List<api.ClickTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClickTag(o[0]);
   checkClickTag(o[1]);
 }
 
-buildUnnamed1579() {
+buildUnnamed3174() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1579(core.List<core.String> o) {
+checkUnnamed3174(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1580() {
+buildUnnamed3175() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1580(core.List<core.String> o) {
+checkUnnamed3175(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1581() {
+buildUnnamed3176() {
   var o = new core.List<api.CreativeCustomEvent>();
   o.add(buildCreativeCustomEvent());
   o.add(buildCreativeCustomEvent());
   return o;
 }
 
-checkUnnamed1581(core.List<api.CreativeCustomEvent> o) {
+checkUnnamed3176(core.List<api.CreativeCustomEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCustomEvent(o[0]);
   checkCreativeCustomEvent(o[1]);
 }
 
-buildUnnamed1582() {
+buildUnnamed3177() {
   var o = new core.List<api.CreativeAsset>();
   o.add(buildCreativeAsset());
   o.add(buildCreativeAsset());
   return o;
 }
 
-checkUnnamed1582(core.List<api.CreativeAsset> o) {
+checkUnnamed3177(core.List<api.CreativeAsset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeAsset(o[0]);
   checkCreativeAsset(o[1]);
 }
 
-buildUnnamed1583() {
+buildUnnamed3178() {
   var o = new core.List<api.CreativeFieldAssignment>();
   o.add(buildCreativeFieldAssignment());
   o.add(buildCreativeFieldAssignment());
   return o;
 }
 
-checkUnnamed1583(core.List<api.CreativeFieldAssignment> o) {
+checkUnnamed3178(core.List<api.CreativeFieldAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeFieldAssignment(o[0]);
   checkCreativeFieldAssignment(o[1]);
 }
 
-buildUnnamed1584() {
+buildUnnamed3179() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1584(core.List<core.String> o) {
+checkUnnamed3179(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1585() {
+buildUnnamed3180() {
   var o = new core.List<api.CreativeCustomEvent>();
   o.add(buildCreativeCustomEvent());
   o.add(buildCreativeCustomEvent());
   return o;
 }
 
-checkUnnamed1585(core.List<api.CreativeCustomEvent> o) {
+checkUnnamed3180(core.List<api.CreativeCustomEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCustomEvent(o[0]);
   checkCreativeCustomEvent(o[1]);
 }
 
-buildUnnamed1586() {
+buildUnnamed3181() {
   var o = new core.List<api.ThirdPartyTrackingUrl>();
   o.add(buildThirdPartyTrackingUrl());
   o.add(buildThirdPartyTrackingUrl());
   return o;
 }
 
-checkUnnamed1586(core.List<api.ThirdPartyTrackingUrl> o) {
+checkUnnamed3181(core.List<api.ThirdPartyTrackingUrl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThirdPartyTrackingUrl(o[0]);
   checkThirdPartyTrackingUrl(o[1]);
 }
 
-buildUnnamed1587() {
+buildUnnamed3182() {
   var o = new core.List<api.CreativeCustomEvent>();
   o.add(buildCreativeCustomEvent());
   o.add(buildCreativeCustomEvent());
   return o;
 }
 
-checkUnnamed1587(core.List<api.CreativeCustomEvent> o) {
+checkUnnamed3182(core.List<api.CreativeCustomEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCustomEvent(o[0]);
   checkCreativeCustomEvent(o[1]);
@@ -2128,7 +2128,7 @@
     o.accountId = "foo";
     o.active = true;
     o.adParameters = "foo";
-    o.adTagKeys = buildUnnamed1576();
+    o.adTagKeys = buildUnnamed3171();
     o.advertiserId = "foo";
     o.allowScriptAccess = true;
     o.archived = true;
@@ -2138,21 +2138,21 @@
     o.autoAdvanceImages = true;
     o.backgroundColor = "foo";
     o.backupImageClickThroughUrl = "foo";
-    o.backupImageFeatures = buildUnnamed1577();
+    o.backupImageFeatures = buildUnnamed3172();
     o.backupImageReportingLabel = "foo";
     o.backupImageTargetWindow = buildTargetWindow();
-    o.clickTags = buildUnnamed1578();
+    o.clickTags = buildUnnamed3173();
     o.commercialId = "foo";
-    o.companionCreatives = buildUnnamed1579();
-    o.compatibility = buildUnnamed1580();
+    o.companionCreatives = buildUnnamed3174();
+    o.compatibility = buildUnnamed3175();
     o.convertFlashToHtml5 = true;
-    o.counterCustomEvents = buildUnnamed1581();
+    o.counterCustomEvents = buildUnnamed3176();
     o.creativeAssetSelection = buildCreativeAssetSelection();
-    o.creativeAssets = buildUnnamed1582();
-    o.creativeFieldAssignments = buildUnnamed1583();
-    o.customKeyValues = buildUnnamed1584();
+    o.creativeAssets = buildUnnamed3177();
+    o.creativeFieldAssignments = buildUnnamed3178();
+    o.customKeyValues = buildUnnamed3179();
     o.dynamicAssetSelection = true;
-    o.exitCustomEvents = buildUnnamed1585();
+    o.exitCustomEvents = buildUnnamed3180();
     o.fsCommand = buildFsCommand();
     o.htmlCode = "foo";
     o.htmlCodeLocked = true;
@@ -2180,8 +2180,8 @@
     o.subaccountId = "foo";
     o.thirdPartyBackupImageImpressionsUrl = "foo";
     o.thirdPartyRichMediaImpressionsUrl = "foo";
-    o.thirdPartyUrls = buildUnnamed1586();
-    o.timerCustomEvents = buildUnnamed1587();
+    o.thirdPartyUrls = buildUnnamed3181();
+    o.timerCustomEvents = buildUnnamed3182();
     o.totalFileSize = "foo";
     o.type = "foo";
     o.universalAdId = buildUniversalAdId();
@@ -2199,7 +2199,7 @@
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.active, unittest.isTrue);
     unittest.expect(o.adParameters, unittest.equals('foo'));
-    checkUnnamed1576(o.adTagKeys);
+    checkUnnamed3171(o.adTagKeys);
     unittest.expect(o.advertiserId, unittest.equals('foo'));
     unittest.expect(o.allowScriptAccess, unittest.isTrue);
     unittest.expect(o.archived, unittest.isTrue);
@@ -2209,21 +2209,21 @@
     unittest.expect(o.autoAdvanceImages, unittest.isTrue);
     unittest.expect(o.backgroundColor, unittest.equals('foo'));
     unittest.expect(o.backupImageClickThroughUrl, unittest.equals('foo'));
-    checkUnnamed1577(o.backupImageFeatures);
+    checkUnnamed3172(o.backupImageFeatures);
     unittest.expect(o.backupImageReportingLabel, unittest.equals('foo'));
     checkTargetWindow(o.backupImageTargetWindow);
-    checkUnnamed1578(o.clickTags);
+    checkUnnamed3173(o.clickTags);
     unittest.expect(o.commercialId, unittest.equals('foo'));
-    checkUnnamed1579(o.companionCreatives);
-    checkUnnamed1580(o.compatibility);
+    checkUnnamed3174(o.companionCreatives);
+    checkUnnamed3175(o.compatibility);
     unittest.expect(o.convertFlashToHtml5, unittest.isTrue);
-    checkUnnamed1581(o.counterCustomEvents);
+    checkUnnamed3176(o.counterCustomEvents);
     checkCreativeAssetSelection(o.creativeAssetSelection);
-    checkUnnamed1582(o.creativeAssets);
-    checkUnnamed1583(o.creativeFieldAssignments);
-    checkUnnamed1584(o.customKeyValues);
+    checkUnnamed3177(o.creativeAssets);
+    checkUnnamed3178(o.creativeFieldAssignments);
+    checkUnnamed3179(o.customKeyValues);
     unittest.expect(o.dynamicAssetSelection, unittest.isTrue);
-    checkUnnamed1585(o.exitCustomEvents);
+    checkUnnamed3180(o.exitCustomEvents);
     checkFsCommand(o.fsCommand);
     unittest.expect(o.htmlCode, unittest.equals('foo'));
     unittest.expect(o.htmlCodeLocked, unittest.isTrue);
@@ -2253,8 +2253,8 @@
         o.thirdPartyBackupImageImpressionsUrl, unittest.equals('foo'));
     unittest.expect(
         o.thirdPartyRichMediaImpressionsUrl, unittest.equals('foo'));
-    checkUnnamed1586(o.thirdPartyUrls);
-    checkUnnamed1587(o.timerCustomEvents);
+    checkUnnamed3181(o.thirdPartyUrls);
+    checkUnnamed3182(o.timerCustomEvents);
     unittest.expect(o.totalFileSize, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     checkUniversalAdId(o.universalAdId);
@@ -2265,27 +2265,27 @@
   buildCounterCreative--;
 }
 
-buildUnnamed1588() {
+buildUnnamed3183() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1588(core.List<core.String> o) {
+checkUnnamed3183(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1589() {
+buildUnnamed3184() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1589(core.List<core.String> o) {
+checkUnnamed3184(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2305,9 +2305,9 @@
     o.bitRate = 42;
     o.childAssetType = "foo";
     o.collapsedSize = buildSize();
-    o.companionCreativeIds = buildUnnamed1588();
+    o.companionCreativeIds = buildUnnamed3183();
     o.customStartTimeValue = 42;
-    o.detectedFeatures = buildUnnamed1589();
+    o.detectedFeatures = buildUnnamed3184();
     o.displayType = "foo";
     o.duration = 42;
     o.durationType = "foo";
@@ -2357,9 +2357,9 @@
     unittest.expect(o.bitRate, unittest.equals(42));
     unittest.expect(o.childAssetType, unittest.equals('foo'));
     checkSize(o.collapsedSize);
-    checkUnnamed1588(o.companionCreativeIds);
+    checkUnnamed3183(o.companionCreativeIds);
     unittest.expect(o.customStartTimeValue, unittest.equals(42));
-    checkUnnamed1589(o.detectedFeatures);
+    checkUnnamed3184(o.detectedFeatures);
     unittest.expect(o.displayType, unittest.equals('foo'));
     unittest.expect(o.duration, unittest.equals(42));
     unittest.expect(o.durationType, unittest.equals('foo'));
@@ -2417,40 +2417,40 @@
   buildCounterCreativeAssetId--;
 }
 
-buildUnnamed1590() {
+buildUnnamed3185() {
   var o = new core.List<api.ClickTag>();
   o.add(buildClickTag());
   o.add(buildClickTag());
   return o;
 }
 
-checkUnnamed1590(core.List<api.ClickTag> o) {
+checkUnnamed3185(core.List<api.ClickTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClickTag(o[0]);
   checkClickTag(o[1]);
 }
 
-buildUnnamed1591() {
+buildUnnamed3186() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1591(core.List<core.String> o) {
+checkUnnamed3186(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1592() {
+buildUnnamed3187() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1592(core.List<core.String> o) {
+checkUnnamed3187(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2462,12 +2462,12 @@
   buildCounterCreativeAssetMetadata++;
   if (buildCounterCreativeAssetMetadata < 3) {
     o.assetIdentifier = buildCreativeAssetId();
-    o.clickTags = buildUnnamed1590();
-    o.detectedFeatures = buildUnnamed1591();
+    o.clickTags = buildUnnamed3185();
+    o.detectedFeatures = buildUnnamed3186();
     o.id = "foo";
     o.idDimensionValue = buildDimensionValue();
     o.kind = "foo";
-    o.warnedValidationRules = buildUnnamed1592();
+    o.warnedValidationRules = buildUnnamed3187();
   }
   buildCounterCreativeAssetMetadata--;
   return o;
@@ -2477,24 +2477,24 @@
   buildCounterCreativeAssetMetadata++;
   if (buildCounterCreativeAssetMetadata < 3) {
     checkCreativeAssetId(o.assetIdentifier);
-    checkUnnamed1590(o.clickTags);
-    checkUnnamed1591(o.detectedFeatures);
+    checkUnnamed3185(o.clickTags);
+    checkUnnamed3186(o.detectedFeatures);
     unittest.expect(o.id, unittest.equals('foo'));
     checkDimensionValue(o.idDimensionValue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1592(o.warnedValidationRules);
+    checkUnnamed3187(o.warnedValidationRules);
   }
   buildCounterCreativeAssetMetadata--;
 }
 
-buildUnnamed1593() {
+buildUnnamed3188() {
   var o = new core.List<api.Rule>();
   o.add(buildRule());
   o.add(buildRule());
   return o;
 }
 
-checkUnnamed1593(core.List<api.Rule> o) {
+checkUnnamed3188(core.List<api.Rule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRule(o[0]);
   checkRule(o[1]);
@@ -2506,7 +2506,7 @@
   buildCounterCreativeAssetSelection++;
   if (buildCounterCreativeAssetSelection < 3) {
     o.defaultAssetId = "foo";
-    o.rules = buildUnnamed1593();
+    o.rules = buildUnnamed3188();
   }
   buildCounterCreativeAssetSelection--;
   return o;
@@ -2516,45 +2516,45 @@
   buildCounterCreativeAssetSelection++;
   if (buildCounterCreativeAssetSelection < 3) {
     unittest.expect(o.defaultAssetId, unittest.equals('foo'));
-    checkUnnamed1593(o.rules);
+    checkUnnamed3188(o.rules);
   }
   buildCounterCreativeAssetSelection--;
 }
 
-buildUnnamed1594() {
+buildUnnamed3189() {
   var o = new core.List<api.CompanionClickThroughOverride>();
   o.add(buildCompanionClickThroughOverride());
   o.add(buildCompanionClickThroughOverride());
   return o;
 }
 
-checkUnnamed1594(core.List<api.CompanionClickThroughOverride> o) {
+checkUnnamed3189(core.List<api.CompanionClickThroughOverride> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCompanionClickThroughOverride(o[0]);
   checkCompanionClickThroughOverride(o[1]);
 }
 
-buildUnnamed1595() {
+buildUnnamed3190() {
   var o = new core.List<api.CreativeGroupAssignment>();
   o.add(buildCreativeGroupAssignment());
   o.add(buildCreativeGroupAssignment());
   return o;
 }
 
-checkUnnamed1595(core.List<api.CreativeGroupAssignment> o) {
+checkUnnamed3190(core.List<api.CreativeGroupAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeGroupAssignment(o[0]);
   checkCreativeGroupAssignment(o[1]);
 }
 
-buildUnnamed1596() {
+buildUnnamed3191() {
   var o = new core.List<api.RichMediaExitOverride>();
   o.add(buildRichMediaExitOverride());
   o.add(buildRichMediaExitOverride());
   return o;
 }
 
-checkUnnamed1596(core.List<api.RichMediaExitOverride> o) {
+checkUnnamed3191(core.List<api.RichMediaExitOverride> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRichMediaExitOverride(o[0]);
   checkRichMediaExitOverride(o[1]);
@@ -2568,12 +2568,12 @@
     o.active = true;
     o.applyEventTags = true;
     o.clickThroughUrl = buildClickThroughUrl();
-    o.companionCreativeOverrides = buildUnnamed1594();
-    o.creativeGroupAssignments = buildUnnamed1595();
+    o.companionCreativeOverrides = buildUnnamed3189();
+    o.creativeGroupAssignments = buildUnnamed3190();
     o.creativeId = "foo";
     o.creativeIdDimensionValue = buildDimensionValue();
     o.endTime = core.DateTime.parse("2002-02-27T14:01:02");
-    o.richMediaExitOverrides = buildUnnamed1596();
+    o.richMediaExitOverrides = buildUnnamed3191();
     o.sequence = 42;
     o.sslCompliant = true;
     o.startTime = core.DateTime.parse("2002-02-27T14:01:02");
@@ -2589,13 +2589,13 @@
     unittest.expect(o.active, unittest.isTrue);
     unittest.expect(o.applyEventTags, unittest.isTrue);
     checkClickThroughUrl(o.clickThroughUrl);
-    checkUnnamed1594(o.companionCreativeOverrides);
-    checkUnnamed1595(o.creativeGroupAssignments);
+    checkUnnamed3189(o.companionCreativeOverrides);
+    checkUnnamed3190(o.creativeGroupAssignments);
     unittest.expect(o.creativeId, unittest.equals('foo'));
     checkDimensionValue(o.creativeIdDimensionValue);
     unittest.expect(
         o.endTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed1596(o.richMediaExitOverrides);
+    checkUnnamed3191(o.richMediaExitOverrides);
     unittest.expect(o.sequence, unittest.equals(42));
     unittest.expect(o.sslCompliant, unittest.isTrue);
     unittest.expect(o.startTime,
@@ -2717,14 +2717,14 @@
   buildCounterCreativeFieldValue--;
 }
 
-buildUnnamed1597() {
+buildUnnamed3192() {
   var o = new core.List<api.CreativeFieldValue>();
   o.add(buildCreativeFieldValue());
   o.add(buildCreativeFieldValue());
   return o;
 }
 
-checkUnnamed1597(core.List<api.CreativeFieldValue> o) {
+checkUnnamed3192(core.List<api.CreativeFieldValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeFieldValue(o[0]);
   checkCreativeFieldValue(o[1]);
@@ -2735,7 +2735,7 @@
   var o = new api.CreativeFieldValuesListResponse();
   buildCounterCreativeFieldValuesListResponse++;
   if (buildCounterCreativeFieldValuesListResponse < 3) {
-    o.creativeFieldValues = buildUnnamed1597();
+    o.creativeFieldValues = buildUnnamed3192();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2746,21 +2746,21 @@
 checkCreativeFieldValuesListResponse(api.CreativeFieldValuesListResponse o) {
   buildCounterCreativeFieldValuesListResponse++;
   if (buildCounterCreativeFieldValuesListResponse < 3) {
-    checkUnnamed1597(o.creativeFieldValues);
+    checkUnnamed3192(o.creativeFieldValues);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCreativeFieldValuesListResponse--;
 }
 
-buildUnnamed1598() {
+buildUnnamed3193() {
   var o = new core.List<api.CreativeField>();
   o.add(buildCreativeField());
   o.add(buildCreativeField());
   return o;
 }
 
-checkUnnamed1598(core.List<api.CreativeField> o) {
+checkUnnamed3193(core.List<api.CreativeField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeField(o[0]);
   checkCreativeField(o[1]);
@@ -2771,7 +2771,7 @@
   var o = new api.CreativeFieldsListResponse();
   buildCounterCreativeFieldsListResponse++;
   if (buildCounterCreativeFieldsListResponse < 3) {
-    o.creativeFields = buildUnnamed1598();
+    o.creativeFields = buildUnnamed3193();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2782,7 +2782,7 @@
 checkCreativeFieldsListResponse(api.CreativeFieldsListResponse o) {
   buildCounterCreativeFieldsListResponse++;
   if (buildCounterCreativeFieldsListResponse < 3) {
-    checkUnnamed1598(o.creativeFields);
+    checkUnnamed3193(o.creativeFields);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -2843,14 +2843,14 @@
   buildCounterCreativeGroupAssignment--;
 }
 
-buildUnnamed1599() {
+buildUnnamed3194() {
   var o = new core.List<api.CreativeGroup>();
   o.add(buildCreativeGroup());
   o.add(buildCreativeGroup());
   return o;
 }
 
-checkUnnamed1599(core.List<api.CreativeGroup> o) {
+checkUnnamed3194(core.List<api.CreativeGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeGroup(o[0]);
   checkCreativeGroup(o[1]);
@@ -2861,7 +2861,7 @@
   var o = new api.CreativeGroupsListResponse();
   buildCounterCreativeGroupsListResponse++;
   if (buildCounterCreativeGroupsListResponse < 3) {
-    o.creativeGroups = buildUnnamed1599();
+    o.creativeGroups = buildUnnamed3194();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2872,21 +2872,21 @@
 checkCreativeGroupsListResponse(api.CreativeGroupsListResponse o) {
   buildCounterCreativeGroupsListResponse++;
   if (buildCounterCreativeGroupsListResponse < 3) {
-    checkUnnamed1599(o.creativeGroups);
+    checkUnnamed3194(o.creativeGroups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCreativeGroupsListResponse--;
 }
 
-buildUnnamed1600() {
+buildUnnamed3195() {
   var o = new core.List<api.OptimizationActivity>();
   o.add(buildOptimizationActivity());
   o.add(buildOptimizationActivity());
   return o;
 }
 
-checkUnnamed1600(core.List<api.OptimizationActivity> o) {
+checkUnnamed3195(core.List<api.OptimizationActivity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOptimizationActivity(o[0]);
   checkOptimizationActivity(o[1]);
@@ -2899,7 +2899,7 @@
   if (buildCounterCreativeOptimizationConfiguration < 3) {
     o.id = "foo";
     o.name = "foo";
-    o.optimizationActivitys = buildUnnamed1600();
+    o.optimizationActivitys = buildUnnamed3195();
     o.optimizationModel = "foo";
   }
   buildCounterCreativeOptimizationConfiguration--;
@@ -2912,20 +2912,20 @@
   if (buildCounterCreativeOptimizationConfiguration < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1600(o.optimizationActivitys);
+    checkUnnamed3195(o.optimizationActivitys);
     unittest.expect(o.optimizationModel, unittest.equals('foo'));
   }
   buildCounterCreativeOptimizationConfiguration--;
 }
 
-buildUnnamed1601() {
+buildUnnamed3196() {
   var o = new core.List<api.CreativeAssignment>();
   o.add(buildCreativeAssignment());
   o.add(buildCreativeAssignment());
   return o;
 }
 
-checkUnnamed1601(core.List<api.CreativeAssignment> o) {
+checkUnnamed3196(core.List<api.CreativeAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeAssignment(o[0]);
   checkCreativeAssignment(o[1]);
@@ -2936,7 +2936,7 @@
   var o = new api.CreativeRotation();
   buildCounterCreativeRotation++;
   if (buildCounterCreativeRotation < 3) {
-    o.creativeAssignments = buildUnnamed1601();
+    o.creativeAssignments = buildUnnamed3196();
     o.creativeOptimizationConfigurationId = "foo";
     o.type = "foo";
     o.weightCalculationStrategy = "foo";
@@ -2948,7 +2948,7 @@
 checkCreativeRotation(api.CreativeRotation o) {
   buildCounterCreativeRotation++;
   if (buildCounterCreativeRotation < 3) {
-    checkUnnamed1601(o.creativeAssignments);
+    checkUnnamed3196(o.creativeAssignments);
     unittest.expect(
         o.creativeOptimizationConfigurationId, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -2978,14 +2978,14 @@
   buildCounterCreativeSettings--;
 }
 
-buildUnnamed1602() {
+buildUnnamed3197() {
   var o = new core.List<api.Creative>();
   o.add(buildCreative());
   o.add(buildCreative());
   return o;
 }
 
-checkUnnamed1602(core.List<api.Creative> o) {
+checkUnnamed3197(core.List<api.Creative> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreative(o[0]);
   checkCreative(o[1]);
@@ -2996,7 +2996,7 @@
   var o = new api.CreativesListResponse();
   buildCounterCreativesListResponse++;
   if (buildCounterCreativesListResponse < 3) {
-    o.creatives = buildUnnamed1602();
+    o.creatives = buildUnnamed3197();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3007,60 +3007,60 @@
 checkCreativesListResponse(api.CreativesListResponse o) {
   buildCounterCreativesListResponse++;
   if (buildCounterCreativesListResponse < 3) {
-    checkUnnamed1602(o.creatives);
+    checkUnnamed3197(o.creatives);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCreativesListResponse--;
 }
 
-buildUnnamed1603() {
+buildUnnamed3198() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1603(core.List<api.Dimension> o) {
+checkUnnamed3198(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed1604() {
+buildUnnamed3199() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1604(core.List<api.Dimension> o) {
+checkUnnamed3199(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed1605() {
+buildUnnamed3200() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed1605(core.List<api.Metric> o) {
+checkUnnamed3200(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed1606() {
+buildUnnamed3201() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed1606(core.List<api.Metric> o) {
+checkUnnamed3201(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -3071,11 +3071,11 @@
   var o = new api.CrossDimensionReachReportCompatibleFields();
   buildCounterCrossDimensionReachReportCompatibleFields++;
   if (buildCounterCrossDimensionReachReportCompatibleFields < 3) {
-    o.breakdown = buildUnnamed1603();
-    o.dimensionFilters = buildUnnamed1604();
+    o.breakdown = buildUnnamed3198();
+    o.dimensionFilters = buildUnnamed3199();
     o.kind = "foo";
-    o.metrics = buildUnnamed1605();
-    o.overlapMetrics = buildUnnamed1606();
+    o.metrics = buildUnnamed3200();
+    o.overlapMetrics = buildUnnamed3201();
   }
   buildCounterCrossDimensionReachReportCompatibleFields--;
   return o;
@@ -3085,11 +3085,11 @@
     api.CrossDimensionReachReportCompatibleFields o) {
   buildCounterCrossDimensionReachReportCompatibleFields++;
   if (buildCounterCrossDimensionReachReportCompatibleFields < 3) {
-    checkUnnamed1603(o.breakdown);
-    checkUnnamed1604(o.dimensionFilters);
+    checkUnnamed3198(o.breakdown);
+    checkUnnamed3199(o.dimensionFilters);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1605(o.metrics);
-    checkUnnamed1606(o.overlapMetrics);
+    checkUnnamed3200(o.metrics);
+    checkUnnamed3201(o.overlapMetrics);
   }
   buildCounterCrossDimensionReachReportCompatibleFields--;
 }
@@ -3117,14 +3117,14 @@
   buildCounterCustomFloodlightVariable--;
 }
 
-buildUnnamed1607() {
+buildUnnamed3202() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed1607(core.List<api.DimensionValue> o) {
+checkUnnamed3202(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
@@ -3135,7 +3135,7 @@
   var o = new api.CustomRichMediaEvents();
   buildCounterCustomRichMediaEvents++;
   if (buildCounterCustomRichMediaEvents < 3) {
-    o.filteredEventIds = buildUnnamed1607();
+    o.filteredEventIds = buildUnnamed3202();
     o.kind = "foo";
   }
   buildCounterCustomRichMediaEvents--;
@@ -3145,7 +3145,7 @@
 checkCustomRichMediaEvents(api.CustomRichMediaEvents o) {
   buildCounterCustomRichMediaEvents++;
   if (buildCounterCustomRichMediaEvents < 3) {
-    checkUnnamed1607(o.filteredEventIds);
+    checkUnnamed3202(o.filteredEventIds);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCustomRichMediaEvents--;
@@ -3178,27 +3178,27 @@
   buildCounterDateRange--;
 }
 
-buildUnnamed1608() {
+buildUnnamed3203() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1608(core.List<core.String> o) {
+checkUnnamed3203(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1609() {
+buildUnnamed3204() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1609(core.List<core.int> o) {
+checkUnnamed3204(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -3209,8 +3209,8 @@
   var o = new api.DayPartTargeting();
   buildCounterDayPartTargeting++;
   if (buildCounterDayPartTargeting < 3) {
-    o.daysOfWeek = buildUnnamed1608();
-    o.hoursOfDay = buildUnnamed1609();
+    o.daysOfWeek = buildUnnamed3203();
+    o.hoursOfDay = buildUnnamed3204();
     o.userLocalTime = true;
   }
   buildCounterDayPartTargeting--;
@@ -3220,8 +3220,8 @@
 checkDayPartTargeting(api.DayPartTargeting o) {
   buildCounterDayPartTargeting++;
   if (buildCounterDayPartTargeting < 3) {
-    checkUnnamed1608(o.daysOfWeek);
-    checkUnnamed1609(o.hoursOfDay);
+    checkUnnamed3203(o.daysOfWeek);
+    checkUnnamed3204(o.hoursOfDay);
     unittest.expect(o.userLocalTime, unittest.isTrue);
   }
   buildCounterDayPartTargeting--;
@@ -3374,14 +3374,14 @@
   buildCounterDimensionValue--;
 }
 
-buildUnnamed1610() {
+buildUnnamed3205() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed1610(core.List<api.DimensionValue> o) {
+checkUnnamed3205(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
@@ -3393,7 +3393,7 @@
   buildCounterDimensionValueList++;
   if (buildCounterDimensionValueList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1610();
+    o.items = buildUnnamed3205();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3405,21 +3405,21 @@
   buildCounterDimensionValueList++;
   if (buildCounterDimensionValueList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1610(o.items);
+    checkUnnamed3205(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterDimensionValueList--;
 }
 
-buildUnnamed1611() {
+buildUnnamed3206() {
   var o = new core.List<api.DimensionFilter>();
   o.add(buildDimensionFilter());
   o.add(buildDimensionFilter());
   return o;
 }
 
-checkUnnamed1611(core.List<api.DimensionFilter> o) {
+checkUnnamed3206(core.List<api.DimensionFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionFilter(o[0]);
   checkDimensionFilter(o[1]);
@@ -3432,7 +3432,7 @@
   if (buildCounterDimensionValueRequest < 3) {
     o.dimensionName = "foo";
     o.endDate = core.DateTime.parse("2002-02-27T14:01:02Z");
-    o.filters = buildUnnamed1611();
+    o.filters = buildUnnamed3206();
     o.kind = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
   }
@@ -3446,7 +3446,7 @@
     unittest.expect(o.dimensionName, unittest.equals('foo'));
     unittest.expect(
         o.endDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
-    checkUnnamed1611(o.filters);
+    checkUnnamed3206(o.filters);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.startDate,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
@@ -3454,40 +3454,40 @@
   buildCounterDimensionValueRequest--;
 }
 
-buildUnnamed1612() {
+buildUnnamed3207() {
   var o = new core.List<api.DirectorySiteContactAssignment>();
   o.add(buildDirectorySiteContactAssignment());
   o.add(buildDirectorySiteContactAssignment());
   return o;
 }
 
-checkUnnamed1612(core.List<api.DirectorySiteContactAssignment> o) {
+checkUnnamed3207(core.List<api.DirectorySiteContactAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectorySiteContactAssignment(o[0]);
   checkDirectorySiteContactAssignment(o[1]);
 }
 
-buildUnnamed1613() {
+buildUnnamed3208() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1613(core.List<core.String> o) {
+checkUnnamed3208(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1614() {
+buildUnnamed3209() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1614(core.List<core.String> o) {
+checkUnnamed3209(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3499,14 +3499,14 @@
   buildCounterDirectorySite++;
   if (buildCounterDirectorySite < 3) {
     o.active = true;
-    o.contactAssignments = buildUnnamed1612();
+    o.contactAssignments = buildUnnamed3207();
     o.countryId = "foo";
     o.currencyId = "foo";
     o.description = "foo";
     o.id = "foo";
     o.idDimensionValue = buildDimensionValue();
-    o.inpageTagFormats = buildUnnamed1613();
-    o.interstitialTagFormats = buildUnnamed1614();
+    o.inpageTagFormats = buildUnnamed3208();
+    o.interstitialTagFormats = buildUnnamed3209();
     o.kind = "foo";
     o.name = "foo";
     o.parentId = "foo";
@@ -3521,14 +3521,14 @@
   buildCounterDirectorySite++;
   if (buildCounterDirectorySite < 3) {
     unittest.expect(o.active, unittest.isTrue);
-    checkUnnamed1612(o.contactAssignments);
+    checkUnnamed3207(o.contactAssignments);
     unittest.expect(o.countryId, unittest.equals('foo'));
     unittest.expect(o.currencyId, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkDimensionValue(o.idDimensionValue);
-    checkUnnamed1613(o.inpageTagFormats);
-    checkUnnamed1614(o.interstitialTagFormats);
+    checkUnnamed3208(o.inpageTagFormats);
+    checkUnnamed3209(o.interstitialTagFormats);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.parentId, unittest.equals('foo'));
@@ -3596,14 +3596,14 @@
   buildCounterDirectorySiteContactAssignment--;
 }
 
-buildUnnamed1615() {
+buildUnnamed3210() {
   var o = new core.List<api.DirectorySiteContact>();
   o.add(buildDirectorySiteContact());
   o.add(buildDirectorySiteContact());
   return o;
 }
 
-checkUnnamed1615(core.List<api.DirectorySiteContact> o) {
+checkUnnamed3210(core.List<api.DirectorySiteContact> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectorySiteContact(o[0]);
   checkDirectorySiteContact(o[1]);
@@ -3614,7 +3614,7 @@
   var o = new api.DirectorySiteContactsListResponse();
   buildCounterDirectorySiteContactsListResponse++;
   if (buildCounterDirectorySiteContactsListResponse < 3) {
-    o.directorySiteContacts = buildUnnamed1615();
+    o.directorySiteContacts = buildUnnamed3210();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3626,7 +3626,7 @@
     api.DirectorySiteContactsListResponse o) {
   buildCounterDirectorySiteContactsListResponse++;
   if (buildCounterDirectorySiteContactsListResponse < 3) {
-    checkUnnamed1615(o.directorySiteContacts);
+    checkUnnamed3210(o.directorySiteContacts);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -3664,14 +3664,14 @@
   buildCounterDirectorySiteSettings--;
 }
 
-buildUnnamed1616() {
+buildUnnamed3211() {
   var o = new core.List<api.DirectorySite>();
   o.add(buildDirectorySite());
   o.add(buildDirectorySite());
   return o;
 }
 
-checkUnnamed1616(core.List<api.DirectorySite> o) {
+checkUnnamed3211(core.List<api.DirectorySite> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectorySite(o[0]);
   checkDirectorySite(o[1]);
@@ -3682,7 +3682,7 @@
   var o = new api.DirectorySitesListResponse();
   buildCounterDirectorySitesListResponse++;
   if (buildCounterDirectorySitesListResponse < 3) {
-    o.directorySites = buildUnnamed1616();
+    o.directorySites = buildUnnamed3211();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3693,7 +3693,7 @@
 checkDirectorySitesListResponse(api.DirectorySitesListResponse o) {
   buildCounterDirectorySitesListResponse++;
   if (buildCounterDirectorySitesListResponse < 3) {
-    checkUnnamed1616(o.directorySites);
+    checkUnnamed3211(o.directorySites);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -3725,14 +3725,14 @@
   buildCounterDynamicTargetingKey--;
 }
 
-buildUnnamed1617() {
+buildUnnamed3212() {
   var o = new core.List<api.DynamicTargetingKey>();
   o.add(buildDynamicTargetingKey());
   o.add(buildDynamicTargetingKey());
   return o;
 }
 
-checkUnnamed1617(core.List<api.DynamicTargetingKey> o) {
+checkUnnamed3212(core.List<api.DynamicTargetingKey> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDynamicTargetingKey(o[0]);
   checkDynamicTargetingKey(o[1]);
@@ -3743,7 +3743,7 @@
   var o = new api.DynamicTargetingKeysListResponse();
   buildCounterDynamicTargetingKeysListResponse++;
   if (buildCounterDynamicTargetingKeysListResponse < 3) {
-    o.dynamicTargetingKeys = buildUnnamed1617();
+    o.dynamicTargetingKeys = buildUnnamed3212();
     o.kind = "foo";
   }
   buildCounterDynamicTargetingKeysListResponse--;
@@ -3753,7 +3753,7 @@
 checkDynamicTargetingKeysListResponse(api.DynamicTargetingKeysListResponse o) {
   buildCounterDynamicTargetingKeysListResponse++;
   if (buildCounterDynamicTargetingKeysListResponse < 3) {
-    checkUnnamed1617(o.dynamicTargetingKeys);
+    checkUnnamed3212(o.dynamicTargetingKeys);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDynamicTargetingKeysListResponse--;
@@ -3784,14 +3784,14 @@
   buildCounterEncryptionInfo--;
 }
 
-buildUnnamed1618() {
+buildUnnamed3213() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1618(core.List<core.String> o) {
+checkUnnamed3213(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3813,7 +3813,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.siteFilterType = "foo";
-    o.siteIds = buildUnnamed1618();
+    o.siteIds = buildUnnamed3213();
     o.sslCompliant = true;
     o.status = "foo";
     o.subaccountId = "foo";
@@ -3839,7 +3839,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.siteFilterType, unittest.equals('foo'));
-    checkUnnamed1618(o.siteIds);
+    checkUnnamed3213(o.siteIds);
     unittest.expect(o.sslCompliant, unittest.isTrue);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.subaccountId, unittest.equals('foo'));
@@ -3871,14 +3871,14 @@
   buildCounterEventTagOverride--;
 }
 
-buildUnnamed1619() {
+buildUnnamed3214() {
   var o = new core.List<api.EventTag>();
   o.add(buildEventTag());
   o.add(buildEventTag());
   return o;
 }
 
-checkUnnamed1619(core.List<api.EventTag> o) {
+checkUnnamed3214(core.List<api.EventTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventTag(o[0]);
   checkEventTag(o[1]);
@@ -3889,7 +3889,7 @@
   var o = new api.EventTagsListResponse();
   buildCounterEventTagsListResponse++;
   if (buildCounterEventTagsListResponse < 3) {
-    o.eventTags = buildUnnamed1619();
+    o.eventTags = buildUnnamed3214();
     o.kind = "foo";
   }
   buildCounterEventTagsListResponse--;
@@ -3899,7 +3899,7 @@
 checkEventTagsListResponse(api.EventTagsListResponse o) {
   buildCounterEventTagsListResponse++;
   if (buildCounterEventTagsListResponse < 3) {
-    checkUnnamed1619(o.eventTags);
+    checkUnnamed3214(o.eventTags);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterEventTagsListResponse--;
@@ -3963,14 +3963,14 @@
   buildCounterFile--;
 }
 
-buildUnnamed1620() {
+buildUnnamed3215() {
   var o = new core.List<api.File>();
   o.add(buildFile());
   o.add(buildFile());
   return o;
 }
 
-checkUnnamed1620(core.List<api.File> o) {
+checkUnnamed3215(core.List<api.File> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFile(o[0]);
   checkFile(o[1]);
@@ -3982,7 +3982,7 @@
   buildCounterFileList++;
   if (buildCounterFileList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1620();
+    o.items = buildUnnamed3215();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3994,7 +3994,7 @@
   buildCounterFileList++;
   if (buildCounterFileList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1620(o.items);
+    checkUnnamed3215(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -4050,14 +4050,14 @@
   buildCounterFloodlightActivitiesGenerateTagResponse--;
 }
 
-buildUnnamed1621() {
+buildUnnamed3216() {
   var o = new core.List<api.FloodlightActivity>();
   o.add(buildFloodlightActivity());
   o.add(buildFloodlightActivity());
   return o;
 }
 
-checkUnnamed1621(core.List<api.FloodlightActivity> o) {
+checkUnnamed3216(core.List<api.FloodlightActivity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightActivity(o[0]);
   checkFloodlightActivity(o[1]);
@@ -4068,7 +4068,7 @@
   var o = new api.FloodlightActivitiesListResponse();
   buildCounterFloodlightActivitiesListResponse++;
   if (buildCounterFloodlightActivitiesListResponse < 3) {
-    o.floodlightActivities = buildUnnamed1621();
+    o.floodlightActivities = buildUnnamed3216();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -4079,47 +4079,47 @@
 checkFloodlightActivitiesListResponse(api.FloodlightActivitiesListResponse o) {
   buildCounterFloodlightActivitiesListResponse++;
   if (buildCounterFloodlightActivitiesListResponse < 3) {
-    checkUnnamed1621(o.floodlightActivities);
+    checkUnnamed3216(o.floodlightActivities);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterFloodlightActivitiesListResponse--;
 }
 
-buildUnnamed1622() {
+buildUnnamed3217() {
   var o = new core.List<api.FloodlightActivityDynamicTag>();
   o.add(buildFloodlightActivityDynamicTag());
   o.add(buildFloodlightActivityDynamicTag());
   return o;
 }
 
-checkUnnamed1622(core.List<api.FloodlightActivityDynamicTag> o) {
+checkUnnamed3217(core.List<api.FloodlightActivityDynamicTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightActivityDynamicTag(o[0]);
   checkFloodlightActivityDynamicTag(o[1]);
 }
 
-buildUnnamed1623() {
+buildUnnamed3218() {
   var o = new core.List<api.FloodlightActivityPublisherDynamicTag>();
   o.add(buildFloodlightActivityPublisherDynamicTag());
   o.add(buildFloodlightActivityPublisherDynamicTag());
   return o;
 }
 
-checkUnnamed1623(core.List<api.FloodlightActivityPublisherDynamicTag> o) {
+checkUnnamed3218(core.List<api.FloodlightActivityPublisherDynamicTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightActivityPublisherDynamicTag(o[0]);
   checkFloodlightActivityPublisherDynamicTag(o[1]);
 }
 
-buildUnnamed1624() {
+buildUnnamed3219() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1624(core.List<core.String> o) {
+checkUnnamed3219(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4135,7 +4135,7 @@
     o.advertiserIdDimensionValue = buildDimensionValue();
     o.cacheBustingType = "foo";
     o.countingMethod = "foo";
-    o.defaultTags = buildUnnamed1622();
+    o.defaultTags = buildUnnamed3217();
     o.expectedUrl = "foo";
     o.floodlightActivityGroupId = "foo";
     o.floodlightActivityGroupName = "foo";
@@ -4150,14 +4150,14 @@
     o.kind = "foo";
     o.name = "foo";
     o.notes = "foo";
-    o.publisherTags = buildUnnamed1623();
+    o.publisherTags = buildUnnamed3218();
     o.secure = true;
     o.sslCompliant = true;
     o.sslRequired = true;
     o.subaccountId = "foo";
     o.tagFormat = "foo";
     o.tagString = "foo";
-    o.userDefinedVariableTypes = buildUnnamed1624();
+    o.userDefinedVariableTypes = buildUnnamed3219();
   }
   buildCounterFloodlightActivity--;
   return o;
@@ -4171,7 +4171,7 @@
     checkDimensionValue(o.advertiserIdDimensionValue);
     unittest.expect(o.cacheBustingType, unittest.equals('foo'));
     unittest.expect(o.countingMethod, unittest.equals('foo'));
-    checkUnnamed1622(o.defaultTags);
+    checkUnnamed3217(o.defaultTags);
     unittest.expect(o.expectedUrl, unittest.equals('foo'));
     unittest.expect(o.floodlightActivityGroupId, unittest.equals('foo'));
     unittest.expect(o.floodlightActivityGroupName, unittest.equals('foo'));
@@ -4186,14 +4186,14 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed1623(o.publisherTags);
+    checkUnnamed3218(o.publisherTags);
     unittest.expect(o.secure, unittest.isTrue);
     unittest.expect(o.sslCompliant, unittest.isTrue);
     unittest.expect(o.sslRequired, unittest.isTrue);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
     unittest.expect(o.tagFormat, unittest.equals('foo'));
     unittest.expect(o.tagString, unittest.equals('foo'));
-    checkUnnamed1624(o.userDefinedVariableTypes);
+    checkUnnamed3219(o.userDefinedVariableTypes);
   }
   buildCounterFloodlightActivity--;
 }
@@ -4262,14 +4262,14 @@
   buildCounterFloodlightActivityGroup--;
 }
 
-buildUnnamed1625() {
+buildUnnamed3220() {
   var o = new core.List<api.FloodlightActivityGroup>();
   o.add(buildFloodlightActivityGroup());
   o.add(buildFloodlightActivityGroup());
   return o;
 }
 
-checkUnnamed1625(core.List<api.FloodlightActivityGroup> o) {
+checkUnnamed3220(core.List<api.FloodlightActivityGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightActivityGroup(o[0]);
   checkFloodlightActivityGroup(o[1]);
@@ -4280,7 +4280,7 @@
   var o = new api.FloodlightActivityGroupsListResponse();
   buildCounterFloodlightActivityGroupsListResponse++;
   if (buildCounterFloodlightActivityGroupsListResponse < 3) {
-    o.floodlightActivityGroups = buildUnnamed1625();
+    o.floodlightActivityGroups = buildUnnamed3220();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -4292,7 +4292,7 @@
     api.FloodlightActivityGroupsListResponse o) {
   buildCounterFloodlightActivityGroupsListResponse++;
   if (buildCounterFloodlightActivityGroupsListResponse < 3) {
-    checkUnnamed1625(o.floodlightActivityGroups);
+    checkUnnamed3220(o.floodlightActivityGroups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -4329,27 +4329,27 @@
   buildCounterFloodlightActivityPublisherDynamicTag--;
 }
 
-buildUnnamed1626() {
+buildUnnamed3221() {
   var o = new core.List<api.ThirdPartyAuthenticationToken>();
   o.add(buildThirdPartyAuthenticationToken());
   o.add(buildThirdPartyAuthenticationToken());
   return o;
 }
 
-checkUnnamed1626(core.List<api.ThirdPartyAuthenticationToken> o) {
+checkUnnamed3221(core.List<api.ThirdPartyAuthenticationToken> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThirdPartyAuthenticationToken(o[0]);
   checkThirdPartyAuthenticationToken(o[1]);
 }
 
-buildUnnamed1627() {
+buildUnnamed3222() {
   var o = new core.List<api.UserDefinedVariableConfiguration>();
   o.add(buildUserDefinedVariableConfiguration());
   o.add(buildUserDefinedVariableConfiguration());
   return o;
 }
 
-checkUnnamed1627(core.List<api.UserDefinedVariableConfiguration> o) {
+checkUnnamed3222(core.List<api.UserDefinedVariableConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserDefinedVariableConfiguration(o[0]);
   checkUserDefinedVariableConfiguration(o[1]);
@@ -4375,8 +4375,8 @@
     o.omnitureSettings = buildOmnitureSettings();
     o.subaccountId = "foo";
     o.tagSettings = buildTagSettings();
-    o.thirdPartyAuthenticationTokens = buildUnnamed1626();
-    o.userDefinedVariableConfigurations = buildUnnamed1627();
+    o.thirdPartyAuthenticationTokens = buildUnnamed3221();
+    o.userDefinedVariableConfigurations = buildUnnamed3222();
   }
   buildCounterFloodlightConfiguration--;
   return o;
@@ -4401,20 +4401,20 @@
     checkOmnitureSettings(o.omnitureSettings);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
     checkTagSettings(o.tagSettings);
-    checkUnnamed1626(o.thirdPartyAuthenticationTokens);
-    checkUnnamed1627(o.userDefinedVariableConfigurations);
+    checkUnnamed3221(o.thirdPartyAuthenticationTokens);
+    checkUnnamed3222(o.userDefinedVariableConfigurations);
   }
   buildCounterFloodlightConfiguration--;
 }
 
-buildUnnamed1628() {
+buildUnnamed3223() {
   var o = new core.List<api.FloodlightConfiguration>();
   o.add(buildFloodlightConfiguration());
   o.add(buildFloodlightConfiguration());
   return o;
 }
 
-checkUnnamed1628(core.List<api.FloodlightConfiguration> o) {
+checkUnnamed3223(core.List<api.FloodlightConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightConfiguration(o[0]);
   checkFloodlightConfiguration(o[1]);
@@ -4425,7 +4425,7 @@
   var o = new api.FloodlightConfigurationsListResponse();
   buildCounterFloodlightConfigurationsListResponse++;
   if (buildCounterFloodlightConfigurationsListResponse < 3) {
-    o.floodlightConfigurations = buildUnnamed1628();
+    o.floodlightConfigurations = buildUnnamed3223();
     o.kind = "foo";
   }
   buildCounterFloodlightConfigurationsListResponse--;
@@ -4436,46 +4436,46 @@
     api.FloodlightConfigurationsListResponse o) {
   buildCounterFloodlightConfigurationsListResponse++;
   if (buildCounterFloodlightConfigurationsListResponse < 3) {
-    checkUnnamed1628(o.floodlightConfigurations);
+    checkUnnamed3223(o.floodlightConfigurations);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterFloodlightConfigurationsListResponse--;
 }
 
-buildUnnamed1629() {
+buildUnnamed3224() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1629(core.List<api.Dimension> o) {
+checkUnnamed3224(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed1630() {
+buildUnnamed3225() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1630(core.List<api.Dimension> o) {
+checkUnnamed3225(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed1631() {
+buildUnnamed3226() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed1631(core.List<api.Metric> o) {
+checkUnnamed3226(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -4486,10 +4486,10 @@
   var o = new api.FloodlightReportCompatibleFields();
   buildCounterFloodlightReportCompatibleFields++;
   if (buildCounterFloodlightReportCompatibleFields < 3) {
-    o.dimensionFilters = buildUnnamed1629();
-    o.dimensions = buildUnnamed1630();
+    o.dimensionFilters = buildUnnamed3224();
+    o.dimensions = buildUnnamed3225();
     o.kind = "foo";
-    o.metrics = buildUnnamed1631();
+    o.metrics = buildUnnamed3226();
   }
   buildCounterFloodlightReportCompatibleFields--;
   return o;
@@ -4498,10 +4498,10 @@
 checkFloodlightReportCompatibleFields(api.FloodlightReportCompatibleFields o) {
   buildCounterFloodlightReportCompatibleFields++;
   if (buildCounterFloodlightReportCompatibleFields < 3) {
-    checkUnnamed1629(o.dimensionFilters);
-    checkUnnamed1630(o.dimensions);
+    checkUnnamed3224(o.dimensionFilters);
+    checkUnnamed3225(o.dimensions);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1631(o.metrics);
+    checkUnnamed3226(o.metrics);
   }
   buildCounterFloodlightReportCompatibleFields--;
 }
@@ -4554,66 +4554,66 @@
   buildCounterFsCommand--;
 }
 
-buildUnnamed1632() {
+buildUnnamed3227() {
   var o = new core.List<api.City>();
   o.add(buildCity());
   o.add(buildCity());
   return o;
 }
 
-checkUnnamed1632(core.List<api.City> o) {
+checkUnnamed3227(core.List<api.City> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCity(o[0]);
   checkCity(o[1]);
 }
 
-buildUnnamed1633() {
+buildUnnamed3228() {
   var o = new core.List<api.Country>();
   o.add(buildCountry());
   o.add(buildCountry());
   return o;
 }
 
-checkUnnamed1633(core.List<api.Country> o) {
+checkUnnamed3228(core.List<api.Country> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCountry(o[0]);
   checkCountry(o[1]);
 }
 
-buildUnnamed1634() {
+buildUnnamed3229() {
   var o = new core.List<api.Metro>();
   o.add(buildMetro());
   o.add(buildMetro());
   return o;
 }
 
-checkUnnamed1634(core.List<api.Metro> o) {
+checkUnnamed3229(core.List<api.Metro> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetro(o[0]);
   checkMetro(o[1]);
 }
 
-buildUnnamed1635() {
+buildUnnamed3230() {
   var o = new core.List<api.PostalCode>();
   o.add(buildPostalCode());
   o.add(buildPostalCode());
   return o;
 }
 
-checkUnnamed1635(core.List<api.PostalCode> o) {
+checkUnnamed3230(core.List<api.PostalCode> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPostalCode(o[0]);
   checkPostalCode(o[1]);
 }
 
-buildUnnamed1636() {
+buildUnnamed3231() {
   var o = new core.List<api.Region>();
   o.add(buildRegion());
   o.add(buildRegion());
   return o;
 }
 
-checkUnnamed1636(core.List<api.Region> o) {
+checkUnnamed3231(core.List<api.Region> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegion(o[0]);
   checkRegion(o[1]);
@@ -4624,12 +4624,12 @@
   var o = new api.GeoTargeting();
   buildCounterGeoTargeting++;
   if (buildCounterGeoTargeting < 3) {
-    o.cities = buildUnnamed1632();
-    o.countries = buildUnnamed1633();
+    o.cities = buildUnnamed3227();
+    o.countries = buildUnnamed3228();
     o.excludeCountries = true;
-    o.metros = buildUnnamed1634();
-    o.postalCodes = buildUnnamed1635();
-    o.regions = buildUnnamed1636();
+    o.metros = buildUnnamed3229();
+    o.postalCodes = buildUnnamed3230();
+    o.regions = buildUnnamed3231();
   }
   buildCounterGeoTargeting--;
   return o;
@@ -4638,24 +4638,24 @@
 checkGeoTargeting(api.GeoTargeting o) {
   buildCounterGeoTargeting++;
   if (buildCounterGeoTargeting < 3) {
-    checkUnnamed1632(o.cities);
-    checkUnnamed1633(o.countries);
+    checkUnnamed3227(o.cities);
+    checkUnnamed3228(o.countries);
     unittest.expect(o.excludeCountries, unittest.isTrue);
-    checkUnnamed1634(o.metros);
-    checkUnnamed1635(o.postalCodes);
-    checkUnnamed1636(o.regions);
+    checkUnnamed3229(o.metros);
+    checkUnnamed3230(o.postalCodes);
+    checkUnnamed3231(o.regions);
   }
   buildCounterGeoTargeting--;
 }
 
-buildUnnamed1637() {
+buildUnnamed3232() {
   var o = new core.List<api.AdSlot>();
   o.add(buildAdSlot());
   o.add(buildAdSlot());
   return o;
 }
 
-checkUnnamed1637(core.List<api.AdSlot> o) {
+checkUnnamed3232(core.List<api.AdSlot> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdSlot(o[0]);
   checkAdSlot(o[1]);
@@ -4667,7 +4667,7 @@
   buildCounterInventoryItem++;
   if (buildCounterInventoryItem < 3) {
     o.accountId = "foo";
-    o.adSlots = buildUnnamed1637();
+    o.adSlots = buildUnnamed3232();
     o.advertiserId = "foo";
     o.contentCategoryId = "foo";
     o.estimatedClickThroughRate = "foo";
@@ -4695,7 +4695,7 @@
   buildCounterInventoryItem++;
   if (buildCounterInventoryItem < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed1637(o.adSlots);
+    checkUnnamed3232(o.adSlots);
     unittest.expect(o.advertiserId, unittest.equals('foo'));
     unittest.expect(o.contentCategoryId, unittest.equals('foo'));
     unittest.expect(o.estimatedClickThroughRate, unittest.equals('foo'));
@@ -4718,14 +4718,14 @@
   buildCounterInventoryItem--;
 }
 
-buildUnnamed1638() {
+buildUnnamed3233() {
   var o = new core.List<api.InventoryItem>();
   o.add(buildInventoryItem());
   o.add(buildInventoryItem());
   return o;
 }
 
-checkUnnamed1638(core.List<api.InventoryItem> o) {
+checkUnnamed3233(core.List<api.InventoryItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInventoryItem(o[0]);
   checkInventoryItem(o[1]);
@@ -4736,7 +4736,7 @@
   var o = new api.InventoryItemsListResponse();
   buildCounterInventoryItemsListResponse++;
   if (buildCounterInventoryItemsListResponse < 3) {
-    o.inventoryItems = buildUnnamed1638();
+    o.inventoryItems = buildUnnamed3233();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -4747,7 +4747,7 @@
 checkInventoryItemsListResponse(api.InventoryItemsListResponse o) {
   buildCounterInventoryItemsListResponse++;
   if (buildCounterInventoryItemsListResponse < 3) {
-    checkUnnamed1638(o.inventoryItems);
+    checkUnnamed3233(o.inventoryItems);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -4800,14 +4800,14 @@
   buildCounterLandingPage--;
 }
 
-buildUnnamed1639() {
+buildUnnamed3234() {
   var o = new core.List<api.LandingPage>();
   o.add(buildLandingPage());
   o.add(buildLandingPage());
   return o;
 }
 
-checkUnnamed1639(core.List<api.LandingPage> o) {
+checkUnnamed3234(core.List<api.LandingPage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLandingPage(o[0]);
   checkLandingPage(o[1]);
@@ -4819,7 +4819,7 @@
   buildCounterLandingPagesListResponse++;
   if (buildCounterLandingPagesListResponse < 3) {
     o.kind = "foo";
-    o.landingPages = buildUnnamed1639();
+    o.landingPages = buildUnnamed3234();
   }
   buildCounterLandingPagesListResponse--;
   return o;
@@ -4829,7 +4829,7 @@
   buildCounterLandingPagesListResponse++;
   if (buildCounterLandingPagesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1639(o.landingPages);
+    checkUnnamed3234(o.landingPages);
   }
   buildCounterLandingPagesListResponse--;
 }
@@ -4859,14 +4859,14 @@
   buildCounterLanguage--;
 }
 
-buildUnnamed1640() {
+buildUnnamed3235() {
   var o = new core.List<api.Language>();
   o.add(buildLanguage());
   o.add(buildLanguage());
   return o;
 }
 
-checkUnnamed1640(core.List<api.Language> o) {
+checkUnnamed3235(core.List<api.Language> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLanguage(o[0]);
   checkLanguage(o[1]);
@@ -4877,7 +4877,7 @@
   var o = new api.LanguageTargeting();
   buildCounterLanguageTargeting++;
   if (buildCounterLanguageTargeting < 3) {
-    o.languages = buildUnnamed1640();
+    o.languages = buildUnnamed3235();
   }
   buildCounterLanguageTargeting--;
   return o;
@@ -4886,19 +4886,19 @@
 checkLanguageTargeting(api.LanguageTargeting o) {
   buildCounterLanguageTargeting++;
   if (buildCounterLanguageTargeting < 3) {
-    checkUnnamed1640(o.languages);
+    checkUnnamed3235(o.languages);
   }
   buildCounterLanguageTargeting--;
 }
 
-buildUnnamed1641() {
+buildUnnamed3236() {
   var o = new core.List<api.Language>();
   o.add(buildLanguage());
   o.add(buildLanguage());
   return o;
 }
 
-checkUnnamed1641(core.List<api.Language> o) {
+checkUnnamed3236(core.List<api.Language> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLanguage(o[0]);
   checkLanguage(o[1]);
@@ -4910,7 +4910,7 @@
   buildCounterLanguagesListResponse++;
   if (buildCounterLanguagesListResponse < 3) {
     o.kind = "foo";
-    o.languages = buildUnnamed1641();
+    o.languages = buildUnnamed3236();
   }
   buildCounterLanguagesListResponse--;
   return o;
@@ -4920,7 +4920,7 @@
   buildCounterLanguagesListResponse++;
   if (buildCounterLanguagesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1641(o.languages);
+    checkUnnamed3236(o.languages);
   }
   buildCounterLanguagesListResponse--;
 }
@@ -4944,14 +4944,14 @@
   buildCounterLastModifiedInfo--;
 }
 
-buildUnnamed1642() {
+buildUnnamed3237() {
   var o = new core.List<api.ListPopulationTerm>();
   o.add(buildListPopulationTerm());
   o.add(buildListPopulationTerm());
   return o;
 }
 
-checkUnnamed1642(core.List<api.ListPopulationTerm> o) {
+checkUnnamed3237(core.List<api.ListPopulationTerm> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkListPopulationTerm(o[0]);
   checkListPopulationTerm(o[1]);
@@ -4962,7 +4962,7 @@
   var o = new api.ListPopulationClause();
   buildCounterListPopulationClause++;
   if (buildCounterListPopulationClause < 3) {
-    o.terms = buildUnnamed1642();
+    o.terms = buildUnnamed3237();
   }
   buildCounterListPopulationClause--;
   return o;
@@ -4971,19 +4971,19 @@
 checkListPopulationClause(api.ListPopulationClause o) {
   buildCounterListPopulationClause++;
   if (buildCounterListPopulationClause < 3) {
-    checkUnnamed1642(o.terms);
+    checkUnnamed3237(o.terms);
   }
   buildCounterListPopulationClause--;
 }
 
-buildUnnamed1643() {
+buildUnnamed3238() {
   var o = new core.List<api.ListPopulationClause>();
   o.add(buildListPopulationClause());
   o.add(buildListPopulationClause());
   return o;
 }
 
-checkUnnamed1643(core.List<api.ListPopulationClause> o) {
+checkUnnamed3238(core.List<api.ListPopulationClause> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkListPopulationClause(o[0]);
   checkListPopulationClause(o[1]);
@@ -4996,7 +4996,7 @@
   if (buildCounterListPopulationRule < 3) {
     o.floodlightActivityId = "foo";
     o.floodlightActivityName = "foo";
-    o.listPopulationClauses = buildUnnamed1643();
+    o.listPopulationClauses = buildUnnamed3238();
   }
   buildCounterListPopulationRule--;
   return o;
@@ -5007,7 +5007,7 @@
   if (buildCounterListPopulationRule < 3) {
     unittest.expect(o.floodlightActivityId, unittest.equals('foo'));
     unittest.expect(o.floodlightActivityName, unittest.equals('foo'));
-    checkUnnamed1643(o.listPopulationClauses);
+    checkUnnamed3238(o.listPopulationClauses);
   }
   buildCounterListPopulationRule--;
 }
@@ -5137,14 +5137,14 @@
   buildCounterMetro--;
 }
 
-buildUnnamed1644() {
+buildUnnamed3239() {
   var o = new core.List<api.Metro>();
   o.add(buildMetro());
   o.add(buildMetro());
   return o;
 }
 
-checkUnnamed1644(core.List<api.Metro> o) {
+checkUnnamed3239(core.List<api.Metro> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetro(o[0]);
   checkMetro(o[1]);
@@ -5156,7 +5156,7 @@
   buildCounterMetrosListResponse++;
   if (buildCounterMetrosListResponse < 3) {
     o.kind = "foo";
-    o.metros = buildUnnamed1644();
+    o.metros = buildUnnamed3239();
   }
   buildCounterMetrosListResponse--;
   return o;
@@ -5166,7 +5166,7 @@
   buildCounterMetrosListResponse++;
   if (buildCounterMetrosListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1644(o.metros);
+    checkUnnamed3239(o.metros);
   }
   buildCounterMetrosListResponse--;
 }
@@ -5198,14 +5198,14 @@
   buildCounterMobileCarrier--;
 }
 
-buildUnnamed1645() {
+buildUnnamed3240() {
   var o = new core.List<api.MobileCarrier>();
   o.add(buildMobileCarrier());
   o.add(buildMobileCarrier());
   return o;
 }
 
-checkUnnamed1645(core.List<api.MobileCarrier> o) {
+checkUnnamed3240(core.List<api.MobileCarrier> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMobileCarrier(o[0]);
   checkMobileCarrier(o[1]);
@@ -5217,7 +5217,7 @@
   buildCounterMobileCarriersListResponse++;
   if (buildCounterMobileCarriersListResponse < 3) {
     o.kind = "foo";
-    o.mobileCarriers = buildUnnamed1645();
+    o.mobileCarriers = buildUnnamed3240();
   }
   buildCounterMobileCarriersListResponse--;
   return o;
@@ -5227,19 +5227,19 @@
   buildCounterMobileCarriersListResponse++;
   if (buildCounterMobileCarriersListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1645(o.mobileCarriers);
+    checkUnnamed3240(o.mobileCarriers);
   }
   buildCounterMobileCarriersListResponse--;
 }
 
-buildUnnamed1646() {
+buildUnnamed3241() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1646(core.List<core.String> o) {
+checkUnnamed3241(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5251,7 +5251,7 @@
   buildCounterObjectFilter++;
   if (buildCounterObjectFilter < 3) {
     o.kind = "foo";
-    o.objectIds = buildUnnamed1646();
+    o.objectIds = buildUnnamed3241();
     o.status = "foo";
   }
   buildCounterObjectFilter--;
@@ -5262,7 +5262,7 @@
   buildCounterObjectFilter++;
   if (buildCounterObjectFilter < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1646(o.objectIds);
+    checkUnnamed3241(o.objectIds);
     unittest.expect(o.status, unittest.equals('foo'));
   }
   buildCounterObjectFilter--;
@@ -5366,14 +5366,14 @@
   buildCounterOperatingSystemVersion--;
 }
 
-buildUnnamed1647() {
+buildUnnamed3242() {
   var o = new core.List<api.OperatingSystemVersion>();
   o.add(buildOperatingSystemVersion());
   o.add(buildOperatingSystemVersion());
   return o;
 }
 
-checkUnnamed1647(core.List<api.OperatingSystemVersion> o) {
+checkUnnamed3242(core.List<api.OperatingSystemVersion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperatingSystemVersion(o[0]);
   checkOperatingSystemVersion(o[1]);
@@ -5385,7 +5385,7 @@
   buildCounterOperatingSystemVersionsListResponse++;
   if (buildCounterOperatingSystemVersionsListResponse < 3) {
     o.kind = "foo";
-    o.operatingSystemVersions = buildUnnamed1647();
+    o.operatingSystemVersions = buildUnnamed3242();
   }
   buildCounterOperatingSystemVersionsListResponse--;
   return o;
@@ -5396,19 +5396,19 @@
   buildCounterOperatingSystemVersionsListResponse++;
   if (buildCounterOperatingSystemVersionsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1647(o.operatingSystemVersions);
+    checkUnnamed3242(o.operatingSystemVersions);
   }
   buildCounterOperatingSystemVersionsListResponse--;
 }
 
-buildUnnamed1648() {
+buildUnnamed3243() {
   var o = new core.List<api.OperatingSystem>();
   o.add(buildOperatingSystem());
   o.add(buildOperatingSystem());
   return o;
 }
 
-checkUnnamed1648(core.List<api.OperatingSystem> o) {
+checkUnnamed3243(core.List<api.OperatingSystem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperatingSystem(o[0]);
   checkOperatingSystem(o[1]);
@@ -5420,7 +5420,7 @@
   buildCounterOperatingSystemsListResponse++;
   if (buildCounterOperatingSystemsListResponse < 3) {
     o.kind = "foo";
-    o.operatingSystems = buildUnnamed1648();
+    o.operatingSystems = buildUnnamed3243();
   }
   buildCounterOperatingSystemsListResponse--;
   return o;
@@ -5430,7 +5430,7 @@
   buildCounterOperatingSystemsListResponse++;
   if (buildCounterOperatingSystemsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1648(o.operatingSystems);
+    checkUnnamed3243(o.operatingSystems);
   }
   buildCounterOperatingSystemsListResponse--;
 }
@@ -5458,53 +5458,53 @@
   buildCounterOptimizationActivity--;
 }
 
-buildUnnamed1649() {
+buildUnnamed3244() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1649(core.List<core.String> o) {
+checkUnnamed3244(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1650() {
+buildUnnamed3245() {
   var o = new core.List<api.OrderContact>();
   o.add(buildOrderContact());
   o.add(buildOrderContact());
   return o;
 }
 
-checkUnnamed1650(core.List<api.OrderContact> o) {
+checkUnnamed3245(core.List<api.OrderContact> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderContact(o[0]);
   checkOrderContact(o[1]);
 }
 
-buildUnnamed1651() {
+buildUnnamed3246() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1651(core.List<core.String> o) {
+checkUnnamed3246(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1652() {
+buildUnnamed3247() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1652(core.List<core.String> o) {
+checkUnnamed3247(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5517,11 +5517,11 @@
   if (buildCounterOrder < 3) {
     o.accountId = "foo";
     o.advertiserId = "foo";
-    o.approverUserProfileIds = buildUnnamed1649();
+    o.approverUserProfileIds = buildUnnamed3244();
     o.buyerInvoiceId = "foo";
     o.buyerOrganizationName = "foo";
     o.comments = "foo";
-    o.contacts = buildUnnamed1650();
+    o.contacts = buildUnnamed3245();
     o.id = "foo";
     o.kind = "foo";
     o.lastModifiedInfo = buildLastModifiedInfo();
@@ -5531,8 +5531,8 @@
     o.projectId = "foo";
     o.sellerOrderId = "foo";
     o.sellerOrganizationName = "foo";
-    o.siteId = buildUnnamed1651();
-    o.siteNames = buildUnnamed1652();
+    o.siteId = buildUnnamed3246();
+    o.siteNames = buildUnnamed3247();
     o.subaccountId = "foo";
     o.termsAndConditions = "foo";
   }
@@ -5545,11 +5545,11 @@
   if (buildCounterOrder < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.advertiserId, unittest.equals('foo'));
-    checkUnnamed1649(o.approverUserProfileIds);
+    checkUnnamed3244(o.approverUserProfileIds);
     unittest.expect(o.buyerInvoiceId, unittest.equals('foo'));
     unittest.expect(o.buyerOrganizationName, unittest.equals('foo'));
     unittest.expect(o.comments, unittest.equals('foo'));
-    checkUnnamed1650(o.contacts);
+    checkUnnamed3245(o.contacts);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkLastModifiedInfo(o.lastModifiedInfo);
@@ -5559,8 +5559,8 @@
     unittest.expect(o.projectId, unittest.equals('foo'));
     unittest.expect(o.sellerOrderId, unittest.equals('foo'));
     unittest.expect(o.sellerOrganizationName, unittest.equals('foo'));
-    checkUnnamed1651(o.siteId);
-    checkUnnamed1652(o.siteNames);
+    checkUnnamed3246(o.siteId);
+    checkUnnamed3247(o.siteNames);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
     unittest.expect(o.termsAndConditions, unittest.equals('foo'));
   }
@@ -5594,27 +5594,27 @@
   buildCounterOrderContact--;
 }
 
-buildUnnamed1653() {
+buildUnnamed3248() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1653(core.List<core.String> o) {
+checkUnnamed3248(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1654() {
+buildUnnamed3249() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1654(core.List<core.String> o) {
+checkUnnamed3249(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5628,13 +5628,13 @@
     o.accountId = "foo";
     o.advertiserId = "foo";
     o.amendedOrderDocumentId = "foo";
-    o.approvedByUserProfileIds = buildUnnamed1653();
+    o.approvedByUserProfileIds = buildUnnamed3248();
     o.cancelled = true;
     o.createdInfo = buildLastModifiedInfo();
     o.effectiveDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.id = "foo";
     o.kind = "foo";
-    o.lastSentRecipients = buildUnnamed1654();
+    o.lastSentRecipients = buildUnnamed3249();
     o.lastSentTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.orderId = "foo";
     o.projectId = "foo";
@@ -5653,14 +5653,14 @@
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.advertiserId, unittest.equals('foo'));
     unittest.expect(o.amendedOrderDocumentId, unittest.equals('foo'));
-    checkUnnamed1653(o.approvedByUserProfileIds);
+    checkUnnamed3248(o.approvedByUserProfileIds);
     unittest.expect(o.cancelled, unittest.isTrue);
     checkLastModifiedInfo(o.createdInfo);
     unittest.expect(o.effectiveDate,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1654(o.lastSentRecipients);
+    checkUnnamed3249(o.lastSentRecipients);
     unittest.expect(o.lastSentTime,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.orderId, unittest.equals('foo'));
@@ -5673,14 +5673,14 @@
   buildCounterOrderDocument--;
 }
 
-buildUnnamed1655() {
+buildUnnamed3250() {
   var o = new core.List<api.OrderDocument>();
   o.add(buildOrderDocument());
   o.add(buildOrderDocument());
   return o;
 }
 
-checkUnnamed1655(core.List<api.OrderDocument> o) {
+checkUnnamed3250(core.List<api.OrderDocument> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderDocument(o[0]);
   checkOrderDocument(o[1]);
@@ -5693,7 +5693,7 @@
   if (buildCounterOrderDocumentsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.orderDocuments = buildUnnamed1655();
+    o.orderDocuments = buildUnnamed3250();
   }
   buildCounterOrderDocumentsListResponse--;
   return o;
@@ -5704,19 +5704,19 @@
   if (buildCounterOrderDocumentsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1655(o.orderDocuments);
+    checkUnnamed3250(o.orderDocuments);
   }
   buildCounterOrderDocumentsListResponse--;
 }
 
-buildUnnamed1656() {
+buildUnnamed3251() {
   var o = new core.List<api.Order>();
   o.add(buildOrder());
   o.add(buildOrder());
   return o;
 }
 
-checkUnnamed1656(core.List<api.Order> o) {
+checkUnnamed3251(core.List<api.Order> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrder(o[0]);
   checkOrder(o[1]);
@@ -5729,7 +5729,7 @@
   if (buildCounterOrdersListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.orders = buildUnnamed1656();
+    o.orders = buildUnnamed3251();
   }
   buildCounterOrdersListResponse--;
   return o;
@@ -5740,58 +5740,58 @@
   if (buildCounterOrdersListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1656(o.orders);
+    checkUnnamed3251(o.orders);
   }
   buildCounterOrdersListResponse--;
 }
 
-buildUnnamed1657() {
+buildUnnamed3252() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1657(core.List<api.Dimension> o) {
+checkUnnamed3252(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed1658() {
+buildUnnamed3253() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1658(core.List<api.Dimension> o) {
+checkUnnamed3253(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed1659() {
+buildUnnamed3254() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed1659(core.List<api.Metric> o) {
+checkUnnamed3254(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed1660() {
+buildUnnamed3255() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1660(core.List<api.Dimension> o) {
+checkUnnamed3255(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
@@ -5802,11 +5802,11 @@
   var o = new api.PathToConversionReportCompatibleFields();
   buildCounterPathToConversionReportCompatibleFields++;
   if (buildCounterPathToConversionReportCompatibleFields < 3) {
-    o.conversionDimensions = buildUnnamed1657();
-    o.customFloodlightVariables = buildUnnamed1658();
+    o.conversionDimensions = buildUnnamed3252();
+    o.customFloodlightVariables = buildUnnamed3253();
     o.kind = "foo";
-    o.metrics = buildUnnamed1659();
-    o.perInteractionDimensions = buildUnnamed1660();
+    o.metrics = buildUnnamed3254();
+    o.perInteractionDimensions = buildUnnamed3255();
   }
   buildCounterPathToConversionReportCompatibleFields--;
   return o;
@@ -5816,23 +5816,23 @@
     api.PathToConversionReportCompatibleFields o) {
   buildCounterPathToConversionReportCompatibleFields++;
   if (buildCounterPathToConversionReportCompatibleFields < 3) {
-    checkUnnamed1657(o.conversionDimensions);
-    checkUnnamed1658(o.customFloodlightVariables);
+    checkUnnamed3252(o.conversionDimensions);
+    checkUnnamed3253(o.customFloodlightVariables);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1659(o.metrics);
-    checkUnnamed1660(o.perInteractionDimensions);
+    checkUnnamed3254(o.metrics);
+    checkUnnamed3255(o.perInteractionDimensions);
   }
   buildCounterPathToConversionReportCompatibleFields--;
 }
 
-buildUnnamed1661() {
+buildUnnamed3256() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1661(core.List<core.String> o) {
+checkUnnamed3256(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5878,7 +5878,7 @@
     o.sslRequired = true;
     o.status = "foo";
     o.subaccountId = "foo";
-    o.tagFormats = buildUnnamed1661();
+    o.tagFormats = buildUnnamed3256();
     o.tagSetting = buildTagSetting();
     o.videoActiveViewOptOut = true;
     o.videoSettings = buildVideoSettings();
@@ -5926,7 +5926,7 @@
     unittest.expect(o.sslRequired, unittest.isTrue);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.subaccountId, unittest.equals('foo'));
-    checkUnnamed1661(o.tagFormats);
+    checkUnnamed3256(o.tagFormats);
     checkTagSetting(o.tagSetting);
     unittest.expect(o.videoActiveViewOptOut, unittest.isTrue);
     checkVideoSettings(o.videoSettings);
@@ -5960,14 +5960,14 @@
   buildCounterPlacementAssignment--;
 }
 
-buildUnnamed1662() {
+buildUnnamed3257() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1662(core.List<core.String> o) {
+checkUnnamed3257(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5984,7 +5984,7 @@
     o.archived = true;
     o.campaignId = "foo";
     o.campaignIdDimensionValue = buildDimensionValue();
-    o.childPlacementIds = buildUnnamed1662();
+    o.childPlacementIds = buildUnnamed3257();
     o.comment = "foo";
     o.contentCategoryId = "foo";
     o.createInfo = buildLastModifiedInfo();
@@ -6018,7 +6018,7 @@
     unittest.expect(o.archived, unittest.isTrue);
     unittest.expect(o.campaignId, unittest.equals('foo'));
     checkDimensionValue(o.campaignIdDimensionValue);
-    checkUnnamed1662(o.childPlacementIds);
+    checkUnnamed3257(o.childPlacementIds);
     unittest.expect(o.comment, unittest.equals('foo'));
     unittest.expect(o.contentCategoryId, unittest.equals('foo'));
     checkLastModifiedInfo(o.createInfo);
@@ -6042,14 +6042,14 @@
   buildCounterPlacementGroup--;
 }
 
-buildUnnamed1663() {
+buildUnnamed3258() {
   var o = new core.List<api.PlacementGroup>();
   o.add(buildPlacementGroup());
   o.add(buildPlacementGroup());
   return o;
 }
 
-checkUnnamed1663(core.List<api.PlacementGroup> o) {
+checkUnnamed3258(core.List<api.PlacementGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacementGroup(o[0]);
   checkPlacementGroup(o[1]);
@@ -6062,7 +6062,7 @@
   if (buildCounterPlacementGroupsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.placementGroups = buildUnnamed1663();
+    o.placementGroups = buildUnnamed3258();
   }
   buildCounterPlacementGroupsListResponse--;
   return o;
@@ -6073,19 +6073,19 @@
   if (buildCounterPlacementGroupsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1663(o.placementGroups);
+    checkUnnamed3258(o.placementGroups);
   }
   buildCounterPlacementGroupsListResponse--;
 }
 
-buildUnnamed1664() {
+buildUnnamed3259() {
   var o = new core.List<api.PlacementStrategy>();
   o.add(buildPlacementStrategy());
   o.add(buildPlacementStrategy());
   return o;
 }
 
-checkUnnamed1664(core.List<api.PlacementStrategy> o) {
+checkUnnamed3259(core.List<api.PlacementStrategy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacementStrategy(o[0]);
   checkPlacementStrategy(o[1]);
@@ -6098,7 +6098,7 @@
   if (buildCounterPlacementStrategiesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.placementStrategies = buildUnnamed1664();
+    o.placementStrategies = buildUnnamed3259();
   }
   buildCounterPlacementStrategiesListResponse--;
   return o;
@@ -6109,7 +6109,7 @@
   if (buildCounterPlacementStrategiesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1664(o.placementStrategies);
+    checkUnnamed3259(o.placementStrategies);
   }
   buildCounterPlacementStrategiesListResponse--;
 }
@@ -6139,14 +6139,14 @@
   buildCounterPlacementStrategy--;
 }
 
-buildUnnamed1665() {
+buildUnnamed3260() {
   var o = new core.List<api.TagData>();
   o.add(buildTagData());
   o.add(buildTagData());
   return o;
 }
 
-checkUnnamed1665(core.List<api.TagData> o) {
+checkUnnamed3260(core.List<api.TagData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTagData(o[0]);
   checkTagData(o[1]);
@@ -6158,7 +6158,7 @@
   buildCounterPlacementTag++;
   if (buildCounterPlacementTag < 3) {
     o.placementId = "foo";
-    o.tagDatas = buildUnnamed1665();
+    o.tagDatas = buildUnnamed3260();
   }
   buildCounterPlacementTag--;
   return o;
@@ -6168,19 +6168,19 @@
   buildCounterPlacementTag++;
   if (buildCounterPlacementTag < 3) {
     unittest.expect(o.placementId, unittest.equals('foo'));
-    checkUnnamed1665(o.tagDatas);
+    checkUnnamed3260(o.tagDatas);
   }
   buildCounterPlacementTag--;
 }
 
-buildUnnamed1666() {
+buildUnnamed3261() {
   var o = new core.List<api.PlacementTag>();
   o.add(buildPlacementTag());
   o.add(buildPlacementTag());
   return o;
 }
 
-checkUnnamed1666(core.List<api.PlacementTag> o) {
+checkUnnamed3261(core.List<api.PlacementTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacementTag(o[0]);
   checkPlacementTag(o[1]);
@@ -6192,7 +6192,7 @@
   buildCounterPlacementsGenerateTagsResponse++;
   if (buildCounterPlacementsGenerateTagsResponse < 3) {
     o.kind = "foo";
-    o.placementTags = buildUnnamed1666();
+    o.placementTags = buildUnnamed3261();
   }
   buildCounterPlacementsGenerateTagsResponse--;
   return o;
@@ -6202,19 +6202,19 @@
   buildCounterPlacementsGenerateTagsResponse++;
   if (buildCounterPlacementsGenerateTagsResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1666(o.placementTags);
+    checkUnnamed3261(o.placementTags);
   }
   buildCounterPlacementsGenerateTagsResponse--;
 }
 
-buildUnnamed1667() {
+buildUnnamed3262() {
   var o = new core.List<api.Placement>();
   o.add(buildPlacement());
   o.add(buildPlacement());
   return o;
 }
 
-checkUnnamed1667(core.List<api.Placement> o) {
+checkUnnamed3262(core.List<api.Placement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacement(o[0]);
   checkPlacement(o[1]);
@@ -6227,7 +6227,7 @@
   if (buildCounterPlacementsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.placements = buildUnnamed1667();
+    o.placements = buildUnnamed3262();
   }
   buildCounterPlacementsListResponse--;
   return o;
@@ -6238,7 +6238,7 @@
   if (buildCounterPlacementsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1667(o.placements);
+    checkUnnamed3262(o.placements);
   }
   buildCounterPlacementsListResponse--;
 }
@@ -6266,14 +6266,14 @@
   buildCounterPlatformType--;
 }
 
-buildUnnamed1668() {
+buildUnnamed3263() {
   var o = new core.List<api.PlatformType>();
   o.add(buildPlatformType());
   o.add(buildPlatformType());
   return o;
 }
 
-checkUnnamed1668(core.List<api.PlatformType> o) {
+checkUnnamed3263(core.List<api.PlatformType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlatformType(o[0]);
   checkPlatformType(o[1]);
@@ -6285,7 +6285,7 @@
   buildCounterPlatformTypesListResponse++;
   if (buildCounterPlatformTypesListResponse < 3) {
     o.kind = "foo";
-    o.platformTypes = buildUnnamed1668();
+    o.platformTypes = buildUnnamed3263();
   }
   buildCounterPlatformTypesListResponse--;
   return o;
@@ -6295,7 +6295,7 @@
   buildCounterPlatformTypesListResponse++;
   if (buildCounterPlatformTypesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1668(o.platformTypes);
+    checkUnnamed3263(o.platformTypes);
   }
   buildCounterPlatformTypesListResponse--;
 }
@@ -6362,14 +6362,14 @@
   buildCounterPostalCode--;
 }
 
-buildUnnamed1669() {
+buildUnnamed3264() {
   var o = new core.List<api.PostalCode>();
   o.add(buildPostalCode());
   o.add(buildPostalCode());
   return o;
 }
 
-checkUnnamed1669(core.List<api.PostalCode> o) {
+checkUnnamed3264(core.List<api.PostalCode> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPostalCode(o[0]);
   checkPostalCode(o[1]);
@@ -6381,7 +6381,7 @@
   buildCounterPostalCodesListResponse++;
   if (buildCounterPostalCodesListResponse < 3) {
     o.kind = "foo";
-    o.postalCodes = buildUnnamed1669();
+    o.postalCodes = buildUnnamed3264();
   }
   buildCounterPostalCodesListResponse--;
   return o;
@@ -6391,19 +6391,19 @@
   buildCounterPostalCodesListResponse++;
   if (buildCounterPostalCodesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1669(o.postalCodes);
+    checkUnnamed3264(o.postalCodes);
   }
   buildCounterPostalCodesListResponse--;
 }
 
-buildUnnamed1670() {
+buildUnnamed3265() {
   var o = new core.List<api.Flight>();
   o.add(buildFlight());
   o.add(buildFlight());
   return o;
 }
 
-checkUnnamed1670(core.List<api.Flight> o) {
+checkUnnamed3265(core.List<api.Flight> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFlight(o[0]);
   checkFlight(o[1]);
@@ -6416,7 +6416,7 @@
   if (buildCounterPricing < 3) {
     o.capCostType = "foo";
     o.endDate = core.DateTime.parse("2002-02-27T14:01:02Z");
-    o.flights = buildUnnamed1670();
+    o.flights = buildUnnamed3265();
     o.groupType = "foo";
     o.pricingType = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
@@ -6431,7 +6431,7 @@
     unittest.expect(o.capCostType, unittest.equals('foo'));
     unittest.expect(
         o.endDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
-    checkUnnamed1670(o.flights);
+    checkUnnamed3265(o.flights);
     unittest.expect(o.groupType, unittest.equals('foo'));
     unittest.expect(o.pricingType, unittest.equals('foo'));
     unittest.expect(o.startDate,
@@ -6440,14 +6440,14 @@
   buildCounterPricing--;
 }
 
-buildUnnamed1671() {
+buildUnnamed3266() {
   var o = new core.List<api.PricingSchedulePricingPeriod>();
   o.add(buildPricingSchedulePricingPeriod());
   o.add(buildPricingSchedulePricingPeriod());
   return o;
 }
 
-checkUnnamed1671(core.List<api.PricingSchedulePricingPeriod> o) {
+checkUnnamed3266(core.List<api.PricingSchedulePricingPeriod> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPricingSchedulePricingPeriod(o[0]);
   checkPricingSchedulePricingPeriod(o[1]);
@@ -6463,7 +6463,7 @@
     o.endDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.flighted = true;
     o.floodlightActivityId = "foo";
-    o.pricingPeriods = buildUnnamed1671();
+    o.pricingPeriods = buildUnnamed3266();
     o.pricingType = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.testingStartDate = core.DateTime.parse("2002-02-27T14:01:02Z");
@@ -6481,7 +6481,7 @@
         o.endDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.flighted, unittest.isTrue);
     unittest.expect(o.floodlightActivityId, unittest.equals('foo'));
-    checkUnnamed1671(o.pricingPeriods);
+    checkUnnamed3266(o.pricingPeriods);
     unittest.expect(o.pricingType, unittest.equals('foo'));
     unittest.expect(o.startDate,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
@@ -6583,14 +6583,14 @@
   buildCounterProject--;
 }
 
-buildUnnamed1672() {
+buildUnnamed3267() {
   var o = new core.List<api.Project>();
   o.add(buildProject());
   o.add(buildProject());
   return o;
 }
 
-checkUnnamed1672(core.List<api.Project> o) {
+checkUnnamed3267(core.List<api.Project> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProject(o[0]);
   checkProject(o[1]);
@@ -6603,7 +6603,7 @@
   if (buildCounterProjectsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.projects = buildUnnamed1672();
+    o.projects = buildUnnamed3267();
   }
   buildCounterProjectsListResponse--;
   return o;
@@ -6614,71 +6614,71 @@
   if (buildCounterProjectsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1672(o.projects);
+    checkUnnamed3267(o.projects);
   }
   buildCounterProjectsListResponse--;
 }
 
-buildUnnamed1673() {
+buildUnnamed3268() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1673(core.List<api.Dimension> o) {
+checkUnnamed3268(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed1674() {
+buildUnnamed3269() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1674(core.List<api.Dimension> o) {
+checkUnnamed3269(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed1675() {
+buildUnnamed3270() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed1675(core.List<api.Metric> o) {
+checkUnnamed3270(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed1676() {
+buildUnnamed3271() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed1676(core.List<api.Metric> o) {
+checkUnnamed3271(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed1677() {
+buildUnnamed3272() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed1677(core.List<api.Metric> o) {
+checkUnnamed3272(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -6689,12 +6689,12 @@
   var o = new api.ReachReportCompatibleFields();
   buildCounterReachReportCompatibleFields++;
   if (buildCounterReachReportCompatibleFields < 3) {
-    o.dimensionFilters = buildUnnamed1673();
-    o.dimensions = buildUnnamed1674();
+    o.dimensionFilters = buildUnnamed3268();
+    o.dimensions = buildUnnamed3269();
     o.kind = "foo";
-    o.metrics = buildUnnamed1675();
-    o.pivotedActivityMetrics = buildUnnamed1676();
-    o.reachByFrequencyMetrics = buildUnnamed1677();
+    o.metrics = buildUnnamed3270();
+    o.pivotedActivityMetrics = buildUnnamed3271();
+    o.reachByFrequencyMetrics = buildUnnamed3272();
   }
   buildCounterReachReportCompatibleFields--;
   return o;
@@ -6703,12 +6703,12 @@
 checkReachReportCompatibleFields(api.ReachReportCompatibleFields o) {
   buildCounterReachReportCompatibleFields++;
   if (buildCounterReachReportCompatibleFields < 3) {
-    checkUnnamed1673(o.dimensionFilters);
-    checkUnnamed1674(o.dimensions);
+    checkUnnamed3268(o.dimensionFilters);
+    checkUnnamed3269(o.dimensions);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1675(o.metrics);
-    checkUnnamed1676(o.pivotedActivityMetrics);
-    checkUnnamed1677(o.reachByFrequencyMetrics);
+    checkUnnamed3270(o.metrics);
+    checkUnnamed3271(o.pivotedActivityMetrics);
+    checkUnnamed3272(o.reachByFrequencyMetrics);
   }
   buildCounterReachReportCompatibleFields--;
 }
@@ -6765,14 +6765,14 @@
   buildCounterRegion--;
 }
 
-buildUnnamed1678() {
+buildUnnamed3273() {
   var o = new core.List<api.Region>();
   o.add(buildRegion());
   o.add(buildRegion());
   return o;
 }
 
-checkUnnamed1678(core.List<api.Region> o) {
+checkUnnamed3273(core.List<api.Region> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegion(o[0]);
   checkRegion(o[1]);
@@ -6784,7 +6784,7 @@
   buildCounterRegionsListResponse++;
   if (buildCounterRegionsListResponse < 3) {
     o.kind = "foo";
-    o.regions = buildUnnamed1678();
+    o.regions = buildUnnamed3273();
   }
   buildCounterRegionsListResponse--;
   return o;
@@ -6794,7 +6794,7 @@
   buildCounterRegionsListResponse++;
   if (buildCounterRegionsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1678(o.regions);
+    checkUnnamed3273(o.regions);
   }
   buildCounterRegionsListResponse--;
 }
@@ -6842,27 +6842,27 @@
   buildCounterRemarketingList--;
 }
 
-buildUnnamed1679() {
+buildUnnamed3274() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1679(core.List<core.String> o) {
+checkUnnamed3274(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1680() {
+buildUnnamed3275() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1680(core.List<core.String> o) {
+checkUnnamed3275(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -6875,8 +6875,8 @@
   if (buildCounterRemarketingListShare < 3) {
     o.kind = "foo";
     o.remarketingListId = "foo";
-    o.sharedAccountIds = buildUnnamed1679();
-    o.sharedAdvertiserIds = buildUnnamed1680();
+    o.sharedAccountIds = buildUnnamed3274();
+    o.sharedAdvertiserIds = buildUnnamed3275();
   }
   buildCounterRemarketingListShare--;
   return o;
@@ -6887,20 +6887,20 @@
   if (buildCounterRemarketingListShare < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.remarketingListId, unittest.equals('foo'));
-    checkUnnamed1679(o.sharedAccountIds);
-    checkUnnamed1680(o.sharedAdvertiserIds);
+    checkUnnamed3274(o.sharedAccountIds);
+    checkUnnamed3275(o.sharedAdvertiserIds);
   }
   buildCounterRemarketingListShare--;
 }
 
-buildUnnamed1681() {
+buildUnnamed3276() {
   var o = new core.List<api.RemarketingList>();
   o.add(buildRemarketingList());
   o.add(buildRemarketingList());
   return o;
 }
 
-checkUnnamed1681(core.List<api.RemarketingList> o) {
+checkUnnamed3276(core.List<api.RemarketingList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRemarketingList(o[0]);
   checkRemarketingList(o[1]);
@@ -6913,7 +6913,7 @@
   if (buildCounterRemarketingListsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.remarketingLists = buildUnnamed1681();
+    o.remarketingLists = buildUnnamed3276();
   }
   buildCounterRemarketingListsListResponse--;
   return o;
@@ -6924,45 +6924,45 @@
   if (buildCounterRemarketingListsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1681(o.remarketingLists);
+    checkUnnamed3276(o.remarketingLists);
   }
   buildCounterRemarketingListsListResponse--;
 }
 
-buildUnnamed1682() {
+buildUnnamed3277() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed1682(core.List<api.DimensionValue> o) {
+checkUnnamed3277(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed1683() {
+buildUnnamed3278() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed1683(core.List<api.SortedDimension> o) {
+checkUnnamed3278(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed1684() {
+buildUnnamed3279() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1684(core.List<core.String> o) {
+checkUnnamed3279(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -6976,9 +6976,9 @@
     o.activities = buildActivities();
     o.customRichMediaEvents = buildCustomRichMediaEvents();
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed1682();
-    o.dimensions = buildUnnamed1683();
-    o.metricNames = buildUnnamed1684();
+    o.dimensionFilters = buildUnnamed3277();
+    o.dimensions = buildUnnamed3278();
+    o.metricNames = buildUnnamed3279();
   }
   buildCounterReportCriteria--;
   return o;
@@ -6990,60 +6990,60 @@
     checkActivities(o.activities);
     checkCustomRichMediaEvents(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
-    checkUnnamed1682(o.dimensionFilters);
-    checkUnnamed1683(o.dimensions);
-    checkUnnamed1684(o.metricNames);
+    checkUnnamed3277(o.dimensionFilters);
+    checkUnnamed3278(o.dimensions);
+    checkUnnamed3279(o.metricNames);
   }
   buildCounterReportCriteria--;
 }
 
-buildUnnamed1685() {
+buildUnnamed3280() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed1685(core.List<api.SortedDimension> o) {
+checkUnnamed3280(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed1686() {
+buildUnnamed3281() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed1686(core.List<api.DimensionValue> o) {
+checkUnnamed3281(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed1687() {
+buildUnnamed3282() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1687(core.List<core.String> o) {
+checkUnnamed3282(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1688() {
+buildUnnamed3283() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1688(core.List<core.String> o) {
+checkUnnamed3283(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -7054,12 +7054,12 @@
   var o = new api.ReportCrossDimensionReachCriteria();
   buildCounterReportCrossDimensionReachCriteria++;
   if (buildCounterReportCrossDimensionReachCriteria < 3) {
-    o.breakdown = buildUnnamed1685();
+    o.breakdown = buildUnnamed3280();
     o.dateRange = buildDateRange();
     o.dimension = "foo";
-    o.dimensionFilters = buildUnnamed1686();
-    o.metricNames = buildUnnamed1687();
-    o.overlapMetricNames = buildUnnamed1688();
+    o.dimensionFilters = buildUnnamed3281();
+    o.metricNames = buildUnnamed3282();
+    o.overlapMetricNames = buildUnnamed3283();
     o.pivoted = true;
   }
   buildCounterReportCrossDimensionReachCriteria--;
@@ -7070,25 +7070,25 @@
     api.ReportCrossDimensionReachCriteria o) {
   buildCounterReportCrossDimensionReachCriteria++;
   if (buildCounterReportCrossDimensionReachCriteria < 3) {
-    checkUnnamed1685(o.breakdown);
+    checkUnnamed3280(o.breakdown);
     checkDateRange(o.dateRange);
     unittest.expect(o.dimension, unittest.equals('foo'));
-    checkUnnamed1686(o.dimensionFilters);
-    checkUnnamed1687(o.metricNames);
-    checkUnnamed1688(o.overlapMetricNames);
+    checkUnnamed3281(o.dimensionFilters);
+    checkUnnamed3282(o.metricNames);
+    checkUnnamed3283(o.overlapMetricNames);
     unittest.expect(o.pivoted, unittest.isTrue);
   }
   buildCounterReportCrossDimensionReachCriteria--;
 }
 
-buildUnnamed1689() {
+buildUnnamed3284() {
   var o = new core.List<api.Recipient>();
   o.add(buildRecipient());
   o.add(buildRecipient());
   return o;
 }
 
-checkUnnamed1689(core.List<api.Recipient> o) {
+checkUnnamed3284(core.List<api.Recipient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRecipient(o[0]);
   checkRecipient(o[1]);
@@ -7102,7 +7102,7 @@
     o.emailOwner = true;
     o.emailOwnerDeliveryType = "foo";
     o.message = "foo";
-    o.recipients = buildUnnamed1689();
+    o.recipients = buildUnnamed3284();
   }
   buildCounterReportDelivery--;
   return o;
@@ -7114,58 +7114,58 @@
     unittest.expect(o.emailOwner, unittest.isTrue);
     unittest.expect(o.emailOwnerDeliveryType, unittest.equals('foo'));
     unittest.expect(o.message, unittest.equals('foo'));
-    checkUnnamed1689(o.recipients);
+    checkUnnamed3284(o.recipients);
   }
   buildCounterReportDelivery--;
 }
 
-buildUnnamed1690() {
+buildUnnamed3285() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed1690(core.List<api.DimensionValue> o) {
+checkUnnamed3285(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed1691() {
+buildUnnamed3286() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed1691(core.List<api.DimensionValue> o) {
+checkUnnamed3286(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed1692() {
+buildUnnamed3287() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed1692(core.List<api.SortedDimension> o) {
+checkUnnamed3287(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed1693() {
+buildUnnamed3288() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1693(core.List<core.String> o) {
+checkUnnamed3288(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -7200,12 +7200,12 @@
   var o = new api.ReportFloodlightCriteria();
   buildCounterReportFloodlightCriteria++;
   if (buildCounterReportFloodlightCriteria < 3) {
-    o.customRichMediaEvents = buildUnnamed1690();
+    o.customRichMediaEvents = buildUnnamed3285();
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed1691();
-    o.dimensions = buildUnnamed1692();
+    o.dimensionFilters = buildUnnamed3286();
+    o.dimensions = buildUnnamed3287();
     o.floodlightConfigId = buildDimensionValue();
-    o.metricNames = buildUnnamed1693();
+    o.metricNames = buildUnnamed3288();
     o.reportProperties = buildReportFloodlightCriteriaReportProperties();
   }
   buildCounterReportFloodlightCriteria--;
@@ -7215,90 +7215,90 @@
 checkReportFloodlightCriteria(api.ReportFloodlightCriteria o) {
   buildCounterReportFloodlightCriteria++;
   if (buildCounterReportFloodlightCriteria < 3) {
-    checkUnnamed1690(o.customRichMediaEvents);
+    checkUnnamed3285(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
-    checkUnnamed1691(o.dimensionFilters);
-    checkUnnamed1692(o.dimensions);
+    checkUnnamed3286(o.dimensionFilters);
+    checkUnnamed3287(o.dimensions);
     checkDimensionValue(o.floodlightConfigId);
-    checkUnnamed1693(o.metricNames);
+    checkUnnamed3288(o.metricNames);
     checkReportFloodlightCriteriaReportProperties(o.reportProperties);
   }
   buildCounterReportFloodlightCriteria--;
 }
 
-buildUnnamed1694() {
+buildUnnamed3289() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed1694(core.List<api.DimensionValue> o) {
+checkUnnamed3289(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed1695() {
+buildUnnamed3290() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed1695(core.List<api.SortedDimension> o) {
+checkUnnamed3290(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed1696() {
+buildUnnamed3291() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed1696(core.List<api.SortedDimension> o) {
+checkUnnamed3291(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed1697() {
+buildUnnamed3292() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed1697(core.List<api.DimensionValue> o) {
+checkUnnamed3292(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed1698() {
+buildUnnamed3293() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1698(core.List<core.String> o) {
+checkUnnamed3293(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1699() {
+buildUnnamed3294() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed1699(core.List<api.SortedDimension> o) {
+checkUnnamed3294(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
@@ -7345,14 +7345,14 @@
   var o = new api.ReportPathToConversionCriteria();
   buildCounterReportPathToConversionCriteria++;
   if (buildCounterReportPathToConversionCriteria < 3) {
-    o.activityFilters = buildUnnamed1694();
-    o.conversionDimensions = buildUnnamed1695();
-    o.customFloodlightVariables = buildUnnamed1696();
-    o.customRichMediaEvents = buildUnnamed1697();
+    o.activityFilters = buildUnnamed3289();
+    o.conversionDimensions = buildUnnamed3290();
+    o.customFloodlightVariables = buildUnnamed3291();
+    o.customRichMediaEvents = buildUnnamed3292();
     o.dateRange = buildDateRange();
     o.floodlightConfigId = buildDimensionValue();
-    o.metricNames = buildUnnamed1698();
-    o.perInteractionDimensions = buildUnnamed1699();
+    o.metricNames = buildUnnamed3293();
+    o.perInteractionDimensions = buildUnnamed3294();
     o.reportProperties = buildReportPathToConversionCriteriaReportProperties();
   }
   buildCounterReportPathToConversionCriteria--;
@@ -7362,66 +7362,66 @@
 checkReportPathToConversionCriteria(api.ReportPathToConversionCriteria o) {
   buildCounterReportPathToConversionCriteria++;
   if (buildCounterReportPathToConversionCriteria < 3) {
-    checkUnnamed1694(o.activityFilters);
-    checkUnnamed1695(o.conversionDimensions);
-    checkUnnamed1696(o.customFloodlightVariables);
-    checkUnnamed1697(o.customRichMediaEvents);
+    checkUnnamed3289(o.activityFilters);
+    checkUnnamed3290(o.conversionDimensions);
+    checkUnnamed3291(o.customFloodlightVariables);
+    checkUnnamed3292(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
     checkDimensionValue(o.floodlightConfigId);
-    checkUnnamed1698(o.metricNames);
-    checkUnnamed1699(o.perInteractionDimensions);
+    checkUnnamed3293(o.metricNames);
+    checkUnnamed3294(o.perInteractionDimensions);
     checkReportPathToConversionCriteriaReportProperties(o.reportProperties);
   }
   buildCounterReportPathToConversionCriteria--;
 }
 
-buildUnnamed1700() {
+buildUnnamed3295() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed1700(core.List<api.DimensionValue> o) {
+checkUnnamed3295(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed1701() {
+buildUnnamed3296() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed1701(core.List<api.SortedDimension> o) {
+checkUnnamed3296(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed1702() {
+buildUnnamed3297() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1702(core.List<core.String> o) {
+checkUnnamed3297(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1703() {
+buildUnnamed3298() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1703(core.List<core.String> o) {
+checkUnnamed3298(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -7435,11 +7435,11 @@
     o.activities = buildActivities();
     o.customRichMediaEvents = buildCustomRichMediaEvents();
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed1700();
-    o.dimensions = buildUnnamed1701();
+    o.dimensionFilters = buildUnnamed3295();
+    o.dimensions = buildUnnamed3296();
     o.enableAllDimensionCombinations = true;
-    o.metricNames = buildUnnamed1702();
-    o.reachByFrequencyMetricNames = buildUnnamed1703();
+    o.metricNames = buildUnnamed3297();
+    o.reachByFrequencyMetricNames = buildUnnamed3298();
   }
   buildCounterReportReachCriteria--;
   return o;
@@ -7451,23 +7451,23 @@
     checkActivities(o.activities);
     checkCustomRichMediaEvents(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
-    checkUnnamed1700(o.dimensionFilters);
-    checkUnnamed1701(o.dimensions);
+    checkUnnamed3295(o.dimensionFilters);
+    checkUnnamed3296(o.dimensions);
     unittest.expect(o.enableAllDimensionCombinations, unittest.isTrue);
-    checkUnnamed1702(o.metricNames);
-    checkUnnamed1703(o.reachByFrequencyMetricNames);
+    checkUnnamed3297(o.metricNames);
+    checkUnnamed3298(o.reachByFrequencyMetricNames);
   }
   buildCounterReportReachCriteria--;
 }
 
-buildUnnamed1704() {
+buildUnnamed3299() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1704(core.List<core.String> o) {
+checkUnnamed3299(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -7482,7 +7482,7 @@
     o.every = 42;
     o.expirationDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.repeats = "foo";
-    o.repeatsOnWeekDays = buildUnnamed1704();
+    o.repeatsOnWeekDays = buildUnnamed3299();
     o.runsOnDayOfMonth = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
   }
@@ -7498,7 +7498,7 @@
     unittest.expect(o.expirationDate,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.repeats, unittest.equals('foo'));
-    checkUnnamed1704(o.repeatsOnWeekDays);
+    checkUnnamed3299(o.repeatsOnWeekDays);
     unittest.expect(o.runsOnDayOfMonth, unittest.equals('foo'));
     unittest.expect(o.startDate,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
@@ -7559,53 +7559,53 @@
   buildCounterReport--;
 }
 
-buildUnnamed1705() {
+buildUnnamed3300() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1705(core.List<api.Dimension> o) {
+checkUnnamed3300(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed1706() {
+buildUnnamed3301() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed1706(core.List<api.Dimension> o) {
+checkUnnamed3301(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed1707() {
+buildUnnamed3302() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed1707(core.List<api.Metric> o) {
+checkUnnamed3302(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed1708() {
+buildUnnamed3303() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed1708(core.List<api.Metric> o) {
+checkUnnamed3303(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -7616,11 +7616,11 @@
   var o = new api.ReportCompatibleFields();
   buildCounterReportCompatibleFields++;
   if (buildCounterReportCompatibleFields < 3) {
-    o.dimensionFilters = buildUnnamed1705();
-    o.dimensions = buildUnnamed1706();
+    o.dimensionFilters = buildUnnamed3300();
+    o.dimensions = buildUnnamed3301();
     o.kind = "foo";
-    o.metrics = buildUnnamed1707();
-    o.pivotedActivityMetrics = buildUnnamed1708();
+    o.metrics = buildUnnamed3302();
+    o.pivotedActivityMetrics = buildUnnamed3303();
   }
   buildCounterReportCompatibleFields--;
   return o;
@@ -7629,23 +7629,23 @@
 checkReportCompatibleFields(api.ReportCompatibleFields o) {
   buildCounterReportCompatibleFields++;
   if (buildCounterReportCompatibleFields < 3) {
-    checkUnnamed1705(o.dimensionFilters);
-    checkUnnamed1706(o.dimensions);
+    checkUnnamed3300(o.dimensionFilters);
+    checkUnnamed3301(o.dimensions);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1707(o.metrics);
-    checkUnnamed1708(o.pivotedActivityMetrics);
+    checkUnnamed3302(o.metrics);
+    checkUnnamed3303(o.pivotedActivityMetrics);
   }
   buildCounterReportCompatibleFields--;
 }
 
-buildUnnamed1709() {
+buildUnnamed3304() {
   var o = new core.List<api.Report>();
   o.add(buildReport());
   o.add(buildReport());
   return o;
 }
 
-checkUnnamed1709(core.List<api.Report> o) {
+checkUnnamed3304(core.List<api.Report> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReport(o[0]);
   checkReport(o[1]);
@@ -7657,7 +7657,7 @@
   buildCounterReportList++;
   if (buildCounterReportList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1709();
+    o.items = buildUnnamed3304();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -7669,7 +7669,7 @@
   buildCounterReportList++;
   if (buildCounterReportList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1709(o.items);
+    checkUnnamed3304(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -7745,14 +7745,14 @@
   buildCounterRule--;
 }
 
-buildUnnamed1710() {
+buildUnnamed3305() {
   var o = new core.List<api.SiteContact>();
   o.add(buildSiteContact());
   o.add(buildSiteContact());
   return o;
 }
 
-checkUnnamed1710(core.List<api.SiteContact> o) {
+checkUnnamed3305(core.List<api.SiteContact> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSiteContact(o[0]);
   checkSiteContact(o[1]);
@@ -7772,7 +7772,7 @@
     o.keyName = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.siteContacts = buildUnnamed1710();
+    o.siteContacts = buildUnnamed3305();
     o.siteSettings = buildSiteSettings();
     o.subaccountId = "foo";
   }
@@ -7792,7 +7792,7 @@
     unittest.expect(o.keyName, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1710(o.siteContacts);
+    checkUnnamed3305(o.siteContacts);
     checkSiteSettings(o.siteSettings);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
   }
@@ -7865,14 +7865,14 @@
   buildCounterSiteSettings--;
 }
 
-buildUnnamed1711() {
+buildUnnamed3306() {
   var o = new core.List<api.Site>();
   o.add(buildSite());
   o.add(buildSite());
   return o;
 }
 
-checkUnnamed1711(core.List<api.Site> o) {
+checkUnnamed3306(core.List<api.Site> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSite(o[0]);
   checkSite(o[1]);
@@ -7885,7 +7885,7 @@
   if (buildCounterSitesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.sites = buildUnnamed1711();
+    o.sites = buildUnnamed3306();
   }
   buildCounterSitesListResponse--;
   return o;
@@ -7896,7 +7896,7 @@
   if (buildCounterSitesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1711(o.sites);
+    checkUnnamed3306(o.sites);
   }
   buildCounterSitesListResponse--;
 }
@@ -7928,14 +7928,14 @@
   buildCounterSize--;
 }
 
-buildUnnamed1712() {
+buildUnnamed3307() {
   var o = new core.List<api.Size>();
   o.add(buildSize());
   o.add(buildSize());
   return o;
 }
 
-checkUnnamed1712(core.List<api.Size> o) {
+checkUnnamed3307(core.List<api.Size> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSize(o[0]);
   checkSize(o[1]);
@@ -7947,7 +7947,7 @@
   buildCounterSizesListResponse++;
   if (buildCounterSizesListResponse < 3) {
     o.kind = "foo";
-    o.sizes = buildUnnamed1712();
+    o.sizes = buildUnnamed3307();
   }
   buildCounterSizesListResponse--;
   return o;
@@ -7957,7 +7957,7 @@
   buildCounterSizesListResponse++;
   if (buildCounterSizesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1712(o.sizes);
+    checkUnnamed3307(o.sizes);
   }
   buildCounterSizesListResponse--;
 }
@@ -8010,14 +8010,14 @@
   buildCounterSortedDimension--;
 }
 
-buildUnnamed1713() {
+buildUnnamed3308() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1713(core.List<core.String> o) {
+checkUnnamed3308(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -8029,7 +8029,7 @@
   buildCounterSubaccount++;
   if (buildCounterSubaccount < 3) {
     o.accountId = "foo";
-    o.availablePermissionIds = buildUnnamed1713();
+    o.availablePermissionIds = buildUnnamed3308();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
@@ -8042,7 +8042,7 @@
   buildCounterSubaccount++;
   if (buildCounterSubaccount < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed1713(o.availablePermissionIds);
+    checkUnnamed3308(o.availablePermissionIds);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -8050,14 +8050,14 @@
   buildCounterSubaccount--;
 }
 
-buildUnnamed1714() {
+buildUnnamed3309() {
   var o = new core.List<api.Subaccount>();
   o.add(buildSubaccount());
   o.add(buildSubaccount());
   return o;
 }
 
-checkUnnamed1714(core.List<api.Subaccount> o) {
+checkUnnamed3309(core.List<api.Subaccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubaccount(o[0]);
   checkSubaccount(o[1]);
@@ -8070,7 +8070,7 @@
   if (buildCounterSubaccountsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.subaccounts = buildUnnamed1714();
+    o.subaccounts = buildUnnamed3309();
   }
   buildCounterSubaccountsListResponse--;
   return o;
@@ -8081,7 +8081,7 @@
   if (buildCounterSubaccountsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1714(o.subaccounts);
+    checkUnnamed3309(o.subaccounts);
   }
   buildCounterSubaccountsListResponse--;
 }
@@ -8221,14 +8221,14 @@
   buildCounterTargetableRemarketingList--;
 }
 
-buildUnnamed1715() {
+buildUnnamed3310() {
   var o = new core.List<api.TargetableRemarketingList>();
   o.add(buildTargetableRemarketingList());
   o.add(buildTargetableRemarketingList());
   return o;
 }
 
-checkUnnamed1715(core.List<api.TargetableRemarketingList> o) {
+checkUnnamed3310(core.List<api.TargetableRemarketingList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetableRemarketingList(o[0]);
   checkTargetableRemarketingList(o[1]);
@@ -8241,7 +8241,7 @@
   if (buildCounterTargetableRemarketingListsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.targetableRemarketingLists = buildUnnamed1715();
+    o.targetableRemarketingLists = buildUnnamed3310();
   }
   buildCounterTargetableRemarketingListsListResponse--;
   return o;
@@ -8253,7 +8253,7 @@
   if (buildCounterTargetableRemarketingListsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1715(o.targetableRemarketingLists);
+    checkUnnamed3310(o.targetableRemarketingLists);
   }
   buildCounterTargetableRemarketingListsListResponse--;
 }
@@ -8301,14 +8301,14 @@
   buildCounterTargetingTemplate--;
 }
 
-buildUnnamed1716() {
+buildUnnamed3311() {
   var o = new core.List<api.TargetingTemplate>();
   o.add(buildTargetingTemplate());
   o.add(buildTargetingTemplate());
   return o;
 }
 
-checkUnnamed1716(core.List<api.TargetingTemplate> o) {
+checkUnnamed3311(core.List<api.TargetingTemplate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetingTemplate(o[0]);
   checkTargetingTemplate(o[1]);
@@ -8321,7 +8321,7 @@
   if (buildCounterTargetingTemplatesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.targetingTemplates = buildUnnamed1716();
+    o.targetingTemplates = buildUnnamed3311();
   }
   buildCounterTargetingTemplatesListResponse--;
   return o;
@@ -8332,84 +8332,84 @@
   if (buildCounterTargetingTemplatesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1716(o.targetingTemplates);
+    checkUnnamed3311(o.targetingTemplates);
   }
   buildCounterTargetingTemplatesListResponse--;
 }
 
-buildUnnamed1717() {
+buildUnnamed3312() {
   var o = new core.List<api.Browser>();
   o.add(buildBrowser());
   o.add(buildBrowser());
   return o;
 }
 
-checkUnnamed1717(core.List<api.Browser> o) {
+checkUnnamed3312(core.List<api.Browser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBrowser(o[0]);
   checkBrowser(o[1]);
 }
 
-buildUnnamed1718() {
+buildUnnamed3313() {
   var o = new core.List<api.ConnectionType>();
   o.add(buildConnectionType());
   o.add(buildConnectionType());
   return o;
 }
 
-checkUnnamed1718(core.List<api.ConnectionType> o) {
+checkUnnamed3313(core.List<api.ConnectionType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConnectionType(o[0]);
   checkConnectionType(o[1]);
 }
 
-buildUnnamed1719() {
+buildUnnamed3314() {
   var o = new core.List<api.MobileCarrier>();
   o.add(buildMobileCarrier());
   o.add(buildMobileCarrier());
   return o;
 }
 
-checkUnnamed1719(core.List<api.MobileCarrier> o) {
+checkUnnamed3314(core.List<api.MobileCarrier> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMobileCarrier(o[0]);
   checkMobileCarrier(o[1]);
 }
 
-buildUnnamed1720() {
+buildUnnamed3315() {
   var o = new core.List<api.OperatingSystemVersion>();
   o.add(buildOperatingSystemVersion());
   o.add(buildOperatingSystemVersion());
   return o;
 }
 
-checkUnnamed1720(core.List<api.OperatingSystemVersion> o) {
+checkUnnamed3315(core.List<api.OperatingSystemVersion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperatingSystemVersion(o[0]);
   checkOperatingSystemVersion(o[1]);
 }
 
-buildUnnamed1721() {
+buildUnnamed3316() {
   var o = new core.List<api.OperatingSystem>();
   o.add(buildOperatingSystem());
   o.add(buildOperatingSystem());
   return o;
 }
 
-checkUnnamed1721(core.List<api.OperatingSystem> o) {
+checkUnnamed3316(core.List<api.OperatingSystem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperatingSystem(o[0]);
   checkOperatingSystem(o[1]);
 }
 
-buildUnnamed1722() {
+buildUnnamed3317() {
   var o = new core.List<api.PlatformType>();
   o.add(buildPlatformType());
   o.add(buildPlatformType());
   return o;
 }
 
-checkUnnamed1722(core.List<api.PlatformType> o) {
+checkUnnamed3317(core.List<api.PlatformType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlatformType(o[0]);
   checkPlatformType(o[1]);
@@ -8420,12 +8420,12 @@
   var o = new api.TechnologyTargeting();
   buildCounterTechnologyTargeting++;
   if (buildCounterTechnologyTargeting < 3) {
-    o.browsers = buildUnnamed1717();
-    o.connectionTypes = buildUnnamed1718();
-    o.mobileCarriers = buildUnnamed1719();
-    o.operatingSystemVersions = buildUnnamed1720();
-    o.operatingSystems = buildUnnamed1721();
-    o.platformTypes = buildUnnamed1722();
+    o.browsers = buildUnnamed3312();
+    o.connectionTypes = buildUnnamed3313();
+    o.mobileCarriers = buildUnnamed3314();
+    o.operatingSystemVersions = buildUnnamed3315();
+    o.operatingSystems = buildUnnamed3316();
+    o.platformTypes = buildUnnamed3317();
   }
   buildCounterTechnologyTargeting--;
   return o;
@@ -8434,12 +8434,12 @@
 checkTechnologyTargeting(api.TechnologyTargeting o) {
   buildCounterTechnologyTargeting++;
   if (buildCounterTechnologyTargeting < 3) {
-    checkUnnamed1717(o.browsers);
-    checkUnnamed1718(o.connectionTypes);
-    checkUnnamed1719(o.mobileCarriers);
-    checkUnnamed1720(o.operatingSystemVersions);
-    checkUnnamed1721(o.operatingSystems);
-    checkUnnamed1722(o.platformTypes);
+    checkUnnamed3312(o.browsers);
+    checkUnnamed3313(o.connectionTypes);
+    checkUnnamed3314(o.mobileCarriers);
+    checkUnnamed3315(o.operatingSystemVersions);
+    checkUnnamed3316(o.operatingSystems);
+    checkUnnamed3317(o.platformTypes);
   }
   buildCounterTechnologyTargeting--;
 }
@@ -8486,14 +8486,14 @@
   buildCounterThirdPartyTrackingUrl--;
 }
 
-buildUnnamed1723() {
+buildUnnamed3318() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1723(core.List<core.int> o) {
+checkUnnamed3318(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -8504,7 +8504,7 @@
   var o = new api.TranscodeSetting();
   buildCounterTranscodeSetting++;
   if (buildCounterTranscodeSetting < 3) {
-    o.enabledVideoFormats = buildUnnamed1723();
+    o.enabledVideoFormats = buildUnnamed3318();
     o.kind = "foo";
   }
   buildCounterTranscodeSetting--;
@@ -8514,7 +8514,7 @@
 checkTranscodeSetting(api.TranscodeSetting o) {
   buildCounterTranscodeSetting++;
   if (buildCounterTranscodeSetting < 3) {
-    checkUnnamed1723(o.enabledVideoFormats);
+    checkUnnamed3318(o.enabledVideoFormats);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTranscodeSetting--;
@@ -8597,14 +8597,14 @@
   buildCounterUserProfile--;
 }
 
-buildUnnamed1724() {
+buildUnnamed3319() {
   var o = new core.List<api.UserProfile>();
   o.add(buildUserProfile());
   o.add(buildUserProfile());
   return o;
 }
 
-checkUnnamed1724(core.List<api.UserProfile> o) {
+checkUnnamed3319(core.List<api.UserProfile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserProfile(o[0]);
   checkUserProfile(o[1]);
@@ -8616,7 +8616,7 @@
   buildCounterUserProfileList++;
   if (buildCounterUserProfileList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed1724();
+    o.items = buildUnnamed3319();
     o.kind = "foo";
   }
   buildCounterUserProfileList--;
@@ -8627,20 +8627,20 @@
   buildCounterUserProfileList++;
   if (buildCounterUserProfileList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed1724(o.items);
+    checkUnnamed3319(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterUserProfileList--;
 }
 
-buildUnnamed1725() {
+buildUnnamed3320() {
   var o = new core.List<api.UserRolePermission>();
   o.add(buildUserRolePermission());
   o.add(buildUserRolePermission());
   return o;
 }
 
-checkUnnamed1725(core.List<api.UserRolePermission> o) {
+checkUnnamed3320(core.List<api.UserRolePermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserRolePermission(o[0]);
   checkUserRolePermission(o[1]);
@@ -8657,7 +8657,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.parentUserRoleId = "foo";
-    o.permissions = buildUnnamed1725();
+    o.permissions = buildUnnamed3320();
     o.subaccountId = "foo";
   }
   buildCounterUserRole--;
@@ -8673,7 +8673,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.parentUserRoleId, unittest.equals('foo'));
-    checkUnnamed1725(o.permissions);
+    checkUnnamed3320(o.permissions);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
   }
   buildCounterUserRole--;
@@ -8729,14 +8729,14 @@
   buildCounterUserRolePermissionGroup--;
 }
 
-buildUnnamed1726() {
+buildUnnamed3321() {
   var o = new core.List<api.UserRolePermissionGroup>();
   o.add(buildUserRolePermissionGroup());
   o.add(buildUserRolePermissionGroup());
   return o;
 }
 
-checkUnnamed1726(core.List<api.UserRolePermissionGroup> o) {
+checkUnnamed3321(core.List<api.UserRolePermissionGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserRolePermissionGroup(o[0]);
   checkUserRolePermissionGroup(o[1]);
@@ -8748,7 +8748,7 @@
   buildCounterUserRolePermissionGroupsListResponse++;
   if (buildCounterUserRolePermissionGroupsListResponse < 3) {
     o.kind = "foo";
-    o.userRolePermissionGroups = buildUnnamed1726();
+    o.userRolePermissionGroups = buildUnnamed3321();
   }
   buildCounterUserRolePermissionGroupsListResponse--;
   return o;
@@ -8759,19 +8759,19 @@
   buildCounterUserRolePermissionGroupsListResponse++;
   if (buildCounterUserRolePermissionGroupsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1726(o.userRolePermissionGroups);
+    checkUnnamed3321(o.userRolePermissionGroups);
   }
   buildCounterUserRolePermissionGroupsListResponse--;
 }
 
-buildUnnamed1727() {
+buildUnnamed3322() {
   var o = new core.List<api.UserRolePermission>();
   o.add(buildUserRolePermission());
   o.add(buildUserRolePermission());
   return o;
 }
 
-checkUnnamed1727(core.List<api.UserRolePermission> o) {
+checkUnnamed3322(core.List<api.UserRolePermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserRolePermission(o[0]);
   checkUserRolePermission(o[1]);
@@ -8783,7 +8783,7 @@
   buildCounterUserRolePermissionsListResponse++;
   if (buildCounterUserRolePermissionsListResponse < 3) {
     o.kind = "foo";
-    o.userRolePermissions = buildUnnamed1727();
+    o.userRolePermissions = buildUnnamed3322();
   }
   buildCounterUserRolePermissionsListResponse--;
   return o;
@@ -8793,19 +8793,19 @@
   buildCounterUserRolePermissionsListResponse++;
   if (buildCounterUserRolePermissionsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1727(o.userRolePermissions);
+    checkUnnamed3322(o.userRolePermissions);
   }
   buildCounterUserRolePermissionsListResponse--;
 }
 
-buildUnnamed1728() {
+buildUnnamed3323() {
   var o = new core.List<api.UserRole>();
   o.add(buildUserRole());
   o.add(buildUserRole());
   return o;
 }
 
-checkUnnamed1728(core.List<api.UserRole> o) {
+checkUnnamed3323(core.List<api.UserRole> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserRole(o[0]);
   checkUserRole(o[1]);
@@ -8818,7 +8818,7 @@
   if (buildCounterUserRolesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.userRoles = buildUnnamed1728();
+    o.userRoles = buildUnnamed3323();
   }
   buildCounterUserRolesListResponse--;
   return o;
@@ -8829,7 +8829,7 @@
   if (buildCounterUserRolesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1728(o.userRoles);
+    checkUnnamed3323(o.userRoles);
   }
   buildCounterUserRolesListResponse--;
 }
@@ -8861,14 +8861,14 @@
   buildCounterVideoFormat--;
 }
 
-buildUnnamed1729() {
+buildUnnamed3324() {
   var o = new core.List<api.VideoFormat>();
   o.add(buildVideoFormat());
   o.add(buildVideoFormat());
   return o;
 }
 
-checkUnnamed1729(core.List<api.VideoFormat> o) {
+checkUnnamed3324(core.List<api.VideoFormat> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoFormat(o[0]);
   checkVideoFormat(o[1]);
@@ -8880,7 +8880,7 @@
   buildCounterVideoFormatsListResponse++;
   if (buildCounterVideoFormatsListResponse < 3) {
     o.kind = "foo";
-    o.videoFormats = buildUnnamed1729();
+    o.videoFormats = buildUnnamed3324();
   }
   buildCounterVideoFormatsListResponse--;
   return o;
@@ -8890,7 +8890,7 @@
   buildCounterVideoFormatsListResponse++;
   if (buildCounterVideoFormatsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1729(o.videoFormats);
+    checkUnnamed3324(o.videoFormats);
   }
   buildCounterVideoFormatsListResponse--;
 }
@@ -8941,1145 +8941,1145 @@
   buildCounterVideoSettings--;
 }
 
-buildUnnamed1730() {
+buildUnnamed3325() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1730(core.List<core.String> o) {
+checkUnnamed3325(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1731() {
+buildUnnamed3326() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1731(core.List<core.String> o) {
+checkUnnamed3326(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1732() {
+buildUnnamed3327() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1732(core.List<core.String> o) {
+checkUnnamed3327(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1733() {
+buildUnnamed3328() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1733(core.List<core.String> o) {
+checkUnnamed3328(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1734() {
+buildUnnamed3329() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1734(core.List<core.String> o) {
+checkUnnamed3329(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1735() {
+buildUnnamed3330() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1735(core.List<core.String> o) {
+checkUnnamed3330(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1736() {
+buildUnnamed3331() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1736(core.List<core.String> o) {
+checkUnnamed3331(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1737() {
+buildUnnamed3332() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1737(core.List<core.String> o) {
+checkUnnamed3332(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1738() {
+buildUnnamed3333() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1738(core.List<core.String> o) {
+checkUnnamed3333(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1739() {
+buildUnnamed3334() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1739(core.List<core.String> o) {
+checkUnnamed3334(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1740() {
+buildUnnamed3335() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1740(core.List<core.String> o) {
+checkUnnamed3335(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1741() {
+buildUnnamed3336() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1741(core.List<core.String> o) {
+checkUnnamed3336(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1742() {
+buildUnnamed3337() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1742(core.List<core.String> o) {
+checkUnnamed3337(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1743() {
+buildUnnamed3338() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1743(core.List<core.String> o) {
+checkUnnamed3338(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1744() {
+buildUnnamed3339() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1744(core.List<core.String> o) {
+checkUnnamed3339(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1745() {
+buildUnnamed3340() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1745(core.List<core.String> o) {
+checkUnnamed3340(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1746() {
+buildUnnamed3341() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1746(core.List<core.String> o) {
+checkUnnamed3341(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1747() {
+buildUnnamed3342() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1747(core.List<core.String> o) {
+checkUnnamed3342(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1748() {
+buildUnnamed3343() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1748(core.List<core.String> o) {
+checkUnnamed3343(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1749() {
+buildUnnamed3344() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1749(core.List<core.String> o) {
+checkUnnamed3344(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1750() {
+buildUnnamed3345() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1750(core.List<core.String> o) {
+checkUnnamed3345(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1751() {
+buildUnnamed3346() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1751(core.List<core.String> o) {
+checkUnnamed3346(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1752() {
+buildUnnamed3347() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1752(core.List<core.String> o) {
+checkUnnamed3347(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1753() {
+buildUnnamed3348() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1753(core.List<core.String> o) {
+checkUnnamed3348(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1754() {
+buildUnnamed3349() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1754(core.List<core.String> o) {
+checkUnnamed3349(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1755() {
+buildUnnamed3350() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1755(core.List<core.String> o) {
+checkUnnamed3350(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1756() {
+buildUnnamed3351() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1756(core.List<core.String> o) {
+checkUnnamed3351(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1757() {
+buildUnnamed3352() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1757(core.List<core.String> o) {
+checkUnnamed3352(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1758() {
+buildUnnamed3353() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1758(core.List<core.String> o) {
+checkUnnamed3353(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1759() {
+buildUnnamed3354() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1759(core.List<core.String> o) {
+checkUnnamed3354(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1760() {
+buildUnnamed3355() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1760(core.List<core.String> o) {
+checkUnnamed3355(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1761() {
+buildUnnamed3356() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1761(core.List<core.String> o) {
+checkUnnamed3356(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1762() {
+buildUnnamed3357() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1762(core.List<core.String> o) {
+checkUnnamed3357(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1763() {
+buildUnnamed3358() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1763(core.List<core.String> o) {
+checkUnnamed3358(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1764() {
+buildUnnamed3359() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1764(core.List<core.String> o) {
+checkUnnamed3359(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1765() {
+buildUnnamed3360() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1765(core.List<core.String> o) {
+checkUnnamed3360(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1766() {
+buildUnnamed3361() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1766(core.List<core.String> o) {
+checkUnnamed3361(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1767() {
+buildUnnamed3362() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1767(core.List<core.String> o) {
+checkUnnamed3362(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1768() {
+buildUnnamed3363() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1768(core.List<core.String> o) {
+checkUnnamed3363(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1769() {
+buildUnnamed3364() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1769(core.List<core.String> o) {
+checkUnnamed3364(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1770() {
+buildUnnamed3365() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1770(core.List<core.String> o) {
+checkUnnamed3365(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1771() {
+buildUnnamed3366() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1771(core.List<core.String> o) {
+checkUnnamed3366(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1772() {
+buildUnnamed3367() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1772(core.List<core.String> o) {
+checkUnnamed3367(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1773() {
+buildUnnamed3368() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1773(core.List<core.String> o) {
+checkUnnamed3368(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1774() {
+buildUnnamed3369() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1774(core.List<core.String> o) {
+checkUnnamed3369(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1775() {
+buildUnnamed3370() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1775(core.List<core.String> o) {
+checkUnnamed3370(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1776() {
+buildUnnamed3371() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1776(core.List<core.String> o) {
+checkUnnamed3371(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1777() {
+buildUnnamed3372() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1777(core.List<core.String> o) {
+checkUnnamed3372(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1778() {
+buildUnnamed3373() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1778(core.List<core.String> o) {
+checkUnnamed3373(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1779() {
+buildUnnamed3374() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1779(core.List<core.String> o) {
+checkUnnamed3374(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1780() {
+buildUnnamed3375() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1780(core.List<core.String> o) {
+checkUnnamed3375(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1781() {
+buildUnnamed3376() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1781(core.List<core.String> o) {
+checkUnnamed3376(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1782() {
+buildUnnamed3377() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1782(core.List<core.String> o) {
+checkUnnamed3377(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1783() {
+buildUnnamed3378() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1783(core.List<core.String> o) {
+checkUnnamed3378(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1784() {
+buildUnnamed3379() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1784(core.List<core.String> o) {
+checkUnnamed3379(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1785() {
+buildUnnamed3380() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1785(core.List<core.String> o) {
+checkUnnamed3380(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1786() {
+buildUnnamed3381() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1786(core.List<core.String> o) {
+checkUnnamed3381(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1787() {
+buildUnnamed3382() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1787(core.List<core.String> o) {
+checkUnnamed3382(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1788() {
+buildUnnamed3383() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1788(core.List<core.String> o) {
+checkUnnamed3383(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1789() {
+buildUnnamed3384() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1789(core.List<core.String> o) {
+checkUnnamed3384(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1790() {
+buildUnnamed3385() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1790(core.List<core.String> o) {
+checkUnnamed3385(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1791() {
+buildUnnamed3386() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1791(core.List<core.String> o) {
+checkUnnamed3386(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1792() {
+buildUnnamed3387() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1792(core.List<core.String> o) {
+checkUnnamed3387(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1793() {
+buildUnnamed3388() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1793(core.List<core.String> o) {
+checkUnnamed3388(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1794() {
+buildUnnamed3389() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1794(core.List<core.String> o) {
+checkUnnamed3389(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1795() {
+buildUnnamed3390() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1795(core.List<core.String> o) {
+checkUnnamed3390(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1796() {
+buildUnnamed3391() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1796(core.List<core.String> o) {
+checkUnnamed3391(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1797() {
+buildUnnamed3392() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1797(core.List<core.String> o) {
+checkUnnamed3392(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1798() {
+buildUnnamed3393() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1798(core.List<core.String> o) {
+checkUnnamed3393(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1799() {
+buildUnnamed3394() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1799(core.List<core.String> o) {
+checkUnnamed3394(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1800() {
+buildUnnamed3395() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1800(core.List<core.String> o) {
+checkUnnamed3395(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1801() {
+buildUnnamed3396() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1801(core.List<core.String> o) {
+checkUnnamed3396(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1802() {
+buildUnnamed3397() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1802(core.List<core.String> o) {
+checkUnnamed3397(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1803() {
+buildUnnamed3398() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1803(core.List<core.String> o) {
+checkUnnamed3398(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1804() {
+buildUnnamed3399() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1804(core.List<core.String> o) {
+checkUnnamed3399(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1805() {
+buildUnnamed3400() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1805(core.List<core.String> o) {
+checkUnnamed3400(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1806() {
+buildUnnamed3401() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1806(core.List<core.String> o) {
+checkUnnamed3401(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1807() {
+buildUnnamed3402() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1807(core.List<core.String> o) {
+checkUnnamed3402(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1808() {
+buildUnnamed3403() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1808(core.List<core.String> o) {
+checkUnnamed3403(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1809() {
+buildUnnamed3404() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1809(core.List<core.String> o) {
+checkUnnamed3404(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1810() {
+buildUnnamed3405() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1810(core.List<core.String> o) {
+checkUnnamed3405(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1811() {
+buildUnnamed3406() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1811(core.List<core.String> o) {
+checkUnnamed3406(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1812() {
+buildUnnamed3407() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1812(core.List<core.String> o) {
+checkUnnamed3407(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1813() {
+buildUnnamed3408() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1813(core.List<core.String> o) {
+checkUnnamed3408(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1814() {
+buildUnnamed3409() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1814(core.List<core.String> o) {
+checkUnnamed3409(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1815() {
+buildUnnamed3410() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1815(core.List<core.String> o) {
+checkUnnamed3410(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1816() {
+buildUnnamed3411() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1816(core.List<core.String> o) {
+checkUnnamed3411(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1817() {
+buildUnnamed3412() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1817(core.List<core.String> o) {
+checkUnnamed3412(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -11922,7 +11922,7 @@
       }), true);
       res
           .get(arg_profileId, arg_summaryAccountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountActiveAdSummary response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountActiveAdSummary(response);
       })));
     });
@@ -11991,7 +11991,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountPermissionGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountPermissionGroup(response);
       })));
     });
@@ -12053,8 +12053,9 @@
             convert.JSON.encode(buildAccountPermissionGroupsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.AccountPermissionGroupsListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkAccountPermissionGroupsListResponse(response);
       })));
     });
@@ -12123,7 +12124,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountPermission response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountPermission(response);
       })));
     });
@@ -12184,8 +12185,9 @@
         var resp = convert.JSON.encode(buildAccountPermissionsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.AccountPermissionsListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkAccountPermissionsListResponse(response);
       })));
     });
@@ -12254,7 +12256,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountUserProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountUserProfile(response);
       })));
     });
@@ -12321,7 +12323,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountUserProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountUserProfile(response);
       })));
     });
@@ -12332,7 +12334,7 @@
           new api.DfareportingApi(mock).accountUserProfiles;
       var arg_profileId = "foo";
       var arg_active = true;
-      var arg_ids = buildUnnamed1730();
+      var arg_ids = buildUnnamed3325();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -12420,8 +12422,7 @@
               subaccountId: arg_subaccountId,
               userRoleId: arg_userRoleId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AccountUserProfilesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountUserProfilesListResponse(response);
       })));
     });
@@ -12490,7 +12491,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountUserProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountUserProfile(response);
       })));
     });
@@ -12557,7 +12558,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountUserProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountUserProfile(response);
       })));
     });
@@ -12625,7 +12626,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -12635,7 +12636,7 @@
       api.AccountsResourceApi res = new api.DfareportingApi(mock).accounts;
       var arg_profileId = "foo";
       var arg_active = true;
-      var arg_ids = buildUnnamed1731();
+      var arg_ids = buildUnnamed3326();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -12715,7 +12716,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountsListResponse(response);
       })));
     });
@@ -12783,7 +12784,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -12849,7 +12850,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -12917,7 +12918,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Ad response) {
+          .then(unittest.expectAsync1(((response) {
         checkAd(response);
       })));
     });
@@ -12983,7 +12984,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Ad response) {
+          .then(unittest.expectAsync1(((response) {
         checkAd(response);
       })));
     });
@@ -12995,26 +12996,26 @@
       var arg_active = true;
       var arg_advertiserId = "foo";
       var arg_archived = true;
-      var arg_audienceSegmentIds = buildUnnamed1732();
-      var arg_campaignIds = buildUnnamed1733();
+      var arg_audienceSegmentIds = buildUnnamed3327();
+      var arg_campaignIds = buildUnnamed3328();
       var arg_compatibility = "foo";
-      var arg_creativeIds = buildUnnamed1734();
-      var arg_creativeOptimizationConfigurationIds = buildUnnamed1735();
+      var arg_creativeIds = buildUnnamed3329();
+      var arg_creativeOptimizationConfigurationIds = buildUnnamed3330();
       var arg_dynamicClickTracker = true;
-      var arg_ids = buildUnnamed1736();
-      var arg_landingPageIds = buildUnnamed1737();
+      var arg_ids = buildUnnamed3331();
+      var arg_landingPageIds = buildUnnamed3332();
       var arg_maxResults = 42;
       var arg_overriddenEventTagId = "foo";
       var arg_pageToken = "foo";
-      var arg_placementIds = buildUnnamed1738();
-      var arg_remarketingListIds = buildUnnamed1739();
+      var arg_placementIds = buildUnnamed3333();
+      var arg_remarketingListIds = buildUnnamed3334();
       var arg_searchString = "foo";
-      var arg_sizeIds = buildUnnamed1740();
+      var arg_sizeIds = buildUnnamed3335();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_sslCompliant = true;
       var arg_sslRequired = true;
-      var arg_type = buildUnnamed1741();
+      var arg_type = buildUnnamed3336();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -13136,7 +13137,7 @@
               sslRequired: arg_sslRequired,
               type: arg_type,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdsListResponse(response);
       })));
     });
@@ -13204,7 +13205,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Ad response) {
+          .then(unittest.expectAsync1(((response) {
         checkAd(response);
       })));
     });
@@ -13270,7 +13271,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Ad response) {
+          .then(unittest.expectAsync1(((response) {
         checkAd(response);
       })));
     });
@@ -13404,7 +13405,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdvertiserGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiserGroup(response);
       })));
     });
@@ -13471,7 +13472,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdvertiserGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiserGroup(response);
       })));
     });
@@ -13481,7 +13482,7 @@
       api.AdvertiserGroupsResourceApi res =
           new api.DfareportingApi(mock).advertiserGroups;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed1742();
+      var arg_ids = buildUnnamed3337();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -13558,8 +13559,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AdvertiserGroupsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiserGroupsListResponse(response);
       })));
     });
@@ -13628,7 +13628,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdvertiserGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiserGroup(response);
       })));
     });
@@ -13695,7 +13695,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdvertiserGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiserGroup(response);
       })));
     });
@@ -13764,7 +13764,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Advertiser response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiser(response);
       })));
     });
@@ -13831,7 +13831,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Advertiser response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiser(response);
       })));
     });
@@ -13841,9 +13841,9 @@
       api.AdvertisersResourceApi res =
           new api.DfareportingApi(mock).advertisers;
       var arg_profileId = "foo";
-      var arg_advertiserGroupIds = buildUnnamed1743();
-      var arg_floodlightConfigurationIds = buildUnnamed1744();
-      var arg_ids = buildUnnamed1745();
+      var arg_advertiserGroupIds = buildUnnamed3338();
+      var arg_floodlightConfigurationIds = buildUnnamed3339();
+      var arg_ids = buildUnnamed3340();
       var arg_includeAdvertisersWithoutGroupsOnly = true;
       var arg_maxResults = 42;
       var arg_onlyParent = true;
@@ -13942,7 +13942,7 @@
               status: arg_status,
               subaccountId: arg_subaccountId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdvertisersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertisersListResponse(response);
       })));
     });
@@ -14011,7 +14011,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Advertiser response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiser(response);
       })));
     });
@@ -14078,7 +14078,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Advertiser response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiser(response);
       })));
     });
@@ -14142,7 +14142,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BrowsersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBrowsersListResponse(response);
       })));
     });
@@ -14222,8 +14222,7 @@
       res
           .insert(arg_request, arg_profileId, arg_campaignId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.CampaignCreativeAssociation response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaignCreativeAssociation(response);
       })));
     });
@@ -14310,8 +14309,7 @@
               pageToken: arg_pageToken,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.CampaignCreativeAssociationsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaignCreativeAssociationsListResponse(response);
       })));
     });
@@ -14379,7 +14377,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Campaign response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaign(response);
       })));
     });
@@ -14453,7 +14451,7 @@
           .insert(arg_request, arg_profileId, arg_defaultLandingPageName,
               arg_defaultLandingPageUrl,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Campaign response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaign(response);
       })));
     });
@@ -14462,12 +14460,12 @@
       var mock = new HttpServerMock();
       api.CampaignsResourceApi res = new api.DfareportingApi(mock).campaigns;
       var arg_profileId = "foo";
-      var arg_advertiserGroupIds = buildUnnamed1746();
-      var arg_advertiserIds = buildUnnamed1747();
+      var arg_advertiserGroupIds = buildUnnamed3341();
+      var arg_advertiserIds = buildUnnamed3342();
       var arg_archived = true;
       var arg_atLeastOneOptimizationActivity = true;
-      var arg_excludedIds = buildUnnamed1748();
-      var arg_ids = buildUnnamed1749();
+      var arg_excludedIds = buildUnnamed3343();
+      var arg_ids = buildUnnamed3344();
       var arg_maxResults = 42;
       var arg_overriddenEventTagId = "foo";
       var arg_pageToken = "foo";
@@ -14568,7 +14566,7 @@
               sortOrder: arg_sortOrder,
               subaccountId: arg_subaccountId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CampaignsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaignsListResponse(response);
       })));
     });
@@ -14636,7 +14634,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Campaign response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaign(response);
       })));
     });
@@ -14702,7 +14700,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Campaign response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaign(response);
       })));
     });
@@ -14770,7 +14768,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChangeLog response) {
+          .then(unittest.expectAsync1(((response) {
         checkChangeLog(response);
       })));
     });
@@ -14780,15 +14778,15 @@
       api.ChangeLogsResourceApi res = new api.DfareportingApi(mock).changeLogs;
       var arg_profileId = "foo";
       var arg_action = "foo";
-      var arg_ids = buildUnnamed1750();
+      var arg_ids = buildUnnamed3345();
       var arg_maxChangeTime = "foo";
       var arg_maxResults = 42;
       var arg_minChangeTime = "foo";
-      var arg_objectIds = buildUnnamed1751();
+      var arg_objectIds = buildUnnamed3346();
       var arg_objectType = "foo";
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
-      var arg_userProfileIds = buildUnnamed1752();
+      var arg_userProfileIds = buildUnnamed3347();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -14870,7 +14868,7 @@
               searchString: arg_searchString,
               userProfileIds: arg_userProfileIds,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChangeLogsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkChangeLogsListResponse(response);
       })));
     });
@@ -14881,10 +14879,10 @@
       var mock = new HttpServerMock();
       api.CitiesResourceApi res = new api.DfareportingApi(mock).cities;
       var arg_profileId = "foo";
-      var arg_countryDartIds = buildUnnamed1753();
-      var arg_dartIds = buildUnnamed1754();
+      var arg_countryDartIds = buildUnnamed3348();
+      var arg_dartIds = buildUnnamed3349();
       var arg_namePrefix = "foo";
-      var arg_regionDartIds = buildUnnamed1755();
+      var arg_regionDartIds = buildUnnamed3350();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -14950,7 +14948,7 @@
               namePrefix: arg_namePrefix,
               regionDartIds: arg_regionDartIds,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CitiesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCitiesListResponse(response);
       })));
     });
@@ -15019,7 +15017,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ConnectionType response) {
+          .then(unittest.expectAsync1(((response) {
         checkConnectionType(response);
       })));
     });
@@ -15080,8 +15078,9 @@
         var resp = convert.JSON.encode(buildConnectionTypesListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ConnectionTypesListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkConnectionTypesListResponse(response);
       })));
     });
@@ -15215,7 +15214,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContentCategory response) {
+          .then(unittest.expectAsync1(((response) {
         checkContentCategory(response);
       })));
     });
@@ -15282,7 +15281,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContentCategory response) {
+          .then(unittest.expectAsync1(((response) {
         checkContentCategory(response);
       })));
     });
@@ -15292,7 +15291,7 @@
       api.ContentCategoriesResourceApi res =
           new api.DfareportingApi(mock).contentCategories;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed1756();
+      var arg_ids = buildUnnamed3351();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -15369,8 +15368,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ContentCategoriesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkContentCategoriesListResponse(response);
       })));
     });
@@ -15439,7 +15437,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContentCategory response) {
+          .then(unittest.expectAsync1(((response) {
         checkContentCategory(response);
       })));
     });
@@ -15506,7 +15504,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContentCategory response) {
+          .then(unittest.expectAsync1(((response) {
         checkContentCategory(response);
       })));
     });
@@ -15573,8 +15571,9 @@
         var resp = convert.JSON.encode(buildConversionsBatchInsertResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchinsert(arg_request, arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ConversionsBatchInsertResponse response) {
+      res
+          .batchinsert(arg_request, arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkConversionsBatchInsertResponse(response);
       })));
     });
@@ -15639,8 +15638,9 @@
         var resp = convert.JSON.encode(buildConversionsBatchUpdateResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchupdate(arg_request, arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ConversionsBatchUpdateResponse response) {
+      res
+          .batchupdate(arg_request, arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkConversionsBatchUpdateResponse(response);
       })));
     });
@@ -15708,7 +15708,7 @@
       }), true);
       res
           .get(arg_profileId, arg_dartId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Country response) {
+          .then(unittest.expectAsync1(((response) {
         checkCountry(response);
       })));
     });
@@ -15770,7 +15770,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CountriesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCountriesListResponse(response);
       })));
     });
@@ -15853,7 +15853,7 @@
       res
           .insert(arg_request, arg_profileId, arg_advertiserId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeAssetMetadata response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeAssetMetadata(response);
       })));
     });
@@ -16008,7 +16008,7 @@
       }), true);
       res
           .get(arg_profileId, arg_creativeFieldId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeFieldValue response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeFieldValue(response);
       })));
     });
@@ -16086,7 +16086,7 @@
       res
           .insert(arg_request, arg_profileId, arg_creativeFieldId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeFieldValue response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeFieldValue(response);
       })));
     });
@@ -16097,7 +16097,7 @@
           new api.DfareportingApi(mock).creativeFieldValues;
       var arg_profileId = "foo";
       var arg_creativeFieldId = "foo";
-      var arg_ids = buildUnnamed1757();
+      var arg_ids = buildUnnamed3352();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -16183,8 +16183,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.CreativeFieldValuesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeFieldValuesListResponse(response);
       })));
     });
@@ -16264,7 +16263,7 @@
       res
           .patch(arg_request, arg_profileId, arg_creativeFieldId, arg_id,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeFieldValue response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeFieldValue(response);
       })));
     });
@@ -16342,7 +16341,7 @@
       res
           .update(arg_request, arg_profileId, arg_creativeFieldId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeFieldValue response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeFieldValue(response);
       })));
     });
@@ -16476,7 +16475,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeField response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeField(response);
       })));
     });
@@ -16543,7 +16542,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeField response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeField(response);
       })));
     });
@@ -16553,8 +16552,8 @@
       api.CreativeFieldsResourceApi res =
           new api.DfareportingApi(mock).creativeFields;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed1758();
-      var arg_ids = buildUnnamed1759();
+      var arg_advertiserIds = buildUnnamed3353();
+      var arg_ids = buildUnnamed3354();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -16634,8 +16633,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.CreativeFieldsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeFieldsListResponse(response);
       })));
     });
@@ -16704,7 +16702,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeField response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeField(response);
       })));
     });
@@ -16771,7 +16769,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeField response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeField(response);
       })));
     });
@@ -16840,7 +16838,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeGroup(response);
       })));
     });
@@ -16907,7 +16905,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeGroup(response);
       })));
     });
@@ -16917,9 +16915,9 @@
       api.CreativeGroupsResourceApi res =
           new api.DfareportingApi(mock).creativeGroups;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed1760();
+      var arg_advertiserIds = buildUnnamed3355();
       var arg_groupNumber = 42;
-      var arg_ids = buildUnnamed1761();
+      var arg_ids = buildUnnamed3356();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -17002,8 +17000,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.CreativeGroupsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeGroupsListResponse(response);
       })));
     });
@@ -17072,7 +17069,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeGroup(response);
       })));
     });
@@ -17139,7 +17136,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeGroup(response);
       })));
     });
@@ -17207,7 +17204,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -17273,7 +17270,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -17286,18 +17283,18 @@
       var arg_advertiserId = "foo";
       var arg_archived = true;
       var arg_campaignId = "foo";
-      var arg_companionCreativeIds = buildUnnamed1762();
-      var arg_creativeFieldIds = buildUnnamed1763();
-      var arg_ids = buildUnnamed1764();
+      var arg_companionCreativeIds = buildUnnamed3357();
+      var arg_creativeFieldIds = buildUnnamed3358();
+      var arg_ids = buildUnnamed3359();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      var arg_renderingIds = buildUnnamed1765();
+      var arg_renderingIds = buildUnnamed3360();
       var arg_searchString = "foo";
-      var arg_sizeIds = buildUnnamed1766();
+      var arg_sizeIds = buildUnnamed3361();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_studioCreativeId = "foo";
-      var arg_types = buildUnnamed1767();
+      var arg_types = buildUnnamed3362();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -17397,7 +17394,7 @@
               studioCreativeId: arg_studioCreativeId,
               types: arg_types,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativesListResponse(response);
       })));
     });
@@ -17465,7 +17462,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -17531,7 +17528,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -17609,7 +17606,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DimensionValueList response) {
+          .then(unittest.expectAsync1(((response) {
         checkDimensionValueList(response);
       })));
     });
@@ -17678,7 +17675,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DirectorySiteContact response) {
+          .then(unittest.expectAsync1(((response) {
         checkDirectorySiteContact(response);
       })));
     });
@@ -17688,8 +17685,8 @@
       api.DirectorySiteContactsResourceApi res =
           new api.DfareportingApi(mock).directorySiteContacts;
       var arg_profileId = "foo";
-      var arg_directorySiteIds = buildUnnamed1768();
-      var arg_ids = buildUnnamed1769();
+      var arg_directorySiteIds = buildUnnamed3363();
+      var arg_ids = buildUnnamed3364();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -17770,8 +17767,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.DirectorySiteContactsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDirectorySiteContactsListResponse(response);
       })));
     });
@@ -17840,7 +17836,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DirectorySite response) {
+          .then(unittest.expectAsync1(((response) {
         checkDirectorySite(response);
       })));
     });
@@ -17907,7 +17903,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DirectorySite response) {
+          .then(unittest.expectAsync1(((response) {
         checkDirectorySite(response);
       })));
     });
@@ -17923,7 +17919,7 @@
       var arg_active = true;
       var arg_countryId = "foo";
       var arg_dfpNetworkCode = "foo";
-      var arg_ids = buildUnnamed1770();
+      var arg_ids = buildUnnamed3365();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_parentId = "foo";
@@ -18024,8 +18020,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.DirectorySitesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDirectorySitesListResponse(response);
       })));
     });
@@ -18165,7 +18160,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DynamicTargetingKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkDynamicTargetingKey(response);
       })));
     });
@@ -18176,7 +18171,7 @@
           new api.DfareportingApi(mock).dynamicTargetingKeys;
       var arg_profileId = "foo";
       var arg_advertiserId = "foo";
-      var arg_names = buildUnnamed1771();
+      var arg_names = buildUnnamed3366();
       var arg_objectId = "foo";
       var arg_objectType = "foo";
       var arg_$fields = "foo";
@@ -18244,8 +18239,7 @@
               objectId: arg_objectId,
               objectType: arg_objectType,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.DynamicTargetingKeysListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDynamicTargetingKeysListResponse(response);
       })));
     });
@@ -18377,7 +18371,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EventTag response) {
+          .then(unittest.expectAsync1(((response) {
         checkEventTag(response);
       })));
     });
@@ -18443,7 +18437,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EventTag response) {
+          .then(unittest.expectAsync1(((response) {
         checkEventTag(response);
       })));
     });
@@ -18457,8 +18451,8 @@
       var arg_campaignId = "foo";
       var arg_definitionsOnly = true;
       var arg_enabled = true;
-      var arg_eventTagTypes = buildUnnamed1772();
-      var arg_ids = buildUnnamed1773();
+      var arg_eventTagTypes = buildUnnamed3367();
+      var arg_ids = buildUnnamed3368();
       var arg_searchString = "foo";
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
@@ -18544,7 +18538,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EventTagsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkEventTagsListResponse(response);
       })));
     });
@@ -18612,7 +18606,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EventTag response) {
+          .then(unittest.expectAsync1(((response) {
         checkEventTag(response);
       })));
     });
@@ -18678,7 +18672,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EventTag response) {
+          .then(unittest.expectAsync1(((response) {
         checkEventTag(response);
       })));
     });
@@ -18749,7 +18743,7 @@
       }), true);
       res
           .get(arg_reportId, arg_fileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -18831,7 +18825,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FileList response) {
+          .then(unittest.expectAsync1(((response) {
         checkFileList(response);
       })));
     });
@@ -18967,8 +18961,7 @@
           .generatetag(arg_profileId,
               floodlightActivityId: arg_floodlightActivityId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.FloodlightActivitiesGenerateTagResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivitiesGenerateTagResponse(response);
       })));
     });
@@ -19035,7 +19028,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivity response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivity(response);
       })));
     });
@@ -19102,7 +19095,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivity response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivity(response);
       })));
     });
@@ -19113,12 +19106,12 @@
           new api.DfareportingApi(mock).floodlightActivities;
       var arg_profileId = "foo";
       var arg_advertiserId = "foo";
-      var arg_floodlightActivityGroupIds = buildUnnamed1774();
+      var arg_floodlightActivityGroupIds = buildUnnamed3369();
       var arg_floodlightActivityGroupName = "foo";
       var arg_floodlightActivityGroupTagString = "foo";
       var arg_floodlightActivityGroupType = "foo";
       var arg_floodlightConfigurationId = "foo";
-      var arg_ids = buildUnnamed1775();
+      var arg_ids = buildUnnamed3370();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -19218,8 +19211,7 @@
               sortOrder: arg_sortOrder,
               tagString: arg_tagString,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.FloodlightActivitiesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivitiesListResponse(response);
       })));
     });
@@ -19288,7 +19280,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivity response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivity(response);
       })));
     });
@@ -19355,7 +19347,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivity response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivity(response);
       })));
     });
@@ -19424,7 +19416,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivityGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivityGroup(response);
       })));
     });
@@ -19491,7 +19483,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivityGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivityGroup(response);
       })));
     });
@@ -19503,7 +19495,7 @@
       var arg_profileId = "foo";
       var arg_advertiserId = "foo";
       var arg_floodlightConfigurationId = "foo";
-      var arg_ids = buildUnnamed1776();
+      var arg_ids = buildUnnamed3371();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -19590,8 +19582,7 @@
               sortOrder: arg_sortOrder,
               type: arg_type,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.FloodlightActivityGroupsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivityGroupsListResponse(response);
       })));
     });
@@ -19660,7 +19651,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivityGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivityGroup(response);
       })));
     });
@@ -19727,7 +19718,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivityGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivityGroup(response);
       })));
     });
@@ -19796,7 +19787,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightConfiguration(response);
       })));
     });
@@ -19806,7 +19797,7 @@
       api.FloodlightConfigurationsResourceApi res =
           new api.DfareportingApi(mock).floodlightConfigurations;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed1777();
+      var arg_ids = buildUnnamed3372();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -19860,8 +19851,9 @@
             convert.JSON.encode(buildFloodlightConfigurationsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, ids: arg_ids, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.FloodlightConfigurationsListResponse response) {
+      res
+          .list(arg_profileId, ids: arg_ids, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightConfigurationsListResponse(response);
       })));
     });
@@ -19930,7 +19922,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightConfiguration(response);
       })));
     });
@@ -19997,7 +19989,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightConfiguration(response);
       })));
     });
@@ -20076,7 +20068,7 @@
       }), true);
       res
           .get(arg_profileId, arg_projectId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InventoryItem response) {
+          .then(unittest.expectAsync1(((response) {
         checkInventoryItem(response);
       })));
     });
@@ -20087,12 +20079,12 @@
           new api.DfareportingApi(mock).inventoryItems;
       var arg_profileId = "foo";
       var arg_projectId = "foo";
-      var arg_ids = buildUnnamed1778();
+      var arg_ids = buildUnnamed3373();
       var arg_inPlan = true;
       var arg_maxResults = 42;
-      var arg_orderId = buildUnnamed1779();
+      var arg_orderId = buildUnnamed3374();
       var arg_pageToken = "foo";
-      var arg_siteId = buildUnnamed1780();
+      var arg_siteId = buildUnnamed3375();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_type = "foo";
@@ -20182,8 +20174,7 @@
               sortOrder: arg_sortOrder,
               type: arg_type,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.InventoryItemsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInventoryItemsListResponse(response);
       })));
     });
@@ -20337,7 +20328,7 @@
       }), true);
       res
           .get(arg_profileId, arg_campaignId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LandingPage response) {
+          .then(unittest.expectAsync1(((response) {
         checkLandingPage(response);
       })));
     });
@@ -20415,7 +20406,7 @@
       res
           .insert(arg_request, arg_profileId, arg_campaignId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LandingPage response) {
+          .then(unittest.expectAsync1(((response) {
         checkLandingPage(response);
       })));
     });
@@ -20488,7 +20479,7 @@
       }), true);
       res
           .list(arg_profileId, arg_campaignId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LandingPagesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLandingPagesListResponse(response);
       })));
     });
@@ -20568,7 +20559,7 @@
       res
           .patch(arg_request, arg_profileId, arg_campaignId, arg_id,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LandingPage response) {
+          .then(unittest.expectAsync1(((response) {
         checkLandingPage(response);
       })));
     });
@@ -20646,7 +20637,7 @@
       res
           .update(arg_request, arg_profileId, arg_campaignId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LandingPage response) {
+          .then(unittest.expectAsync1(((response) {
         checkLandingPage(response);
       })));
     });
@@ -20710,7 +20701,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LanguagesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLanguagesListResponse(response);
       })));
     });
@@ -20774,7 +20765,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MetrosListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkMetrosListResponse(response);
       })));
     });
@@ -20843,7 +20834,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MobileCarrier response) {
+          .then(unittest.expectAsync1(((response) {
         checkMobileCarrier(response);
       })));
     });
@@ -20904,8 +20895,9 @@
         var resp = convert.JSON.encode(buildMobileCarriersListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.MobileCarriersListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkMobileCarriersListResponse(response);
       })));
     });
@@ -20974,7 +20966,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperatingSystemVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperatingSystemVersion(response);
       })));
     });
@@ -21036,8 +21028,9 @@
             convert.JSON.encode(buildOperatingSystemVersionsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.OperatingSystemVersionsListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkOperatingSystemVersionsListResponse(response);
       })));
     });
@@ -21106,7 +21099,7 @@
       }), true);
       res
           .get(arg_profileId, arg_dartId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperatingSystem response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperatingSystem(response);
       })));
     });
@@ -21167,8 +21160,9 @@
         var resp = convert.JSON.encode(buildOperatingSystemsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.OperatingSystemsListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkOperatingSystemsListResponse(response);
       })));
     });
@@ -21247,7 +21241,7 @@
       }), true);
       res
           .get(arg_profileId, arg_projectId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrderDocument response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrderDocument(response);
       })));
     });
@@ -21259,12 +21253,12 @@
       var arg_profileId = "foo";
       var arg_projectId = "foo";
       var arg_approved = true;
-      var arg_ids = buildUnnamed1781();
+      var arg_ids = buildUnnamed3376();
       var arg_maxResults = 42;
-      var arg_orderId = buildUnnamed1782();
+      var arg_orderId = buildUnnamed3377();
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
-      var arg_siteId = buildUnnamed1783();
+      var arg_siteId = buildUnnamed3378();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_$fields = "foo";
@@ -21354,8 +21348,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.OrderDocumentsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrderDocumentsListResponse(response);
       })));
     });
@@ -21433,7 +21426,7 @@
       }), true);
       res
           .get(arg_profileId, arg_projectId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Order response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrder(response);
       })));
     });
@@ -21443,11 +21436,11 @@
       api.OrdersResourceApi res = new api.DfareportingApi(mock).orders;
       var arg_profileId = "foo";
       var arg_projectId = "foo";
-      var arg_ids = buildUnnamed1784();
+      var arg_ids = buildUnnamed3379();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
-      var arg_siteId = buildUnnamed1785();
+      var arg_siteId = buildUnnamed3380();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_$fields = "foo";
@@ -21532,7 +21525,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrdersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersListResponse(response);
       })));
     });
@@ -21601,7 +21594,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementGroup(response);
       })));
     });
@@ -21668,7 +21661,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementGroup(response);
       })));
     });
@@ -21678,12 +21671,12 @@
       api.PlacementGroupsResourceApi res =
           new api.DfareportingApi(mock).placementGroups;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed1786();
+      var arg_advertiserIds = buildUnnamed3381();
       var arg_archived = true;
-      var arg_campaignIds = buildUnnamed1787();
-      var arg_contentCategoryIds = buildUnnamed1788();
-      var arg_directorySiteIds = buildUnnamed1789();
-      var arg_ids = buildUnnamed1790();
+      var arg_campaignIds = buildUnnamed3382();
+      var arg_contentCategoryIds = buildUnnamed3383();
+      var arg_directorySiteIds = buildUnnamed3384();
+      var arg_ids = buildUnnamed3385();
       var arg_maxEndDate = "foo";
       var arg_maxResults = 42;
       var arg_maxStartDate = "foo";
@@ -21691,10 +21684,10 @@
       var arg_minStartDate = "foo";
       var arg_pageToken = "foo";
       var arg_placementGroupType = "foo";
-      var arg_placementStrategyIds = buildUnnamed1791();
-      var arg_pricingTypes = buildUnnamed1792();
+      var arg_placementStrategyIds = buildUnnamed3386();
+      var arg_pricingTypes = buildUnnamed3387();
       var arg_searchString = "foo";
-      var arg_siteIds = buildUnnamed1793();
+      var arg_siteIds = buildUnnamed3388();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_$fields = "foo";
@@ -21806,8 +21799,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.PlacementGroupsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementGroupsListResponse(response);
       })));
     });
@@ -21876,7 +21868,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementGroup(response);
       })));
     });
@@ -21943,7 +21935,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementGroup(response);
       })));
     });
@@ -22077,7 +22069,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementStrategy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementStrategy(response);
       })));
     });
@@ -22144,7 +22136,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementStrategy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementStrategy(response);
       })));
     });
@@ -22154,7 +22146,7 @@
       api.PlacementStrategiesResourceApi res =
           new api.DfareportingApi(mock).placementStrategies;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed1794();
+      var arg_ids = buildUnnamed3389();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -22231,8 +22223,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.PlacementStrategiesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementStrategiesListResponse(response);
       })));
     });
@@ -22301,7 +22292,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementStrategy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementStrategy(response);
       })));
     });
@@ -22368,7 +22359,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementStrategy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementStrategy(response);
       })));
     });
@@ -22380,8 +22371,8 @@
       api.PlacementsResourceApi res = new api.DfareportingApi(mock).placements;
       var arg_profileId = "foo";
       var arg_campaignId = "foo";
-      var arg_placementIds = buildUnnamed1795();
-      var arg_tagFormats = buildUnnamed1796();
+      var arg_placementIds = buildUnnamed3390();
+      var arg_tagFormats = buildUnnamed3391();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -22445,8 +22436,7 @@
               placementIds: arg_placementIds,
               tagFormats: arg_tagFormats,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.PlacementsGenerateTagsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementsGenerateTagsResponse(response);
       })));
     });
@@ -22512,7 +22502,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Placement response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacement(response);
       })));
     });
@@ -22578,7 +22568,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Placement response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacement(response);
       })));
     });
@@ -22587,14 +22577,14 @@
       var mock = new HttpServerMock();
       api.PlacementsResourceApi res = new api.DfareportingApi(mock).placements;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed1797();
+      var arg_advertiserIds = buildUnnamed3392();
       var arg_archived = true;
-      var arg_campaignIds = buildUnnamed1798();
-      var arg_compatibilities = buildUnnamed1799();
-      var arg_contentCategoryIds = buildUnnamed1800();
-      var arg_directorySiteIds = buildUnnamed1801();
-      var arg_groupIds = buildUnnamed1802();
-      var arg_ids = buildUnnamed1803();
+      var arg_campaignIds = buildUnnamed3393();
+      var arg_compatibilities = buildUnnamed3394();
+      var arg_contentCategoryIds = buildUnnamed3395();
+      var arg_directorySiteIds = buildUnnamed3396();
+      var arg_groupIds = buildUnnamed3397();
+      var arg_ids = buildUnnamed3398();
       var arg_maxEndDate = "foo";
       var arg_maxResults = 42;
       var arg_maxStartDate = "foo";
@@ -22602,11 +22592,11 @@
       var arg_minStartDate = "foo";
       var arg_pageToken = "foo";
       var arg_paymentSource = "foo";
-      var arg_placementStrategyIds = buildUnnamed1804();
-      var arg_pricingTypes = buildUnnamed1805();
+      var arg_placementStrategyIds = buildUnnamed3399();
+      var arg_pricingTypes = buildUnnamed3400();
       var arg_searchString = "foo";
-      var arg_siteIds = buildUnnamed1806();
-      var arg_sizeIds = buildUnnamed1807();
+      var arg_siteIds = buildUnnamed3401();
+      var arg_sizeIds = buildUnnamed3402();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_$fields = "foo";
@@ -22725,7 +22715,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementsListResponse(response);
       })));
     });
@@ -22793,7 +22783,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Placement response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacement(response);
       })));
     });
@@ -22859,7 +22849,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Placement response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacement(response);
       })));
     });
@@ -22928,7 +22918,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlatformType response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlatformType(response);
       })));
     });
@@ -22989,8 +22979,9 @@
         var resp = convert.JSON.encode(buildPlatformTypesListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.PlatformTypesListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkPlatformTypesListResponse(response);
       })));
     });
@@ -23059,7 +23050,7 @@
       }), true);
       res
           .get(arg_profileId, arg_code, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PostalCode response) {
+          .then(unittest.expectAsync1(((response) {
         checkPostalCode(response);
       })));
     });
@@ -23122,7 +23113,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PostalCodesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPostalCodesListResponse(response);
       })));
     });
@@ -23190,7 +23181,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
@@ -23199,8 +23190,8 @@
       var mock = new HttpServerMock();
       api.ProjectsResourceApi res = new api.DfareportingApi(mock).projects;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed1808();
-      var arg_ids = buildUnnamed1809();
+      var arg_advertiserIds = buildUnnamed3403();
+      var arg_ids = buildUnnamed3404();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -23280,7 +23271,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProjectsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkProjectsListResponse(response);
       })));
     });
@@ -23344,7 +23335,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RegionsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegionsListResponse(response);
       })));
     });
@@ -23413,7 +23404,7 @@
       }), true);
       res
           .get(arg_profileId, arg_remarketingListId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingListShare response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingListShare(response);
       })));
     });
@@ -23484,7 +23475,7 @@
       res
           .patch(arg_request, arg_profileId, arg_remarketingListId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingListShare response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingListShare(response);
       })));
     });
@@ -23551,7 +23542,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingListShare response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingListShare(response);
       })));
     });
@@ -23620,7 +23611,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingList(response);
       })));
     });
@@ -23687,7 +23678,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingList(response);
       })));
     });
@@ -23781,8 +23772,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.RemarketingListsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingListsListResponse(response);
       })));
     });
@@ -23851,7 +23841,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingList(response);
       })));
     });
@@ -23918,7 +23908,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingList(response);
       })));
     });
@@ -24050,7 +24040,7 @@
       }), true);
       res
           .get(arg_profileId, arg_reportId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -24116,7 +24106,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -24198,7 +24188,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReportList response) {
+          .then(unittest.expectAsync1(((response) {
         checkReportList(response);
       })));
     });
@@ -24268,7 +24258,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_reportId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -24344,7 +24334,7 @@
       res
           .run(arg_profileId, arg_reportId,
               synchronous: arg_synchronous, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -24415,7 +24405,7 @@
       res
           .update(arg_request, arg_profileId, arg_reportId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -24484,7 +24474,7 @@
       }), true);
       res
           .query(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CompatibleFields response) {
+          .then(unittest.expectAsync1(((response) {
         checkCompatibleFields(response);
       })));
     });
@@ -24566,7 +24556,7 @@
       }), true);
       res
           .get(arg_profileId, arg_reportId, arg_fileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -24656,7 +24646,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FileList response) {
+          .then(unittest.expectAsync1(((response) {
         checkFileList(response);
       })));
     });
@@ -24724,7 +24714,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Site response) {
+          .then(unittest.expectAsync1(((response) {
         checkSite(response);
       })));
     });
@@ -24790,7 +24780,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Site response) {
+          .then(unittest.expectAsync1(((response) {
         checkSite(response);
       })));
     });
@@ -24804,9 +24794,9 @@
       var arg_acceptsPublisherPaidPlacements = true;
       var arg_adWordsSite = true;
       var arg_approved = true;
-      var arg_campaignIds = buildUnnamed1810();
-      var arg_directorySiteIds = buildUnnamed1811();
-      var arg_ids = buildUnnamed1812();
+      var arg_campaignIds = buildUnnamed3405();
+      var arg_directorySiteIds = buildUnnamed3406();
+      var arg_ids = buildUnnamed3407();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -24914,7 +24904,7 @@
               subaccountId: arg_subaccountId,
               unmappedSite: arg_unmappedSite,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SitesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSitesListResponse(response);
       })));
     });
@@ -24982,7 +24972,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Site response) {
+          .then(unittest.expectAsync1(((response) {
         checkSite(response);
       })));
     });
@@ -25048,7 +25038,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Site response) {
+          .then(unittest.expectAsync1(((response) {
         checkSite(response);
       })));
     });
@@ -25116,7 +25106,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Size response) {
+          .then(unittest.expectAsync1(((response) {
         checkSize(response);
       })));
     });
@@ -25182,7 +25172,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Size response) {
+          .then(unittest.expectAsync1(((response) {
         checkSize(response);
       })));
     });
@@ -25193,7 +25183,7 @@
       var arg_profileId = "foo";
       var arg_height = 42;
       var arg_iabStandard = true;
-      var arg_ids = buildUnnamed1813();
+      var arg_ids = buildUnnamed3408();
       var arg_width = 42;
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -25260,7 +25250,7 @@
               ids: arg_ids,
               width: arg_width,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SizesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSizesListResponse(response);
       })));
     });
@@ -25329,7 +25319,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subaccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubaccount(response);
       })));
     });
@@ -25396,7 +25386,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subaccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubaccount(response);
       })));
     });
@@ -25406,7 +25396,7 @@
       api.SubaccountsResourceApi res =
           new api.DfareportingApi(mock).subaccounts;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed1814();
+      var arg_ids = buildUnnamed3409();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -25483,7 +25473,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SubaccountsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubaccountsListResponse(response);
       })));
     });
@@ -25552,7 +25542,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subaccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubaccount(response);
       })));
     });
@@ -25619,7 +25609,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subaccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubaccount(response);
       })));
     });
@@ -25686,8 +25676,9 @@
         var resp = convert.JSON.encode(buildTargetableRemarketingList());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_profileId, arg_id, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.TargetableRemarketingList response) {
+      res
+          .get(arg_profileId, arg_id, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkTargetableRemarketingList(response);
       })));
     });
@@ -25778,8 +25769,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.TargetableRemarketingListsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetableRemarketingListsListResponse(response);
       })));
     });
@@ -25848,7 +25838,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetingTemplate response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetingTemplate(response);
       })));
     });
@@ -25915,7 +25905,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetingTemplate response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetingTemplate(response);
       })));
     });
@@ -25926,7 +25916,7 @@
           new api.DfareportingApi(mock).targetingTemplates;
       var arg_profileId = "foo";
       var arg_advertiserId = "foo";
-      var arg_ids = buildUnnamed1815();
+      var arg_ids = buildUnnamed3410();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -26006,8 +25996,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.TargetingTemplatesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetingTemplatesListResponse(response);
       })));
     });
@@ -26076,7 +26065,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetingTemplate response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetingTemplate(response);
       })));
     });
@@ -26143,7 +26132,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetingTemplate response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetingTemplate(response);
       })));
     });
@@ -26202,7 +26191,7 @@
       }), true);
       res
           .get(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserProfile(response);
       })));
     });
@@ -26253,9 +26242,7 @@
         var resp = convert.JSON.encode(buildUserProfileList());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserProfileList response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkUserProfileList(response);
       })));
     });
@@ -26324,7 +26311,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRolePermissionGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRolePermissionGroup(response);
       })));
     });
@@ -26386,8 +26373,9 @@
             convert.JSON.encode(buildUserRolePermissionGroupsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.UserRolePermissionGroupsListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkUserRolePermissionGroupsListResponse(response);
       })));
     });
@@ -26456,7 +26444,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRolePermission response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRolePermission(response);
       })));
     });
@@ -26466,7 +26454,7 @@
       api.UserRolePermissionsResourceApi res =
           new api.DfareportingApi(mock).userRolePermissions;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed1816();
+      var arg_ids = buildUnnamed3411();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -26519,8 +26507,9 @@
         var resp = convert.JSON.encode(buildUserRolePermissionsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, ids: arg_ids, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.UserRolePermissionsListResponse response) {
+      res
+          .list(arg_profileId, ids: arg_ids, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkUserRolePermissionsListResponse(response);
       })));
     });
@@ -26652,7 +26641,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRole response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRole(response);
       })));
     });
@@ -26718,7 +26707,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRole response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRole(response);
       })));
     });
@@ -26728,7 +26717,7 @@
       api.UserRolesResourceApi res = new api.DfareportingApi(mock).userRoles;
       var arg_profileId = "foo";
       var arg_accountUserRoleOnly = true;
-      var arg_ids = buildUnnamed1817();
+      var arg_ids = buildUnnamed3412();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -26812,7 +26801,7 @@
               sortOrder: arg_sortOrder,
               subaccountId: arg_subaccountId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRolesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRolesListResponse(response);
       })));
     });
@@ -26880,7 +26869,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRole response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRole(response);
       })));
     });
@@ -26946,7 +26935,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRole response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRole(response);
       })));
     });
@@ -27015,7 +27004,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VideoFormat response) {
+          .then(unittest.expectAsync1(((response) {
         checkVideoFormat(response);
       })));
     });
@@ -27078,7 +27067,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VideoFormatsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkVideoFormatsListResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/dfareporting/v3_0_test.dart b/generated/googleapis/test/dfareporting/v3_0_test.dart
index 23fca5f..11c8e88 100644
--- a/generated/googleapis/test/dfareporting/v3_0_test.dart
+++ b/generated/googleapis/test/dfareporting/v3_0_test.dart
@@ -50,27 +50,27 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed708() {
+buildUnnamed523() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed708(core.List<core.String> o) {
+checkUnnamed523(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed709() {
+buildUnnamed524() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed709(core.List<core.String> o) {
+checkUnnamed524(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -81,12 +81,12 @@
   var o = new api.Account();
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    o.accountPermissionIds = buildUnnamed708();
+    o.accountPermissionIds = buildUnnamed523();
     o.accountProfile = "foo";
     o.active = true;
     o.activeAdsLimitTier = "foo";
     o.activeViewOptOut = true;
-    o.availablePermissionIds = buildUnnamed709();
+    o.availablePermissionIds = buildUnnamed524();
     o.countryId = "foo";
     o.currencyId = "foo";
     o.defaultCreativeSizeId = "foo";
@@ -108,12 +108,12 @@
 checkAccount(api.Account o) {
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    checkUnnamed708(o.accountPermissionIds);
+    checkUnnamed523(o.accountPermissionIds);
     unittest.expect(o.accountProfile, unittest.equals('foo'));
     unittest.expect(o.active, unittest.isTrue);
     unittest.expect(o.activeAdsLimitTier, unittest.equals('foo'));
     unittest.expect(o.activeViewOptOut, unittest.isTrue);
-    checkUnnamed709(o.availablePermissionIds);
+    checkUnnamed524(o.availablePermissionIds);
     unittest.expect(o.countryId, unittest.equals('foo'));
     unittest.expect(o.currencyId, unittest.equals('foo'));
     unittest.expect(o.defaultCreativeSizeId, unittest.equals('foo'));
@@ -158,14 +158,14 @@
   buildCounterAccountActiveAdSummary--;
 }
 
-buildUnnamed710() {
+buildUnnamed525() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed710(core.List<core.String> o) {
+checkUnnamed525(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -176,7 +176,7 @@
   var o = new api.AccountPermission();
   buildCounterAccountPermission++;
   if (buildCounterAccountPermission < 3) {
-    o.accountProfiles = buildUnnamed710();
+    o.accountProfiles = buildUnnamed525();
     o.id = "foo";
     o.kind = "foo";
     o.level = "foo";
@@ -190,7 +190,7 @@
 checkAccountPermission(api.AccountPermission o) {
   buildCounterAccountPermission++;
   if (buildCounterAccountPermission < 3) {
-    checkUnnamed710(o.accountProfiles);
+    checkUnnamed525(o.accountProfiles);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.level, unittest.equals('foo'));
@@ -223,14 +223,14 @@
   buildCounterAccountPermissionGroup--;
 }
 
-buildUnnamed711() {
+buildUnnamed526() {
   var o = new core.List<api.AccountPermissionGroup>();
   o.add(buildAccountPermissionGroup());
   o.add(buildAccountPermissionGroup());
   return o;
 }
 
-checkUnnamed711(core.List<api.AccountPermissionGroup> o) {
+checkUnnamed526(core.List<api.AccountPermissionGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountPermissionGroup(o[0]);
   checkAccountPermissionGroup(o[1]);
@@ -241,7 +241,7 @@
   var o = new api.AccountPermissionGroupsListResponse();
   buildCounterAccountPermissionGroupsListResponse++;
   if (buildCounterAccountPermissionGroupsListResponse < 3) {
-    o.accountPermissionGroups = buildUnnamed711();
+    o.accountPermissionGroups = buildUnnamed526();
     o.kind = "foo";
   }
   buildCounterAccountPermissionGroupsListResponse--;
@@ -252,20 +252,20 @@
     api.AccountPermissionGroupsListResponse o) {
   buildCounterAccountPermissionGroupsListResponse++;
   if (buildCounterAccountPermissionGroupsListResponse < 3) {
-    checkUnnamed711(o.accountPermissionGroups);
+    checkUnnamed526(o.accountPermissionGroups);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountPermissionGroupsListResponse--;
 }
 
-buildUnnamed712() {
+buildUnnamed527() {
   var o = new core.List<api.AccountPermission>();
   o.add(buildAccountPermission());
   o.add(buildAccountPermission());
   return o;
 }
 
-checkUnnamed712(core.List<api.AccountPermission> o) {
+checkUnnamed527(core.List<api.AccountPermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountPermission(o[0]);
   checkAccountPermission(o[1]);
@@ -276,7 +276,7 @@
   var o = new api.AccountPermissionsListResponse();
   buildCounterAccountPermissionsListResponse++;
   if (buildCounterAccountPermissionsListResponse < 3) {
-    o.accountPermissions = buildUnnamed712();
+    o.accountPermissions = buildUnnamed527();
     o.kind = "foo";
   }
   buildCounterAccountPermissionsListResponse--;
@@ -286,7 +286,7 @@
 checkAccountPermissionsListResponse(api.AccountPermissionsListResponse o) {
   buildCounterAccountPermissionsListResponse++;
   if (buildCounterAccountPermissionsListResponse < 3) {
-    checkUnnamed712(o.accountPermissions);
+    checkUnnamed527(o.accountPermissions);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAccountPermissionsListResponse--;
@@ -341,14 +341,14 @@
   buildCounterAccountUserProfile--;
 }
 
-buildUnnamed713() {
+buildUnnamed528() {
   var o = new core.List<api.AccountUserProfile>();
   o.add(buildAccountUserProfile());
   o.add(buildAccountUserProfile());
   return o;
 }
 
-checkUnnamed713(core.List<api.AccountUserProfile> o) {
+checkUnnamed528(core.List<api.AccountUserProfile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccountUserProfile(o[0]);
   checkAccountUserProfile(o[1]);
@@ -359,7 +359,7 @@
   var o = new api.AccountUserProfilesListResponse();
   buildCounterAccountUserProfilesListResponse++;
   if (buildCounterAccountUserProfilesListResponse < 3) {
-    o.accountUserProfiles = buildUnnamed713();
+    o.accountUserProfiles = buildUnnamed528();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -370,21 +370,21 @@
 checkAccountUserProfilesListResponse(api.AccountUserProfilesListResponse o) {
   buildCounterAccountUserProfilesListResponse++;
   if (buildCounterAccountUserProfilesListResponse < 3) {
-    checkUnnamed713(o.accountUserProfiles);
+    checkUnnamed528(o.accountUserProfiles);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAccountUserProfilesListResponse--;
 }
 
-buildUnnamed714() {
+buildUnnamed529() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed714(core.List<api.Account> o) {
+checkUnnamed529(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -395,7 +395,7 @@
   var o = new api.AccountsListResponse();
   buildCounterAccountsListResponse++;
   if (buildCounterAccountsListResponse < 3) {
-    o.accounts = buildUnnamed714();
+    o.accounts = buildUnnamed529();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -406,34 +406,34 @@
 checkAccountsListResponse(api.AccountsListResponse o) {
   buildCounterAccountsListResponse++;
   if (buildCounterAccountsListResponse < 3) {
-    checkUnnamed714(o.accounts);
+    checkUnnamed529(o.accounts);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAccountsListResponse--;
 }
 
-buildUnnamed715() {
+buildUnnamed530() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed715(core.List<api.DimensionValue> o) {
+checkUnnamed530(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed716() {
+buildUnnamed531() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed716(core.List<core.String> o) {
+checkUnnamed531(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -444,9 +444,9 @@
   var o = new api.Activities();
   buildCounterActivities++;
   if (buildCounterActivities < 3) {
-    o.filters = buildUnnamed715();
+    o.filters = buildUnnamed530();
     o.kind = "foo";
-    o.metricNames = buildUnnamed716();
+    o.metricNames = buildUnnamed531();
   }
   buildCounterActivities--;
   return o;
@@ -455,47 +455,47 @@
 checkActivities(api.Activities o) {
   buildCounterActivities++;
   if (buildCounterActivities < 3) {
-    checkUnnamed715(o.filters);
+    checkUnnamed530(o.filters);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed716(o.metricNames);
+    checkUnnamed531(o.metricNames);
   }
   buildCounterActivities--;
 }
 
-buildUnnamed717() {
+buildUnnamed532() {
   var o = new core.List<api.CreativeGroupAssignment>();
   o.add(buildCreativeGroupAssignment());
   o.add(buildCreativeGroupAssignment());
   return o;
 }
 
-checkUnnamed717(core.List<api.CreativeGroupAssignment> o) {
+checkUnnamed532(core.List<api.CreativeGroupAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeGroupAssignment(o[0]);
   checkCreativeGroupAssignment(o[1]);
 }
 
-buildUnnamed718() {
+buildUnnamed533() {
   var o = new core.List<api.EventTagOverride>();
   o.add(buildEventTagOverride());
   o.add(buildEventTagOverride());
   return o;
 }
 
-checkUnnamed718(core.List<api.EventTagOverride> o) {
+checkUnnamed533(core.List<api.EventTagOverride> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventTagOverride(o[0]);
   checkEventTagOverride(o[1]);
 }
 
-buildUnnamed719() {
+buildUnnamed534() {
   var o = new core.List<api.PlacementAssignment>();
   o.add(buildPlacementAssignment());
   o.add(buildPlacementAssignment());
   return o;
 }
 
-checkUnnamed719(core.List<api.PlacementAssignment> o) {
+checkUnnamed534(core.List<api.PlacementAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacementAssignment(o[0]);
   checkPlacementAssignment(o[1]);
@@ -519,7 +519,7 @@
     o.comments = "foo";
     o.compatibility = "foo";
     o.createInfo = buildLastModifiedInfo();
-    o.creativeGroupAssignments = buildUnnamed717();
+    o.creativeGroupAssignments = buildUnnamed532();
     o.creativeRotation = buildCreativeRotation();
     o.dayPartTargeting = buildDayPartTargeting();
     o.defaultClickThroughEventTagProperties =
@@ -527,7 +527,7 @@
     o.deliverySchedule = buildDeliverySchedule();
     o.dynamicClickTracker = true;
     o.endTime = core.DateTime.parse("2002-02-27T14:01:02");
-    o.eventTagOverrides = buildUnnamed718();
+    o.eventTagOverrides = buildUnnamed533();
     o.geoTargeting = buildGeoTargeting();
     o.id = "foo";
     o.idDimensionValue = buildDimensionValue();
@@ -536,7 +536,7 @@
     o.languageTargeting = buildLanguageTargeting();
     o.lastModifiedInfo = buildLastModifiedInfo();
     o.name = "foo";
-    o.placementAssignments = buildUnnamed719();
+    o.placementAssignments = buildUnnamed534();
     o.remarketingListExpression = buildListTargetingExpression();
     o.size = buildSize();
     o.sslCompliant = true;
@@ -567,7 +567,7 @@
     unittest.expect(o.comments, unittest.equals('foo'));
     unittest.expect(o.compatibility, unittest.equals('foo'));
     checkLastModifiedInfo(o.createInfo);
-    checkUnnamed717(o.creativeGroupAssignments);
+    checkUnnamed532(o.creativeGroupAssignments);
     checkCreativeRotation(o.creativeRotation);
     checkDayPartTargeting(o.dayPartTargeting);
     checkDefaultClickThroughEventTagProperties(
@@ -576,7 +576,7 @@
     unittest.expect(o.dynamicClickTracker, unittest.isTrue);
     unittest.expect(
         o.endTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed718(o.eventTagOverrides);
+    checkUnnamed533(o.eventTagOverrides);
     checkGeoTargeting(o.geoTargeting);
     unittest.expect(o.id, unittest.equals('foo'));
     checkDimensionValue(o.idDimensionValue);
@@ -585,7 +585,7 @@
     checkLanguageTargeting(o.languageTargeting);
     checkLastModifiedInfo(o.lastModifiedInfo);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed719(o.placementAssignments);
+    checkUnnamed534(o.placementAssignments);
     checkListTargetingExpression(o.remarketingListExpression);
     checkSize(o.size);
     unittest.expect(o.sslCompliant, unittest.isTrue);
@@ -658,14 +658,14 @@
   buildCounterAdSlot--;
 }
 
-buildUnnamed720() {
+buildUnnamed535() {
   var o = new core.List<api.Ad>();
   o.add(buildAd());
   o.add(buildAd());
   return o;
 }
 
-checkUnnamed720(core.List<api.Ad> o) {
+checkUnnamed535(core.List<api.Ad> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAd(o[0]);
   checkAd(o[1]);
@@ -676,7 +676,7 @@
   var o = new api.AdsListResponse();
   buildCounterAdsListResponse++;
   if (buildCounterAdsListResponse < 3) {
-    o.ads = buildUnnamed720();
+    o.ads = buildUnnamed535();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -687,7 +687,7 @@
 checkAdsListResponse(api.AdsListResponse o) {
   buildCounterAdsListResponse++;
   if (buildCounterAdsListResponse < 3) {
-    checkUnnamed720(o.ads);
+    checkUnnamed535(o.ads);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -767,14 +767,14 @@
   buildCounterAdvertiserGroup--;
 }
 
-buildUnnamed721() {
+buildUnnamed536() {
   var o = new core.List<api.AdvertiserGroup>();
   o.add(buildAdvertiserGroup());
   o.add(buildAdvertiserGroup());
   return o;
 }
 
-checkUnnamed721(core.List<api.AdvertiserGroup> o) {
+checkUnnamed536(core.List<api.AdvertiserGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdvertiserGroup(o[0]);
   checkAdvertiserGroup(o[1]);
@@ -785,7 +785,7 @@
   var o = new api.AdvertiserGroupsListResponse();
   buildCounterAdvertiserGroupsListResponse++;
   if (buildCounterAdvertiserGroupsListResponse < 3) {
-    o.advertiserGroups = buildUnnamed721();
+    o.advertiserGroups = buildUnnamed536();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -796,21 +796,21 @@
 checkAdvertiserGroupsListResponse(api.AdvertiserGroupsListResponse o) {
   buildCounterAdvertiserGroupsListResponse++;
   if (buildCounterAdvertiserGroupsListResponse < 3) {
-    checkUnnamed721(o.advertiserGroups);
+    checkUnnamed536(o.advertiserGroups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAdvertiserGroupsListResponse--;
 }
 
-buildUnnamed722() {
+buildUnnamed537() {
   var o = new core.List<api.LandingPage>();
   o.add(buildLandingPage());
   o.add(buildLandingPage());
   return o;
 }
 
-checkUnnamed722(core.List<api.LandingPage> o) {
+checkUnnamed537(core.List<api.LandingPage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLandingPage(o[0]);
   checkLandingPage(o[1]);
@@ -822,7 +822,7 @@
   buildCounterAdvertiserLandingPagesListResponse++;
   if (buildCounterAdvertiserLandingPagesListResponse < 3) {
     o.kind = "foo";
-    o.landingPages = buildUnnamed722();
+    o.landingPages = buildUnnamed537();
     o.nextPageToken = "foo";
   }
   buildCounterAdvertiserLandingPagesListResponse--;
@@ -834,20 +834,20 @@
   buildCounterAdvertiserLandingPagesListResponse++;
   if (buildCounterAdvertiserLandingPagesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed722(o.landingPages);
+    checkUnnamed537(o.landingPages);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterAdvertiserLandingPagesListResponse--;
 }
 
-buildUnnamed723() {
+buildUnnamed538() {
   var o = new core.List<api.Advertiser>();
   o.add(buildAdvertiser());
   o.add(buildAdvertiser());
   return o;
 }
 
-checkUnnamed723(core.List<api.Advertiser> o) {
+checkUnnamed538(core.List<api.Advertiser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdvertiser(o[0]);
   checkAdvertiser(o[1]);
@@ -858,7 +858,7 @@
   var o = new api.AdvertisersListResponse();
   buildCounterAdvertisersListResponse++;
   if (buildCounterAdvertisersListResponse < 3) {
-    o.advertisers = buildUnnamed723();
+    o.advertisers = buildUnnamed538();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -869,7 +869,7 @@
 checkAdvertisersListResponse(api.AdvertisersListResponse o) {
   buildCounterAdvertisersListResponse++;
   if (buildCounterAdvertisersListResponse < 3) {
-    checkUnnamed723(o.advertisers);
+    checkUnnamed538(o.advertisers);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -899,14 +899,14 @@
   buildCounterAudienceSegment--;
 }
 
-buildUnnamed724() {
+buildUnnamed539() {
   var o = new core.List<api.AudienceSegment>();
   o.add(buildAudienceSegment());
   o.add(buildAudienceSegment());
   return o;
 }
 
-checkUnnamed724(core.List<api.AudienceSegment> o) {
+checkUnnamed539(core.List<api.AudienceSegment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAudienceSegment(o[0]);
   checkAudienceSegment(o[1]);
@@ -917,7 +917,7 @@
   var o = new api.AudienceSegmentGroup();
   buildCounterAudienceSegmentGroup++;
   if (buildCounterAudienceSegmentGroup < 3) {
-    o.audienceSegments = buildUnnamed724();
+    o.audienceSegments = buildUnnamed539();
     o.id = "foo";
     o.name = "foo";
   }
@@ -928,7 +928,7 @@
 checkAudienceSegmentGroup(api.AudienceSegmentGroup o) {
   buildCounterAudienceSegmentGroup++;
   if (buildCounterAudienceSegmentGroup < 3) {
-    checkUnnamed724(o.audienceSegments);
+    checkUnnamed539(o.audienceSegments);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
   }
@@ -964,14 +964,14 @@
   buildCounterBrowser--;
 }
 
-buildUnnamed725() {
+buildUnnamed540() {
   var o = new core.List<api.Browser>();
   o.add(buildBrowser());
   o.add(buildBrowser());
   return o;
 }
 
-checkUnnamed725(core.List<api.Browser> o) {
+checkUnnamed540(core.List<api.Browser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBrowser(o[0]);
   checkBrowser(o[1]);
@@ -982,7 +982,7 @@
   var o = new api.BrowsersListResponse();
   buildCounterBrowsersListResponse++;
   if (buildCounterBrowsersListResponse < 3) {
-    o.browsers = buildUnnamed725();
+    o.browsers = buildUnnamed540();
     o.kind = "foo";
   }
   buildCounterBrowsersListResponse--;
@@ -992,72 +992,72 @@
 checkBrowsersListResponse(api.BrowsersListResponse o) {
   buildCounterBrowsersListResponse++;
   if (buildCounterBrowsersListResponse < 3) {
-    checkUnnamed725(o.browsers);
+    checkUnnamed540(o.browsers);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBrowsersListResponse--;
 }
 
-buildUnnamed726() {
+buildUnnamed541() {
   var o = new core.List<api.CreativeOptimizationConfiguration>();
   o.add(buildCreativeOptimizationConfiguration());
   o.add(buildCreativeOptimizationConfiguration());
   return o;
 }
 
-checkUnnamed726(core.List<api.CreativeOptimizationConfiguration> o) {
+checkUnnamed541(core.List<api.CreativeOptimizationConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeOptimizationConfiguration(o[0]);
   checkCreativeOptimizationConfiguration(o[1]);
 }
 
-buildUnnamed727() {
+buildUnnamed542() {
   var o = new core.List<api.AudienceSegmentGroup>();
   o.add(buildAudienceSegmentGroup());
   o.add(buildAudienceSegmentGroup());
   return o;
 }
 
-checkUnnamed727(core.List<api.AudienceSegmentGroup> o) {
+checkUnnamed542(core.List<api.AudienceSegmentGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAudienceSegmentGroup(o[0]);
   checkAudienceSegmentGroup(o[1]);
 }
 
-buildUnnamed728() {
+buildUnnamed543() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed728(core.List<core.String> o) {
+checkUnnamed543(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed729() {
+buildUnnamed544() {
   var o = new core.List<api.EventTagOverride>();
   o.add(buildEventTagOverride());
   o.add(buildEventTagOverride());
   return o;
 }
 
-checkUnnamed729(core.List<api.EventTagOverride> o) {
+checkUnnamed544(core.List<api.EventTagOverride> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventTagOverride(o[0]);
   checkEventTagOverride(o[1]);
 }
 
-buildUnnamed730() {
+buildUnnamed545() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed730(core.List<core.String> o) {
+checkUnnamed545(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1070,24 +1070,24 @@
   if (buildCounterCampaign < 3) {
     o.accountId = "foo";
     o.adBlockingConfiguration = buildAdBlockingConfiguration();
-    o.additionalCreativeOptimizationConfigurations = buildUnnamed726();
+    o.additionalCreativeOptimizationConfigurations = buildUnnamed541();
     o.advertiserGroupId = "foo";
     o.advertiserId = "foo";
     o.advertiserIdDimensionValue = buildDimensionValue();
     o.archived = true;
-    o.audienceSegmentGroups = buildUnnamed727();
+    o.audienceSegmentGroups = buildUnnamed542();
     o.billingInvoiceCode = "foo";
     o.clickThroughUrlSuffixProperties = buildClickThroughUrlSuffixProperties();
     o.comment = "foo";
     o.createInfo = buildLastModifiedInfo();
-    o.creativeGroupIds = buildUnnamed728();
+    o.creativeGroupIds = buildUnnamed543();
     o.creativeOptimizationConfiguration =
         buildCreativeOptimizationConfiguration();
     o.defaultClickThroughEventTagProperties =
         buildDefaultClickThroughEventTagProperties();
     o.defaultLandingPageId = "foo";
     o.endDate = core.DateTime.parse("2002-02-27T14:01:02Z");
-    o.eventTagOverrides = buildUnnamed729();
+    o.eventTagOverrides = buildUnnamed544();
     o.externalId = "foo";
     o.id = "foo";
     o.idDimensionValue = buildDimensionValue();
@@ -1098,7 +1098,7 @@
     o.nielsenOcrEnabled = true;
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.subaccountId = "foo";
-    o.traffickerEmails = buildUnnamed730();
+    o.traffickerEmails = buildUnnamed545();
   }
   buildCounterCampaign--;
   return o;
@@ -1109,24 +1109,24 @@
   if (buildCounterCampaign < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     checkAdBlockingConfiguration(o.adBlockingConfiguration);
-    checkUnnamed726(o.additionalCreativeOptimizationConfigurations);
+    checkUnnamed541(o.additionalCreativeOptimizationConfigurations);
     unittest.expect(o.advertiserGroupId, unittest.equals('foo'));
     unittest.expect(o.advertiserId, unittest.equals('foo'));
     checkDimensionValue(o.advertiserIdDimensionValue);
     unittest.expect(o.archived, unittest.isTrue);
-    checkUnnamed727(o.audienceSegmentGroups);
+    checkUnnamed542(o.audienceSegmentGroups);
     unittest.expect(o.billingInvoiceCode, unittest.equals('foo'));
     checkClickThroughUrlSuffixProperties(o.clickThroughUrlSuffixProperties);
     unittest.expect(o.comment, unittest.equals('foo'));
     checkLastModifiedInfo(o.createInfo);
-    checkUnnamed728(o.creativeGroupIds);
+    checkUnnamed543(o.creativeGroupIds);
     checkCreativeOptimizationConfiguration(o.creativeOptimizationConfiguration);
     checkDefaultClickThroughEventTagProperties(
         o.defaultClickThroughEventTagProperties);
     unittest.expect(o.defaultLandingPageId, unittest.equals('foo'));
     unittest.expect(
         o.endDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
-    checkUnnamed729(o.eventTagOverrides);
+    checkUnnamed544(o.eventTagOverrides);
     unittest.expect(o.externalId, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkDimensionValue(o.idDimensionValue);
@@ -1138,7 +1138,7 @@
     unittest.expect(o.startDate,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.subaccountId, unittest.equals('foo'));
-    checkUnnamed730(o.traffickerEmails);
+    checkUnnamed545(o.traffickerEmails);
   }
   buildCounterCampaign--;
 }
@@ -1164,14 +1164,14 @@
   buildCounterCampaignCreativeAssociation--;
 }
 
-buildUnnamed731() {
+buildUnnamed546() {
   var o = new core.List<api.CampaignCreativeAssociation>();
   o.add(buildCampaignCreativeAssociation());
   o.add(buildCampaignCreativeAssociation());
   return o;
 }
 
-checkUnnamed731(core.List<api.CampaignCreativeAssociation> o) {
+checkUnnamed546(core.List<api.CampaignCreativeAssociation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCampaignCreativeAssociation(o[0]);
   checkCampaignCreativeAssociation(o[1]);
@@ -1182,7 +1182,7 @@
   var o = new api.CampaignCreativeAssociationsListResponse();
   buildCounterCampaignCreativeAssociationsListResponse++;
   if (buildCounterCampaignCreativeAssociationsListResponse < 3) {
-    o.campaignCreativeAssociations = buildUnnamed731();
+    o.campaignCreativeAssociations = buildUnnamed546();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1194,21 +1194,21 @@
     api.CampaignCreativeAssociationsListResponse o) {
   buildCounterCampaignCreativeAssociationsListResponse++;
   if (buildCounterCampaignCreativeAssociationsListResponse < 3) {
-    checkUnnamed731(o.campaignCreativeAssociations);
+    checkUnnamed546(o.campaignCreativeAssociations);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCampaignCreativeAssociationsListResponse--;
 }
 
-buildUnnamed732() {
+buildUnnamed547() {
   var o = new core.List<api.Campaign>();
   o.add(buildCampaign());
   o.add(buildCampaign());
   return o;
 }
 
-checkUnnamed732(core.List<api.Campaign> o) {
+checkUnnamed547(core.List<api.Campaign> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCampaign(o[0]);
   checkCampaign(o[1]);
@@ -1219,7 +1219,7 @@
   var o = new api.CampaignsListResponse();
   buildCounterCampaignsListResponse++;
   if (buildCounterCampaignsListResponse < 3) {
-    o.campaigns = buildUnnamed732();
+    o.campaigns = buildUnnamed547();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1230,7 +1230,7 @@
 checkCampaignsListResponse(api.CampaignsListResponse o) {
   buildCounterCampaignsListResponse++;
   if (buildCounterCampaignsListResponse < 3) {
-    checkUnnamed732(o.campaigns);
+    checkUnnamed547(o.campaigns);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1283,14 +1283,14 @@
   buildCounterChangeLog--;
 }
 
-buildUnnamed733() {
+buildUnnamed548() {
   var o = new core.List<api.ChangeLog>();
   o.add(buildChangeLog());
   o.add(buildChangeLog());
   return o;
 }
 
-checkUnnamed733(core.List<api.ChangeLog> o) {
+checkUnnamed548(core.List<api.ChangeLog> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChangeLog(o[0]);
   checkChangeLog(o[1]);
@@ -1301,7 +1301,7 @@
   var o = new api.ChangeLogsListResponse();
   buildCounterChangeLogsListResponse++;
   if (buildCounterChangeLogsListResponse < 3) {
-    o.changeLogs = buildUnnamed733();
+    o.changeLogs = buildUnnamed548();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1312,21 +1312,21 @@
 checkChangeLogsListResponse(api.ChangeLogsListResponse o) {
   buildCounterChangeLogsListResponse++;
   if (buildCounterChangeLogsListResponse < 3) {
-    checkUnnamed733(o.changeLogs);
+    checkUnnamed548(o.changeLogs);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterChangeLogsListResponse--;
 }
 
-buildUnnamed734() {
+buildUnnamed549() {
   var o = new core.List<api.City>();
   o.add(buildCity());
   o.add(buildCity());
   return o;
 }
 
-checkUnnamed734(core.List<api.City> o) {
+checkUnnamed549(core.List<api.City> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCity(o[0]);
   checkCity(o[1]);
@@ -1337,7 +1337,7 @@
   var o = new api.CitiesListResponse();
   buildCounterCitiesListResponse++;
   if (buildCounterCitiesListResponse < 3) {
-    o.cities = buildUnnamed734();
+    o.cities = buildUnnamed549();
     o.kind = "foo";
   }
   buildCounterCitiesListResponse--;
@@ -1347,7 +1347,7 @@
 checkCitiesListResponse(api.CitiesListResponse o) {
   buildCounterCitiesListResponse++;
   if (buildCounterCitiesListResponse < 3) {
-    checkUnnamed734(o.cities);
+    checkUnnamed549(o.cities);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCitiesListResponse--;
@@ -1478,14 +1478,14 @@
   buildCounterCompanionClickThroughOverride--;
 }
 
-buildUnnamed735() {
+buildUnnamed550() {
   var o = new core.List<api.Size>();
   o.add(buildSize());
   o.add(buildSize());
   return o;
 }
 
-checkUnnamed735(core.List<api.Size> o) {
+checkUnnamed550(core.List<api.Size> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSize(o[0]);
   checkSize(o[1]);
@@ -1497,7 +1497,7 @@
   buildCounterCompanionSetting++;
   if (buildCounterCompanionSetting < 3) {
     o.companionsDisabled = true;
-    o.enabledSizes = buildUnnamed735();
+    o.enabledSizes = buildUnnamed550();
     o.imageOnly = true;
     o.kind = "foo";
   }
@@ -1509,7 +1509,7 @@
   buildCounterCompanionSetting++;
   if (buildCounterCompanionSetting < 3) {
     unittest.expect(o.companionsDisabled, unittest.isTrue);
-    checkUnnamed735(o.enabledSizes);
+    checkUnnamed550(o.enabledSizes);
     unittest.expect(o.imageOnly, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
@@ -1573,14 +1573,14 @@
   buildCounterConnectionType--;
 }
 
-buildUnnamed736() {
+buildUnnamed551() {
   var o = new core.List<api.ConnectionType>();
   o.add(buildConnectionType());
   o.add(buildConnectionType());
   return o;
 }
 
-checkUnnamed736(core.List<api.ConnectionType> o) {
+checkUnnamed551(core.List<api.ConnectionType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConnectionType(o[0]);
   checkConnectionType(o[1]);
@@ -1591,7 +1591,7 @@
   var o = new api.ConnectionTypesListResponse();
   buildCounterConnectionTypesListResponse++;
   if (buildCounterConnectionTypesListResponse < 3) {
-    o.connectionTypes = buildUnnamed736();
+    o.connectionTypes = buildUnnamed551();
     o.kind = "foo";
   }
   buildCounterConnectionTypesListResponse--;
@@ -1601,20 +1601,20 @@
 checkConnectionTypesListResponse(api.ConnectionTypesListResponse o) {
   buildCounterConnectionTypesListResponse++;
   if (buildCounterConnectionTypesListResponse < 3) {
-    checkUnnamed736(o.connectionTypes);
+    checkUnnamed551(o.connectionTypes);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterConnectionTypesListResponse--;
 }
 
-buildUnnamed737() {
+buildUnnamed552() {
   var o = new core.List<api.ContentCategory>();
   o.add(buildContentCategory());
   o.add(buildContentCategory());
   return o;
 }
 
-checkUnnamed737(core.List<api.ContentCategory> o) {
+checkUnnamed552(core.List<api.ContentCategory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContentCategory(o[0]);
   checkContentCategory(o[1]);
@@ -1625,7 +1625,7 @@
   var o = new api.ContentCategoriesListResponse();
   buildCounterContentCategoriesListResponse++;
   if (buildCounterContentCategoriesListResponse < 3) {
-    o.contentCategories = buildUnnamed737();
+    o.contentCategories = buildUnnamed552();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1636,7 +1636,7 @@
 checkContentCategoriesListResponse(api.ContentCategoriesListResponse o) {
   buildCounterContentCategoriesListResponse++;
   if (buildCounterContentCategoriesListResponse < 3) {
-    checkUnnamed737(o.contentCategories);
+    checkUnnamed552(o.contentCategories);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1668,27 +1668,27 @@
   buildCounterContentCategory--;
 }
 
-buildUnnamed738() {
+buildUnnamed553() {
   var o = new core.List<api.CustomFloodlightVariable>();
   o.add(buildCustomFloodlightVariable());
   o.add(buildCustomFloodlightVariable());
   return o;
 }
 
-checkUnnamed738(core.List<api.CustomFloodlightVariable> o) {
+checkUnnamed553(core.List<api.CustomFloodlightVariable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomFloodlightVariable(o[0]);
   checkCustomFloodlightVariable(o[1]);
 }
 
-buildUnnamed739() {
+buildUnnamed554() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed739(core.List<core.String> o) {
+checkUnnamed554(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1700,9 +1700,9 @@
   buildCounterConversion++;
   if (buildCounterConversion < 3) {
     o.childDirectedTreatment = true;
-    o.customVariables = buildUnnamed738();
+    o.customVariables = buildUnnamed553();
     o.encryptedUserId = "foo";
-    o.encryptedUserIdCandidates = buildUnnamed739();
+    o.encryptedUserIdCandidates = buildUnnamed554();
     o.floodlightActivityId = "foo";
     o.floodlightConfigurationId = "foo";
     o.gclid = "foo";
@@ -1722,9 +1722,9 @@
   buildCounterConversion++;
   if (buildCounterConversion < 3) {
     unittest.expect(o.childDirectedTreatment, unittest.isTrue);
-    checkUnnamed738(o.customVariables);
+    checkUnnamed553(o.customVariables);
     unittest.expect(o.encryptedUserId, unittest.equals('foo'));
-    checkUnnamed739(o.encryptedUserIdCandidates);
+    checkUnnamed554(o.encryptedUserIdCandidates);
     unittest.expect(o.floodlightActivityId, unittest.equals('foo'));
     unittest.expect(o.floodlightConfigurationId, unittest.equals('foo'));
     unittest.expect(o.gclid, unittest.equals('foo'));
@@ -1762,14 +1762,14 @@
   buildCounterConversionError--;
 }
 
-buildUnnamed740() {
+buildUnnamed555() {
   var o = new core.List<api.ConversionError>();
   o.add(buildConversionError());
   o.add(buildConversionError());
   return o;
 }
 
-checkUnnamed740(core.List<api.ConversionError> o) {
+checkUnnamed555(core.List<api.ConversionError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConversionError(o[0]);
   checkConversionError(o[1]);
@@ -1781,7 +1781,7 @@
   buildCounterConversionStatus++;
   if (buildCounterConversionStatus < 3) {
     o.conversion = buildConversion();
-    o.errors = buildUnnamed740();
+    o.errors = buildUnnamed555();
     o.kind = "foo";
   }
   buildCounterConversionStatus--;
@@ -1792,20 +1792,20 @@
   buildCounterConversionStatus++;
   if (buildCounterConversionStatus < 3) {
     checkConversion(o.conversion);
-    checkUnnamed740(o.errors);
+    checkUnnamed555(o.errors);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterConversionStatus--;
 }
 
-buildUnnamed741() {
+buildUnnamed556() {
   var o = new core.List<api.Conversion>();
   o.add(buildConversion());
   o.add(buildConversion());
   return o;
 }
 
-checkUnnamed741(core.List<api.Conversion> o) {
+checkUnnamed556(core.List<api.Conversion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConversion(o[0]);
   checkConversion(o[1]);
@@ -1816,7 +1816,7 @@
   var o = new api.ConversionsBatchInsertRequest();
   buildCounterConversionsBatchInsertRequest++;
   if (buildCounterConversionsBatchInsertRequest < 3) {
-    o.conversions = buildUnnamed741();
+    o.conversions = buildUnnamed556();
     o.encryptionInfo = buildEncryptionInfo();
     o.kind = "foo";
   }
@@ -1827,21 +1827,21 @@
 checkConversionsBatchInsertRequest(api.ConversionsBatchInsertRequest o) {
   buildCounterConversionsBatchInsertRequest++;
   if (buildCounterConversionsBatchInsertRequest < 3) {
-    checkUnnamed741(o.conversions);
+    checkUnnamed556(o.conversions);
     checkEncryptionInfo(o.encryptionInfo);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterConversionsBatchInsertRequest--;
 }
 
-buildUnnamed742() {
+buildUnnamed557() {
   var o = new core.List<api.ConversionStatus>();
   o.add(buildConversionStatus());
   o.add(buildConversionStatus());
   return o;
 }
 
-checkUnnamed742(core.List<api.ConversionStatus> o) {
+checkUnnamed557(core.List<api.ConversionStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConversionStatus(o[0]);
   checkConversionStatus(o[1]);
@@ -1854,7 +1854,7 @@
   if (buildCounterConversionsBatchInsertResponse < 3) {
     o.hasFailures = true;
     o.kind = "foo";
-    o.status = buildUnnamed742();
+    o.status = buildUnnamed557();
   }
   buildCounterConversionsBatchInsertResponse--;
   return o;
@@ -1865,19 +1865,19 @@
   if (buildCounterConversionsBatchInsertResponse < 3) {
     unittest.expect(o.hasFailures, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed742(o.status);
+    checkUnnamed557(o.status);
   }
   buildCounterConversionsBatchInsertResponse--;
 }
 
-buildUnnamed743() {
+buildUnnamed558() {
   var o = new core.List<api.Conversion>();
   o.add(buildConversion());
   o.add(buildConversion());
   return o;
 }
 
-checkUnnamed743(core.List<api.Conversion> o) {
+checkUnnamed558(core.List<api.Conversion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConversion(o[0]);
   checkConversion(o[1]);
@@ -1888,7 +1888,7 @@
   var o = new api.ConversionsBatchUpdateRequest();
   buildCounterConversionsBatchUpdateRequest++;
   if (buildCounterConversionsBatchUpdateRequest < 3) {
-    o.conversions = buildUnnamed743();
+    o.conversions = buildUnnamed558();
     o.encryptionInfo = buildEncryptionInfo();
     o.kind = "foo";
   }
@@ -1899,21 +1899,21 @@
 checkConversionsBatchUpdateRequest(api.ConversionsBatchUpdateRequest o) {
   buildCounterConversionsBatchUpdateRequest++;
   if (buildCounterConversionsBatchUpdateRequest < 3) {
-    checkUnnamed743(o.conversions);
+    checkUnnamed558(o.conversions);
     checkEncryptionInfo(o.encryptionInfo);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterConversionsBatchUpdateRequest--;
 }
 
-buildUnnamed744() {
+buildUnnamed559() {
   var o = new core.List<api.ConversionStatus>();
   o.add(buildConversionStatus());
   o.add(buildConversionStatus());
   return o;
 }
 
-checkUnnamed744(core.List<api.ConversionStatus> o) {
+checkUnnamed559(core.List<api.ConversionStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConversionStatus(o[0]);
   checkConversionStatus(o[1]);
@@ -1926,7 +1926,7 @@
   if (buildCounterConversionsBatchUpdateResponse < 3) {
     o.hasFailures = true;
     o.kind = "foo";
-    o.status = buildUnnamed744();
+    o.status = buildUnnamed559();
   }
   buildCounterConversionsBatchUpdateResponse--;
   return o;
@@ -1937,19 +1937,19 @@
   if (buildCounterConversionsBatchUpdateResponse < 3) {
     unittest.expect(o.hasFailures, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed744(o.status);
+    checkUnnamed559(o.status);
   }
   buildCounterConversionsBatchUpdateResponse--;
 }
 
-buildUnnamed745() {
+buildUnnamed560() {
   var o = new core.List<api.Country>();
   o.add(buildCountry());
   o.add(buildCountry());
   return o;
 }
 
-checkUnnamed745(core.List<api.Country> o) {
+checkUnnamed560(core.List<api.Country> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCountry(o[0]);
   checkCountry(o[1]);
@@ -1960,7 +1960,7 @@
   var o = new api.CountriesListResponse();
   buildCounterCountriesListResponse++;
   if (buildCounterCountriesListResponse < 3) {
-    o.countries = buildUnnamed745();
+    o.countries = buildUnnamed560();
     o.kind = "foo";
   }
   buildCounterCountriesListResponse--;
@@ -1970,7 +1970,7 @@
 checkCountriesListResponse(api.CountriesListResponse o) {
   buildCounterCountriesListResponse++;
   if (buildCounterCountriesListResponse < 3) {
-    checkUnnamed745(o.countries);
+    checkUnnamed560(o.countries);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCountriesListResponse--;
@@ -2003,157 +2003,157 @@
   buildCounterCountry--;
 }
 
-buildUnnamed746() {
+buildUnnamed561() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed746(core.List<core.String> o) {
+checkUnnamed561(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed747() {
+buildUnnamed562() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed747(core.List<core.String> o) {
+checkUnnamed562(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed748() {
+buildUnnamed563() {
   var o = new core.List<api.ClickTag>();
   o.add(buildClickTag());
   o.add(buildClickTag());
   return o;
 }
 
-checkUnnamed748(core.List<api.ClickTag> o) {
+checkUnnamed563(core.List<api.ClickTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClickTag(o[0]);
   checkClickTag(o[1]);
 }
 
-buildUnnamed749() {
+buildUnnamed564() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed749(core.List<core.String> o) {
+checkUnnamed564(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed750() {
+buildUnnamed565() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed750(core.List<core.String> o) {
+checkUnnamed565(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed751() {
+buildUnnamed566() {
   var o = new core.List<api.CreativeCustomEvent>();
   o.add(buildCreativeCustomEvent());
   o.add(buildCreativeCustomEvent());
   return o;
 }
 
-checkUnnamed751(core.List<api.CreativeCustomEvent> o) {
+checkUnnamed566(core.List<api.CreativeCustomEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCustomEvent(o[0]);
   checkCreativeCustomEvent(o[1]);
 }
 
-buildUnnamed752() {
+buildUnnamed567() {
   var o = new core.List<api.CreativeAsset>();
   o.add(buildCreativeAsset());
   o.add(buildCreativeAsset());
   return o;
 }
 
-checkUnnamed752(core.List<api.CreativeAsset> o) {
+checkUnnamed567(core.List<api.CreativeAsset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeAsset(o[0]);
   checkCreativeAsset(o[1]);
 }
 
-buildUnnamed753() {
+buildUnnamed568() {
   var o = new core.List<api.CreativeFieldAssignment>();
   o.add(buildCreativeFieldAssignment());
   o.add(buildCreativeFieldAssignment());
   return o;
 }
 
-checkUnnamed753(core.List<api.CreativeFieldAssignment> o) {
+checkUnnamed568(core.List<api.CreativeFieldAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeFieldAssignment(o[0]);
   checkCreativeFieldAssignment(o[1]);
 }
 
-buildUnnamed754() {
+buildUnnamed569() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed754(core.List<core.String> o) {
+checkUnnamed569(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed755() {
+buildUnnamed570() {
   var o = new core.List<api.CreativeCustomEvent>();
   o.add(buildCreativeCustomEvent());
   o.add(buildCreativeCustomEvent());
   return o;
 }
 
-checkUnnamed755(core.List<api.CreativeCustomEvent> o) {
+checkUnnamed570(core.List<api.CreativeCustomEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCustomEvent(o[0]);
   checkCreativeCustomEvent(o[1]);
 }
 
-buildUnnamed756() {
+buildUnnamed571() {
   var o = new core.List<api.ThirdPartyTrackingUrl>();
   o.add(buildThirdPartyTrackingUrl());
   o.add(buildThirdPartyTrackingUrl());
   return o;
 }
 
-checkUnnamed756(core.List<api.ThirdPartyTrackingUrl> o) {
+checkUnnamed571(core.List<api.ThirdPartyTrackingUrl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThirdPartyTrackingUrl(o[0]);
   checkThirdPartyTrackingUrl(o[1]);
 }
 
-buildUnnamed757() {
+buildUnnamed572() {
   var o = new core.List<api.CreativeCustomEvent>();
   o.add(buildCreativeCustomEvent());
   o.add(buildCreativeCustomEvent());
   return o;
 }
 
-checkUnnamed757(core.List<api.CreativeCustomEvent> o) {
+checkUnnamed572(core.List<api.CreativeCustomEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeCustomEvent(o[0]);
   checkCreativeCustomEvent(o[1]);
@@ -2167,7 +2167,7 @@
     o.accountId = "foo";
     o.active = true;
     o.adParameters = "foo";
-    o.adTagKeys = buildUnnamed746();
+    o.adTagKeys = buildUnnamed561();
     o.advertiserId = "foo";
     o.allowScriptAccess = true;
     o.archived = true;
@@ -2177,21 +2177,21 @@
     o.autoAdvanceImages = true;
     o.backgroundColor = "foo";
     o.backupImageClickThroughUrl = buildCreativeClickThroughUrl();
-    o.backupImageFeatures = buildUnnamed747();
+    o.backupImageFeatures = buildUnnamed562();
     o.backupImageReportingLabel = "foo";
     o.backupImageTargetWindow = buildTargetWindow();
-    o.clickTags = buildUnnamed748();
+    o.clickTags = buildUnnamed563();
     o.commercialId = "foo";
-    o.companionCreatives = buildUnnamed749();
-    o.compatibility = buildUnnamed750();
+    o.companionCreatives = buildUnnamed564();
+    o.compatibility = buildUnnamed565();
     o.convertFlashToHtml5 = true;
-    o.counterCustomEvents = buildUnnamed751();
+    o.counterCustomEvents = buildUnnamed566();
     o.creativeAssetSelection = buildCreativeAssetSelection();
-    o.creativeAssets = buildUnnamed752();
-    o.creativeFieldAssignments = buildUnnamed753();
-    o.customKeyValues = buildUnnamed754();
+    o.creativeAssets = buildUnnamed567();
+    o.creativeFieldAssignments = buildUnnamed568();
+    o.customKeyValues = buildUnnamed569();
     o.dynamicAssetSelection = true;
-    o.exitCustomEvents = buildUnnamed755();
+    o.exitCustomEvents = buildUnnamed570();
     o.fsCommand = buildFsCommand();
     o.htmlCode = "foo";
     o.htmlCodeLocked = true;
@@ -2220,8 +2220,8 @@
     o.subaccountId = "foo";
     o.thirdPartyBackupImageImpressionsUrl = "foo";
     o.thirdPartyRichMediaImpressionsUrl = "foo";
-    o.thirdPartyUrls = buildUnnamed756();
-    o.timerCustomEvents = buildUnnamed757();
+    o.thirdPartyUrls = buildUnnamed571();
+    o.timerCustomEvents = buildUnnamed572();
     o.totalFileSize = "foo";
     o.type = "foo";
     o.universalAdId = buildUniversalAdId();
@@ -2239,7 +2239,7 @@
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.active, unittest.isTrue);
     unittest.expect(o.adParameters, unittest.equals('foo'));
-    checkUnnamed746(o.adTagKeys);
+    checkUnnamed561(o.adTagKeys);
     unittest.expect(o.advertiserId, unittest.equals('foo'));
     unittest.expect(o.allowScriptAccess, unittest.isTrue);
     unittest.expect(o.archived, unittest.isTrue);
@@ -2249,21 +2249,21 @@
     unittest.expect(o.autoAdvanceImages, unittest.isTrue);
     unittest.expect(o.backgroundColor, unittest.equals('foo'));
     checkCreativeClickThroughUrl(o.backupImageClickThroughUrl);
-    checkUnnamed747(o.backupImageFeatures);
+    checkUnnamed562(o.backupImageFeatures);
     unittest.expect(o.backupImageReportingLabel, unittest.equals('foo'));
     checkTargetWindow(o.backupImageTargetWindow);
-    checkUnnamed748(o.clickTags);
+    checkUnnamed563(o.clickTags);
     unittest.expect(o.commercialId, unittest.equals('foo'));
-    checkUnnamed749(o.companionCreatives);
-    checkUnnamed750(o.compatibility);
+    checkUnnamed564(o.companionCreatives);
+    checkUnnamed565(o.compatibility);
     unittest.expect(o.convertFlashToHtml5, unittest.isTrue);
-    checkUnnamed751(o.counterCustomEvents);
+    checkUnnamed566(o.counterCustomEvents);
     checkCreativeAssetSelection(o.creativeAssetSelection);
-    checkUnnamed752(o.creativeAssets);
-    checkUnnamed753(o.creativeFieldAssignments);
-    checkUnnamed754(o.customKeyValues);
+    checkUnnamed567(o.creativeAssets);
+    checkUnnamed568(o.creativeFieldAssignments);
+    checkUnnamed569(o.customKeyValues);
     unittest.expect(o.dynamicAssetSelection, unittest.isTrue);
-    checkUnnamed755(o.exitCustomEvents);
+    checkUnnamed570(o.exitCustomEvents);
     checkFsCommand(o.fsCommand);
     unittest.expect(o.htmlCode, unittest.equals('foo'));
     unittest.expect(o.htmlCodeLocked, unittest.isTrue);
@@ -2294,8 +2294,8 @@
         o.thirdPartyBackupImageImpressionsUrl, unittest.equals('foo'));
     unittest.expect(
         o.thirdPartyRichMediaImpressionsUrl, unittest.equals('foo'));
-    checkUnnamed756(o.thirdPartyUrls);
-    checkUnnamed757(o.timerCustomEvents);
+    checkUnnamed571(o.thirdPartyUrls);
+    checkUnnamed572(o.timerCustomEvents);
     unittest.expect(o.totalFileSize, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     checkUniversalAdId(o.universalAdId);
@@ -2306,27 +2306,27 @@
   buildCounterCreative--;
 }
 
-buildUnnamed758() {
+buildUnnamed573() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed758(core.List<core.String> o) {
+checkUnnamed573(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed759() {
+buildUnnamed574() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed759(core.List<core.String> o) {
+checkUnnamed574(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2346,9 +2346,9 @@
     o.bitRate = 42;
     o.childAssetType = "foo";
     o.collapsedSize = buildSize();
-    o.companionCreativeIds = buildUnnamed758();
+    o.companionCreativeIds = buildUnnamed573();
     o.customStartTimeValue = 42;
-    o.detectedFeatures = buildUnnamed759();
+    o.detectedFeatures = buildUnnamed574();
     o.displayType = "foo";
     o.duration = 42;
     o.durationType = "foo";
@@ -2399,9 +2399,9 @@
     unittest.expect(o.bitRate, unittest.equals(42));
     unittest.expect(o.childAssetType, unittest.equals('foo'));
     checkSize(o.collapsedSize);
-    checkUnnamed758(o.companionCreativeIds);
+    checkUnnamed573(o.companionCreativeIds);
     unittest.expect(o.customStartTimeValue, unittest.equals(42));
-    checkUnnamed759(o.detectedFeatures);
+    checkUnnamed574(o.detectedFeatures);
     unittest.expect(o.displayType, unittest.equals('foo'));
     unittest.expect(o.duration, unittest.equals(42));
     unittest.expect(o.durationType, unittest.equals('foo'));
@@ -2460,40 +2460,40 @@
   buildCounterCreativeAssetId--;
 }
 
-buildUnnamed760() {
+buildUnnamed575() {
   var o = new core.List<api.ClickTag>();
   o.add(buildClickTag());
   o.add(buildClickTag());
   return o;
 }
 
-checkUnnamed760(core.List<api.ClickTag> o) {
+checkUnnamed575(core.List<api.ClickTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClickTag(o[0]);
   checkClickTag(o[1]);
 }
 
-buildUnnamed761() {
+buildUnnamed576() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed761(core.List<core.String> o) {
+checkUnnamed576(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed762() {
+buildUnnamed577() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed762(core.List<core.String> o) {
+checkUnnamed577(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2505,12 +2505,12 @@
   buildCounterCreativeAssetMetadata++;
   if (buildCounterCreativeAssetMetadata < 3) {
     o.assetIdentifier = buildCreativeAssetId();
-    o.clickTags = buildUnnamed760();
-    o.detectedFeatures = buildUnnamed761();
+    o.clickTags = buildUnnamed575();
+    o.detectedFeatures = buildUnnamed576();
     o.id = "foo";
     o.idDimensionValue = buildDimensionValue();
     o.kind = "foo";
-    o.warnedValidationRules = buildUnnamed762();
+    o.warnedValidationRules = buildUnnamed577();
   }
   buildCounterCreativeAssetMetadata--;
   return o;
@@ -2520,24 +2520,24 @@
   buildCounterCreativeAssetMetadata++;
   if (buildCounterCreativeAssetMetadata < 3) {
     checkCreativeAssetId(o.assetIdentifier);
-    checkUnnamed760(o.clickTags);
-    checkUnnamed761(o.detectedFeatures);
+    checkUnnamed575(o.clickTags);
+    checkUnnamed576(o.detectedFeatures);
     unittest.expect(o.id, unittest.equals('foo'));
     checkDimensionValue(o.idDimensionValue);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed762(o.warnedValidationRules);
+    checkUnnamed577(o.warnedValidationRules);
   }
   buildCounterCreativeAssetMetadata--;
 }
 
-buildUnnamed763() {
+buildUnnamed578() {
   var o = new core.List<api.Rule>();
   o.add(buildRule());
   o.add(buildRule());
   return o;
 }
 
-checkUnnamed763(core.List<api.Rule> o) {
+checkUnnamed578(core.List<api.Rule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRule(o[0]);
   checkRule(o[1]);
@@ -2549,7 +2549,7 @@
   buildCounterCreativeAssetSelection++;
   if (buildCounterCreativeAssetSelection < 3) {
     o.defaultAssetId = "foo";
-    o.rules = buildUnnamed763();
+    o.rules = buildUnnamed578();
   }
   buildCounterCreativeAssetSelection--;
   return o;
@@ -2559,45 +2559,45 @@
   buildCounterCreativeAssetSelection++;
   if (buildCounterCreativeAssetSelection < 3) {
     unittest.expect(o.defaultAssetId, unittest.equals('foo'));
-    checkUnnamed763(o.rules);
+    checkUnnamed578(o.rules);
   }
   buildCounterCreativeAssetSelection--;
 }
 
-buildUnnamed764() {
+buildUnnamed579() {
   var o = new core.List<api.CompanionClickThroughOverride>();
   o.add(buildCompanionClickThroughOverride());
   o.add(buildCompanionClickThroughOverride());
   return o;
 }
 
-checkUnnamed764(core.List<api.CompanionClickThroughOverride> o) {
+checkUnnamed579(core.List<api.CompanionClickThroughOverride> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCompanionClickThroughOverride(o[0]);
   checkCompanionClickThroughOverride(o[1]);
 }
 
-buildUnnamed765() {
+buildUnnamed580() {
   var o = new core.List<api.CreativeGroupAssignment>();
   o.add(buildCreativeGroupAssignment());
   o.add(buildCreativeGroupAssignment());
   return o;
 }
 
-checkUnnamed765(core.List<api.CreativeGroupAssignment> o) {
+checkUnnamed580(core.List<api.CreativeGroupAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeGroupAssignment(o[0]);
   checkCreativeGroupAssignment(o[1]);
 }
 
-buildUnnamed766() {
+buildUnnamed581() {
   var o = new core.List<api.RichMediaExitOverride>();
   o.add(buildRichMediaExitOverride());
   o.add(buildRichMediaExitOverride());
   return o;
 }
 
-checkUnnamed766(core.List<api.RichMediaExitOverride> o) {
+checkUnnamed581(core.List<api.RichMediaExitOverride> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRichMediaExitOverride(o[0]);
   checkRichMediaExitOverride(o[1]);
@@ -2611,12 +2611,12 @@
     o.active = true;
     o.applyEventTags = true;
     o.clickThroughUrl = buildClickThroughUrl();
-    o.companionCreativeOverrides = buildUnnamed764();
-    o.creativeGroupAssignments = buildUnnamed765();
+    o.companionCreativeOverrides = buildUnnamed579();
+    o.creativeGroupAssignments = buildUnnamed580();
     o.creativeId = "foo";
     o.creativeIdDimensionValue = buildDimensionValue();
     o.endTime = core.DateTime.parse("2002-02-27T14:01:02");
-    o.richMediaExitOverrides = buildUnnamed766();
+    o.richMediaExitOverrides = buildUnnamed581();
     o.sequence = 42;
     o.sslCompliant = true;
     o.startTime = core.DateTime.parse("2002-02-27T14:01:02");
@@ -2632,13 +2632,13 @@
     unittest.expect(o.active, unittest.isTrue);
     unittest.expect(o.applyEventTags, unittest.isTrue);
     checkClickThroughUrl(o.clickThroughUrl);
-    checkUnnamed764(o.companionCreativeOverrides);
-    checkUnnamed765(o.creativeGroupAssignments);
+    checkUnnamed579(o.companionCreativeOverrides);
+    checkUnnamed580(o.creativeGroupAssignments);
     unittest.expect(o.creativeId, unittest.equals('foo'));
     checkDimensionValue(o.creativeIdDimensionValue);
     unittest.expect(
         o.endTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed766(o.richMediaExitOverrides);
+    checkUnnamed581(o.richMediaExitOverrides);
     unittest.expect(o.sequence, unittest.equals(42));
     unittest.expect(o.sslCompliant, unittest.isTrue);
     unittest.expect(o.startTime,
@@ -2783,14 +2783,14 @@
   buildCounterCreativeFieldValue--;
 }
 
-buildUnnamed767() {
+buildUnnamed582() {
   var o = new core.List<api.CreativeFieldValue>();
   o.add(buildCreativeFieldValue());
   o.add(buildCreativeFieldValue());
   return o;
 }
 
-checkUnnamed767(core.List<api.CreativeFieldValue> o) {
+checkUnnamed582(core.List<api.CreativeFieldValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeFieldValue(o[0]);
   checkCreativeFieldValue(o[1]);
@@ -2801,7 +2801,7 @@
   var o = new api.CreativeFieldValuesListResponse();
   buildCounterCreativeFieldValuesListResponse++;
   if (buildCounterCreativeFieldValuesListResponse < 3) {
-    o.creativeFieldValues = buildUnnamed767();
+    o.creativeFieldValues = buildUnnamed582();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2812,21 +2812,21 @@
 checkCreativeFieldValuesListResponse(api.CreativeFieldValuesListResponse o) {
   buildCounterCreativeFieldValuesListResponse++;
   if (buildCounterCreativeFieldValuesListResponse < 3) {
-    checkUnnamed767(o.creativeFieldValues);
+    checkUnnamed582(o.creativeFieldValues);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCreativeFieldValuesListResponse--;
 }
 
-buildUnnamed768() {
+buildUnnamed583() {
   var o = new core.List<api.CreativeField>();
   o.add(buildCreativeField());
   o.add(buildCreativeField());
   return o;
 }
 
-checkUnnamed768(core.List<api.CreativeField> o) {
+checkUnnamed583(core.List<api.CreativeField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeField(o[0]);
   checkCreativeField(o[1]);
@@ -2837,7 +2837,7 @@
   var o = new api.CreativeFieldsListResponse();
   buildCounterCreativeFieldsListResponse++;
   if (buildCounterCreativeFieldsListResponse < 3) {
-    o.creativeFields = buildUnnamed768();
+    o.creativeFields = buildUnnamed583();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2848,7 +2848,7 @@
 checkCreativeFieldsListResponse(api.CreativeFieldsListResponse o) {
   buildCounterCreativeFieldsListResponse++;
   if (buildCounterCreativeFieldsListResponse < 3) {
-    checkUnnamed768(o.creativeFields);
+    checkUnnamed583(o.creativeFields);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -2909,14 +2909,14 @@
   buildCounterCreativeGroupAssignment--;
 }
 
-buildUnnamed769() {
+buildUnnamed584() {
   var o = new core.List<api.CreativeGroup>();
   o.add(buildCreativeGroup());
   o.add(buildCreativeGroup());
   return o;
 }
 
-checkUnnamed769(core.List<api.CreativeGroup> o) {
+checkUnnamed584(core.List<api.CreativeGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeGroup(o[0]);
   checkCreativeGroup(o[1]);
@@ -2927,7 +2927,7 @@
   var o = new api.CreativeGroupsListResponse();
   buildCounterCreativeGroupsListResponse++;
   if (buildCounterCreativeGroupsListResponse < 3) {
-    o.creativeGroups = buildUnnamed769();
+    o.creativeGroups = buildUnnamed584();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2938,21 +2938,21 @@
 checkCreativeGroupsListResponse(api.CreativeGroupsListResponse o) {
   buildCounterCreativeGroupsListResponse++;
   if (buildCounterCreativeGroupsListResponse < 3) {
-    checkUnnamed769(o.creativeGroups);
+    checkUnnamed584(o.creativeGroups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCreativeGroupsListResponse--;
 }
 
-buildUnnamed770() {
+buildUnnamed585() {
   var o = new core.List<api.OptimizationActivity>();
   o.add(buildOptimizationActivity());
   o.add(buildOptimizationActivity());
   return o;
 }
 
-checkUnnamed770(core.List<api.OptimizationActivity> o) {
+checkUnnamed585(core.List<api.OptimizationActivity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOptimizationActivity(o[0]);
   checkOptimizationActivity(o[1]);
@@ -2965,7 +2965,7 @@
   if (buildCounterCreativeOptimizationConfiguration < 3) {
     o.id = "foo";
     o.name = "foo";
-    o.optimizationActivitys = buildUnnamed770();
+    o.optimizationActivitys = buildUnnamed585();
     o.optimizationModel = "foo";
   }
   buildCounterCreativeOptimizationConfiguration--;
@@ -2978,20 +2978,20 @@
   if (buildCounterCreativeOptimizationConfiguration < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed770(o.optimizationActivitys);
+    checkUnnamed585(o.optimizationActivitys);
     unittest.expect(o.optimizationModel, unittest.equals('foo'));
   }
   buildCounterCreativeOptimizationConfiguration--;
 }
 
-buildUnnamed771() {
+buildUnnamed586() {
   var o = new core.List<api.CreativeAssignment>();
   o.add(buildCreativeAssignment());
   o.add(buildCreativeAssignment());
   return o;
 }
 
-checkUnnamed771(core.List<api.CreativeAssignment> o) {
+checkUnnamed586(core.List<api.CreativeAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeAssignment(o[0]);
   checkCreativeAssignment(o[1]);
@@ -3002,7 +3002,7 @@
   var o = new api.CreativeRotation();
   buildCounterCreativeRotation++;
   if (buildCounterCreativeRotation < 3) {
-    o.creativeAssignments = buildUnnamed771();
+    o.creativeAssignments = buildUnnamed586();
     o.creativeOptimizationConfigurationId = "foo";
     o.type = "foo";
     o.weightCalculationStrategy = "foo";
@@ -3014,7 +3014,7 @@
 checkCreativeRotation(api.CreativeRotation o) {
   buildCounterCreativeRotation++;
   if (buildCounterCreativeRotation < 3) {
-    checkUnnamed771(o.creativeAssignments);
+    checkUnnamed586(o.creativeAssignments);
     unittest.expect(
         o.creativeOptimizationConfigurationId, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -3044,14 +3044,14 @@
   buildCounterCreativeSettings--;
 }
 
-buildUnnamed772() {
+buildUnnamed587() {
   var o = new core.List<api.Creative>();
   o.add(buildCreative());
   o.add(buildCreative());
   return o;
 }
 
-checkUnnamed772(core.List<api.Creative> o) {
+checkUnnamed587(core.List<api.Creative> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreative(o[0]);
   checkCreative(o[1]);
@@ -3062,7 +3062,7 @@
   var o = new api.CreativesListResponse();
   buildCounterCreativesListResponse++;
   if (buildCounterCreativesListResponse < 3) {
-    o.creatives = buildUnnamed772();
+    o.creatives = buildUnnamed587();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3073,60 +3073,60 @@
 checkCreativesListResponse(api.CreativesListResponse o) {
   buildCounterCreativesListResponse++;
   if (buildCounterCreativesListResponse < 3) {
-    checkUnnamed772(o.creatives);
+    checkUnnamed587(o.creatives);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCreativesListResponse--;
 }
 
-buildUnnamed773() {
+buildUnnamed588() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed773(core.List<api.Dimension> o) {
+checkUnnamed588(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed774() {
+buildUnnamed589() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed774(core.List<api.Dimension> o) {
+checkUnnamed589(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed775() {
+buildUnnamed590() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed775(core.List<api.Metric> o) {
+checkUnnamed590(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed776() {
+buildUnnamed591() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed776(core.List<api.Metric> o) {
+checkUnnamed591(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -3137,11 +3137,11 @@
   var o = new api.CrossDimensionReachReportCompatibleFields();
   buildCounterCrossDimensionReachReportCompatibleFields++;
   if (buildCounterCrossDimensionReachReportCompatibleFields < 3) {
-    o.breakdown = buildUnnamed773();
-    o.dimensionFilters = buildUnnamed774();
+    o.breakdown = buildUnnamed588();
+    o.dimensionFilters = buildUnnamed589();
     o.kind = "foo";
-    o.metrics = buildUnnamed775();
-    o.overlapMetrics = buildUnnamed776();
+    o.metrics = buildUnnamed590();
+    o.overlapMetrics = buildUnnamed591();
   }
   buildCounterCrossDimensionReachReportCompatibleFields--;
   return o;
@@ -3151,11 +3151,11 @@
     api.CrossDimensionReachReportCompatibleFields o) {
   buildCounterCrossDimensionReachReportCompatibleFields++;
   if (buildCounterCrossDimensionReachReportCompatibleFields < 3) {
-    checkUnnamed773(o.breakdown);
-    checkUnnamed774(o.dimensionFilters);
+    checkUnnamed588(o.breakdown);
+    checkUnnamed589(o.dimensionFilters);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed775(o.metrics);
-    checkUnnamed776(o.overlapMetrics);
+    checkUnnamed590(o.metrics);
+    checkUnnamed591(o.overlapMetrics);
   }
   buildCounterCrossDimensionReachReportCompatibleFields--;
 }
@@ -3183,14 +3183,14 @@
   buildCounterCustomFloodlightVariable--;
 }
 
-buildUnnamed777() {
+buildUnnamed592() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed777(core.List<api.DimensionValue> o) {
+checkUnnamed592(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
@@ -3201,7 +3201,7 @@
   var o = new api.CustomRichMediaEvents();
   buildCounterCustomRichMediaEvents++;
   if (buildCounterCustomRichMediaEvents < 3) {
-    o.filteredEventIds = buildUnnamed777();
+    o.filteredEventIds = buildUnnamed592();
     o.kind = "foo";
   }
   buildCounterCustomRichMediaEvents--;
@@ -3211,7 +3211,7 @@
 checkCustomRichMediaEvents(api.CustomRichMediaEvents o) {
   buildCounterCustomRichMediaEvents++;
   if (buildCounterCustomRichMediaEvents < 3) {
-    checkUnnamed777(o.filteredEventIds);
+    checkUnnamed592(o.filteredEventIds);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterCustomRichMediaEvents--;
@@ -3244,27 +3244,27 @@
   buildCounterDateRange--;
 }
 
-buildUnnamed778() {
+buildUnnamed593() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed778(core.List<core.String> o) {
+checkUnnamed593(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed779() {
+buildUnnamed594() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed779(core.List<core.int> o) {
+checkUnnamed594(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -3275,8 +3275,8 @@
   var o = new api.DayPartTargeting();
   buildCounterDayPartTargeting++;
   if (buildCounterDayPartTargeting < 3) {
-    o.daysOfWeek = buildUnnamed778();
-    o.hoursOfDay = buildUnnamed779();
+    o.daysOfWeek = buildUnnamed593();
+    o.hoursOfDay = buildUnnamed594();
     o.userLocalTime = true;
   }
   buildCounterDayPartTargeting--;
@@ -3286,8 +3286,8 @@
 checkDayPartTargeting(api.DayPartTargeting o) {
   buildCounterDayPartTargeting++;
   if (buildCounterDayPartTargeting < 3) {
-    checkUnnamed778(o.daysOfWeek);
-    checkUnnamed779(o.hoursOfDay);
+    checkUnnamed593(o.daysOfWeek);
+    checkUnnamed594(o.hoursOfDay);
     unittest.expect(o.userLocalTime, unittest.isTrue);
   }
   buildCounterDayPartTargeting--;
@@ -3440,14 +3440,14 @@
   buildCounterDimensionValue--;
 }
 
-buildUnnamed780() {
+buildUnnamed595() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed780(core.List<api.DimensionValue> o) {
+checkUnnamed595(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
@@ -3459,7 +3459,7 @@
   buildCounterDimensionValueList++;
   if (buildCounterDimensionValueList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed780();
+    o.items = buildUnnamed595();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3471,21 +3471,21 @@
   buildCounterDimensionValueList++;
   if (buildCounterDimensionValueList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed780(o.items);
+    checkUnnamed595(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterDimensionValueList--;
 }
 
-buildUnnamed781() {
+buildUnnamed596() {
   var o = new core.List<api.DimensionFilter>();
   o.add(buildDimensionFilter());
   o.add(buildDimensionFilter());
   return o;
 }
 
-checkUnnamed781(core.List<api.DimensionFilter> o) {
+checkUnnamed596(core.List<api.DimensionFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionFilter(o[0]);
   checkDimensionFilter(o[1]);
@@ -3498,7 +3498,7 @@
   if (buildCounterDimensionValueRequest < 3) {
     o.dimensionName = "foo";
     o.endDate = core.DateTime.parse("2002-02-27T14:01:02Z");
-    o.filters = buildUnnamed781();
+    o.filters = buildUnnamed596();
     o.kind = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
   }
@@ -3512,7 +3512,7 @@
     unittest.expect(o.dimensionName, unittest.equals('foo'));
     unittest.expect(
         o.endDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
-    checkUnnamed781(o.filters);
+    checkUnnamed596(o.filters);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.startDate,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
@@ -3520,40 +3520,40 @@
   buildCounterDimensionValueRequest--;
 }
 
-buildUnnamed782() {
+buildUnnamed597() {
   var o = new core.List<api.DirectorySiteContactAssignment>();
   o.add(buildDirectorySiteContactAssignment());
   o.add(buildDirectorySiteContactAssignment());
   return o;
 }
 
-checkUnnamed782(core.List<api.DirectorySiteContactAssignment> o) {
+checkUnnamed597(core.List<api.DirectorySiteContactAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectorySiteContactAssignment(o[0]);
   checkDirectorySiteContactAssignment(o[1]);
 }
 
-buildUnnamed783() {
+buildUnnamed598() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed783(core.List<core.String> o) {
+checkUnnamed598(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed784() {
+buildUnnamed599() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed784(core.List<core.String> o) {
+checkUnnamed599(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3565,14 +3565,14 @@
   buildCounterDirectorySite++;
   if (buildCounterDirectorySite < 3) {
     o.active = true;
-    o.contactAssignments = buildUnnamed782();
+    o.contactAssignments = buildUnnamed597();
     o.countryId = "foo";
     o.currencyId = "foo";
     o.description = "foo";
     o.id = "foo";
     o.idDimensionValue = buildDimensionValue();
-    o.inpageTagFormats = buildUnnamed783();
-    o.interstitialTagFormats = buildUnnamed784();
+    o.inpageTagFormats = buildUnnamed598();
+    o.interstitialTagFormats = buildUnnamed599();
     o.kind = "foo";
     o.name = "foo";
     o.parentId = "foo";
@@ -3587,14 +3587,14 @@
   buildCounterDirectorySite++;
   if (buildCounterDirectorySite < 3) {
     unittest.expect(o.active, unittest.isTrue);
-    checkUnnamed782(o.contactAssignments);
+    checkUnnamed597(o.contactAssignments);
     unittest.expect(o.countryId, unittest.equals('foo'));
     unittest.expect(o.currencyId, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkDimensionValue(o.idDimensionValue);
-    checkUnnamed783(o.inpageTagFormats);
-    checkUnnamed784(o.interstitialTagFormats);
+    checkUnnamed598(o.inpageTagFormats);
+    checkUnnamed599(o.interstitialTagFormats);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.parentId, unittest.equals('foo'));
@@ -3662,14 +3662,14 @@
   buildCounterDirectorySiteContactAssignment--;
 }
 
-buildUnnamed785() {
+buildUnnamed600() {
   var o = new core.List<api.DirectorySiteContact>();
   o.add(buildDirectorySiteContact());
   o.add(buildDirectorySiteContact());
   return o;
 }
 
-checkUnnamed785(core.List<api.DirectorySiteContact> o) {
+checkUnnamed600(core.List<api.DirectorySiteContact> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectorySiteContact(o[0]);
   checkDirectorySiteContact(o[1]);
@@ -3680,7 +3680,7 @@
   var o = new api.DirectorySiteContactsListResponse();
   buildCounterDirectorySiteContactsListResponse++;
   if (buildCounterDirectorySiteContactsListResponse < 3) {
-    o.directorySiteContacts = buildUnnamed785();
+    o.directorySiteContacts = buildUnnamed600();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3692,7 +3692,7 @@
     api.DirectorySiteContactsListResponse o) {
   buildCounterDirectorySiteContactsListResponse++;
   if (buildCounterDirectorySiteContactsListResponse < 3) {
-    checkUnnamed785(o.directorySiteContacts);
+    checkUnnamed600(o.directorySiteContacts);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -3730,14 +3730,14 @@
   buildCounterDirectorySiteSettings--;
 }
 
-buildUnnamed786() {
+buildUnnamed601() {
   var o = new core.List<api.DirectorySite>();
   o.add(buildDirectorySite());
   o.add(buildDirectorySite());
   return o;
 }
 
-checkUnnamed786(core.List<api.DirectorySite> o) {
+checkUnnamed601(core.List<api.DirectorySite> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectorySite(o[0]);
   checkDirectorySite(o[1]);
@@ -3748,7 +3748,7 @@
   var o = new api.DirectorySitesListResponse();
   buildCounterDirectorySitesListResponse++;
   if (buildCounterDirectorySitesListResponse < 3) {
-    o.directorySites = buildUnnamed786();
+    o.directorySites = buildUnnamed601();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3759,7 +3759,7 @@
 checkDirectorySitesListResponse(api.DirectorySitesListResponse o) {
   buildCounterDirectorySitesListResponse++;
   if (buildCounterDirectorySitesListResponse < 3) {
-    checkUnnamed786(o.directorySites);
+    checkUnnamed601(o.directorySites);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -3791,14 +3791,14 @@
   buildCounterDynamicTargetingKey--;
 }
 
-buildUnnamed787() {
+buildUnnamed602() {
   var o = new core.List<api.DynamicTargetingKey>();
   o.add(buildDynamicTargetingKey());
   o.add(buildDynamicTargetingKey());
   return o;
 }
 
-checkUnnamed787(core.List<api.DynamicTargetingKey> o) {
+checkUnnamed602(core.List<api.DynamicTargetingKey> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDynamicTargetingKey(o[0]);
   checkDynamicTargetingKey(o[1]);
@@ -3809,7 +3809,7 @@
   var o = new api.DynamicTargetingKeysListResponse();
   buildCounterDynamicTargetingKeysListResponse++;
   if (buildCounterDynamicTargetingKeysListResponse < 3) {
-    o.dynamicTargetingKeys = buildUnnamed787();
+    o.dynamicTargetingKeys = buildUnnamed602();
     o.kind = "foo";
   }
   buildCounterDynamicTargetingKeysListResponse--;
@@ -3819,7 +3819,7 @@
 checkDynamicTargetingKeysListResponse(api.DynamicTargetingKeysListResponse o) {
   buildCounterDynamicTargetingKeysListResponse++;
   if (buildCounterDynamicTargetingKeysListResponse < 3) {
-    checkUnnamed787(o.dynamicTargetingKeys);
+    checkUnnamed602(o.dynamicTargetingKeys);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDynamicTargetingKeysListResponse--;
@@ -3850,14 +3850,14 @@
   buildCounterEncryptionInfo--;
 }
 
-buildUnnamed788() {
+buildUnnamed603() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed788(core.List<core.String> o) {
+checkUnnamed603(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3879,7 +3879,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.siteFilterType = "foo";
-    o.siteIds = buildUnnamed788();
+    o.siteIds = buildUnnamed603();
     o.sslCompliant = true;
     o.status = "foo";
     o.subaccountId = "foo";
@@ -3905,7 +3905,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.siteFilterType, unittest.equals('foo'));
-    checkUnnamed788(o.siteIds);
+    checkUnnamed603(o.siteIds);
     unittest.expect(o.sslCompliant, unittest.isTrue);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.subaccountId, unittest.equals('foo'));
@@ -3937,14 +3937,14 @@
   buildCounterEventTagOverride--;
 }
 
-buildUnnamed789() {
+buildUnnamed604() {
   var o = new core.List<api.EventTag>();
   o.add(buildEventTag());
   o.add(buildEventTag());
   return o;
 }
 
-checkUnnamed789(core.List<api.EventTag> o) {
+checkUnnamed604(core.List<api.EventTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventTag(o[0]);
   checkEventTag(o[1]);
@@ -3955,7 +3955,7 @@
   var o = new api.EventTagsListResponse();
   buildCounterEventTagsListResponse++;
   if (buildCounterEventTagsListResponse < 3) {
-    o.eventTags = buildUnnamed789();
+    o.eventTags = buildUnnamed604();
     o.kind = "foo";
   }
   buildCounterEventTagsListResponse--;
@@ -3965,7 +3965,7 @@
 checkEventTagsListResponse(api.EventTagsListResponse o) {
   buildCounterEventTagsListResponse++;
   if (buildCounterEventTagsListResponse < 3) {
-    checkUnnamed789(o.eventTags);
+    checkUnnamed604(o.eventTags);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterEventTagsListResponse--;
@@ -4029,14 +4029,14 @@
   buildCounterFile--;
 }
 
-buildUnnamed790() {
+buildUnnamed605() {
   var o = new core.List<api.File>();
   o.add(buildFile());
   o.add(buildFile());
   return o;
 }
 
-checkUnnamed790(core.List<api.File> o) {
+checkUnnamed605(core.List<api.File> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFile(o[0]);
   checkFile(o[1]);
@@ -4048,7 +4048,7 @@
   buildCounterFileList++;
   if (buildCounterFileList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed790();
+    o.items = buildUnnamed605();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -4060,7 +4060,7 @@
   buildCounterFileList++;
   if (buildCounterFileList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed790(o.items);
+    checkUnnamed605(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -4118,14 +4118,14 @@
   buildCounterFloodlightActivitiesGenerateTagResponse--;
 }
 
-buildUnnamed791() {
+buildUnnamed606() {
   var o = new core.List<api.FloodlightActivity>();
   o.add(buildFloodlightActivity());
   o.add(buildFloodlightActivity());
   return o;
 }
 
-checkUnnamed791(core.List<api.FloodlightActivity> o) {
+checkUnnamed606(core.List<api.FloodlightActivity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightActivity(o[0]);
   checkFloodlightActivity(o[1]);
@@ -4136,7 +4136,7 @@
   var o = new api.FloodlightActivitiesListResponse();
   buildCounterFloodlightActivitiesListResponse++;
   if (buildCounterFloodlightActivitiesListResponse < 3) {
-    o.floodlightActivities = buildUnnamed791();
+    o.floodlightActivities = buildUnnamed606();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -4147,47 +4147,47 @@
 checkFloodlightActivitiesListResponse(api.FloodlightActivitiesListResponse o) {
   buildCounterFloodlightActivitiesListResponse++;
   if (buildCounterFloodlightActivitiesListResponse < 3) {
-    checkUnnamed791(o.floodlightActivities);
+    checkUnnamed606(o.floodlightActivities);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterFloodlightActivitiesListResponse--;
 }
 
-buildUnnamed792() {
+buildUnnamed607() {
   var o = new core.List<api.FloodlightActivityDynamicTag>();
   o.add(buildFloodlightActivityDynamicTag());
   o.add(buildFloodlightActivityDynamicTag());
   return o;
 }
 
-checkUnnamed792(core.List<api.FloodlightActivityDynamicTag> o) {
+checkUnnamed607(core.List<api.FloodlightActivityDynamicTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightActivityDynamicTag(o[0]);
   checkFloodlightActivityDynamicTag(o[1]);
 }
 
-buildUnnamed793() {
+buildUnnamed608() {
   var o = new core.List<api.FloodlightActivityPublisherDynamicTag>();
   o.add(buildFloodlightActivityPublisherDynamicTag());
   o.add(buildFloodlightActivityPublisherDynamicTag());
   return o;
 }
 
-checkUnnamed793(core.List<api.FloodlightActivityPublisherDynamicTag> o) {
+checkUnnamed608(core.List<api.FloodlightActivityPublisherDynamicTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightActivityPublisherDynamicTag(o[0]);
   checkFloodlightActivityPublisherDynamicTag(o[1]);
 }
 
-buildUnnamed794() {
+buildUnnamed609() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed794(core.List<core.String> o) {
+checkUnnamed609(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4203,7 +4203,7 @@
     o.advertiserIdDimensionValue = buildDimensionValue();
     o.cacheBustingType = "foo";
     o.countingMethod = "foo";
-    o.defaultTags = buildUnnamed792();
+    o.defaultTags = buildUnnamed607();
     o.expectedUrl = "foo";
     o.floodlightActivityGroupId = "foo";
     o.floodlightActivityGroupName = "foo";
@@ -4218,14 +4218,14 @@
     o.kind = "foo";
     o.name = "foo";
     o.notes = "foo";
-    o.publisherTags = buildUnnamed793();
+    o.publisherTags = buildUnnamed608();
     o.secure = true;
     o.sslCompliant = true;
     o.sslRequired = true;
     o.subaccountId = "foo";
     o.tagFormat = "foo";
     o.tagString = "foo";
-    o.userDefinedVariableTypes = buildUnnamed794();
+    o.userDefinedVariableTypes = buildUnnamed609();
   }
   buildCounterFloodlightActivity--;
   return o;
@@ -4239,7 +4239,7 @@
     checkDimensionValue(o.advertiserIdDimensionValue);
     unittest.expect(o.cacheBustingType, unittest.equals('foo'));
     unittest.expect(o.countingMethod, unittest.equals('foo'));
-    checkUnnamed792(o.defaultTags);
+    checkUnnamed607(o.defaultTags);
     unittest.expect(o.expectedUrl, unittest.equals('foo'));
     unittest.expect(o.floodlightActivityGroupId, unittest.equals('foo'));
     unittest.expect(o.floodlightActivityGroupName, unittest.equals('foo'));
@@ -4254,14 +4254,14 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed793(o.publisherTags);
+    checkUnnamed608(o.publisherTags);
     unittest.expect(o.secure, unittest.isTrue);
     unittest.expect(o.sslCompliant, unittest.isTrue);
     unittest.expect(o.sslRequired, unittest.isTrue);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
     unittest.expect(o.tagFormat, unittest.equals('foo'));
     unittest.expect(o.tagString, unittest.equals('foo'));
-    checkUnnamed794(o.userDefinedVariableTypes);
+    checkUnnamed609(o.userDefinedVariableTypes);
   }
   buildCounterFloodlightActivity--;
 }
@@ -4330,14 +4330,14 @@
   buildCounterFloodlightActivityGroup--;
 }
 
-buildUnnamed795() {
+buildUnnamed610() {
   var o = new core.List<api.FloodlightActivityGroup>();
   o.add(buildFloodlightActivityGroup());
   o.add(buildFloodlightActivityGroup());
   return o;
 }
 
-checkUnnamed795(core.List<api.FloodlightActivityGroup> o) {
+checkUnnamed610(core.List<api.FloodlightActivityGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightActivityGroup(o[0]);
   checkFloodlightActivityGroup(o[1]);
@@ -4348,7 +4348,7 @@
   var o = new api.FloodlightActivityGroupsListResponse();
   buildCounterFloodlightActivityGroupsListResponse++;
   if (buildCounterFloodlightActivityGroupsListResponse < 3) {
-    o.floodlightActivityGroups = buildUnnamed795();
+    o.floodlightActivityGroups = buildUnnamed610();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -4360,7 +4360,7 @@
     api.FloodlightActivityGroupsListResponse o) {
   buildCounterFloodlightActivityGroupsListResponse++;
   if (buildCounterFloodlightActivityGroupsListResponse < 3) {
-    checkUnnamed795(o.floodlightActivityGroups);
+    checkUnnamed610(o.floodlightActivityGroups);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -4397,27 +4397,27 @@
   buildCounterFloodlightActivityPublisherDynamicTag--;
 }
 
-buildUnnamed796() {
+buildUnnamed611() {
   var o = new core.List<api.ThirdPartyAuthenticationToken>();
   o.add(buildThirdPartyAuthenticationToken());
   o.add(buildThirdPartyAuthenticationToken());
   return o;
 }
 
-checkUnnamed796(core.List<api.ThirdPartyAuthenticationToken> o) {
+checkUnnamed611(core.List<api.ThirdPartyAuthenticationToken> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThirdPartyAuthenticationToken(o[0]);
   checkThirdPartyAuthenticationToken(o[1]);
 }
 
-buildUnnamed797() {
+buildUnnamed612() {
   var o = new core.List<api.UserDefinedVariableConfiguration>();
   o.add(buildUserDefinedVariableConfiguration());
   o.add(buildUserDefinedVariableConfiguration());
   return o;
 }
 
-checkUnnamed797(core.List<api.UserDefinedVariableConfiguration> o) {
+checkUnnamed612(core.List<api.UserDefinedVariableConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserDefinedVariableConfiguration(o[0]);
   checkUserDefinedVariableConfiguration(o[1]);
@@ -4443,8 +4443,8 @@
     o.omnitureSettings = buildOmnitureSettings();
     o.subaccountId = "foo";
     o.tagSettings = buildTagSettings();
-    o.thirdPartyAuthenticationTokens = buildUnnamed796();
-    o.userDefinedVariableConfigurations = buildUnnamed797();
+    o.thirdPartyAuthenticationTokens = buildUnnamed611();
+    o.userDefinedVariableConfigurations = buildUnnamed612();
   }
   buildCounterFloodlightConfiguration--;
   return o;
@@ -4469,20 +4469,20 @@
     checkOmnitureSettings(o.omnitureSettings);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
     checkTagSettings(o.tagSettings);
-    checkUnnamed796(o.thirdPartyAuthenticationTokens);
-    checkUnnamed797(o.userDefinedVariableConfigurations);
+    checkUnnamed611(o.thirdPartyAuthenticationTokens);
+    checkUnnamed612(o.userDefinedVariableConfigurations);
   }
   buildCounterFloodlightConfiguration--;
 }
 
-buildUnnamed798() {
+buildUnnamed613() {
   var o = new core.List<api.FloodlightConfiguration>();
   o.add(buildFloodlightConfiguration());
   o.add(buildFloodlightConfiguration());
   return o;
 }
 
-checkUnnamed798(core.List<api.FloodlightConfiguration> o) {
+checkUnnamed613(core.List<api.FloodlightConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFloodlightConfiguration(o[0]);
   checkFloodlightConfiguration(o[1]);
@@ -4493,7 +4493,7 @@
   var o = new api.FloodlightConfigurationsListResponse();
   buildCounterFloodlightConfigurationsListResponse++;
   if (buildCounterFloodlightConfigurationsListResponse < 3) {
-    o.floodlightConfigurations = buildUnnamed798();
+    o.floodlightConfigurations = buildUnnamed613();
     o.kind = "foo";
   }
   buildCounterFloodlightConfigurationsListResponse--;
@@ -4504,46 +4504,46 @@
     api.FloodlightConfigurationsListResponse o) {
   buildCounterFloodlightConfigurationsListResponse++;
   if (buildCounterFloodlightConfigurationsListResponse < 3) {
-    checkUnnamed798(o.floodlightConfigurations);
+    checkUnnamed613(o.floodlightConfigurations);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterFloodlightConfigurationsListResponse--;
 }
 
-buildUnnamed799() {
+buildUnnamed614() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed799(core.List<api.Dimension> o) {
+checkUnnamed614(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed800() {
+buildUnnamed615() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed800(core.List<api.Dimension> o) {
+checkUnnamed615(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed801() {
+buildUnnamed616() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed801(core.List<api.Metric> o) {
+checkUnnamed616(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -4554,10 +4554,10 @@
   var o = new api.FloodlightReportCompatibleFields();
   buildCounterFloodlightReportCompatibleFields++;
   if (buildCounterFloodlightReportCompatibleFields < 3) {
-    o.dimensionFilters = buildUnnamed799();
-    o.dimensions = buildUnnamed800();
+    o.dimensionFilters = buildUnnamed614();
+    o.dimensions = buildUnnamed615();
     o.kind = "foo";
-    o.metrics = buildUnnamed801();
+    o.metrics = buildUnnamed616();
   }
   buildCounterFloodlightReportCompatibleFields--;
   return o;
@@ -4566,10 +4566,10 @@
 checkFloodlightReportCompatibleFields(api.FloodlightReportCompatibleFields o) {
   buildCounterFloodlightReportCompatibleFields++;
   if (buildCounterFloodlightReportCompatibleFields < 3) {
-    checkUnnamed799(o.dimensionFilters);
-    checkUnnamed800(o.dimensions);
+    checkUnnamed614(o.dimensionFilters);
+    checkUnnamed615(o.dimensions);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed801(o.metrics);
+    checkUnnamed616(o.metrics);
   }
   buildCounterFloodlightReportCompatibleFields--;
 }
@@ -4622,66 +4622,66 @@
   buildCounterFsCommand--;
 }
 
-buildUnnamed802() {
+buildUnnamed617() {
   var o = new core.List<api.City>();
   o.add(buildCity());
   o.add(buildCity());
   return o;
 }
 
-checkUnnamed802(core.List<api.City> o) {
+checkUnnamed617(core.List<api.City> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCity(o[0]);
   checkCity(o[1]);
 }
 
-buildUnnamed803() {
+buildUnnamed618() {
   var o = new core.List<api.Country>();
   o.add(buildCountry());
   o.add(buildCountry());
   return o;
 }
 
-checkUnnamed803(core.List<api.Country> o) {
+checkUnnamed618(core.List<api.Country> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCountry(o[0]);
   checkCountry(o[1]);
 }
 
-buildUnnamed804() {
+buildUnnamed619() {
   var o = new core.List<api.Metro>();
   o.add(buildMetro());
   o.add(buildMetro());
   return o;
 }
 
-checkUnnamed804(core.List<api.Metro> o) {
+checkUnnamed619(core.List<api.Metro> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetro(o[0]);
   checkMetro(o[1]);
 }
 
-buildUnnamed805() {
+buildUnnamed620() {
   var o = new core.List<api.PostalCode>();
   o.add(buildPostalCode());
   o.add(buildPostalCode());
   return o;
 }
 
-checkUnnamed805(core.List<api.PostalCode> o) {
+checkUnnamed620(core.List<api.PostalCode> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPostalCode(o[0]);
   checkPostalCode(o[1]);
 }
 
-buildUnnamed806() {
+buildUnnamed621() {
   var o = new core.List<api.Region>();
   o.add(buildRegion());
   o.add(buildRegion());
   return o;
 }
 
-checkUnnamed806(core.List<api.Region> o) {
+checkUnnamed621(core.List<api.Region> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegion(o[0]);
   checkRegion(o[1]);
@@ -4692,12 +4692,12 @@
   var o = new api.GeoTargeting();
   buildCounterGeoTargeting++;
   if (buildCounterGeoTargeting < 3) {
-    o.cities = buildUnnamed802();
-    o.countries = buildUnnamed803();
+    o.cities = buildUnnamed617();
+    o.countries = buildUnnamed618();
     o.excludeCountries = true;
-    o.metros = buildUnnamed804();
-    o.postalCodes = buildUnnamed805();
-    o.regions = buildUnnamed806();
+    o.metros = buildUnnamed619();
+    o.postalCodes = buildUnnamed620();
+    o.regions = buildUnnamed621();
   }
   buildCounterGeoTargeting--;
   return o;
@@ -4706,24 +4706,24 @@
 checkGeoTargeting(api.GeoTargeting o) {
   buildCounterGeoTargeting++;
   if (buildCounterGeoTargeting < 3) {
-    checkUnnamed802(o.cities);
-    checkUnnamed803(o.countries);
+    checkUnnamed617(o.cities);
+    checkUnnamed618(o.countries);
     unittest.expect(o.excludeCountries, unittest.isTrue);
-    checkUnnamed804(o.metros);
-    checkUnnamed805(o.postalCodes);
-    checkUnnamed806(o.regions);
+    checkUnnamed619(o.metros);
+    checkUnnamed620(o.postalCodes);
+    checkUnnamed621(o.regions);
   }
   buildCounterGeoTargeting--;
 }
 
-buildUnnamed807() {
+buildUnnamed622() {
   var o = new core.List<api.AdSlot>();
   o.add(buildAdSlot());
   o.add(buildAdSlot());
   return o;
 }
 
-checkUnnamed807(core.List<api.AdSlot> o) {
+checkUnnamed622(core.List<api.AdSlot> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdSlot(o[0]);
   checkAdSlot(o[1]);
@@ -4735,7 +4735,7 @@
   buildCounterInventoryItem++;
   if (buildCounterInventoryItem < 3) {
     o.accountId = "foo";
-    o.adSlots = buildUnnamed807();
+    o.adSlots = buildUnnamed622();
     o.advertiserId = "foo";
     o.contentCategoryId = "foo";
     o.estimatedClickThroughRate = "foo";
@@ -4763,7 +4763,7 @@
   buildCounterInventoryItem++;
   if (buildCounterInventoryItem < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed807(o.adSlots);
+    checkUnnamed622(o.adSlots);
     unittest.expect(o.advertiserId, unittest.equals('foo'));
     unittest.expect(o.contentCategoryId, unittest.equals('foo'));
     unittest.expect(o.estimatedClickThroughRate, unittest.equals('foo'));
@@ -4786,14 +4786,14 @@
   buildCounterInventoryItem--;
 }
 
-buildUnnamed808() {
+buildUnnamed623() {
   var o = new core.List<api.InventoryItem>();
   o.add(buildInventoryItem());
   o.add(buildInventoryItem());
   return o;
 }
 
-checkUnnamed808(core.List<api.InventoryItem> o) {
+checkUnnamed623(core.List<api.InventoryItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInventoryItem(o[0]);
   checkInventoryItem(o[1]);
@@ -4804,7 +4804,7 @@
   var o = new api.InventoryItemsListResponse();
   buildCounterInventoryItemsListResponse++;
   if (buildCounterInventoryItemsListResponse < 3) {
-    o.inventoryItems = buildUnnamed808();
+    o.inventoryItems = buildUnnamed623();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -4815,7 +4815,7 @@
 checkInventoryItemsListResponse(api.InventoryItemsListResponse o) {
   buildCounterInventoryItemsListResponse++;
   if (buildCounterInventoryItemsListResponse < 3) {
-    checkUnnamed808(o.inventoryItems);
+    checkUnnamed623(o.inventoryItems);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -4895,14 +4895,14 @@
   buildCounterLanguage--;
 }
 
-buildUnnamed809() {
+buildUnnamed624() {
   var o = new core.List<api.Language>();
   o.add(buildLanguage());
   o.add(buildLanguage());
   return o;
 }
 
-checkUnnamed809(core.List<api.Language> o) {
+checkUnnamed624(core.List<api.Language> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLanguage(o[0]);
   checkLanguage(o[1]);
@@ -4913,7 +4913,7 @@
   var o = new api.LanguageTargeting();
   buildCounterLanguageTargeting++;
   if (buildCounterLanguageTargeting < 3) {
-    o.languages = buildUnnamed809();
+    o.languages = buildUnnamed624();
   }
   buildCounterLanguageTargeting--;
   return o;
@@ -4922,19 +4922,19 @@
 checkLanguageTargeting(api.LanguageTargeting o) {
   buildCounterLanguageTargeting++;
   if (buildCounterLanguageTargeting < 3) {
-    checkUnnamed809(o.languages);
+    checkUnnamed624(o.languages);
   }
   buildCounterLanguageTargeting--;
 }
 
-buildUnnamed810() {
+buildUnnamed625() {
   var o = new core.List<api.Language>();
   o.add(buildLanguage());
   o.add(buildLanguage());
   return o;
 }
 
-checkUnnamed810(core.List<api.Language> o) {
+checkUnnamed625(core.List<api.Language> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLanguage(o[0]);
   checkLanguage(o[1]);
@@ -4946,7 +4946,7 @@
   buildCounterLanguagesListResponse++;
   if (buildCounterLanguagesListResponse < 3) {
     o.kind = "foo";
-    o.languages = buildUnnamed810();
+    o.languages = buildUnnamed625();
   }
   buildCounterLanguagesListResponse--;
   return o;
@@ -4956,7 +4956,7 @@
   buildCounterLanguagesListResponse++;
   if (buildCounterLanguagesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed810(o.languages);
+    checkUnnamed625(o.languages);
   }
   buildCounterLanguagesListResponse--;
 }
@@ -4980,14 +4980,14 @@
   buildCounterLastModifiedInfo--;
 }
 
-buildUnnamed811() {
+buildUnnamed626() {
   var o = new core.List<api.ListPopulationTerm>();
   o.add(buildListPopulationTerm());
   o.add(buildListPopulationTerm());
   return o;
 }
 
-checkUnnamed811(core.List<api.ListPopulationTerm> o) {
+checkUnnamed626(core.List<api.ListPopulationTerm> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkListPopulationTerm(o[0]);
   checkListPopulationTerm(o[1]);
@@ -4998,7 +4998,7 @@
   var o = new api.ListPopulationClause();
   buildCounterListPopulationClause++;
   if (buildCounterListPopulationClause < 3) {
-    o.terms = buildUnnamed811();
+    o.terms = buildUnnamed626();
   }
   buildCounterListPopulationClause--;
   return o;
@@ -5007,19 +5007,19 @@
 checkListPopulationClause(api.ListPopulationClause o) {
   buildCounterListPopulationClause++;
   if (buildCounterListPopulationClause < 3) {
-    checkUnnamed811(o.terms);
+    checkUnnamed626(o.terms);
   }
   buildCounterListPopulationClause--;
 }
 
-buildUnnamed812() {
+buildUnnamed627() {
   var o = new core.List<api.ListPopulationClause>();
   o.add(buildListPopulationClause());
   o.add(buildListPopulationClause());
   return o;
 }
 
-checkUnnamed812(core.List<api.ListPopulationClause> o) {
+checkUnnamed627(core.List<api.ListPopulationClause> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkListPopulationClause(o[0]);
   checkListPopulationClause(o[1]);
@@ -5032,7 +5032,7 @@
   if (buildCounterListPopulationRule < 3) {
     o.floodlightActivityId = "foo";
     o.floodlightActivityName = "foo";
-    o.listPopulationClauses = buildUnnamed812();
+    o.listPopulationClauses = buildUnnamed627();
   }
   buildCounterListPopulationRule--;
   return o;
@@ -5043,7 +5043,7 @@
   if (buildCounterListPopulationRule < 3) {
     unittest.expect(o.floodlightActivityId, unittest.equals('foo'));
     unittest.expect(o.floodlightActivityName, unittest.equals('foo'));
-    checkUnnamed812(o.listPopulationClauses);
+    checkUnnamed627(o.listPopulationClauses);
   }
   buildCounterListPopulationRule--;
 }
@@ -5173,14 +5173,14 @@
   buildCounterMetro--;
 }
 
-buildUnnamed813() {
+buildUnnamed628() {
   var o = new core.List<api.Metro>();
   o.add(buildMetro());
   o.add(buildMetro());
   return o;
 }
 
-checkUnnamed813(core.List<api.Metro> o) {
+checkUnnamed628(core.List<api.Metro> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetro(o[0]);
   checkMetro(o[1]);
@@ -5192,7 +5192,7 @@
   buildCounterMetrosListResponse++;
   if (buildCounterMetrosListResponse < 3) {
     o.kind = "foo";
-    o.metros = buildUnnamed813();
+    o.metros = buildUnnamed628();
   }
   buildCounterMetrosListResponse--;
   return o;
@@ -5202,7 +5202,7 @@
   buildCounterMetrosListResponse++;
   if (buildCounterMetrosListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed813(o.metros);
+    checkUnnamed628(o.metros);
   }
   buildCounterMetrosListResponse--;
 }
@@ -5234,14 +5234,14 @@
   buildCounterMobileCarrier--;
 }
 
-buildUnnamed814() {
+buildUnnamed629() {
   var o = new core.List<api.MobileCarrier>();
   o.add(buildMobileCarrier());
   o.add(buildMobileCarrier());
   return o;
 }
 
-checkUnnamed814(core.List<api.MobileCarrier> o) {
+checkUnnamed629(core.List<api.MobileCarrier> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMobileCarrier(o[0]);
   checkMobileCarrier(o[1]);
@@ -5253,7 +5253,7 @@
   buildCounterMobileCarriersListResponse++;
   if (buildCounterMobileCarriersListResponse < 3) {
     o.kind = "foo";
-    o.mobileCarriers = buildUnnamed814();
+    o.mobileCarriers = buildUnnamed629();
   }
   buildCounterMobileCarriersListResponse--;
   return o;
@@ -5263,19 +5263,19 @@
   buildCounterMobileCarriersListResponse++;
   if (buildCounterMobileCarriersListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed814(o.mobileCarriers);
+    checkUnnamed629(o.mobileCarriers);
   }
   buildCounterMobileCarriersListResponse--;
 }
 
-buildUnnamed815() {
+buildUnnamed630() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed815(core.List<core.String> o) {
+checkUnnamed630(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5287,7 +5287,7 @@
   buildCounterObjectFilter++;
   if (buildCounterObjectFilter < 3) {
     o.kind = "foo";
-    o.objectIds = buildUnnamed815();
+    o.objectIds = buildUnnamed630();
     o.status = "foo";
   }
   buildCounterObjectFilter--;
@@ -5298,7 +5298,7 @@
   buildCounterObjectFilter++;
   if (buildCounterObjectFilter < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed815(o.objectIds);
+    checkUnnamed630(o.objectIds);
     unittest.expect(o.status, unittest.equals('foo'));
   }
   buildCounterObjectFilter--;
@@ -5402,14 +5402,14 @@
   buildCounterOperatingSystemVersion--;
 }
 
-buildUnnamed816() {
+buildUnnamed631() {
   var o = new core.List<api.OperatingSystemVersion>();
   o.add(buildOperatingSystemVersion());
   o.add(buildOperatingSystemVersion());
   return o;
 }
 
-checkUnnamed816(core.List<api.OperatingSystemVersion> o) {
+checkUnnamed631(core.List<api.OperatingSystemVersion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperatingSystemVersion(o[0]);
   checkOperatingSystemVersion(o[1]);
@@ -5421,7 +5421,7 @@
   buildCounterOperatingSystemVersionsListResponse++;
   if (buildCounterOperatingSystemVersionsListResponse < 3) {
     o.kind = "foo";
-    o.operatingSystemVersions = buildUnnamed816();
+    o.operatingSystemVersions = buildUnnamed631();
   }
   buildCounterOperatingSystemVersionsListResponse--;
   return o;
@@ -5432,19 +5432,19 @@
   buildCounterOperatingSystemVersionsListResponse++;
   if (buildCounterOperatingSystemVersionsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed816(o.operatingSystemVersions);
+    checkUnnamed631(o.operatingSystemVersions);
   }
   buildCounterOperatingSystemVersionsListResponse--;
 }
 
-buildUnnamed817() {
+buildUnnamed632() {
   var o = new core.List<api.OperatingSystem>();
   o.add(buildOperatingSystem());
   o.add(buildOperatingSystem());
   return o;
 }
 
-checkUnnamed817(core.List<api.OperatingSystem> o) {
+checkUnnamed632(core.List<api.OperatingSystem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperatingSystem(o[0]);
   checkOperatingSystem(o[1]);
@@ -5456,7 +5456,7 @@
   buildCounterOperatingSystemsListResponse++;
   if (buildCounterOperatingSystemsListResponse < 3) {
     o.kind = "foo";
-    o.operatingSystems = buildUnnamed817();
+    o.operatingSystems = buildUnnamed632();
   }
   buildCounterOperatingSystemsListResponse--;
   return o;
@@ -5466,7 +5466,7 @@
   buildCounterOperatingSystemsListResponse++;
   if (buildCounterOperatingSystemsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed817(o.operatingSystems);
+    checkUnnamed632(o.operatingSystems);
   }
   buildCounterOperatingSystemsListResponse--;
 }
@@ -5494,53 +5494,53 @@
   buildCounterOptimizationActivity--;
 }
 
-buildUnnamed818() {
+buildUnnamed633() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed818(core.List<core.String> o) {
+checkUnnamed633(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed819() {
+buildUnnamed634() {
   var o = new core.List<api.OrderContact>();
   o.add(buildOrderContact());
   o.add(buildOrderContact());
   return o;
 }
 
-checkUnnamed819(core.List<api.OrderContact> o) {
+checkUnnamed634(core.List<api.OrderContact> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderContact(o[0]);
   checkOrderContact(o[1]);
 }
 
-buildUnnamed820() {
+buildUnnamed635() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed820(core.List<core.String> o) {
+checkUnnamed635(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed821() {
+buildUnnamed636() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed821(core.List<core.String> o) {
+checkUnnamed636(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5553,11 +5553,11 @@
   if (buildCounterOrder < 3) {
     o.accountId = "foo";
     o.advertiserId = "foo";
-    o.approverUserProfileIds = buildUnnamed818();
+    o.approverUserProfileIds = buildUnnamed633();
     o.buyerInvoiceId = "foo";
     o.buyerOrganizationName = "foo";
     o.comments = "foo";
-    o.contacts = buildUnnamed819();
+    o.contacts = buildUnnamed634();
     o.id = "foo";
     o.kind = "foo";
     o.lastModifiedInfo = buildLastModifiedInfo();
@@ -5567,8 +5567,8 @@
     o.projectId = "foo";
     o.sellerOrderId = "foo";
     o.sellerOrganizationName = "foo";
-    o.siteId = buildUnnamed820();
-    o.siteNames = buildUnnamed821();
+    o.siteId = buildUnnamed635();
+    o.siteNames = buildUnnamed636();
     o.subaccountId = "foo";
     o.termsAndConditions = "foo";
   }
@@ -5581,11 +5581,11 @@
   if (buildCounterOrder < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.advertiserId, unittest.equals('foo'));
-    checkUnnamed818(o.approverUserProfileIds);
+    checkUnnamed633(o.approverUserProfileIds);
     unittest.expect(o.buyerInvoiceId, unittest.equals('foo'));
     unittest.expect(o.buyerOrganizationName, unittest.equals('foo'));
     unittest.expect(o.comments, unittest.equals('foo'));
-    checkUnnamed819(o.contacts);
+    checkUnnamed634(o.contacts);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkLastModifiedInfo(o.lastModifiedInfo);
@@ -5595,8 +5595,8 @@
     unittest.expect(o.projectId, unittest.equals('foo'));
     unittest.expect(o.sellerOrderId, unittest.equals('foo'));
     unittest.expect(o.sellerOrganizationName, unittest.equals('foo'));
-    checkUnnamed820(o.siteId);
-    checkUnnamed821(o.siteNames);
+    checkUnnamed635(o.siteId);
+    checkUnnamed636(o.siteNames);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
     unittest.expect(o.termsAndConditions, unittest.equals('foo'));
   }
@@ -5630,27 +5630,27 @@
   buildCounterOrderContact--;
 }
 
-buildUnnamed822() {
+buildUnnamed637() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed822(core.List<core.String> o) {
+checkUnnamed637(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed823() {
+buildUnnamed638() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed823(core.List<core.String> o) {
+checkUnnamed638(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5664,13 +5664,13 @@
     o.accountId = "foo";
     o.advertiserId = "foo";
     o.amendedOrderDocumentId = "foo";
-    o.approvedByUserProfileIds = buildUnnamed822();
+    o.approvedByUserProfileIds = buildUnnamed637();
     o.cancelled = true;
     o.createdInfo = buildLastModifiedInfo();
     o.effectiveDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.id = "foo";
     o.kind = "foo";
-    o.lastSentRecipients = buildUnnamed823();
+    o.lastSentRecipients = buildUnnamed638();
     o.lastSentTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.orderId = "foo";
     o.projectId = "foo";
@@ -5689,14 +5689,14 @@
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.advertiserId, unittest.equals('foo'));
     unittest.expect(o.amendedOrderDocumentId, unittest.equals('foo'));
-    checkUnnamed822(o.approvedByUserProfileIds);
+    checkUnnamed637(o.approvedByUserProfileIds);
     unittest.expect(o.cancelled, unittest.isTrue);
     checkLastModifiedInfo(o.createdInfo);
     unittest.expect(o.effectiveDate,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed823(o.lastSentRecipients);
+    checkUnnamed638(o.lastSentRecipients);
     unittest.expect(o.lastSentTime,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.orderId, unittest.equals('foo'));
@@ -5709,14 +5709,14 @@
   buildCounterOrderDocument--;
 }
 
-buildUnnamed824() {
+buildUnnamed639() {
   var o = new core.List<api.OrderDocument>();
   o.add(buildOrderDocument());
   o.add(buildOrderDocument());
   return o;
 }
 
-checkUnnamed824(core.List<api.OrderDocument> o) {
+checkUnnamed639(core.List<api.OrderDocument> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrderDocument(o[0]);
   checkOrderDocument(o[1]);
@@ -5729,7 +5729,7 @@
   if (buildCounterOrderDocumentsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.orderDocuments = buildUnnamed824();
+    o.orderDocuments = buildUnnamed639();
   }
   buildCounterOrderDocumentsListResponse--;
   return o;
@@ -5740,19 +5740,19 @@
   if (buildCounterOrderDocumentsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed824(o.orderDocuments);
+    checkUnnamed639(o.orderDocuments);
   }
   buildCounterOrderDocumentsListResponse--;
 }
 
-buildUnnamed825() {
+buildUnnamed640() {
   var o = new core.List<api.Order>();
   o.add(buildOrder());
   o.add(buildOrder());
   return o;
 }
 
-checkUnnamed825(core.List<api.Order> o) {
+checkUnnamed640(core.List<api.Order> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrder(o[0]);
   checkOrder(o[1]);
@@ -5765,7 +5765,7 @@
   if (buildCounterOrdersListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.orders = buildUnnamed825();
+    o.orders = buildUnnamed640();
   }
   buildCounterOrdersListResponse--;
   return o;
@@ -5776,58 +5776,58 @@
   if (buildCounterOrdersListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed825(o.orders);
+    checkUnnamed640(o.orders);
   }
   buildCounterOrdersListResponse--;
 }
 
-buildUnnamed826() {
+buildUnnamed641() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed826(core.List<api.Dimension> o) {
+checkUnnamed641(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed827() {
+buildUnnamed642() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed827(core.List<api.Dimension> o) {
+checkUnnamed642(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed828() {
+buildUnnamed643() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed828(core.List<api.Metric> o) {
+checkUnnamed643(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed829() {
+buildUnnamed644() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed829(core.List<api.Dimension> o) {
+checkUnnamed644(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
@@ -5838,11 +5838,11 @@
   var o = new api.PathToConversionReportCompatibleFields();
   buildCounterPathToConversionReportCompatibleFields++;
   if (buildCounterPathToConversionReportCompatibleFields < 3) {
-    o.conversionDimensions = buildUnnamed826();
-    o.customFloodlightVariables = buildUnnamed827();
+    o.conversionDimensions = buildUnnamed641();
+    o.customFloodlightVariables = buildUnnamed642();
     o.kind = "foo";
-    o.metrics = buildUnnamed828();
-    o.perInteractionDimensions = buildUnnamed829();
+    o.metrics = buildUnnamed643();
+    o.perInteractionDimensions = buildUnnamed644();
   }
   buildCounterPathToConversionReportCompatibleFields--;
   return o;
@@ -5852,23 +5852,23 @@
     api.PathToConversionReportCompatibleFields o) {
   buildCounterPathToConversionReportCompatibleFields++;
   if (buildCounterPathToConversionReportCompatibleFields < 3) {
-    checkUnnamed826(o.conversionDimensions);
-    checkUnnamed827(o.customFloodlightVariables);
+    checkUnnamed641(o.conversionDimensions);
+    checkUnnamed642(o.customFloodlightVariables);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed828(o.metrics);
-    checkUnnamed829(o.perInteractionDimensions);
+    checkUnnamed643(o.metrics);
+    checkUnnamed644(o.perInteractionDimensions);
   }
   buildCounterPathToConversionReportCompatibleFields--;
 }
 
-buildUnnamed830() {
+buildUnnamed645() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed830(core.List<core.String> o) {
+checkUnnamed645(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5914,7 +5914,7 @@
     o.sslRequired = true;
     o.status = "foo";
     o.subaccountId = "foo";
-    o.tagFormats = buildUnnamed830();
+    o.tagFormats = buildUnnamed645();
     o.tagSetting = buildTagSetting();
     o.videoActiveViewOptOut = true;
     o.videoSettings = buildVideoSettings();
@@ -5962,7 +5962,7 @@
     unittest.expect(o.sslRequired, unittest.isTrue);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.subaccountId, unittest.equals('foo'));
-    checkUnnamed830(o.tagFormats);
+    checkUnnamed645(o.tagFormats);
     checkTagSetting(o.tagSetting);
     unittest.expect(o.videoActiveViewOptOut, unittest.isTrue);
     checkVideoSettings(o.videoSettings);
@@ -5996,14 +5996,14 @@
   buildCounterPlacementAssignment--;
 }
 
-buildUnnamed831() {
+buildUnnamed646() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed831(core.List<core.String> o) {
+checkUnnamed646(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -6020,7 +6020,7 @@
     o.archived = true;
     o.campaignId = "foo";
     o.campaignIdDimensionValue = buildDimensionValue();
-    o.childPlacementIds = buildUnnamed831();
+    o.childPlacementIds = buildUnnamed646();
     o.comment = "foo";
     o.contentCategoryId = "foo";
     o.createInfo = buildLastModifiedInfo();
@@ -6054,7 +6054,7 @@
     unittest.expect(o.archived, unittest.isTrue);
     unittest.expect(o.campaignId, unittest.equals('foo'));
     checkDimensionValue(o.campaignIdDimensionValue);
-    checkUnnamed831(o.childPlacementIds);
+    checkUnnamed646(o.childPlacementIds);
     unittest.expect(o.comment, unittest.equals('foo'));
     unittest.expect(o.contentCategoryId, unittest.equals('foo'));
     checkLastModifiedInfo(o.createInfo);
@@ -6078,14 +6078,14 @@
   buildCounterPlacementGroup--;
 }
 
-buildUnnamed832() {
+buildUnnamed647() {
   var o = new core.List<api.PlacementGroup>();
   o.add(buildPlacementGroup());
   o.add(buildPlacementGroup());
   return o;
 }
 
-checkUnnamed832(core.List<api.PlacementGroup> o) {
+checkUnnamed647(core.List<api.PlacementGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacementGroup(o[0]);
   checkPlacementGroup(o[1]);
@@ -6098,7 +6098,7 @@
   if (buildCounterPlacementGroupsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.placementGroups = buildUnnamed832();
+    o.placementGroups = buildUnnamed647();
   }
   buildCounterPlacementGroupsListResponse--;
   return o;
@@ -6109,19 +6109,19 @@
   if (buildCounterPlacementGroupsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed832(o.placementGroups);
+    checkUnnamed647(o.placementGroups);
   }
   buildCounterPlacementGroupsListResponse--;
 }
 
-buildUnnamed833() {
+buildUnnamed648() {
   var o = new core.List<api.PlacementStrategy>();
   o.add(buildPlacementStrategy());
   o.add(buildPlacementStrategy());
   return o;
 }
 
-checkUnnamed833(core.List<api.PlacementStrategy> o) {
+checkUnnamed648(core.List<api.PlacementStrategy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacementStrategy(o[0]);
   checkPlacementStrategy(o[1]);
@@ -6134,7 +6134,7 @@
   if (buildCounterPlacementStrategiesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.placementStrategies = buildUnnamed833();
+    o.placementStrategies = buildUnnamed648();
   }
   buildCounterPlacementStrategiesListResponse--;
   return o;
@@ -6145,7 +6145,7 @@
   if (buildCounterPlacementStrategiesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed833(o.placementStrategies);
+    checkUnnamed648(o.placementStrategies);
   }
   buildCounterPlacementStrategiesListResponse--;
 }
@@ -6175,14 +6175,14 @@
   buildCounterPlacementStrategy--;
 }
 
-buildUnnamed834() {
+buildUnnamed649() {
   var o = new core.List<api.TagData>();
   o.add(buildTagData());
   o.add(buildTagData());
   return o;
 }
 
-checkUnnamed834(core.List<api.TagData> o) {
+checkUnnamed649(core.List<api.TagData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTagData(o[0]);
   checkTagData(o[1]);
@@ -6194,7 +6194,7 @@
   buildCounterPlacementTag++;
   if (buildCounterPlacementTag < 3) {
     o.placementId = "foo";
-    o.tagDatas = buildUnnamed834();
+    o.tagDatas = buildUnnamed649();
   }
   buildCounterPlacementTag--;
   return o;
@@ -6204,19 +6204,19 @@
   buildCounterPlacementTag++;
   if (buildCounterPlacementTag < 3) {
     unittest.expect(o.placementId, unittest.equals('foo'));
-    checkUnnamed834(o.tagDatas);
+    checkUnnamed649(o.tagDatas);
   }
   buildCounterPlacementTag--;
 }
 
-buildUnnamed835() {
+buildUnnamed650() {
   var o = new core.List<api.PlacementTag>();
   o.add(buildPlacementTag());
   o.add(buildPlacementTag());
   return o;
 }
 
-checkUnnamed835(core.List<api.PlacementTag> o) {
+checkUnnamed650(core.List<api.PlacementTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacementTag(o[0]);
   checkPlacementTag(o[1]);
@@ -6228,7 +6228,7 @@
   buildCounterPlacementsGenerateTagsResponse++;
   if (buildCounterPlacementsGenerateTagsResponse < 3) {
     o.kind = "foo";
-    o.placementTags = buildUnnamed835();
+    o.placementTags = buildUnnamed650();
   }
   buildCounterPlacementsGenerateTagsResponse--;
   return o;
@@ -6238,19 +6238,19 @@
   buildCounterPlacementsGenerateTagsResponse++;
   if (buildCounterPlacementsGenerateTagsResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed835(o.placementTags);
+    checkUnnamed650(o.placementTags);
   }
   buildCounterPlacementsGenerateTagsResponse--;
 }
 
-buildUnnamed836() {
+buildUnnamed651() {
   var o = new core.List<api.Placement>();
   o.add(buildPlacement());
   o.add(buildPlacement());
   return o;
 }
 
-checkUnnamed836(core.List<api.Placement> o) {
+checkUnnamed651(core.List<api.Placement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlacement(o[0]);
   checkPlacement(o[1]);
@@ -6263,7 +6263,7 @@
   if (buildCounterPlacementsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.placements = buildUnnamed836();
+    o.placements = buildUnnamed651();
   }
   buildCounterPlacementsListResponse--;
   return o;
@@ -6274,7 +6274,7 @@
   if (buildCounterPlacementsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed836(o.placements);
+    checkUnnamed651(o.placements);
   }
   buildCounterPlacementsListResponse--;
 }
@@ -6302,14 +6302,14 @@
   buildCounterPlatformType--;
 }
 
-buildUnnamed837() {
+buildUnnamed652() {
   var o = new core.List<api.PlatformType>();
   o.add(buildPlatformType());
   o.add(buildPlatformType());
   return o;
 }
 
-checkUnnamed837(core.List<api.PlatformType> o) {
+checkUnnamed652(core.List<api.PlatformType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlatformType(o[0]);
   checkPlatformType(o[1]);
@@ -6321,7 +6321,7 @@
   buildCounterPlatformTypesListResponse++;
   if (buildCounterPlatformTypesListResponse < 3) {
     o.kind = "foo";
-    o.platformTypes = buildUnnamed837();
+    o.platformTypes = buildUnnamed652();
   }
   buildCounterPlatformTypesListResponse--;
   return o;
@@ -6331,7 +6331,7 @@
   buildCounterPlatformTypesListResponse++;
   if (buildCounterPlatformTypesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed837(o.platformTypes);
+    checkUnnamed652(o.platformTypes);
   }
   buildCounterPlatformTypesListResponse--;
 }
@@ -6398,14 +6398,14 @@
   buildCounterPostalCode--;
 }
 
-buildUnnamed838() {
+buildUnnamed653() {
   var o = new core.List<api.PostalCode>();
   o.add(buildPostalCode());
   o.add(buildPostalCode());
   return o;
 }
 
-checkUnnamed838(core.List<api.PostalCode> o) {
+checkUnnamed653(core.List<api.PostalCode> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPostalCode(o[0]);
   checkPostalCode(o[1]);
@@ -6417,7 +6417,7 @@
   buildCounterPostalCodesListResponse++;
   if (buildCounterPostalCodesListResponse < 3) {
     o.kind = "foo";
-    o.postalCodes = buildUnnamed838();
+    o.postalCodes = buildUnnamed653();
   }
   buildCounterPostalCodesListResponse--;
   return o;
@@ -6427,19 +6427,19 @@
   buildCounterPostalCodesListResponse++;
   if (buildCounterPostalCodesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed838(o.postalCodes);
+    checkUnnamed653(o.postalCodes);
   }
   buildCounterPostalCodesListResponse--;
 }
 
-buildUnnamed839() {
+buildUnnamed654() {
   var o = new core.List<api.Flight>();
   o.add(buildFlight());
   o.add(buildFlight());
   return o;
 }
 
-checkUnnamed839(core.List<api.Flight> o) {
+checkUnnamed654(core.List<api.Flight> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFlight(o[0]);
   checkFlight(o[1]);
@@ -6452,7 +6452,7 @@
   if (buildCounterPricing < 3) {
     o.capCostType = "foo";
     o.endDate = core.DateTime.parse("2002-02-27T14:01:02Z");
-    o.flights = buildUnnamed839();
+    o.flights = buildUnnamed654();
     o.groupType = "foo";
     o.pricingType = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
@@ -6467,7 +6467,7 @@
     unittest.expect(o.capCostType, unittest.equals('foo'));
     unittest.expect(
         o.endDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
-    checkUnnamed839(o.flights);
+    checkUnnamed654(o.flights);
     unittest.expect(o.groupType, unittest.equals('foo'));
     unittest.expect(o.pricingType, unittest.equals('foo'));
     unittest.expect(o.startDate,
@@ -6476,14 +6476,14 @@
   buildCounterPricing--;
 }
 
-buildUnnamed840() {
+buildUnnamed655() {
   var o = new core.List<api.PricingSchedulePricingPeriod>();
   o.add(buildPricingSchedulePricingPeriod());
   o.add(buildPricingSchedulePricingPeriod());
   return o;
 }
 
-checkUnnamed840(core.List<api.PricingSchedulePricingPeriod> o) {
+checkUnnamed655(core.List<api.PricingSchedulePricingPeriod> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPricingSchedulePricingPeriod(o[0]);
   checkPricingSchedulePricingPeriod(o[1]);
@@ -6499,7 +6499,7 @@
     o.endDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.flighted = true;
     o.floodlightActivityId = "foo";
-    o.pricingPeriods = buildUnnamed840();
+    o.pricingPeriods = buildUnnamed655();
     o.pricingType = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.testingStartDate = core.DateTime.parse("2002-02-27T14:01:02Z");
@@ -6517,7 +6517,7 @@
         o.endDate, unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.flighted, unittest.isTrue);
     unittest.expect(o.floodlightActivityId, unittest.equals('foo'));
-    checkUnnamed840(o.pricingPeriods);
+    checkUnnamed655(o.pricingPeriods);
     unittest.expect(o.pricingType, unittest.equals('foo'));
     unittest.expect(o.startDate,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
@@ -6619,14 +6619,14 @@
   buildCounterProject--;
 }
 
-buildUnnamed841() {
+buildUnnamed656() {
   var o = new core.List<api.Project>();
   o.add(buildProject());
   o.add(buildProject());
   return o;
 }
 
-checkUnnamed841(core.List<api.Project> o) {
+checkUnnamed656(core.List<api.Project> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProject(o[0]);
   checkProject(o[1]);
@@ -6639,7 +6639,7 @@
   if (buildCounterProjectsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.projects = buildUnnamed841();
+    o.projects = buildUnnamed656();
   }
   buildCounterProjectsListResponse--;
   return o;
@@ -6650,71 +6650,71 @@
   if (buildCounterProjectsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed841(o.projects);
+    checkUnnamed656(o.projects);
   }
   buildCounterProjectsListResponse--;
 }
 
-buildUnnamed842() {
+buildUnnamed657() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed842(core.List<api.Dimension> o) {
+checkUnnamed657(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed843() {
+buildUnnamed658() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed843(core.List<api.Dimension> o) {
+checkUnnamed658(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed844() {
+buildUnnamed659() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed844(core.List<api.Metric> o) {
+checkUnnamed659(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed845() {
+buildUnnamed660() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed845(core.List<api.Metric> o) {
+checkUnnamed660(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed846() {
+buildUnnamed661() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed846(core.List<api.Metric> o) {
+checkUnnamed661(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -6725,12 +6725,12 @@
   var o = new api.ReachReportCompatibleFields();
   buildCounterReachReportCompatibleFields++;
   if (buildCounterReachReportCompatibleFields < 3) {
-    o.dimensionFilters = buildUnnamed842();
-    o.dimensions = buildUnnamed843();
+    o.dimensionFilters = buildUnnamed657();
+    o.dimensions = buildUnnamed658();
     o.kind = "foo";
-    o.metrics = buildUnnamed844();
-    o.pivotedActivityMetrics = buildUnnamed845();
-    o.reachByFrequencyMetrics = buildUnnamed846();
+    o.metrics = buildUnnamed659();
+    o.pivotedActivityMetrics = buildUnnamed660();
+    o.reachByFrequencyMetrics = buildUnnamed661();
   }
   buildCounterReachReportCompatibleFields--;
   return o;
@@ -6739,12 +6739,12 @@
 checkReachReportCompatibleFields(api.ReachReportCompatibleFields o) {
   buildCounterReachReportCompatibleFields++;
   if (buildCounterReachReportCompatibleFields < 3) {
-    checkUnnamed842(o.dimensionFilters);
-    checkUnnamed843(o.dimensions);
+    checkUnnamed657(o.dimensionFilters);
+    checkUnnamed658(o.dimensions);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed844(o.metrics);
-    checkUnnamed845(o.pivotedActivityMetrics);
-    checkUnnamed846(o.reachByFrequencyMetrics);
+    checkUnnamed659(o.metrics);
+    checkUnnamed660(o.pivotedActivityMetrics);
+    checkUnnamed661(o.reachByFrequencyMetrics);
   }
   buildCounterReachReportCompatibleFields--;
 }
@@ -6801,14 +6801,14 @@
   buildCounterRegion--;
 }
 
-buildUnnamed847() {
+buildUnnamed662() {
   var o = new core.List<api.Region>();
   o.add(buildRegion());
   o.add(buildRegion());
   return o;
 }
 
-checkUnnamed847(core.List<api.Region> o) {
+checkUnnamed662(core.List<api.Region> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRegion(o[0]);
   checkRegion(o[1]);
@@ -6820,7 +6820,7 @@
   buildCounterRegionsListResponse++;
   if (buildCounterRegionsListResponse < 3) {
     o.kind = "foo";
-    o.regions = buildUnnamed847();
+    o.regions = buildUnnamed662();
   }
   buildCounterRegionsListResponse--;
   return o;
@@ -6830,7 +6830,7 @@
   buildCounterRegionsListResponse++;
   if (buildCounterRegionsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed847(o.regions);
+    checkUnnamed662(o.regions);
   }
   buildCounterRegionsListResponse--;
 }
@@ -6878,27 +6878,27 @@
   buildCounterRemarketingList--;
 }
 
-buildUnnamed848() {
+buildUnnamed663() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed848(core.List<core.String> o) {
+checkUnnamed663(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed849() {
+buildUnnamed664() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed849(core.List<core.String> o) {
+checkUnnamed664(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -6911,8 +6911,8 @@
   if (buildCounterRemarketingListShare < 3) {
     o.kind = "foo";
     o.remarketingListId = "foo";
-    o.sharedAccountIds = buildUnnamed848();
-    o.sharedAdvertiserIds = buildUnnamed849();
+    o.sharedAccountIds = buildUnnamed663();
+    o.sharedAdvertiserIds = buildUnnamed664();
   }
   buildCounterRemarketingListShare--;
   return o;
@@ -6923,20 +6923,20 @@
   if (buildCounterRemarketingListShare < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.remarketingListId, unittest.equals('foo'));
-    checkUnnamed848(o.sharedAccountIds);
-    checkUnnamed849(o.sharedAdvertiserIds);
+    checkUnnamed663(o.sharedAccountIds);
+    checkUnnamed664(o.sharedAdvertiserIds);
   }
   buildCounterRemarketingListShare--;
 }
 
-buildUnnamed850() {
+buildUnnamed665() {
   var o = new core.List<api.RemarketingList>();
   o.add(buildRemarketingList());
   o.add(buildRemarketingList());
   return o;
 }
 
-checkUnnamed850(core.List<api.RemarketingList> o) {
+checkUnnamed665(core.List<api.RemarketingList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRemarketingList(o[0]);
   checkRemarketingList(o[1]);
@@ -6949,7 +6949,7 @@
   if (buildCounterRemarketingListsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.remarketingLists = buildUnnamed850();
+    o.remarketingLists = buildUnnamed665();
   }
   buildCounterRemarketingListsListResponse--;
   return o;
@@ -6960,45 +6960,45 @@
   if (buildCounterRemarketingListsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed850(o.remarketingLists);
+    checkUnnamed665(o.remarketingLists);
   }
   buildCounterRemarketingListsListResponse--;
 }
 
-buildUnnamed851() {
+buildUnnamed666() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed851(core.List<api.DimensionValue> o) {
+checkUnnamed666(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed852() {
+buildUnnamed667() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed852(core.List<api.SortedDimension> o) {
+checkUnnamed667(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed853() {
+buildUnnamed668() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed853(core.List<core.String> o) {
+checkUnnamed668(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -7012,9 +7012,9 @@
     o.activities = buildActivities();
     o.customRichMediaEvents = buildCustomRichMediaEvents();
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed851();
-    o.dimensions = buildUnnamed852();
-    o.metricNames = buildUnnamed853();
+    o.dimensionFilters = buildUnnamed666();
+    o.dimensions = buildUnnamed667();
+    o.metricNames = buildUnnamed668();
   }
   buildCounterReportCriteria--;
   return o;
@@ -7026,60 +7026,60 @@
     checkActivities(o.activities);
     checkCustomRichMediaEvents(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
-    checkUnnamed851(o.dimensionFilters);
-    checkUnnamed852(o.dimensions);
-    checkUnnamed853(o.metricNames);
+    checkUnnamed666(o.dimensionFilters);
+    checkUnnamed667(o.dimensions);
+    checkUnnamed668(o.metricNames);
   }
   buildCounterReportCriteria--;
 }
 
-buildUnnamed854() {
+buildUnnamed669() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed854(core.List<api.SortedDimension> o) {
+checkUnnamed669(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed855() {
+buildUnnamed670() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed855(core.List<api.DimensionValue> o) {
+checkUnnamed670(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed856() {
+buildUnnamed671() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed856(core.List<core.String> o) {
+checkUnnamed671(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed857() {
+buildUnnamed672() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed857(core.List<core.String> o) {
+checkUnnamed672(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -7090,12 +7090,12 @@
   var o = new api.ReportCrossDimensionReachCriteria();
   buildCounterReportCrossDimensionReachCriteria++;
   if (buildCounterReportCrossDimensionReachCriteria < 3) {
-    o.breakdown = buildUnnamed854();
+    o.breakdown = buildUnnamed669();
     o.dateRange = buildDateRange();
     o.dimension = "foo";
-    o.dimensionFilters = buildUnnamed855();
-    o.metricNames = buildUnnamed856();
-    o.overlapMetricNames = buildUnnamed857();
+    o.dimensionFilters = buildUnnamed670();
+    o.metricNames = buildUnnamed671();
+    o.overlapMetricNames = buildUnnamed672();
     o.pivoted = true;
   }
   buildCounterReportCrossDimensionReachCriteria--;
@@ -7106,25 +7106,25 @@
     api.ReportCrossDimensionReachCriteria o) {
   buildCounterReportCrossDimensionReachCriteria++;
   if (buildCounterReportCrossDimensionReachCriteria < 3) {
-    checkUnnamed854(o.breakdown);
+    checkUnnamed669(o.breakdown);
     checkDateRange(o.dateRange);
     unittest.expect(o.dimension, unittest.equals('foo'));
-    checkUnnamed855(o.dimensionFilters);
-    checkUnnamed856(o.metricNames);
-    checkUnnamed857(o.overlapMetricNames);
+    checkUnnamed670(o.dimensionFilters);
+    checkUnnamed671(o.metricNames);
+    checkUnnamed672(o.overlapMetricNames);
     unittest.expect(o.pivoted, unittest.isTrue);
   }
   buildCounterReportCrossDimensionReachCriteria--;
 }
 
-buildUnnamed858() {
+buildUnnamed673() {
   var o = new core.List<api.Recipient>();
   o.add(buildRecipient());
   o.add(buildRecipient());
   return o;
 }
 
-checkUnnamed858(core.List<api.Recipient> o) {
+checkUnnamed673(core.List<api.Recipient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRecipient(o[0]);
   checkRecipient(o[1]);
@@ -7138,7 +7138,7 @@
     o.emailOwner = true;
     o.emailOwnerDeliveryType = "foo";
     o.message = "foo";
-    o.recipients = buildUnnamed858();
+    o.recipients = buildUnnamed673();
   }
   buildCounterReportDelivery--;
   return o;
@@ -7150,58 +7150,58 @@
     unittest.expect(o.emailOwner, unittest.isTrue);
     unittest.expect(o.emailOwnerDeliveryType, unittest.equals('foo'));
     unittest.expect(o.message, unittest.equals('foo'));
-    checkUnnamed858(o.recipients);
+    checkUnnamed673(o.recipients);
   }
   buildCounterReportDelivery--;
 }
 
-buildUnnamed859() {
+buildUnnamed674() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed859(core.List<api.DimensionValue> o) {
+checkUnnamed674(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed860() {
+buildUnnamed675() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed860(core.List<api.DimensionValue> o) {
+checkUnnamed675(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed861() {
+buildUnnamed676() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed861(core.List<api.SortedDimension> o) {
+checkUnnamed676(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed862() {
+buildUnnamed677() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed862(core.List<core.String> o) {
+checkUnnamed677(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -7236,12 +7236,12 @@
   var o = new api.ReportFloodlightCriteria();
   buildCounterReportFloodlightCriteria++;
   if (buildCounterReportFloodlightCriteria < 3) {
-    o.customRichMediaEvents = buildUnnamed859();
+    o.customRichMediaEvents = buildUnnamed674();
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed860();
-    o.dimensions = buildUnnamed861();
+    o.dimensionFilters = buildUnnamed675();
+    o.dimensions = buildUnnamed676();
     o.floodlightConfigId = buildDimensionValue();
-    o.metricNames = buildUnnamed862();
+    o.metricNames = buildUnnamed677();
     o.reportProperties = buildReportFloodlightCriteriaReportProperties();
   }
   buildCounterReportFloodlightCriteria--;
@@ -7251,90 +7251,90 @@
 checkReportFloodlightCriteria(api.ReportFloodlightCriteria o) {
   buildCounterReportFloodlightCriteria++;
   if (buildCounterReportFloodlightCriteria < 3) {
-    checkUnnamed859(o.customRichMediaEvents);
+    checkUnnamed674(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
-    checkUnnamed860(o.dimensionFilters);
-    checkUnnamed861(o.dimensions);
+    checkUnnamed675(o.dimensionFilters);
+    checkUnnamed676(o.dimensions);
     checkDimensionValue(o.floodlightConfigId);
-    checkUnnamed862(o.metricNames);
+    checkUnnamed677(o.metricNames);
     checkReportFloodlightCriteriaReportProperties(o.reportProperties);
   }
   buildCounterReportFloodlightCriteria--;
 }
 
-buildUnnamed863() {
+buildUnnamed678() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed863(core.List<api.DimensionValue> o) {
+checkUnnamed678(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed864() {
+buildUnnamed679() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed864(core.List<api.SortedDimension> o) {
+checkUnnamed679(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed865() {
+buildUnnamed680() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed865(core.List<api.SortedDimension> o) {
+checkUnnamed680(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed866() {
+buildUnnamed681() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed866(core.List<api.DimensionValue> o) {
+checkUnnamed681(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed867() {
+buildUnnamed682() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed867(core.List<core.String> o) {
+checkUnnamed682(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed868() {
+buildUnnamed683() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed868(core.List<api.SortedDimension> o) {
+checkUnnamed683(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
@@ -7381,14 +7381,14 @@
   var o = new api.ReportPathToConversionCriteria();
   buildCounterReportPathToConversionCriteria++;
   if (buildCounterReportPathToConversionCriteria < 3) {
-    o.activityFilters = buildUnnamed863();
-    o.conversionDimensions = buildUnnamed864();
-    o.customFloodlightVariables = buildUnnamed865();
-    o.customRichMediaEvents = buildUnnamed866();
+    o.activityFilters = buildUnnamed678();
+    o.conversionDimensions = buildUnnamed679();
+    o.customFloodlightVariables = buildUnnamed680();
+    o.customRichMediaEvents = buildUnnamed681();
     o.dateRange = buildDateRange();
     o.floodlightConfigId = buildDimensionValue();
-    o.metricNames = buildUnnamed867();
-    o.perInteractionDimensions = buildUnnamed868();
+    o.metricNames = buildUnnamed682();
+    o.perInteractionDimensions = buildUnnamed683();
     o.reportProperties = buildReportPathToConversionCriteriaReportProperties();
   }
   buildCounterReportPathToConversionCriteria--;
@@ -7398,66 +7398,66 @@
 checkReportPathToConversionCriteria(api.ReportPathToConversionCriteria o) {
   buildCounterReportPathToConversionCriteria++;
   if (buildCounterReportPathToConversionCriteria < 3) {
-    checkUnnamed863(o.activityFilters);
-    checkUnnamed864(o.conversionDimensions);
-    checkUnnamed865(o.customFloodlightVariables);
-    checkUnnamed866(o.customRichMediaEvents);
+    checkUnnamed678(o.activityFilters);
+    checkUnnamed679(o.conversionDimensions);
+    checkUnnamed680(o.customFloodlightVariables);
+    checkUnnamed681(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
     checkDimensionValue(o.floodlightConfigId);
-    checkUnnamed867(o.metricNames);
-    checkUnnamed868(o.perInteractionDimensions);
+    checkUnnamed682(o.metricNames);
+    checkUnnamed683(o.perInteractionDimensions);
     checkReportPathToConversionCriteriaReportProperties(o.reportProperties);
   }
   buildCounterReportPathToConversionCriteria--;
 }
 
-buildUnnamed869() {
+buildUnnamed684() {
   var o = new core.List<api.DimensionValue>();
   o.add(buildDimensionValue());
   o.add(buildDimensionValue());
   return o;
 }
 
-checkUnnamed869(core.List<api.DimensionValue> o) {
+checkUnnamed684(core.List<api.DimensionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionValue(o[0]);
   checkDimensionValue(o[1]);
 }
 
-buildUnnamed870() {
+buildUnnamed685() {
   var o = new core.List<api.SortedDimension>();
   o.add(buildSortedDimension());
   o.add(buildSortedDimension());
   return o;
 }
 
-checkUnnamed870(core.List<api.SortedDimension> o) {
+checkUnnamed685(core.List<api.SortedDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortedDimension(o[0]);
   checkSortedDimension(o[1]);
 }
 
-buildUnnamed871() {
+buildUnnamed686() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed871(core.List<core.String> o) {
+checkUnnamed686(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed872() {
+buildUnnamed687() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed872(core.List<core.String> o) {
+checkUnnamed687(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -7471,11 +7471,11 @@
     o.activities = buildActivities();
     o.customRichMediaEvents = buildCustomRichMediaEvents();
     o.dateRange = buildDateRange();
-    o.dimensionFilters = buildUnnamed869();
-    o.dimensions = buildUnnamed870();
+    o.dimensionFilters = buildUnnamed684();
+    o.dimensions = buildUnnamed685();
     o.enableAllDimensionCombinations = true;
-    o.metricNames = buildUnnamed871();
-    o.reachByFrequencyMetricNames = buildUnnamed872();
+    o.metricNames = buildUnnamed686();
+    o.reachByFrequencyMetricNames = buildUnnamed687();
   }
   buildCounterReportReachCriteria--;
   return o;
@@ -7487,23 +7487,23 @@
     checkActivities(o.activities);
     checkCustomRichMediaEvents(o.customRichMediaEvents);
     checkDateRange(o.dateRange);
-    checkUnnamed869(o.dimensionFilters);
-    checkUnnamed870(o.dimensions);
+    checkUnnamed684(o.dimensionFilters);
+    checkUnnamed685(o.dimensions);
     unittest.expect(o.enableAllDimensionCombinations, unittest.isTrue);
-    checkUnnamed871(o.metricNames);
-    checkUnnamed872(o.reachByFrequencyMetricNames);
+    checkUnnamed686(o.metricNames);
+    checkUnnamed687(o.reachByFrequencyMetricNames);
   }
   buildCounterReportReachCriteria--;
 }
 
-buildUnnamed873() {
+buildUnnamed688() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed873(core.List<core.String> o) {
+checkUnnamed688(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -7518,7 +7518,7 @@
     o.every = 42;
     o.expirationDate = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.repeats = "foo";
-    o.repeatsOnWeekDays = buildUnnamed873();
+    o.repeatsOnWeekDays = buildUnnamed688();
     o.runsOnDayOfMonth = "foo";
     o.startDate = core.DateTime.parse("2002-02-27T14:01:02Z");
   }
@@ -7534,7 +7534,7 @@
     unittest.expect(o.expirationDate,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.repeats, unittest.equals('foo'));
-    checkUnnamed873(o.repeatsOnWeekDays);
+    checkUnnamed688(o.repeatsOnWeekDays);
     unittest.expect(o.runsOnDayOfMonth, unittest.equals('foo'));
     unittest.expect(o.startDate,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
@@ -7595,53 +7595,53 @@
   buildCounterReport--;
 }
 
-buildUnnamed874() {
+buildUnnamed689() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed874(core.List<api.Dimension> o) {
+checkUnnamed689(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed875() {
+buildUnnamed690() {
   var o = new core.List<api.Dimension>();
   o.add(buildDimension());
   o.add(buildDimension());
   return o;
 }
 
-checkUnnamed875(core.List<api.Dimension> o) {
+checkUnnamed690(core.List<api.Dimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimension(o[0]);
   checkDimension(o[1]);
 }
 
-buildUnnamed876() {
+buildUnnamed691() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed876(core.List<api.Metric> o) {
+checkUnnamed691(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
 }
 
-buildUnnamed877() {
+buildUnnamed692() {
   var o = new core.List<api.Metric>();
   o.add(buildMetric());
   o.add(buildMetric());
   return o;
 }
 
-checkUnnamed877(core.List<api.Metric> o) {
+checkUnnamed692(core.List<api.Metric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetric(o[0]);
   checkMetric(o[1]);
@@ -7652,11 +7652,11 @@
   var o = new api.ReportCompatibleFields();
   buildCounterReportCompatibleFields++;
   if (buildCounterReportCompatibleFields < 3) {
-    o.dimensionFilters = buildUnnamed874();
-    o.dimensions = buildUnnamed875();
+    o.dimensionFilters = buildUnnamed689();
+    o.dimensions = buildUnnamed690();
     o.kind = "foo";
-    o.metrics = buildUnnamed876();
-    o.pivotedActivityMetrics = buildUnnamed877();
+    o.metrics = buildUnnamed691();
+    o.pivotedActivityMetrics = buildUnnamed692();
   }
   buildCounterReportCompatibleFields--;
   return o;
@@ -7665,23 +7665,23 @@
 checkReportCompatibleFields(api.ReportCompatibleFields o) {
   buildCounterReportCompatibleFields++;
   if (buildCounterReportCompatibleFields < 3) {
-    checkUnnamed874(o.dimensionFilters);
-    checkUnnamed875(o.dimensions);
+    checkUnnamed689(o.dimensionFilters);
+    checkUnnamed690(o.dimensions);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed876(o.metrics);
-    checkUnnamed877(o.pivotedActivityMetrics);
+    checkUnnamed691(o.metrics);
+    checkUnnamed692(o.pivotedActivityMetrics);
   }
   buildCounterReportCompatibleFields--;
 }
 
-buildUnnamed878() {
+buildUnnamed693() {
   var o = new core.List<api.Report>();
   o.add(buildReport());
   o.add(buildReport());
   return o;
 }
 
-checkUnnamed878(core.List<api.Report> o) {
+checkUnnamed693(core.List<api.Report> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReport(o[0]);
   checkReport(o[1]);
@@ -7693,7 +7693,7 @@
   buildCounterReportList++;
   if (buildCounterReportList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed878();
+    o.items = buildUnnamed693();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -7705,7 +7705,7 @@
   buildCounterReportList++;
   if (buildCounterReportList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed878(o.items);
+    checkUnnamed693(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -7781,14 +7781,14 @@
   buildCounterRule--;
 }
 
-buildUnnamed879() {
+buildUnnamed694() {
   var o = new core.List<api.SiteContact>();
   o.add(buildSiteContact());
   o.add(buildSiteContact());
   return o;
 }
 
-checkUnnamed879(core.List<api.SiteContact> o) {
+checkUnnamed694(core.List<api.SiteContact> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSiteContact(o[0]);
   checkSiteContact(o[1]);
@@ -7808,7 +7808,7 @@
     o.keyName = "foo";
     o.kind = "foo";
     o.name = "foo";
-    o.siteContacts = buildUnnamed879();
+    o.siteContacts = buildUnnamed694();
     o.siteSettings = buildSiteSettings();
     o.subaccountId = "foo";
   }
@@ -7828,7 +7828,7 @@
     unittest.expect(o.keyName, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed879(o.siteContacts);
+    checkUnnamed694(o.siteContacts);
     checkSiteSettings(o.siteSettings);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
   }
@@ -7901,14 +7901,14 @@
   buildCounterSiteSettings--;
 }
 
-buildUnnamed880() {
+buildUnnamed695() {
   var o = new core.List<api.Site>();
   o.add(buildSite());
   o.add(buildSite());
   return o;
 }
 
-checkUnnamed880(core.List<api.Site> o) {
+checkUnnamed695(core.List<api.Site> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSite(o[0]);
   checkSite(o[1]);
@@ -7921,7 +7921,7 @@
   if (buildCounterSitesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.sites = buildUnnamed880();
+    o.sites = buildUnnamed695();
   }
   buildCounterSitesListResponse--;
   return o;
@@ -7932,7 +7932,7 @@
   if (buildCounterSitesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed880(o.sites);
+    checkUnnamed695(o.sites);
   }
   buildCounterSitesListResponse--;
 }
@@ -7964,14 +7964,14 @@
   buildCounterSize--;
 }
 
-buildUnnamed881() {
+buildUnnamed696() {
   var o = new core.List<api.Size>();
   o.add(buildSize());
   o.add(buildSize());
   return o;
 }
 
-checkUnnamed881(core.List<api.Size> o) {
+checkUnnamed696(core.List<api.Size> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSize(o[0]);
   checkSize(o[1]);
@@ -7983,7 +7983,7 @@
   buildCounterSizesListResponse++;
   if (buildCounterSizesListResponse < 3) {
     o.kind = "foo";
-    o.sizes = buildUnnamed881();
+    o.sizes = buildUnnamed696();
   }
   buildCounterSizesListResponse--;
   return o;
@@ -7993,7 +7993,7 @@
   buildCounterSizesListResponse++;
   if (buildCounterSizesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed881(o.sizes);
+    checkUnnamed696(o.sizes);
   }
   buildCounterSizesListResponse--;
 }
@@ -8046,14 +8046,14 @@
   buildCounterSortedDimension--;
 }
 
-buildUnnamed882() {
+buildUnnamed697() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed882(core.List<core.String> o) {
+checkUnnamed697(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -8065,7 +8065,7 @@
   buildCounterSubaccount++;
   if (buildCounterSubaccount < 3) {
     o.accountId = "foo";
-    o.availablePermissionIds = buildUnnamed882();
+    o.availablePermissionIds = buildUnnamed697();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
@@ -8078,7 +8078,7 @@
   buildCounterSubaccount++;
   if (buildCounterSubaccount < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed882(o.availablePermissionIds);
+    checkUnnamed697(o.availablePermissionIds);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -8086,14 +8086,14 @@
   buildCounterSubaccount--;
 }
 
-buildUnnamed883() {
+buildUnnamed698() {
   var o = new core.List<api.Subaccount>();
   o.add(buildSubaccount());
   o.add(buildSubaccount());
   return o;
 }
 
-checkUnnamed883(core.List<api.Subaccount> o) {
+checkUnnamed698(core.List<api.Subaccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubaccount(o[0]);
   checkSubaccount(o[1]);
@@ -8106,7 +8106,7 @@
   if (buildCounterSubaccountsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.subaccounts = buildUnnamed883();
+    o.subaccounts = buildUnnamed698();
   }
   buildCounterSubaccountsListResponse--;
   return o;
@@ -8117,7 +8117,7 @@
   if (buildCounterSubaccountsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed883(o.subaccounts);
+    checkUnnamed698(o.subaccounts);
   }
   buildCounterSubaccountsListResponse--;
 }
@@ -8257,14 +8257,14 @@
   buildCounterTargetableRemarketingList--;
 }
 
-buildUnnamed884() {
+buildUnnamed699() {
   var o = new core.List<api.TargetableRemarketingList>();
   o.add(buildTargetableRemarketingList());
   o.add(buildTargetableRemarketingList());
   return o;
 }
 
-checkUnnamed884(core.List<api.TargetableRemarketingList> o) {
+checkUnnamed699(core.List<api.TargetableRemarketingList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetableRemarketingList(o[0]);
   checkTargetableRemarketingList(o[1]);
@@ -8277,7 +8277,7 @@
   if (buildCounterTargetableRemarketingListsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.targetableRemarketingLists = buildUnnamed884();
+    o.targetableRemarketingLists = buildUnnamed699();
   }
   buildCounterTargetableRemarketingListsListResponse--;
   return o;
@@ -8289,7 +8289,7 @@
   if (buildCounterTargetableRemarketingListsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed884(o.targetableRemarketingLists);
+    checkUnnamed699(o.targetableRemarketingLists);
   }
   buildCounterTargetableRemarketingListsListResponse--;
 }
@@ -8337,14 +8337,14 @@
   buildCounterTargetingTemplate--;
 }
 
-buildUnnamed885() {
+buildUnnamed700() {
   var o = new core.List<api.TargetingTemplate>();
   o.add(buildTargetingTemplate());
   o.add(buildTargetingTemplate());
   return o;
 }
 
-checkUnnamed885(core.List<api.TargetingTemplate> o) {
+checkUnnamed700(core.List<api.TargetingTemplate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTargetingTemplate(o[0]);
   checkTargetingTemplate(o[1]);
@@ -8357,7 +8357,7 @@
   if (buildCounterTargetingTemplatesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.targetingTemplates = buildUnnamed885();
+    o.targetingTemplates = buildUnnamed700();
   }
   buildCounterTargetingTemplatesListResponse--;
   return o;
@@ -8368,84 +8368,84 @@
   if (buildCounterTargetingTemplatesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed885(o.targetingTemplates);
+    checkUnnamed700(o.targetingTemplates);
   }
   buildCounterTargetingTemplatesListResponse--;
 }
 
-buildUnnamed886() {
+buildUnnamed701() {
   var o = new core.List<api.Browser>();
   o.add(buildBrowser());
   o.add(buildBrowser());
   return o;
 }
 
-checkUnnamed886(core.List<api.Browser> o) {
+checkUnnamed701(core.List<api.Browser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBrowser(o[0]);
   checkBrowser(o[1]);
 }
 
-buildUnnamed887() {
+buildUnnamed702() {
   var o = new core.List<api.ConnectionType>();
   o.add(buildConnectionType());
   o.add(buildConnectionType());
   return o;
 }
 
-checkUnnamed887(core.List<api.ConnectionType> o) {
+checkUnnamed702(core.List<api.ConnectionType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConnectionType(o[0]);
   checkConnectionType(o[1]);
 }
 
-buildUnnamed888() {
+buildUnnamed703() {
   var o = new core.List<api.MobileCarrier>();
   o.add(buildMobileCarrier());
   o.add(buildMobileCarrier());
   return o;
 }
 
-checkUnnamed888(core.List<api.MobileCarrier> o) {
+checkUnnamed703(core.List<api.MobileCarrier> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMobileCarrier(o[0]);
   checkMobileCarrier(o[1]);
 }
 
-buildUnnamed889() {
+buildUnnamed704() {
   var o = new core.List<api.OperatingSystemVersion>();
   o.add(buildOperatingSystemVersion());
   o.add(buildOperatingSystemVersion());
   return o;
 }
 
-checkUnnamed889(core.List<api.OperatingSystemVersion> o) {
+checkUnnamed704(core.List<api.OperatingSystemVersion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperatingSystemVersion(o[0]);
   checkOperatingSystemVersion(o[1]);
 }
 
-buildUnnamed890() {
+buildUnnamed705() {
   var o = new core.List<api.OperatingSystem>();
   o.add(buildOperatingSystem());
   o.add(buildOperatingSystem());
   return o;
 }
 
-checkUnnamed890(core.List<api.OperatingSystem> o) {
+checkUnnamed705(core.List<api.OperatingSystem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperatingSystem(o[0]);
   checkOperatingSystem(o[1]);
 }
 
-buildUnnamed891() {
+buildUnnamed706() {
   var o = new core.List<api.PlatformType>();
   o.add(buildPlatformType());
   o.add(buildPlatformType());
   return o;
 }
 
-checkUnnamed891(core.List<api.PlatformType> o) {
+checkUnnamed706(core.List<api.PlatformType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlatformType(o[0]);
   checkPlatformType(o[1]);
@@ -8456,12 +8456,12 @@
   var o = new api.TechnologyTargeting();
   buildCounterTechnologyTargeting++;
   if (buildCounterTechnologyTargeting < 3) {
-    o.browsers = buildUnnamed886();
-    o.connectionTypes = buildUnnamed887();
-    o.mobileCarriers = buildUnnamed888();
-    o.operatingSystemVersions = buildUnnamed889();
-    o.operatingSystems = buildUnnamed890();
-    o.platformTypes = buildUnnamed891();
+    o.browsers = buildUnnamed701();
+    o.connectionTypes = buildUnnamed702();
+    o.mobileCarriers = buildUnnamed703();
+    o.operatingSystemVersions = buildUnnamed704();
+    o.operatingSystems = buildUnnamed705();
+    o.platformTypes = buildUnnamed706();
   }
   buildCounterTechnologyTargeting--;
   return o;
@@ -8470,12 +8470,12 @@
 checkTechnologyTargeting(api.TechnologyTargeting o) {
   buildCounterTechnologyTargeting++;
   if (buildCounterTechnologyTargeting < 3) {
-    checkUnnamed886(o.browsers);
-    checkUnnamed887(o.connectionTypes);
-    checkUnnamed888(o.mobileCarriers);
-    checkUnnamed889(o.operatingSystemVersions);
-    checkUnnamed890(o.operatingSystems);
-    checkUnnamed891(o.platformTypes);
+    checkUnnamed701(o.browsers);
+    checkUnnamed702(o.connectionTypes);
+    checkUnnamed703(o.mobileCarriers);
+    checkUnnamed704(o.operatingSystemVersions);
+    checkUnnamed705(o.operatingSystems);
+    checkUnnamed706(o.platformTypes);
   }
   buildCounterTechnologyTargeting--;
 }
@@ -8522,14 +8522,14 @@
   buildCounterThirdPartyTrackingUrl--;
 }
 
-buildUnnamed892() {
+buildUnnamed707() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed892(core.List<core.int> o) {
+checkUnnamed707(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -8540,7 +8540,7 @@
   var o = new api.TranscodeSetting();
   buildCounterTranscodeSetting++;
   if (buildCounterTranscodeSetting < 3) {
-    o.enabledVideoFormats = buildUnnamed892();
+    o.enabledVideoFormats = buildUnnamed707();
     o.kind = "foo";
   }
   buildCounterTranscodeSetting--;
@@ -8550,7 +8550,7 @@
 checkTranscodeSetting(api.TranscodeSetting o) {
   buildCounterTranscodeSetting++;
   if (buildCounterTranscodeSetting < 3) {
-    checkUnnamed892(o.enabledVideoFormats);
+    checkUnnamed707(o.enabledVideoFormats);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTranscodeSetting--;
@@ -8633,14 +8633,14 @@
   buildCounterUserProfile--;
 }
 
-buildUnnamed893() {
+buildUnnamed708() {
   var o = new core.List<api.UserProfile>();
   o.add(buildUserProfile());
   o.add(buildUserProfile());
   return o;
 }
 
-checkUnnamed893(core.List<api.UserProfile> o) {
+checkUnnamed708(core.List<api.UserProfile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserProfile(o[0]);
   checkUserProfile(o[1]);
@@ -8652,7 +8652,7 @@
   buildCounterUserProfileList++;
   if (buildCounterUserProfileList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed893();
+    o.items = buildUnnamed708();
     o.kind = "foo";
   }
   buildCounterUserProfileList--;
@@ -8663,20 +8663,20 @@
   buildCounterUserProfileList++;
   if (buildCounterUserProfileList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed893(o.items);
+    checkUnnamed708(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterUserProfileList--;
 }
 
-buildUnnamed894() {
+buildUnnamed709() {
   var o = new core.List<api.UserRolePermission>();
   o.add(buildUserRolePermission());
   o.add(buildUserRolePermission());
   return o;
 }
 
-checkUnnamed894(core.List<api.UserRolePermission> o) {
+checkUnnamed709(core.List<api.UserRolePermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserRolePermission(o[0]);
   checkUserRolePermission(o[1]);
@@ -8693,7 +8693,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.parentUserRoleId = "foo";
-    o.permissions = buildUnnamed894();
+    o.permissions = buildUnnamed709();
     o.subaccountId = "foo";
   }
   buildCounterUserRole--;
@@ -8709,7 +8709,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.parentUserRoleId, unittest.equals('foo'));
-    checkUnnamed894(o.permissions);
+    checkUnnamed709(o.permissions);
     unittest.expect(o.subaccountId, unittest.equals('foo'));
   }
   buildCounterUserRole--;
@@ -8765,14 +8765,14 @@
   buildCounterUserRolePermissionGroup--;
 }
 
-buildUnnamed895() {
+buildUnnamed710() {
   var o = new core.List<api.UserRolePermissionGroup>();
   o.add(buildUserRolePermissionGroup());
   o.add(buildUserRolePermissionGroup());
   return o;
 }
 
-checkUnnamed895(core.List<api.UserRolePermissionGroup> o) {
+checkUnnamed710(core.List<api.UserRolePermissionGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserRolePermissionGroup(o[0]);
   checkUserRolePermissionGroup(o[1]);
@@ -8784,7 +8784,7 @@
   buildCounterUserRolePermissionGroupsListResponse++;
   if (buildCounterUserRolePermissionGroupsListResponse < 3) {
     o.kind = "foo";
-    o.userRolePermissionGroups = buildUnnamed895();
+    o.userRolePermissionGroups = buildUnnamed710();
   }
   buildCounterUserRolePermissionGroupsListResponse--;
   return o;
@@ -8795,19 +8795,19 @@
   buildCounterUserRolePermissionGroupsListResponse++;
   if (buildCounterUserRolePermissionGroupsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed895(o.userRolePermissionGroups);
+    checkUnnamed710(o.userRolePermissionGroups);
   }
   buildCounterUserRolePermissionGroupsListResponse--;
 }
 
-buildUnnamed896() {
+buildUnnamed711() {
   var o = new core.List<api.UserRolePermission>();
   o.add(buildUserRolePermission());
   o.add(buildUserRolePermission());
   return o;
 }
 
-checkUnnamed896(core.List<api.UserRolePermission> o) {
+checkUnnamed711(core.List<api.UserRolePermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserRolePermission(o[0]);
   checkUserRolePermission(o[1]);
@@ -8819,7 +8819,7 @@
   buildCounterUserRolePermissionsListResponse++;
   if (buildCounterUserRolePermissionsListResponse < 3) {
     o.kind = "foo";
-    o.userRolePermissions = buildUnnamed896();
+    o.userRolePermissions = buildUnnamed711();
   }
   buildCounterUserRolePermissionsListResponse--;
   return o;
@@ -8829,19 +8829,19 @@
   buildCounterUserRolePermissionsListResponse++;
   if (buildCounterUserRolePermissionsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed896(o.userRolePermissions);
+    checkUnnamed711(o.userRolePermissions);
   }
   buildCounterUserRolePermissionsListResponse--;
 }
 
-buildUnnamed897() {
+buildUnnamed712() {
   var o = new core.List<api.UserRole>();
   o.add(buildUserRole());
   o.add(buildUserRole());
   return o;
 }
 
-checkUnnamed897(core.List<api.UserRole> o) {
+checkUnnamed712(core.List<api.UserRole> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserRole(o[0]);
   checkUserRole(o[1]);
@@ -8854,7 +8854,7 @@
   if (buildCounterUserRolesListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.userRoles = buildUnnamed897();
+    o.userRoles = buildUnnamed712();
   }
   buildCounterUserRolesListResponse--;
   return o;
@@ -8865,7 +8865,7 @@
   if (buildCounterUserRolesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed897(o.userRoles);
+    checkUnnamed712(o.userRoles);
   }
   buildCounterUserRolesListResponse--;
 }
@@ -8897,14 +8897,14 @@
   buildCounterVideoFormat--;
 }
 
-buildUnnamed898() {
+buildUnnamed713() {
   var o = new core.List<api.VideoFormat>();
   o.add(buildVideoFormat());
   o.add(buildVideoFormat());
   return o;
 }
 
-checkUnnamed898(core.List<api.VideoFormat> o) {
+checkUnnamed713(core.List<api.VideoFormat> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoFormat(o[0]);
   checkVideoFormat(o[1]);
@@ -8916,7 +8916,7 @@
   buildCounterVideoFormatsListResponse++;
   if (buildCounterVideoFormatsListResponse < 3) {
     o.kind = "foo";
-    o.videoFormats = buildUnnamed898();
+    o.videoFormats = buildUnnamed713();
   }
   buildCounterVideoFormatsListResponse--;
   return o;
@@ -8926,7 +8926,7 @@
   buildCounterVideoFormatsListResponse++;
   if (buildCounterVideoFormatsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed898(o.videoFormats);
+    checkUnnamed713(o.videoFormats);
   }
   buildCounterVideoFormatsListResponse--;
 }
@@ -8979,1171 +8979,1171 @@
   buildCounterVideoSettings--;
 }
 
-buildUnnamed899() {
+buildUnnamed714() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed899(core.List<core.String> o) {
+checkUnnamed714(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed900() {
+buildUnnamed715() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed900(core.List<core.String> o) {
+checkUnnamed715(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed901() {
+buildUnnamed716() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed901(core.List<core.String> o) {
+checkUnnamed716(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed902() {
+buildUnnamed717() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed902(core.List<core.String> o) {
+checkUnnamed717(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed903() {
+buildUnnamed718() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed903(core.List<core.String> o) {
+checkUnnamed718(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed904() {
+buildUnnamed719() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed904(core.List<core.String> o) {
+checkUnnamed719(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed905() {
+buildUnnamed720() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed905(core.List<core.String> o) {
+checkUnnamed720(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed906() {
+buildUnnamed721() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed906(core.List<core.String> o) {
+checkUnnamed721(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed907() {
+buildUnnamed722() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed907(core.List<core.String> o) {
+checkUnnamed722(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed908() {
+buildUnnamed723() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed908(core.List<core.String> o) {
+checkUnnamed723(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed909() {
+buildUnnamed724() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed909(core.List<core.String> o) {
+checkUnnamed724(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed910() {
+buildUnnamed725() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed910(core.List<core.String> o) {
+checkUnnamed725(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed911() {
+buildUnnamed726() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed911(core.List<core.String> o) {
+checkUnnamed726(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed912() {
+buildUnnamed727() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed912(core.List<core.String> o) {
+checkUnnamed727(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed913() {
+buildUnnamed728() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed913(core.List<core.String> o) {
+checkUnnamed728(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed914() {
+buildUnnamed729() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed914(core.List<core.String> o) {
+checkUnnamed729(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed915() {
+buildUnnamed730() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed915(core.List<core.String> o) {
+checkUnnamed730(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed916() {
+buildUnnamed731() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed916(core.List<core.String> o) {
+checkUnnamed731(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed917() {
+buildUnnamed732() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed917(core.List<core.String> o) {
+checkUnnamed732(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed918() {
+buildUnnamed733() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed918(core.List<core.String> o) {
+checkUnnamed733(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed919() {
+buildUnnamed734() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed919(core.List<core.String> o) {
+checkUnnamed734(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed920() {
+buildUnnamed735() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed920(core.List<core.String> o) {
+checkUnnamed735(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed921() {
+buildUnnamed736() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed921(core.List<core.String> o) {
+checkUnnamed736(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed922() {
+buildUnnamed737() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed922(core.List<core.String> o) {
+checkUnnamed737(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed923() {
+buildUnnamed738() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed923(core.List<core.String> o) {
+checkUnnamed738(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed924() {
+buildUnnamed739() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed924(core.List<core.String> o) {
+checkUnnamed739(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed925() {
+buildUnnamed740() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed925(core.List<core.String> o) {
+checkUnnamed740(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed926() {
+buildUnnamed741() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed926(core.List<core.String> o) {
+checkUnnamed741(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed927() {
+buildUnnamed742() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed927(core.List<core.String> o) {
+checkUnnamed742(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed928() {
+buildUnnamed743() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed928(core.List<core.String> o) {
+checkUnnamed743(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed929() {
+buildUnnamed744() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed929(core.List<core.String> o) {
+checkUnnamed744(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed930() {
+buildUnnamed745() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed930(core.List<core.String> o) {
+checkUnnamed745(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed931() {
+buildUnnamed746() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed931(core.List<core.String> o) {
+checkUnnamed746(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed932() {
+buildUnnamed747() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed932(core.List<core.String> o) {
+checkUnnamed747(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed933() {
+buildUnnamed748() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed933(core.List<core.String> o) {
+checkUnnamed748(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed934() {
+buildUnnamed749() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed934(core.List<core.String> o) {
+checkUnnamed749(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed935() {
+buildUnnamed750() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed935(core.List<core.String> o) {
+checkUnnamed750(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed936() {
+buildUnnamed751() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed936(core.List<core.String> o) {
+checkUnnamed751(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed937() {
+buildUnnamed752() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed937(core.List<core.String> o) {
+checkUnnamed752(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed938() {
+buildUnnamed753() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed938(core.List<core.String> o) {
+checkUnnamed753(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed939() {
+buildUnnamed754() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed939(core.List<core.String> o) {
+checkUnnamed754(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed940() {
+buildUnnamed755() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed940(core.List<core.String> o) {
+checkUnnamed755(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed941() {
+buildUnnamed756() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed941(core.List<core.String> o) {
+checkUnnamed756(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed942() {
+buildUnnamed757() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed942(core.List<core.String> o) {
+checkUnnamed757(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed943() {
+buildUnnamed758() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed943(core.List<core.String> o) {
+checkUnnamed758(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed944() {
+buildUnnamed759() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed944(core.List<core.String> o) {
+checkUnnamed759(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed945() {
+buildUnnamed760() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed945(core.List<core.String> o) {
+checkUnnamed760(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed946() {
+buildUnnamed761() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed946(core.List<core.String> o) {
+checkUnnamed761(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed947() {
+buildUnnamed762() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed947(core.List<core.String> o) {
+checkUnnamed762(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed948() {
+buildUnnamed763() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed948(core.List<core.String> o) {
+checkUnnamed763(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed949() {
+buildUnnamed764() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed949(core.List<core.String> o) {
+checkUnnamed764(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed950() {
+buildUnnamed765() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed950(core.List<core.String> o) {
+checkUnnamed765(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed951() {
+buildUnnamed766() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed951(core.List<core.String> o) {
+checkUnnamed766(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed952() {
+buildUnnamed767() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed952(core.List<core.String> o) {
+checkUnnamed767(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed953() {
+buildUnnamed768() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed953(core.List<core.String> o) {
+checkUnnamed768(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed954() {
+buildUnnamed769() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed954(core.List<core.String> o) {
+checkUnnamed769(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed955() {
+buildUnnamed770() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed955(core.List<core.String> o) {
+checkUnnamed770(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed956() {
+buildUnnamed771() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed956(core.List<core.String> o) {
+checkUnnamed771(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed957() {
+buildUnnamed772() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed957(core.List<core.String> o) {
+checkUnnamed772(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed958() {
+buildUnnamed773() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed958(core.List<core.String> o) {
+checkUnnamed773(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed959() {
+buildUnnamed774() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed959(core.List<core.String> o) {
+checkUnnamed774(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed960() {
+buildUnnamed775() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed960(core.List<core.String> o) {
+checkUnnamed775(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed961() {
+buildUnnamed776() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed961(core.List<core.String> o) {
+checkUnnamed776(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed962() {
+buildUnnamed777() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed962(core.List<core.String> o) {
+checkUnnamed777(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed963() {
+buildUnnamed778() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed963(core.List<core.String> o) {
+checkUnnamed778(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed964() {
+buildUnnamed779() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed964(core.List<core.String> o) {
+checkUnnamed779(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed965() {
+buildUnnamed780() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed965(core.List<core.String> o) {
+checkUnnamed780(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed966() {
+buildUnnamed781() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed966(core.List<core.String> o) {
+checkUnnamed781(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed967() {
+buildUnnamed782() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed967(core.List<core.String> o) {
+checkUnnamed782(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed968() {
+buildUnnamed783() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed968(core.List<core.String> o) {
+checkUnnamed783(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed969() {
+buildUnnamed784() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed969(core.List<core.String> o) {
+checkUnnamed784(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed970() {
+buildUnnamed785() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed970(core.List<core.String> o) {
+checkUnnamed785(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed971() {
+buildUnnamed786() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed971(core.List<core.String> o) {
+checkUnnamed786(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed972() {
+buildUnnamed787() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed972(core.List<core.String> o) {
+checkUnnamed787(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed973() {
+buildUnnamed788() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed973(core.List<core.String> o) {
+checkUnnamed788(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed974() {
+buildUnnamed789() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed974(core.List<core.String> o) {
+checkUnnamed789(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed975() {
+buildUnnamed790() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed975(core.List<core.String> o) {
+checkUnnamed790(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed976() {
+buildUnnamed791() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed976(core.List<core.String> o) {
+checkUnnamed791(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed977() {
+buildUnnamed792() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed977(core.List<core.String> o) {
+checkUnnamed792(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed978() {
+buildUnnamed793() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed978(core.List<core.String> o) {
+checkUnnamed793(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed979() {
+buildUnnamed794() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed979(core.List<core.String> o) {
+checkUnnamed794(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed980() {
+buildUnnamed795() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed980(core.List<core.String> o) {
+checkUnnamed795(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed981() {
+buildUnnamed796() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed981(core.List<core.String> o) {
+checkUnnamed796(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed982() {
+buildUnnamed797() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed982(core.List<core.String> o) {
+checkUnnamed797(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed983() {
+buildUnnamed798() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed983(core.List<core.String> o) {
+checkUnnamed798(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed984() {
+buildUnnamed799() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed984(core.List<core.String> o) {
+checkUnnamed799(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed985() {
+buildUnnamed800() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed985(core.List<core.String> o) {
+checkUnnamed800(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed986() {
+buildUnnamed801() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed986(core.List<core.String> o) {
+checkUnnamed801(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed987() {
+buildUnnamed802() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed987(core.List<core.String> o) {
+checkUnnamed802(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed988() {
+buildUnnamed803() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed988(core.List<core.String> o) {
+checkUnnamed803(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -11994,7 +11994,7 @@
       }), true);
       res
           .get(arg_profileId, arg_summaryAccountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountActiveAdSummary response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountActiveAdSummary(response);
       })));
     });
@@ -12063,7 +12063,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountPermissionGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountPermissionGroup(response);
       })));
     });
@@ -12125,8 +12125,9 @@
             convert.JSON.encode(buildAccountPermissionGroupsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.AccountPermissionGroupsListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkAccountPermissionGroupsListResponse(response);
       })));
     });
@@ -12195,7 +12196,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountPermission response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountPermission(response);
       })));
     });
@@ -12256,8 +12257,9 @@
         var resp = convert.JSON.encode(buildAccountPermissionsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.AccountPermissionsListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkAccountPermissionsListResponse(response);
       })));
     });
@@ -12326,7 +12328,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountUserProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountUserProfile(response);
       })));
     });
@@ -12393,7 +12395,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountUserProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountUserProfile(response);
       })));
     });
@@ -12404,7 +12406,7 @@
           new api.DfareportingApi(mock).accountUserProfiles;
       var arg_profileId = "foo";
       var arg_active = true;
-      var arg_ids = buildUnnamed899();
+      var arg_ids = buildUnnamed714();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -12492,8 +12494,7 @@
               subaccountId: arg_subaccountId,
               userRoleId: arg_userRoleId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AccountUserProfilesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountUserProfilesListResponse(response);
       })));
     });
@@ -12562,7 +12563,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountUserProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountUserProfile(response);
       })));
     });
@@ -12629,7 +12630,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountUserProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountUserProfile(response);
       })));
     });
@@ -12697,7 +12698,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -12707,7 +12708,7 @@
       api.AccountsResourceApi res = new api.DfareportingApi(mock).accounts;
       var arg_profileId = "foo";
       var arg_active = true;
-      var arg_ids = buildUnnamed900();
+      var arg_ids = buildUnnamed715();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -12787,7 +12788,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AccountsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccountsListResponse(response);
       })));
     });
@@ -12855,7 +12856,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -12921,7 +12922,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -12989,7 +12990,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Ad response) {
+          .then(unittest.expectAsync1(((response) {
         checkAd(response);
       })));
     });
@@ -13055,7 +13056,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Ad response) {
+          .then(unittest.expectAsync1(((response) {
         checkAd(response);
       })));
     });
@@ -13067,26 +13068,26 @@
       var arg_active = true;
       var arg_advertiserId = "foo";
       var arg_archived = true;
-      var arg_audienceSegmentIds = buildUnnamed901();
-      var arg_campaignIds = buildUnnamed902();
+      var arg_audienceSegmentIds = buildUnnamed716();
+      var arg_campaignIds = buildUnnamed717();
       var arg_compatibility = "foo";
-      var arg_creativeIds = buildUnnamed903();
-      var arg_creativeOptimizationConfigurationIds = buildUnnamed904();
+      var arg_creativeIds = buildUnnamed718();
+      var arg_creativeOptimizationConfigurationIds = buildUnnamed719();
       var arg_dynamicClickTracker = true;
-      var arg_ids = buildUnnamed905();
-      var arg_landingPageIds = buildUnnamed906();
+      var arg_ids = buildUnnamed720();
+      var arg_landingPageIds = buildUnnamed721();
       var arg_maxResults = 42;
       var arg_overriddenEventTagId = "foo";
       var arg_pageToken = "foo";
-      var arg_placementIds = buildUnnamed907();
-      var arg_remarketingListIds = buildUnnamed908();
+      var arg_placementIds = buildUnnamed722();
+      var arg_remarketingListIds = buildUnnamed723();
       var arg_searchString = "foo";
-      var arg_sizeIds = buildUnnamed909();
+      var arg_sizeIds = buildUnnamed724();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_sslCompliant = true;
       var arg_sslRequired = true;
-      var arg_type = buildUnnamed910();
+      var arg_type = buildUnnamed725();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -13208,7 +13209,7 @@
               sslRequired: arg_sslRequired,
               type: arg_type,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdsListResponse(response);
       })));
     });
@@ -13276,7 +13277,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Ad response) {
+          .then(unittest.expectAsync1(((response) {
         checkAd(response);
       })));
     });
@@ -13342,7 +13343,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Ad response) {
+          .then(unittest.expectAsync1(((response) {
         checkAd(response);
       })));
     });
@@ -13476,7 +13477,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdvertiserGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiserGroup(response);
       })));
     });
@@ -13543,7 +13544,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdvertiserGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiserGroup(response);
       })));
     });
@@ -13553,7 +13554,7 @@
       api.AdvertiserGroupsResourceApi res =
           new api.DfareportingApi(mock).advertiserGroups;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed911();
+      var arg_ids = buildUnnamed726();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -13630,8 +13631,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AdvertiserGroupsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiserGroupsListResponse(response);
       })));
     });
@@ -13700,7 +13700,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdvertiserGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiserGroup(response);
       })));
     });
@@ -13767,7 +13767,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdvertiserGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiserGroup(response);
       })));
     });
@@ -13836,7 +13836,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LandingPage response) {
+          .then(unittest.expectAsync1(((response) {
         checkLandingPage(response);
       })));
     });
@@ -13903,7 +13903,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LandingPage response) {
+          .then(unittest.expectAsync1(((response) {
         checkLandingPage(response);
       })));
     });
@@ -13913,9 +13913,9 @@
       api.AdvertiserLandingPagesResourceApi res =
           new api.DfareportingApi(mock).advertiserLandingPages;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed912();
+      var arg_advertiserIds = buildUnnamed727();
       var arg_archived = true;
-      var arg_ids = buildUnnamed913();
+      var arg_ids = buildUnnamed728();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -14003,8 +14003,7 @@
               sortOrder: arg_sortOrder,
               subaccountId: arg_subaccountId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AdvertiserLandingPagesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiserLandingPagesListResponse(response);
       })));
     });
@@ -14073,7 +14072,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LandingPage response) {
+          .then(unittest.expectAsync1(((response) {
         checkLandingPage(response);
       })));
     });
@@ -14140,7 +14139,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LandingPage response) {
+          .then(unittest.expectAsync1(((response) {
         checkLandingPage(response);
       })));
     });
@@ -14209,7 +14208,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Advertiser response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiser(response);
       })));
     });
@@ -14276,7 +14275,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Advertiser response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiser(response);
       })));
     });
@@ -14286,9 +14285,9 @@
       api.AdvertisersResourceApi res =
           new api.DfareportingApi(mock).advertisers;
       var arg_profileId = "foo";
-      var arg_advertiserGroupIds = buildUnnamed914();
-      var arg_floodlightConfigurationIds = buildUnnamed915();
-      var arg_ids = buildUnnamed916();
+      var arg_advertiserGroupIds = buildUnnamed729();
+      var arg_floodlightConfigurationIds = buildUnnamed730();
+      var arg_ids = buildUnnamed731();
       var arg_includeAdvertisersWithoutGroupsOnly = true;
       var arg_maxResults = 42;
       var arg_onlyParent = true;
@@ -14387,7 +14386,7 @@
               status: arg_status,
               subaccountId: arg_subaccountId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AdvertisersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertisersListResponse(response);
       })));
     });
@@ -14456,7 +14455,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Advertiser response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiser(response);
       })));
     });
@@ -14523,7 +14522,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Advertiser response) {
+          .then(unittest.expectAsync1(((response) {
         checkAdvertiser(response);
       })));
     });
@@ -14587,7 +14586,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BrowsersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBrowsersListResponse(response);
       })));
     });
@@ -14667,8 +14666,7 @@
       res
           .insert(arg_request, arg_profileId, arg_campaignId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.CampaignCreativeAssociation response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaignCreativeAssociation(response);
       })));
     });
@@ -14755,8 +14753,7 @@
               pageToken: arg_pageToken,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.CampaignCreativeAssociationsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaignCreativeAssociationsListResponse(response);
       })));
     });
@@ -14824,7 +14821,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Campaign response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaign(response);
       })));
     });
@@ -14890,7 +14887,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Campaign response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaign(response);
       })));
     });
@@ -14899,12 +14896,12 @@
       var mock = new HttpServerMock();
       api.CampaignsResourceApi res = new api.DfareportingApi(mock).campaigns;
       var arg_profileId = "foo";
-      var arg_advertiserGroupIds = buildUnnamed917();
-      var arg_advertiserIds = buildUnnamed918();
+      var arg_advertiserGroupIds = buildUnnamed732();
+      var arg_advertiserIds = buildUnnamed733();
       var arg_archived = true;
       var arg_atLeastOneOptimizationActivity = true;
-      var arg_excludedIds = buildUnnamed919();
-      var arg_ids = buildUnnamed920();
+      var arg_excludedIds = buildUnnamed734();
+      var arg_ids = buildUnnamed735();
       var arg_maxResults = 42;
       var arg_overriddenEventTagId = "foo";
       var arg_pageToken = "foo";
@@ -15005,7 +15002,7 @@
               sortOrder: arg_sortOrder,
               subaccountId: arg_subaccountId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CampaignsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaignsListResponse(response);
       })));
     });
@@ -15073,7 +15070,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Campaign response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaign(response);
       })));
     });
@@ -15139,7 +15136,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Campaign response) {
+          .then(unittest.expectAsync1(((response) {
         checkCampaign(response);
       })));
     });
@@ -15207,7 +15204,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChangeLog response) {
+          .then(unittest.expectAsync1(((response) {
         checkChangeLog(response);
       })));
     });
@@ -15217,15 +15214,15 @@
       api.ChangeLogsResourceApi res = new api.DfareportingApi(mock).changeLogs;
       var arg_profileId = "foo";
       var arg_action = "foo";
-      var arg_ids = buildUnnamed921();
+      var arg_ids = buildUnnamed736();
       var arg_maxChangeTime = "foo";
       var arg_maxResults = 42;
       var arg_minChangeTime = "foo";
-      var arg_objectIds = buildUnnamed922();
+      var arg_objectIds = buildUnnamed737();
       var arg_objectType = "foo";
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
-      var arg_userProfileIds = buildUnnamed923();
+      var arg_userProfileIds = buildUnnamed738();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -15307,7 +15304,7 @@
               searchString: arg_searchString,
               userProfileIds: arg_userProfileIds,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChangeLogsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkChangeLogsListResponse(response);
       })));
     });
@@ -15318,10 +15315,10 @@
       var mock = new HttpServerMock();
       api.CitiesResourceApi res = new api.DfareportingApi(mock).cities;
       var arg_profileId = "foo";
-      var arg_countryDartIds = buildUnnamed924();
-      var arg_dartIds = buildUnnamed925();
+      var arg_countryDartIds = buildUnnamed739();
+      var arg_dartIds = buildUnnamed740();
       var arg_namePrefix = "foo";
-      var arg_regionDartIds = buildUnnamed926();
+      var arg_regionDartIds = buildUnnamed741();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -15387,7 +15384,7 @@
               namePrefix: arg_namePrefix,
               regionDartIds: arg_regionDartIds,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CitiesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCitiesListResponse(response);
       })));
     });
@@ -15456,7 +15453,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ConnectionType response) {
+          .then(unittest.expectAsync1(((response) {
         checkConnectionType(response);
       })));
     });
@@ -15517,8 +15514,9 @@
         var resp = convert.JSON.encode(buildConnectionTypesListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ConnectionTypesListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkConnectionTypesListResponse(response);
       })));
     });
@@ -15652,7 +15650,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContentCategory response) {
+          .then(unittest.expectAsync1(((response) {
         checkContentCategory(response);
       })));
     });
@@ -15719,7 +15717,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContentCategory response) {
+          .then(unittest.expectAsync1(((response) {
         checkContentCategory(response);
       })));
     });
@@ -15729,7 +15727,7 @@
       api.ContentCategoriesResourceApi res =
           new api.DfareportingApi(mock).contentCategories;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed927();
+      var arg_ids = buildUnnamed742();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -15806,8 +15804,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ContentCategoriesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkContentCategoriesListResponse(response);
       })));
     });
@@ -15876,7 +15873,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContentCategory response) {
+          .then(unittest.expectAsync1(((response) {
         checkContentCategory(response);
       })));
     });
@@ -15943,7 +15940,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContentCategory response) {
+          .then(unittest.expectAsync1(((response) {
         checkContentCategory(response);
       })));
     });
@@ -16010,8 +16007,9 @@
         var resp = convert.JSON.encode(buildConversionsBatchInsertResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchinsert(arg_request, arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ConversionsBatchInsertResponse response) {
+      res
+          .batchinsert(arg_request, arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkConversionsBatchInsertResponse(response);
       })));
     });
@@ -16076,8 +16074,9 @@
         var resp = convert.JSON.encode(buildConversionsBatchUpdateResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchupdate(arg_request, arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ConversionsBatchUpdateResponse response) {
+      res
+          .batchupdate(arg_request, arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkConversionsBatchUpdateResponse(response);
       })));
     });
@@ -16145,7 +16144,7 @@
       }), true);
       res
           .get(arg_profileId, arg_dartId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Country response) {
+          .then(unittest.expectAsync1(((response) {
         checkCountry(response);
       })));
     });
@@ -16207,7 +16206,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CountriesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCountriesListResponse(response);
       })));
     });
@@ -16290,7 +16289,7 @@
       res
           .insert(arg_request, arg_profileId, arg_advertiserId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeAssetMetadata response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeAssetMetadata(response);
       })));
     });
@@ -16445,7 +16444,7 @@
       }), true);
       res
           .get(arg_profileId, arg_creativeFieldId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeFieldValue response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeFieldValue(response);
       })));
     });
@@ -16523,7 +16522,7 @@
       res
           .insert(arg_request, arg_profileId, arg_creativeFieldId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeFieldValue response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeFieldValue(response);
       })));
     });
@@ -16534,7 +16533,7 @@
           new api.DfareportingApi(mock).creativeFieldValues;
       var arg_profileId = "foo";
       var arg_creativeFieldId = "foo";
-      var arg_ids = buildUnnamed928();
+      var arg_ids = buildUnnamed743();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -16620,8 +16619,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.CreativeFieldValuesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeFieldValuesListResponse(response);
       })));
     });
@@ -16701,7 +16699,7 @@
       res
           .patch(arg_request, arg_profileId, arg_creativeFieldId, arg_id,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeFieldValue response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeFieldValue(response);
       })));
     });
@@ -16779,7 +16777,7 @@
       res
           .update(arg_request, arg_profileId, arg_creativeFieldId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeFieldValue response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeFieldValue(response);
       })));
     });
@@ -16913,7 +16911,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeField response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeField(response);
       })));
     });
@@ -16980,7 +16978,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeField response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeField(response);
       })));
     });
@@ -16990,8 +16988,8 @@
       api.CreativeFieldsResourceApi res =
           new api.DfareportingApi(mock).creativeFields;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed929();
-      var arg_ids = buildUnnamed930();
+      var arg_advertiserIds = buildUnnamed744();
+      var arg_ids = buildUnnamed745();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -17071,8 +17069,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.CreativeFieldsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeFieldsListResponse(response);
       })));
     });
@@ -17141,7 +17138,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeField response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeField(response);
       })));
     });
@@ -17208,7 +17205,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeField response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeField(response);
       })));
     });
@@ -17277,7 +17274,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeGroup(response);
       })));
     });
@@ -17344,7 +17341,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeGroup(response);
       })));
     });
@@ -17354,9 +17351,9 @@
       api.CreativeGroupsResourceApi res =
           new api.DfareportingApi(mock).creativeGroups;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed931();
+      var arg_advertiserIds = buildUnnamed746();
       var arg_groupNumber = 42;
-      var arg_ids = buildUnnamed932();
+      var arg_ids = buildUnnamed747();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -17439,8 +17436,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.CreativeGroupsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeGroupsListResponse(response);
       })));
     });
@@ -17509,7 +17505,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeGroup(response);
       })));
     });
@@ -17576,7 +17572,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativeGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativeGroup(response);
       })));
     });
@@ -17644,7 +17640,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -17710,7 +17706,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -17723,18 +17719,18 @@
       var arg_advertiserId = "foo";
       var arg_archived = true;
       var arg_campaignId = "foo";
-      var arg_companionCreativeIds = buildUnnamed933();
-      var arg_creativeFieldIds = buildUnnamed934();
-      var arg_ids = buildUnnamed935();
+      var arg_companionCreativeIds = buildUnnamed748();
+      var arg_creativeFieldIds = buildUnnamed749();
+      var arg_ids = buildUnnamed750();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
-      var arg_renderingIds = buildUnnamed936();
+      var arg_renderingIds = buildUnnamed751();
       var arg_searchString = "foo";
-      var arg_sizeIds = buildUnnamed937();
+      var arg_sizeIds = buildUnnamed752();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_studioCreativeId = "foo";
-      var arg_types = buildUnnamed938();
+      var arg_types = buildUnnamed753();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -17834,7 +17830,7 @@
               studioCreativeId: arg_studioCreativeId,
               types: arg_types,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreativesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreativesListResponse(response);
       })));
     });
@@ -17902,7 +17898,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -17968,7 +17964,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -18046,7 +18042,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DimensionValueList response) {
+          .then(unittest.expectAsync1(((response) {
         checkDimensionValueList(response);
       })));
     });
@@ -18115,7 +18111,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DirectorySiteContact response) {
+          .then(unittest.expectAsync1(((response) {
         checkDirectorySiteContact(response);
       })));
     });
@@ -18125,8 +18121,8 @@
       api.DirectorySiteContactsResourceApi res =
           new api.DfareportingApi(mock).directorySiteContacts;
       var arg_profileId = "foo";
-      var arg_directorySiteIds = buildUnnamed939();
-      var arg_ids = buildUnnamed940();
+      var arg_directorySiteIds = buildUnnamed754();
+      var arg_ids = buildUnnamed755();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -18207,8 +18203,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.DirectorySiteContactsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDirectorySiteContactsListResponse(response);
       })));
     });
@@ -18277,7 +18272,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DirectorySite response) {
+          .then(unittest.expectAsync1(((response) {
         checkDirectorySite(response);
       })));
     });
@@ -18344,7 +18339,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DirectorySite response) {
+          .then(unittest.expectAsync1(((response) {
         checkDirectorySite(response);
       })));
     });
@@ -18360,7 +18355,7 @@
       var arg_active = true;
       var arg_countryId = "foo";
       var arg_dfpNetworkCode = "foo";
-      var arg_ids = buildUnnamed941();
+      var arg_ids = buildUnnamed756();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_parentId = "foo";
@@ -18461,8 +18456,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.DirectorySitesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDirectorySitesListResponse(response);
       })));
     });
@@ -18602,7 +18596,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DynamicTargetingKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkDynamicTargetingKey(response);
       })));
     });
@@ -18613,7 +18607,7 @@
           new api.DfareportingApi(mock).dynamicTargetingKeys;
       var arg_profileId = "foo";
       var arg_advertiserId = "foo";
-      var arg_names = buildUnnamed942();
+      var arg_names = buildUnnamed757();
       var arg_objectId = "foo";
       var arg_objectType = "foo";
       var arg_$fields = "foo";
@@ -18681,8 +18675,7 @@
               objectId: arg_objectId,
               objectType: arg_objectType,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.DynamicTargetingKeysListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDynamicTargetingKeysListResponse(response);
       })));
     });
@@ -18814,7 +18807,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EventTag response) {
+          .then(unittest.expectAsync1(((response) {
         checkEventTag(response);
       })));
     });
@@ -18880,7 +18873,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EventTag response) {
+          .then(unittest.expectAsync1(((response) {
         checkEventTag(response);
       })));
     });
@@ -18894,8 +18887,8 @@
       var arg_campaignId = "foo";
       var arg_definitionsOnly = true;
       var arg_enabled = true;
-      var arg_eventTagTypes = buildUnnamed943();
-      var arg_ids = buildUnnamed944();
+      var arg_eventTagTypes = buildUnnamed758();
+      var arg_ids = buildUnnamed759();
       var arg_searchString = "foo";
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
@@ -18981,7 +18974,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EventTagsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkEventTagsListResponse(response);
       })));
     });
@@ -19049,7 +19042,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EventTag response) {
+          .then(unittest.expectAsync1(((response) {
         checkEventTag(response);
       })));
     });
@@ -19115,7 +19108,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EventTag response) {
+          .then(unittest.expectAsync1(((response) {
         checkEventTag(response);
       })));
     });
@@ -19186,7 +19179,7 @@
       }), true);
       res
           .get(arg_reportId, arg_fileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -19268,7 +19261,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FileList response) {
+          .then(unittest.expectAsync1(((response) {
         checkFileList(response);
       })));
     });
@@ -19404,8 +19397,7 @@
           .generatetag(arg_profileId,
               floodlightActivityId: arg_floodlightActivityId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.FloodlightActivitiesGenerateTagResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivitiesGenerateTagResponse(response);
       })));
     });
@@ -19472,7 +19464,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivity response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivity(response);
       })));
     });
@@ -19539,7 +19531,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivity response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivity(response);
       })));
     });
@@ -19550,12 +19542,12 @@
           new api.DfareportingApi(mock).floodlightActivities;
       var arg_profileId = "foo";
       var arg_advertiserId = "foo";
-      var arg_floodlightActivityGroupIds = buildUnnamed945();
+      var arg_floodlightActivityGroupIds = buildUnnamed760();
       var arg_floodlightActivityGroupName = "foo";
       var arg_floodlightActivityGroupTagString = "foo";
       var arg_floodlightActivityGroupType = "foo";
       var arg_floodlightConfigurationId = "foo";
-      var arg_ids = buildUnnamed946();
+      var arg_ids = buildUnnamed761();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -19655,8 +19647,7 @@
               sortOrder: arg_sortOrder,
               tagString: arg_tagString,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.FloodlightActivitiesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivitiesListResponse(response);
       })));
     });
@@ -19725,7 +19716,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivity response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivity(response);
       })));
     });
@@ -19792,7 +19783,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivity response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivity(response);
       })));
     });
@@ -19861,7 +19852,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivityGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivityGroup(response);
       })));
     });
@@ -19928,7 +19919,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivityGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivityGroup(response);
       })));
     });
@@ -19940,7 +19931,7 @@
       var arg_profileId = "foo";
       var arg_advertiserId = "foo";
       var arg_floodlightConfigurationId = "foo";
-      var arg_ids = buildUnnamed947();
+      var arg_ids = buildUnnamed762();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -20027,8 +20018,7 @@
               sortOrder: arg_sortOrder,
               type: arg_type,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.FloodlightActivityGroupsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivityGroupsListResponse(response);
       })));
     });
@@ -20097,7 +20087,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivityGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivityGroup(response);
       })));
     });
@@ -20164,7 +20154,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightActivityGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightActivityGroup(response);
       })));
     });
@@ -20233,7 +20223,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightConfiguration(response);
       })));
     });
@@ -20243,7 +20233,7 @@
       api.FloodlightConfigurationsResourceApi res =
           new api.DfareportingApi(mock).floodlightConfigurations;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed948();
+      var arg_ids = buildUnnamed763();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -20297,8 +20287,9 @@
             convert.JSON.encode(buildFloodlightConfigurationsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, ids: arg_ids, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.FloodlightConfigurationsListResponse response) {
+      res
+          .list(arg_profileId, ids: arg_ids, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightConfigurationsListResponse(response);
       })));
     });
@@ -20367,7 +20358,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightConfiguration(response);
       })));
     });
@@ -20434,7 +20425,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FloodlightConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkFloodlightConfiguration(response);
       })));
     });
@@ -20513,7 +20504,7 @@
       }), true);
       res
           .get(arg_profileId, arg_projectId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InventoryItem response) {
+          .then(unittest.expectAsync1(((response) {
         checkInventoryItem(response);
       })));
     });
@@ -20524,12 +20515,12 @@
           new api.DfareportingApi(mock).inventoryItems;
       var arg_profileId = "foo";
       var arg_projectId = "foo";
-      var arg_ids = buildUnnamed949();
+      var arg_ids = buildUnnamed764();
       var arg_inPlan = true;
       var arg_maxResults = 42;
-      var arg_orderId = buildUnnamed950();
+      var arg_orderId = buildUnnamed765();
       var arg_pageToken = "foo";
-      var arg_siteId = buildUnnamed951();
+      var arg_siteId = buildUnnamed766();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_type = "foo";
@@ -20619,8 +20610,7 @@
               sortOrder: arg_sortOrder,
               type: arg_type,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.InventoryItemsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInventoryItemsListResponse(response);
       })));
     });
@@ -20684,7 +20674,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LanguagesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLanguagesListResponse(response);
       })));
     });
@@ -20748,7 +20738,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MetrosListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkMetrosListResponse(response);
       })));
     });
@@ -20817,7 +20807,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MobileCarrier response) {
+          .then(unittest.expectAsync1(((response) {
         checkMobileCarrier(response);
       })));
     });
@@ -20878,8 +20868,9 @@
         var resp = convert.JSON.encode(buildMobileCarriersListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.MobileCarriersListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkMobileCarriersListResponse(response);
       })));
     });
@@ -20948,7 +20939,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperatingSystemVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperatingSystemVersion(response);
       })));
     });
@@ -21010,8 +21001,9 @@
             convert.JSON.encode(buildOperatingSystemVersionsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.OperatingSystemVersionsListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkOperatingSystemVersionsListResponse(response);
       })));
     });
@@ -21080,7 +21072,7 @@
       }), true);
       res
           .get(arg_profileId, arg_dartId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperatingSystem response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperatingSystem(response);
       })));
     });
@@ -21141,8 +21133,9 @@
         var resp = convert.JSON.encode(buildOperatingSystemsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.OperatingSystemsListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkOperatingSystemsListResponse(response);
       })));
     });
@@ -21221,7 +21214,7 @@
       }), true);
       res
           .get(arg_profileId, arg_projectId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrderDocument response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrderDocument(response);
       })));
     });
@@ -21233,12 +21226,12 @@
       var arg_profileId = "foo";
       var arg_projectId = "foo";
       var arg_approved = true;
-      var arg_ids = buildUnnamed952();
+      var arg_ids = buildUnnamed767();
       var arg_maxResults = 42;
-      var arg_orderId = buildUnnamed953();
+      var arg_orderId = buildUnnamed768();
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
-      var arg_siteId = buildUnnamed954();
+      var arg_siteId = buildUnnamed769();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_$fields = "foo";
@@ -21328,8 +21321,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.OrderDocumentsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrderDocumentsListResponse(response);
       })));
     });
@@ -21407,7 +21399,7 @@
       }), true);
       res
           .get(arg_profileId, arg_projectId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Order response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrder(response);
       })));
     });
@@ -21417,11 +21409,11 @@
       api.OrdersResourceApi res = new api.DfareportingApi(mock).orders;
       var arg_profileId = "foo";
       var arg_projectId = "foo";
-      var arg_ids = buildUnnamed955();
+      var arg_ids = buildUnnamed770();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
-      var arg_siteId = buildUnnamed956();
+      var arg_siteId = buildUnnamed771();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_$fields = "foo";
@@ -21506,7 +21498,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OrdersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrdersListResponse(response);
       })));
     });
@@ -21575,7 +21567,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementGroup(response);
       })));
     });
@@ -21642,7 +21634,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementGroup(response);
       })));
     });
@@ -21652,12 +21644,12 @@
       api.PlacementGroupsResourceApi res =
           new api.DfareportingApi(mock).placementGroups;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed957();
+      var arg_advertiserIds = buildUnnamed772();
       var arg_archived = true;
-      var arg_campaignIds = buildUnnamed958();
-      var arg_contentCategoryIds = buildUnnamed959();
-      var arg_directorySiteIds = buildUnnamed960();
-      var arg_ids = buildUnnamed961();
+      var arg_campaignIds = buildUnnamed773();
+      var arg_contentCategoryIds = buildUnnamed774();
+      var arg_directorySiteIds = buildUnnamed775();
+      var arg_ids = buildUnnamed776();
       var arg_maxEndDate = "foo";
       var arg_maxResults = 42;
       var arg_maxStartDate = "foo";
@@ -21665,10 +21657,10 @@
       var arg_minStartDate = "foo";
       var arg_pageToken = "foo";
       var arg_placementGroupType = "foo";
-      var arg_placementStrategyIds = buildUnnamed962();
-      var arg_pricingTypes = buildUnnamed963();
+      var arg_placementStrategyIds = buildUnnamed777();
+      var arg_pricingTypes = buildUnnamed778();
       var arg_searchString = "foo";
-      var arg_siteIds = buildUnnamed964();
+      var arg_siteIds = buildUnnamed779();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_$fields = "foo";
@@ -21780,8 +21772,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.PlacementGroupsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementGroupsListResponse(response);
       })));
     });
@@ -21850,7 +21841,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementGroup(response);
       })));
     });
@@ -21917,7 +21908,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementGroup(response);
       })));
     });
@@ -22051,7 +22042,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementStrategy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementStrategy(response);
       })));
     });
@@ -22118,7 +22109,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementStrategy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementStrategy(response);
       })));
     });
@@ -22128,7 +22119,7 @@
       api.PlacementStrategiesResourceApi res =
           new api.DfareportingApi(mock).placementStrategies;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed965();
+      var arg_ids = buildUnnamed780();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -22205,8 +22196,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.PlacementStrategiesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementStrategiesListResponse(response);
       })));
     });
@@ -22275,7 +22265,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementStrategy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementStrategy(response);
       })));
     });
@@ -22342,7 +22332,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementStrategy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementStrategy(response);
       })));
     });
@@ -22354,8 +22344,8 @@
       api.PlacementsResourceApi res = new api.DfareportingApi(mock).placements;
       var arg_profileId = "foo";
       var arg_campaignId = "foo";
-      var arg_placementIds = buildUnnamed966();
-      var arg_tagFormats = buildUnnamed967();
+      var arg_placementIds = buildUnnamed781();
+      var arg_tagFormats = buildUnnamed782();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -22419,8 +22409,7 @@
               placementIds: arg_placementIds,
               tagFormats: arg_tagFormats,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.PlacementsGenerateTagsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementsGenerateTagsResponse(response);
       })));
     });
@@ -22486,7 +22475,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Placement response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacement(response);
       })));
     });
@@ -22552,7 +22541,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Placement response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacement(response);
       })));
     });
@@ -22561,14 +22550,14 @@
       var mock = new HttpServerMock();
       api.PlacementsResourceApi res = new api.DfareportingApi(mock).placements;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed968();
+      var arg_advertiserIds = buildUnnamed783();
       var arg_archived = true;
-      var arg_campaignIds = buildUnnamed969();
-      var arg_compatibilities = buildUnnamed970();
-      var arg_contentCategoryIds = buildUnnamed971();
-      var arg_directorySiteIds = buildUnnamed972();
-      var arg_groupIds = buildUnnamed973();
-      var arg_ids = buildUnnamed974();
+      var arg_campaignIds = buildUnnamed784();
+      var arg_compatibilities = buildUnnamed785();
+      var arg_contentCategoryIds = buildUnnamed786();
+      var arg_directorySiteIds = buildUnnamed787();
+      var arg_groupIds = buildUnnamed788();
+      var arg_ids = buildUnnamed789();
       var arg_maxEndDate = "foo";
       var arg_maxResults = 42;
       var arg_maxStartDate = "foo";
@@ -22576,11 +22565,11 @@
       var arg_minStartDate = "foo";
       var arg_pageToken = "foo";
       var arg_paymentSource = "foo";
-      var arg_placementStrategyIds = buildUnnamed975();
-      var arg_pricingTypes = buildUnnamed976();
+      var arg_placementStrategyIds = buildUnnamed790();
+      var arg_pricingTypes = buildUnnamed791();
       var arg_searchString = "foo";
-      var arg_siteIds = buildUnnamed977();
-      var arg_sizeIds = buildUnnamed978();
+      var arg_siteIds = buildUnnamed792();
+      var arg_sizeIds = buildUnnamed793();
       var arg_sortField = "foo";
       var arg_sortOrder = "foo";
       var arg_$fields = "foo";
@@ -22699,7 +22688,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlacementsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacementsListResponse(response);
       })));
     });
@@ -22767,7 +22756,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Placement response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacement(response);
       })));
     });
@@ -22833,7 +22822,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Placement response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlacement(response);
       })));
     });
@@ -22902,7 +22891,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlatformType response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlatformType(response);
       })));
     });
@@ -22963,8 +22952,9 @@
         var resp = convert.JSON.encode(buildPlatformTypesListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.PlatformTypesListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkPlatformTypesListResponse(response);
       })));
     });
@@ -23033,7 +23023,7 @@
       }), true);
       res
           .get(arg_profileId, arg_code, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PostalCode response) {
+          .then(unittest.expectAsync1(((response) {
         checkPostalCode(response);
       })));
     });
@@ -23096,7 +23086,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PostalCodesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPostalCodesListResponse(response);
       })));
     });
@@ -23164,7 +23154,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
@@ -23173,8 +23163,8 @@
       var mock = new HttpServerMock();
       api.ProjectsResourceApi res = new api.DfareportingApi(mock).projects;
       var arg_profileId = "foo";
-      var arg_advertiserIds = buildUnnamed979();
-      var arg_ids = buildUnnamed980();
+      var arg_advertiserIds = buildUnnamed794();
+      var arg_ids = buildUnnamed795();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -23254,7 +23244,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProjectsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkProjectsListResponse(response);
       })));
     });
@@ -23318,7 +23308,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RegionsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegionsListResponse(response);
       })));
     });
@@ -23387,7 +23377,7 @@
       }), true);
       res
           .get(arg_profileId, arg_remarketingListId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingListShare response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingListShare(response);
       })));
     });
@@ -23458,7 +23448,7 @@
       res
           .patch(arg_request, arg_profileId, arg_remarketingListId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingListShare response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingListShare(response);
       })));
     });
@@ -23525,7 +23515,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingListShare response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingListShare(response);
       })));
     });
@@ -23594,7 +23584,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingList(response);
       })));
     });
@@ -23661,7 +23651,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingList(response);
       })));
     });
@@ -23755,8 +23745,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.RemarketingListsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingListsListResponse(response);
       })));
     });
@@ -23825,7 +23814,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingList(response);
       })));
     });
@@ -23892,7 +23881,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemarketingList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemarketingList(response);
       })));
     });
@@ -24024,7 +24013,7 @@
       }), true);
       res
           .get(arg_profileId, arg_reportId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -24090,7 +24079,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -24172,7 +24161,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReportList response) {
+          .then(unittest.expectAsync1(((response) {
         checkReportList(response);
       })));
     });
@@ -24242,7 +24231,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_reportId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -24318,7 +24307,7 @@
       res
           .run(arg_profileId, arg_reportId,
               synchronous: arg_synchronous, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -24389,7 +24378,7 @@
       res
           .update(arg_request, arg_profileId, arg_reportId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -24458,7 +24447,7 @@
       }), true);
       res
           .query(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CompatibleFields response) {
+          .then(unittest.expectAsync1(((response) {
         checkCompatibleFields(response);
       })));
     });
@@ -24540,7 +24529,7 @@
       }), true);
       res
           .get(arg_profileId, arg_reportId, arg_fileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -24630,7 +24619,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FileList response) {
+          .then(unittest.expectAsync1(((response) {
         checkFileList(response);
       })));
     });
@@ -24698,7 +24687,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Site response) {
+          .then(unittest.expectAsync1(((response) {
         checkSite(response);
       })));
     });
@@ -24764,7 +24753,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Site response) {
+          .then(unittest.expectAsync1(((response) {
         checkSite(response);
       })));
     });
@@ -24778,9 +24767,9 @@
       var arg_acceptsPublisherPaidPlacements = true;
       var arg_adWordsSite = true;
       var arg_approved = true;
-      var arg_campaignIds = buildUnnamed981();
-      var arg_directorySiteIds = buildUnnamed982();
-      var arg_ids = buildUnnamed983();
+      var arg_campaignIds = buildUnnamed796();
+      var arg_directorySiteIds = buildUnnamed797();
+      var arg_ids = buildUnnamed798();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -24888,7 +24877,7 @@
               subaccountId: arg_subaccountId,
               unmappedSite: arg_unmappedSite,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SitesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSitesListResponse(response);
       })));
     });
@@ -24956,7 +24945,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Site response) {
+          .then(unittest.expectAsync1(((response) {
         checkSite(response);
       })));
     });
@@ -25022,7 +25011,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Site response) {
+          .then(unittest.expectAsync1(((response) {
         checkSite(response);
       })));
     });
@@ -25090,7 +25079,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Size response) {
+          .then(unittest.expectAsync1(((response) {
         checkSize(response);
       })));
     });
@@ -25156,7 +25145,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Size response) {
+          .then(unittest.expectAsync1(((response) {
         checkSize(response);
       })));
     });
@@ -25167,7 +25156,7 @@
       var arg_profileId = "foo";
       var arg_height = 42;
       var arg_iabStandard = true;
-      var arg_ids = buildUnnamed984();
+      var arg_ids = buildUnnamed799();
       var arg_width = 42;
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -25234,7 +25223,7 @@
               ids: arg_ids,
               width: arg_width,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SizesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSizesListResponse(response);
       })));
     });
@@ -25303,7 +25292,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subaccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubaccount(response);
       })));
     });
@@ -25370,7 +25359,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subaccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubaccount(response);
       })));
     });
@@ -25380,7 +25369,7 @@
       api.SubaccountsResourceApi res =
           new api.DfareportingApi(mock).subaccounts;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed985();
+      var arg_ids = buildUnnamed800();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -25457,7 +25446,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SubaccountsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubaccountsListResponse(response);
       })));
     });
@@ -25526,7 +25515,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subaccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubaccount(response);
       })));
     });
@@ -25593,7 +25582,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subaccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubaccount(response);
       })));
     });
@@ -25660,8 +25649,9 @@
         var resp = convert.JSON.encode(buildTargetableRemarketingList());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_profileId, arg_id, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.TargetableRemarketingList response) {
+      res
+          .get(arg_profileId, arg_id, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkTargetableRemarketingList(response);
       })));
     });
@@ -25752,8 +25742,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.TargetableRemarketingListsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetableRemarketingListsListResponse(response);
       })));
     });
@@ -25822,7 +25811,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetingTemplate response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetingTemplate(response);
       })));
     });
@@ -25889,7 +25878,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetingTemplate response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetingTemplate(response);
       })));
     });
@@ -25900,7 +25889,7 @@
           new api.DfareportingApi(mock).targetingTemplates;
       var arg_profileId = "foo";
       var arg_advertiserId = "foo";
-      var arg_ids = buildUnnamed986();
+      var arg_ids = buildUnnamed801();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -25980,8 +25969,7 @@
               sortField: arg_sortField,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.TargetingTemplatesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetingTemplatesListResponse(response);
       })));
     });
@@ -26050,7 +26038,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetingTemplate response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetingTemplate(response);
       })));
     });
@@ -26117,7 +26105,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TargetingTemplate response) {
+          .then(unittest.expectAsync1(((response) {
         checkTargetingTemplate(response);
       })));
     });
@@ -26176,7 +26164,7 @@
       }), true);
       res
           .get(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserProfile(response);
       })));
     });
@@ -26227,9 +26215,7 @@
         var resp = convert.JSON.encode(buildUserProfileList());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserProfileList response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkUserProfileList(response);
       })));
     });
@@ -26298,7 +26284,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRolePermissionGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRolePermissionGroup(response);
       })));
     });
@@ -26360,8 +26346,9 @@
             convert.JSON.encode(buildUserRolePermissionGroupsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.UserRolePermissionGroupsListResponse response) {
+      res
+          .list(arg_profileId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkUserRolePermissionGroupsListResponse(response);
       })));
     });
@@ -26430,7 +26417,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRolePermission response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRolePermission(response);
       })));
     });
@@ -26440,7 +26427,7 @@
       api.UserRolePermissionsResourceApi res =
           new api.DfareportingApi(mock).userRolePermissions;
       var arg_profileId = "foo";
-      var arg_ids = buildUnnamed987();
+      var arg_ids = buildUnnamed802();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -26493,8 +26480,9 @@
         var resp = convert.JSON.encode(buildUserRolePermissionsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_profileId, ids: arg_ids, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.UserRolePermissionsListResponse response) {
+      res
+          .list(arg_profileId, ids: arg_ids, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkUserRolePermissionsListResponse(response);
       })));
     });
@@ -26626,7 +26614,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRole response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRole(response);
       })));
     });
@@ -26692,7 +26680,7 @@
       }), true);
       res
           .insert(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRole response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRole(response);
       })));
     });
@@ -26702,7 +26690,7 @@
       api.UserRolesResourceApi res = new api.DfareportingApi(mock).userRoles;
       var arg_profileId = "foo";
       var arg_accountUserRoleOnly = true;
-      var arg_ids = buildUnnamed988();
+      var arg_ids = buildUnnamed803();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_searchString = "foo";
@@ -26786,7 +26774,7 @@
               sortOrder: arg_sortOrder,
               subaccountId: arg_subaccountId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRolesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRolesListResponse(response);
       })));
     });
@@ -26854,7 +26842,7 @@
       }), true);
       res
           .patch(arg_request, arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRole response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRole(response);
       })));
     });
@@ -26920,7 +26908,7 @@
       }), true);
       res
           .update(arg_request, arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserRole response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserRole(response);
       })));
     });
@@ -26989,7 +26977,7 @@
       }), true);
       res
           .get(arg_profileId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VideoFormat response) {
+          .then(unittest.expectAsync1(((response) {
         checkVideoFormat(response);
       })));
     });
@@ -27052,7 +27040,7 @@
       }), true);
       res
           .list(arg_profileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VideoFormatsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkVideoFormatsListResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/digitalassetlinks/v1_test.dart b/generated/googleapis/test/digitalassetlinks/v1_test.dart
index fcd5028..f9a888e 100644
--- a/generated/googleapis/test/digitalassetlinks/v1_test.dart
+++ b/generated/googleapis/test/digitalassetlinks/v1_test.dart
@@ -111,14 +111,14 @@
   buildCounterCertificateInfo--;
 }
 
-buildUnnamed2620() {
+buildUnnamed1142() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2620(core.List<core.String> o) {
+checkUnnamed1142(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -130,7 +130,7 @@
   buildCounterCheckResponse++;
   if (buildCounterCheckResponse < 3) {
     o.debugString = "foo";
-    o.errorCode = buildUnnamed2620();
+    o.errorCode = buildUnnamed1142();
     o.linked = true;
     o.maxAge = "foo";
   }
@@ -142,34 +142,34 @@
   buildCounterCheckResponse++;
   if (buildCounterCheckResponse < 3) {
     unittest.expect(o.debugString, unittest.equals('foo'));
-    checkUnnamed2620(o.errorCode);
+    checkUnnamed1142(o.errorCode);
     unittest.expect(o.linked, unittest.isTrue);
     unittest.expect(o.maxAge, unittest.equals('foo'));
   }
   buildCounterCheckResponse--;
 }
 
-buildUnnamed2621() {
+buildUnnamed1143() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2621(core.List<core.String> o) {
+checkUnnamed1143(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2622() {
+buildUnnamed1144() {
   var o = new core.List<api.Statement>();
   o.add(buildStatement());
   o.add(buildStatement());
   return o;
 }
 
-checkUnnamed2622(core.List<api.Statement> o) {
+checkUnnamed1144(core.List<api.Statement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStatement(o[0]);
   checkStatement(o[1]);
@@ -181,9 +181,9 @@
   buildCounterListResponse++;
   if (buildCounterListResponse < 3) {
     o.debugString = "foo";
-    o.errorCode = buildUnnamed2621();
+    o.errorCode = buildUnnamed1143();
     o.maxAge = "foo";
-    o.statements = buildUnnamed2622();
+    o.statements = buildUnnamed1144();
   }
   buildCounterListResponse--;
   return o;
@@ -193,9 +193,9 @@
   buildCounterListResponse++;
   if (buildCounterListResponse < 3) {
     unittest.expect(o.debugString, unittest.equals('foo'));
-    checkUnnamed2621(o.errorCode);
+    checkUnnamed1143(o.errorCode);
     unittest.expect(o.maxAge, unittest.equals('foo'));
-    checkUnnamed2622(o.statements);
+    checkUnnamed1144(o.statements);
   }
   buildCounterListResponse--;
 }
@@ -380,7 +380,7 @@
               relation: arg_relation,
               target_web_site: arg_target_web_site,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CheckResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCheckResponse(response);
       })));
     });
@@ -452,7 +452,7 @@
               source_androidApp_certificate_sha256Fingerprint:
                   arg_source_androidApp_certificate_sha256Fingerprint,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/discovery/v1_test.dart b/generated/googleapis/test/discovery/v1_test.dart
index e004142..e1d3ece 100644
--- a/generated/googleapis/test/discovery/v1_test.dart
+++ b/generated/googleapis/test/discovery/v1_test.dart
@@ -71,14 +71,14 @@
   buildCounterDirectoryListItemsIcons--;
 }
 
-buildUnnamed221() {
+buildUnnamed1761() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed221(core.List<core.String> o) {
+checkUnnamed1761(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -96,7 +96,7 @@
     o.icons = buildDirectoryListItemsIcons();
     o.id = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed221();
+    o.labels = buildUnnamed1761();
     o.name = "foo";
     o.preferred = true;
     o.title = "foo";
@@ -116,7 +116,7 @@
     checkDirectoryListItemsIcons(o.icons);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed221(o.labels);
+    checkUnnamed1761(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.preferred, unittest.isTrue);
     unittest.expect(o.title, unittest.equals('foo'));
@@ -125,14 +125,14 @@
   buildCounterDirectoryListItems--;
 }
 
-buildUnnamed222() {
+buildUnnamed1762() {
   var o = new core.List<api.DirectoryListItems>();
   o.add(buildDirectoryListItems());
   o.add(buildDirectoryListItems());
   return o;
 }
 
-checkUnnamed222(core.List<api.DirectoryListItems> o) {
+checkUnnamed1762(core.List<api.DirectoryListItems> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDirectoryListItems(o[0]);
   checkDirectoryListItems(o[1]);
@@ -144,7 +144,7 @@
   buildCounterDirectoryList++;
   if (buildCounterDirectoryList < 3) {
     o.discoveryVersion = "foo";
-    o.items = buildUnnamed222();
+    o.items = buildUnnamed1762();
     o.kind = "foo";
   }
   buildCounterDirectoryList--;
@@ -155,20 +155,20 @@
   buildCounterDirectoryList++;
   if (buildCounterDirectoryList < 3) {
     unittest.expect(o.discoveryVersion, unittest.equals('foo'));
-    checkUnnamed222(o.items);
+    checkUnnamed1762(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDirectoryList--;
 }
 
-buildUnnamed223() {
+buildUnnamed1763() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed223(core.List<core.String> o) {
+checkUnnamed1763(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -179,7 +179,7 @@
   var o = new api.JsonSchemaAnnotations();
   buildCounterJsonSchemaAnnotations++;
   if (buildCounterJsonSchemaAnnotations < 3) {
-    o.required = buildUnnamed223();
+    o.required = buildUnnamed1763();
   }
   buildCounterJsonSchemaAnnotations--;
   return o;
@@ -188,45 +188,45 @@
 checkJsonSchemaAnnotations(api.JsonSchemaAnnotations o) {
   buildCounterJsonSchemaAnnotations++;
   if (buildCounterJsonSchemaAnnotations < 3) {
-    checkUnnamed223(o.required);
+    checkUnnamed1763(o.required);
   }
   buildCounterJsonSchemaAnnotations--;
 }
 
-buildUnnamed224() {
+buildUnnamed1764() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed224(core.List<core.String> o) {
+checkUnnamed1764(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed225() {
+buildUnnamed1765() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed225(core.List<core.String> o) {
+checkUnnamed1765(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed226() {
+buildUnnamed1766() {
   var o = new core.Map<core.String, api.JsonSchema>();
   o["x"] = buildJsonSchema();
   o["y"] = buildJsonSchema();
   return o;
 }
 
-checkUnnamed226(core.Map<core.String, api.JsonSchema> o) {
+checkUnnamed1766(core.Map<core.String, api.JsonSchema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJsonSchema(o["x"]);
   checkJsonSchema(o["y"]);
@@ -253,14 +253,14 @@
   buildCounterJsonSchemaVariantMap--;
 }
 
-buildUnnamed227() {
+buildUnnamed1767() {
   var o = new core.List<api.JsonSchemaVariantMap>();
   o.add(buildJsonSchemaVariantMap());
   o.add(buildJsonSchemaVariantMap());
   return o;
 }
 
-checkUnnamed227(core.List<api.JsonSchemaVariantMap> o) {
+checkUnnamed1767(core.List<api.JsonSchemaVariantMap> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJsonSchemaVariantMap(o[0]);
   checkJsonSchemaVariantMap(o[1]);
@@ -272,7 +272,7 @@
   buildCounterJsonSchemaVariant++;
   if (buildCounterJsonSchemaVariant < 3) {
     o.discriminant = "foo";
-    o.map = buildUnnamed227();
+    o.map = buildUnnamed1767();
   }
   buildCounterJsonSchemaVariant--;
   return o;
@@ -282,7 +282,7 @@
   buildCounterJsonSchemaVariant++;
   if (buildCounterJsonSchemaVariant < 3) {
     unittest.expect(o.discriminant, unittest.equals('foo'));
-    checkUnnamed227(o.map);
+    checkUnnamed1767(o.map);
   }
   buildCounterJsonSchemaVariant--;
 }
@@ -297,8 +297,8 @@
     o.annotations = buildJsonSchemaAnnotations();
     o.default_ = "foo";
     o.description = "foo";
-    o.enum_ = buildUnnamed224();
-    o.enumDescriptions = buildUnnamed225();
+    o.enum_ = buildUnnamed1764();
+    o.enumDescriptions = buildUnnamed1765();
     o.format = "foo";
     o.id = "foo";
     o.items = buildJsonSchema();
@@ -306,7 +306,7 @@
     o.maximum = "foo";
     o.minimum = "foo";
     o.pattern = "foo";
-    o.properties = buildUnnamed226();
+    o.properties = buildUnnamed1766();
     o.readOnly = true;
     o.repeated = true;
     o.required = true;
@@ -325,8 +325,8 @@
     checkJsonSchemaAnnotations(o.annotations);
     unittest.expect(o.default_, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed224(o.enum_);
-    checkUnnamed225(o.enumDescriptions);
+    checkUnnamed1764(o.enum_);
+    checkUnnamed1765(o.enumDescriptions);
     unittest.expect(o.format, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkJsonSchema(o.items);
@@ -334,7 +334,7 @@
     unittest.expect(o.maximum, unittest.equals('foo'));
     unittest.expect(o.minimum, unittest.equals('foo'));
     unittest.expect(o.pattern, unittest.equals('foo'));
-    checkUnnamed226(o.properties);
+    checkUnnamed1766(o.properties);
     unittest.expect(o.readOnly, unittest.isTrue);
     unittest.expect(o.repeated, unittest.isTrue);
     unittest.expect(o.required, unittest.isTrue);
@@ -364,14 +364,14 @@
   buildCounterRestDescriptionAuthOauth2ScopesValue--;
 }
 
-buildUnnamed228() {
+buildUnnamed1768() {
   var o = new core.Map<core.String, api.RestDescriptionAuthOauth2ScopesValue>();
   o["x"] = buildRestDescriptionAuthOauth2ScopesValue();
   o["y"] = buildRestDescriptionAuthOauth2ScopesValue();
   return o;
 }
 
-checkUnnamed228(
+checkUnnamed1768(
     core.Map<core.String, api.RestDescriptionAuthOauth2ScopesValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRestDescriptionAuthOauth2ScopesValue(o["x"]);
@@ -383,7 +383,7 @@
   var o = new api.RestDescriptionAuthOauth2();
   buildCounterRestDescriptionAuthOauth2++;
   if (buildCounterRestDescriptionAuthOauth2 < 3) {
-    o.scopes = buildUnnamed228();
+    o.scopes = buildUnnamed1768();
   }
   buildCounterRestDescriptionAuthOauth2--;
   return o;
@@ -392,7 +392,7 @@
 checkRestDescriptionAuthOauth2(api.RestDescriptionAuthOauth2 o) {
   buildCounterRestDescriptionAuthOauth2++;
   if (buildCounterRestDescriptionAuthOauth2 < 3) {
-    checkUnnamed228(o.scopes);
+    checkUnnamed1768(o.scopes);
   }
   buildCounterRestDescriptionAuthOauth2--;
 }
@@ -416,14 +416,14 @@
   buildCounterRestDescriptionAuth--;
 }
 
-buildUnnamed229() {
+buildUnnamed1769() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed229(core.List<core.String> o) {
+checkUnnamed1769(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -450,66 +450,66 @@
   buildCounterRestDescriptionIcons--;
 }
 
-buildUnnamed230() {
+buildUnnamed1770() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed230(core.List<core.String> o) {
+checkUnnamed1770(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed231() {
+buildUnnamed1771() {
   var o = new core.Map<core.String, api.RestMethod>();
   o["x"] = buildRestMethod();
   o["y"] = buildRestMethod();
   return o;
 }
 
-checkUnnamed231(core.Map<core.String, api.RestMethod> o) {
+checkUnnamed1771(core.Map<core.String, api.RestMethod> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRestMethod(o["x"]);
   checkRestMethod(o["y"]);
 }
 
-buildUnnamed232() {
+buildUnnamed1772() {
   var o = new core.Map<core.String, api.JsonSchema>();
   o["x"] = buildJsonSchema();
   o["y"] = buildJsonSchema();
   return o;
 }
 
-checkUnnamed232(core.Map<core.String, api.JsonSchema> o) {
+checkUnnamed1772(core.Map<core.String, api.JsonSchema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJsonSchema(o["x"]);
   checkJsonSchema(o["y"]);
 }
 
-buildUnnamed233() {
+buildUnnamed1773() {
   var o = new core.Map<core.String, api.RestResource>();
   o["x"] = buildRestResource();
   o["y"] = buildRestResource();
   return o;
 }
 
-checkUnnamed233(core.Map<core.String, api.RestResource> o) {
+checkUnnamed1773(core.Map<core.String, api.RestResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRestResource(o["x"]);
   checkRestResource(o["y"]);
 }
 
-buildUnnamed234() {
+buildUnnamed1774() {
   var o = new core.Map<core.String, api.JsonSchema>();
   o["x"] = buildJsonSchema();
   o["y"] = buildJsonSchema();
   return o;
 }
 
-checkUnnamed234(core.Map<core.String, api.JsonSchema> o) {
+checkUnnamed1774(core.Map<core.String, api.JsonSchema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJsonSchema(o["x"]);
   checkJsonSchema(o["y"]);
@@ -530,22 +530,22 @@
     o.documentationLink = "foo";
     o.etag = "foo";
     o.exponentialBackoffDefault = true;
-    o.features = buildUnnamed229();
+    o.features = buildUnnamed1769();
     o.icons = buildRestDescriptionIcons();
     o.id = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed230();
-    o.methods = buildUnnamed231();
+    o.labels = buildUnnamed1770();
+    o.methods = buildUnnamed1771();
     o.name = "foo";
     o.ownerDomain = "foo";
     o.ownerName = "foo";
     o.packagePath = "foo";
-    o.parameters = buildUnnamed232();
+    o.parameters = buildUnnamed1772();
     o.protocol = "foo";
-    o.resources = buildUnnamed233();
+    o.resources = buildUnnamed1773();
     o.revision = "foo";
     o.rootUrl = "foo";
-    o.schemas = buildUnnamed234();
+    o.schemas = buildUnnamed1774();
     o.servicePath = "foo";
     o.title = "foo";
     o.version = "foo";
@@ -568,22 +568,22 @@
     unittest.expect(o.documentationLink, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.exponentialBackoffDefault, unittest.isTrue);
-    checkUnnamed229(o.features);
+    checkUnnamed1769(o.features);
     checkRestDescriptionIcons(o.icons);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed230(o.labels);
-    checkUnnamed231(o.methods);
+    checkUnnamed1770(o.labels);
+    checkUnnamed1771(o.methods);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.ownerDomain, unittest.equals('foo'));
     unittest.expect(o.ownerName, unittest.equals('foo'));
     unittest.expect(o.packagePath, unittest.equals('foo'));
-    checkUnnamed232(o.parameters);
+    checkUnnamed1772(o.parameters);
     unittest.expect(o.protocol, unittest.equals('foo'));
-    checkUnnamed233(o.resources);
+    checkUnnamed1773(o.resources);
     unittest.expect(o.revision, unittest.equals('foo'));
     unittest.expect(o.rootUrl, unittest.equals('foo'));
-    checkUnnamed234(o.schemas);
+    checkUnnamed1774(o.schemas);
     unittest.expect(o.servicePath, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals('foo'));
@@ -592,14 +592,14 @@
   buildCounterRestDescription--;
 }
 
-buildUnnamed235() {
+buildUnnamed1775() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed235(core.List<core.String> o) {
+checkUnnamed1775(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -675,7 +675,7 @@
   var o = new api.RestMethodMediaUpload();
   buildCounterRestMethodMediaUpload++;
   if (buildCounterRestMethodMediaUpload < 3) {
-    o.accept = buildUnnamed235();
+    o.accept = buildUnnamed1775();
     o.maxSize = "foo";
     o.protocols = buildRestMethodMediaUploadProtocols();
   }
@@ -686,34 +686,34 @@
 checkRestMethodMediaUpload(api.RestMethodMediaUpload o) {
   buildCounterRestMethodMediaUpload++;
   if (buildCounterRestMethodMediaUpload < 3) {
-    checkUnnamed235(o.accept);
+    checkUnnamed1775(o.accept);
     unittest.expect(o.maxSize, unittest.equals('foo'));
     checkRestMethodMediaUploadProtocols(o.protocols);
   }
   buildCounterRestMethodMediaUpload--;
 }
 
-buildUnnamed236() {
+buildUnnamed1776() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed236(core.List<core.String> o) {
+checkUnnamed1776(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed237() {
+buildUnnamed1777() {
   var o = new core.Map<core.String, api.JsonSchema>();
   o["x"] = buildJsonSchema();
   o["y"] = buildJsonSchema();
   return o;
 }
 
-checkUnnamed237(core.Map<core.String, api.JsonSchema> o) {
+checkUnnamed1777(core.Map<core.String, api.JsonSchema> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJsonSchema(o["x"]);
   checkJsonSchema(o["y"]);
@@ -759,14 +759,14 @@
   buildCounterRestMethodResponse--;
 }
 
-buildUnnamed238() {
+buildUnnamed1778() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed238(core.List<core.String> o) {
+checkUnnamed1778(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -782,12 +782,12 @@
     o.httpMethod = "foo";
     o.id = "foo";
     o.mediaUpload = buildRestMethodMediaUpload();
-    o.parameterOrder = buildUnnamed236();
-    o.parameters = buildUnnamed237();
+    o.parameterOrder = buildUnnamed1776();
+    o.parameters = buildUnnamed1777();
     o.path = "foo";
     o.request = buildRestMethodRequest();
     o.response = buildRestMethodResponse();
-    o.scopes = buildUnnamed238();
+    o.scopes = buildUnnamed1778();
     o.supportsMediaDownload = true;
     o.supportsMediaUpload = true;
     o.supportsSubscription = true;
@@ -805,12 +805,12 @@
     unittest.expect(o.httpMethod, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkRestMethodMediaUpload(o.mediaUpload);
-    checkUnnamed236(o.parameterOrder);
-    checkUnnamed237(o.parameters);
+    checkUnnamed1776(o.parameterOrder);
+    checkUnnamed1777(o.parameters);
     unittest.expect(o.path, unittest.equals('foo'));
     checkRestMethodRequest(o.request);
     checkRestMethodResponse(o.response);
-    checkUnnamed238(o.scopes);
+    checkUnnamed1778(o.scopes);
     unittest.expect(o.supportsMediaDownload, unittest.isTrue);
     unittest.expect(o.supportsMediaUpload, unittest.isTrue);
     unittest.expect(o.supportsSubscription, unittest.isTrue);
@@ -819,27 +819,27 @@
   buildCounterRestMethod--;
 }
 
-buildUnnamed239() {
+buildUnnamed1779() {
   var o = new core.Map<core.String, api.RestMethod>();
   o["x"] = buildRestMethod();
   o["y"] = buildRestMethod();
   return o;
 }
 
-checkUnnamed239(core.Map<core.String, api.RestMethod> o) {
+checkUnnamed1779(core.Map<core.String, api.RestMethod> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRestMethod(o["x"]);
   checkRestMethod(o["y"]);
 }
 
-buildUnnamed240() {
+buildUnnamed1780() {
   var o = new core.Map<core.String, api.RestResource>();
   o["x"] = buildRestResource();
   o["y"] = buildRestResource();
   return o;
 }
 
-checkUnnamed240(core.Map<core.String, api.RestResource> o) {
+checkUnnamed1780(core.Map<core.String, api.RestResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRestResource(o["x"]);
   checkRestResource(o["y"]);
@@ -850,8 +850,8 @@
   var o = new api.RestResource();
   buildCounterRestResource++;
   if (buildCounterRestResource < 3) {
-    o.methods = buildUnnamed239();
-    o.resources = buildUnnamed240();
+    o.methods = buildUnnamed1779();
+    o.resources = buildUnnamed1780();
   }
   buildCounterRestResource--;
   return o;
@@ -860,8 +860,8 @@
 checkRestResource(api.RestResource o) {
   buildCounterRestResource++;
   if (buildCounterRestResource < 3) {
-    checkUnnamed239(o.methods);
-    checkUnnamed240(o.resources);
+    checkUnnamed1779(o.methods);
+    checkUnnamed1780(o.resources);
   }
   buildCounterRestResource--;
 }
@@ -1098,7 +1098,7 @@
       }), true);
       res
           .getRest(arg_api, arg_version, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RestDescription response) {
+          .then(unittest.expectAsync1(((response) {
         checkRestDescription(response);
       })));
     });
@@ -1155,7 +1155,7 @@
       }), true);
       res
           .list(name: arg_name, preferred: arg_preferred, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DirectoryList response) {
+          .then(unittest.expectAsync1(((response) {
         checkDirectoryList(response);
       })));
     });
diff --git a/generated/googleapis/test/dns/v1_test.dart b/generated/googleapis/test/dns/v1_test.dart
index 56b00a5..7cb9739 100644
--- a/generated/googleapis/test/dns/v1_test.dart
+++ b/generated/googleapis/test/dns/v1_test.dart
@@ -50,27 +50,27 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed128() {
+buildUnnamed2639() {
   var o = new core.List<api.ResourceRecordSet>();
   o.add(buildResourceRecordSet());
   o.add(buildResourceRecordSet());
   return o;
 }
 
-checkUnnamed128(core.List<api.ResourceRecordSet> o) {
+checkUnnamed2639(core.List<api.ResourceRecordSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceRecordSet(o[0]);
   checkResourceRecordSet(o[1]);
 }
 
-buildUnnamed129() {
+buildUnnamed2640() {
   var o = new core.List<api.ResourceRecordSet>();
   o.add(buildResourceRecordSet());
   o.add(buildResourceRecordSet());
   return o;
 }
 
-checkUnnamed129(core.List<api.ResourceRecordSet> o) {
+checkUnnamed2640(core.List<api.ResourceRecordSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceRecordSet(o[0]);
   checkResourceRecordSet(o[1]);
@@ -81,8 +81,8 @@
   var o = new api.Change();
   buildCounterChange++;
   if (buildCounterChange < 3) {
-    o.additions = buildUnnamed128();
-    o.deletions = buildUnnamed129();
+    o.additions = buildUnnamed2639();
+    o.deletions = buildUnnamed2640();
     o.id = "foo";
     o.kind = "foo";
     o.startTime = "foo";
@@ -95,8 +95,8 @@
 checkChange(api.Change o) {
   buildCounterChange++;
   if (buildCounterChange < 3) {
-    checkUnnamed128(o.additions);
-    checkUnnamed129(o.deletions);
+    checkUnnamed2639(o.additions);
+    checkUnnamed2640(o.deletions);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.startTime, unittest.equals('foo'));
@@ -105,14 +105,14 @@
   buildCounterChange--;
 }
 
-buildUnnamed130() {
+buildUnnamed2641() {
   var o = new core.List<api.Change>();
   o.add(buildChange());
   o.add(buildChange());
   return o;
 }
 
-checkUnnamed130(core.List<api.Change> o) {
+checkUnnamed2641(core.List<api.Change> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChange(o[0]);
   checkChange(o[1]);
@@ -123,7 +123,7 @@
   var o = new api.ChangesListResponse();
   buildCounterChangesListResponse++;
   if (buildCounterChangesListResponse < 3) {
-    o.changes = buildUnnamed130();
+    o.changes = buildUnnamed2641();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -134,21 +134,21 @@
 checkChangesListResponse(api.ChangesListResponse o) {
   buildCounterChangesListResponse++;
   if (buildCounterChangesListResponse < 3) {
-    checkUnnamed130(o.changes);
+    checkUnnamed2641(o.changes);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterChangesListResponse--;
 }
 
-buildUnnamed131() {
+buildUnnamed2642() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed131(core.List<core.String> o) {
+checkUnnamed2642(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -166,7 +166,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.nameServerSet = "foo";
-    o.nameServers = buildUnnamed131();
+    o.nameServers = buildUnnamed2642();
   }
   buildCounterManagedZone--;
   return o;
@@ -182,19 +182,19 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.nameServerSet, unittest.equals('foo'));
-    checkUnnamed131(o.nameServers);
+    checkUnnamed2642(o.nameServers);
   }
   buildCounterManagedZone--;
 }
 
-buildUnnamed132() {
+buildUnnamed2643() {
   var o = new core.List<api.ManagedZone>();
   o.add(buildManagedZone());
   o.add(buildManagedZone());
   return o;
 }
 
-checkUnnamed132(core.List<api.ManagedZone> o) {
+checkUnnamed2643(core.List<api.ManagedZone> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedZone(o[0]);
   checkManagedZone(o[1]);
@@ -206,7 +206,7 @@
   buildCounterManagedZonesListResponse++;
   if (buildCounterManagedZonesListResponse < 3) {
     o.kind = "foo";
-    o.managedZones = buildUnnamed132();
+    o.managedZones = buildUnnamed2643();
     o.nextPageToken = "foo";
   }
   buildCounterManagedZonesListResponse--;
@@ -217,7 +217,7 @@
   buildCounterManagedZonesListResponse++;
   if (buildCounterManagedZonesListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed132(o.managedZones);
+    checkUnnamed2643(o.managedZones);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterManagedZonesListResponse--;
@@ -279,14 +279,14 @@
   buildCounterQuota--;
 }
 
-buildUnnamed133() {
+buildUnnamed2644() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed133(core.List<core.String> o) {
+checkUnnamed2644(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -299,7 +299,7 @@
   if (buildCounterResourceRecordSet < 3) {
     o.kind = "foo";
     o.name = "foo";
-    o.rrdatas = buildUnnamed133();
+    o.rrdatas = buildUnnamed2644();
     o.ttl = 42;
     o.type = "foo";
   }
@@ -312,21 +312,21 @@
   if (buildCounterResourceRecordSet < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed133(o.rrdatas);
+    checkUnnamed2644(o.rrdatas);
     unittest.expect(o.ttl, unittest.equals(42));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterResourceRecordSet--;
 }
 
-buildUnnamed134() {
+buildUnnamed2645() {
   var o = new core.List<api.ResourceRecordSet>();
   o.add(buildResourceRecordSet());
   o.add(buildResourceRecordSet());
   return o;
 }
 
-checkUnnamed134(core.List<api.ResourceRecordSet> o) {
+checkUnnamed2645(core.List<api.ResourceRecordSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceRecordSet(o[0]);
   checkResourceRecordSet(o[1]);
@@ -339,7 +339,7 @@
   if (buildCounterResourceRecordSetsListResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.rrsets = buildUnnamed134();
+    o.rrsets = buildUnnamed2645();
   }
   buildCounterResourceRecordSetsListResponse--;
   return o;
@@ -350,7 +350,7 @@
   if (buildCounterResourceRecordSetsListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed134(o.rrsets);
+    checkUnnamed2645(o.rrsets);
   }
   buildCounterResourceRecordSetsListResponse--;
 }
@@ -469,7 +469,7 @@
       res
           .create(arg_request, arg_project, arg_managedZone,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Change response) {
+          .then(unittest.expectAsync1(((response) {
         checkChange(response);
       })));
     });
@@ -518,7 +518,7 @@
       }), true);
       res
           .get(arg_project, arg_managedZone, arg_changeId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Change response) {
+          .then(unittest.expectAsync1(((response) {
         checkChange(response);
       })));
     });
@@ -582,7 +582,7 @@
               sortBy: arg_sortBy,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChangesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkChangesListResponse(response);
       })));
     });
@@ -635,7 +635,7 @@
       }), true);
       res
           .create(arg_request, arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedZone response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedZone(response);
       })));
     });
@@ -729,7 +729,7 @@
       }), true);
       res
           .get(arg_project, arg_managedZone, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedZone response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedZone(response);
       })));
     });
@@ -789,7 +789,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedZonesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedZonesListResponse(response);
       })));
     });
@@ -838,7 +838,7 @@
       }), true);
       res
           .get(arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
@@ -904,8 +904,7 @@
               pageToken: arg_pageToken,
               type: arg_type,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ResourceRecordSetsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkResourceRecordSetsListResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/doubleclickbidmanager/v1_test.dart b/generated/googleapis/test/doubleclickbidmanager/v1_test.dart
index 130eda8..386b812 100644
--- a/generated/googleapis/test/doubleclickbidmanager/v1_test.dart
+++ b/generated/googleapis/test/doubleclickbidmanager/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed1419() {
+buildUnnamed1635() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1419(core.List<core.String> o) {
+checkUnnamed1635(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -69,7 +69,7 @@
   buildCounterDownloadLineItemsRequest++;
   if (buildCounterDownloadLineItemsRequest < 3) {
     o.fileSpec = "foo";
-    o.filterIds = buildUnnamed1419();
+    o.filterIds = buildUnnamed1635();
     o.filterType = "foo";
     o.format = "foo";
   }
@@ -81,7 +81,7 @@
   buildCounterDownloadLineItemsRequest++;
   if (buildCounterDownloadLineItemsRequest < 3) {
     unittest.expect(o.fileSpec, unittest.equals('foo'));
-    checkUnnamed1419(o.filterIds);
+    checkUnnamed1635(o.filterIds);
     unittest.expect(o.filterType, unittest.equals('foo'));
     unittest.expect(o.format, unittest.equals('foo'));
   }
@@ -107,27 +107,27 @@
   buildCounterDownloadLineItemsResponse--;
 }
 
-buildUnnamed1420() {
+buildUnnamed1636() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1420(core.List<core.String> o) {
+checkUnnamed1636(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1421() {
+buildUnnamed1637() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1421(core.List<core.String> o) {
+checkUnnamed1637(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -138,8 +138,8 @@
   var o = new api.DownloadRequest();
   buildCounterDownloadRequest++;
   if (buildCounterDownloadRequest < 3) {
-    o.fileTypes = buildUnnamed1420();
-    o.filterIds = buildUnnamed1421();
+    o.fileTypes = buildUnnamed1636();
+    o.filterIds = buildUnnamed1637();
     o.filterType = "foo";
     o.version = "foo";
   }
@@ -150,8 +150,8 @@
 checkDownloadRequest(api.DownloadRequest o) {
   buildCounterDownloadRequest++;
   if (buildCounterDownloadRequest < 3) {
-    checkUnnamed1420(o.fileTypes);
-    checkUnnamed1421(o.filterIds);
+    checkUnnamed1636(o.fileTypes);
+    checkUnnamed1637(o.filterIds);
     unittest.expect(o.filterType, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals('foo'));
   }
@@ -206,14 +206,14 @@
   buildCounterFilterPair--;
 }
 
-buildUnnamed1422() {
+buildUnnamed1638() {
   var o = new core.List<api.Query>();
   o.add(buildQuery());
   o.add(buildQuery());
   return o;
 }
 
-checkUnnamed1422(core.List<api.Query> o) {
+checkUnnamed1638(core.List<api.Query> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuery(o[0]);
   checkQuery(o[1]);
@@ -225,7 +225,7 @@
   buildCounterListQueriesResponse++;
   if (buildCounterListQueriesResponse < 3) {
     o.kind = "foo";
-    o.queries = buildUnnamed1422();
+    o.queries = buildUnnamed1638();
   }
   buildCounterListQueriesResponse--;
   return o;
@@ -235,19 +235,19 @@
   buildCounterListQueriesResponse++;
   if (buildCounterListQueriesResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1422(o.queries);
+    checkUnnamed1638(o.queries);
   }
   buildCounterListQueriesResponse--;
 }
 
-buildUnnamed1423() {
+buildUnnamed1639() {
   var o = new core.List<api.Report>();
   o.add(buildReport());
   o.add(buildReport());
   return o;
 }
 
-checkUnnamed1423(core.List<api.Report> o) {
+checkUnnamed1639(core.List<api.Report> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReport(o[0]);
   checkReport(o[1]);
@@ -259,7 +259,7 @@
   buildCounterListReportsResponse++;
   if (buildCounterListReportsResponse < 3) {
     o.kind = "foo";
-    o.reports = buildUnnamed1423();
+    o.reports = buildUnnamed1639();
   }
   buildCounterListReportsResponse--;
   return o;
@@ -269,45 +269,45 @@
   buildCounterListReportsResponse++;
   if (buildCounterListReportsResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1423(o.reports);
+    checkUnnamed1639(o.reports);
   }
   buildCounterListReportsResponse--;
 }
 
-buildUnnamed1424() {
+buildUnnamed1640() {
   var o = new core.List<api.FilterPair>();
   o.add(buildFilterPair());
   o.add(buildFilterPair());
   return o;
 }
 
-checkUnnamed1424(core.List<api.FilterPair> o) {
+checkUnnamed1640(core.List<api.FilterPair> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilterPair(o[0]);
   checkFilterPair(o[1]);
 }
 
-buildUnnamed1425() {
+buildUnnamed1641() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1425(core.List<core.String> o) {
+checkUnnamed1641(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1426() {
+buildUnnamed1642() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1426(core.List<core.String> o) {
+checkUnnamed1642(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -318,10 +318,10 @@
   var o = new api.Parameters();
   buildCounterParameters++;
   if (buildCounterParameters < 3) {
-    o.filters = buildUnnamed1424();
-    o.groupBys = buildUnnamed1425();
+    o.filters = buildUnnamed1640();
+    o.groupBys = buildUnnamed1641();
     o.includeInviteData = true;
-    o.metrics = buildUnnamed1426();
+    o.metrics = buildUnnamed1642();
     o.type = "foo";
   }
   buildCounterParameters--;
@@ -331,10 +331,10 @@
 checkParameters(api.Parameters o) {
   buildCounterParameters++;
   if (buildCounterParameters < 3) {
-    checkUnnamed1424(o.filters);
-    checkUnnamed1425(o.groupBys);
+    checkUnnamed1640(o.filters);
+    checkUnnamed1641(o.groupBys);
     unittest.expect(o.includeInviteData, unittest.isTrue);
-    checkUnnamed1426(o.metrics);
+    checkUnnamed1642(o.metrics);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterParameters--;
@@ -373,14 +373,14 @@
   buildCounterQuery--;
 }
 
-buildUnnamed1427() {
+buildUnnamed1643() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1427(core.List<core.String> o) {
+checkUnnamed1643(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -400,7 +400,7 @@
     o.reportCount = 42;
     o.running = true;
     o.sendNotification = true;
-    o.shareEmailAddress = buildUnnamed1427();
+    o.shareEmailAddress = buildUnnamed1643();
     o.title = "foo";
   }
   buildCounterQueryMetadata--;
@@ -420,7 +420,7 @@
     unittest.expect(o.reportCount, unittest.equals(42));
     unittest.expect(o.running, unittest.isTrue);
     unittest.expect(o.sendNotification, unittest.isTrue);
-    checkUnnamed1427(o.shareEmailAddress);
+    checkUnnamed1643(o.shareEmailAddress);
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterQueryMetadata--;
@@ -564,14 +564,14 @@
   buildCounterReportStatus--;
 }
 
-buildUnnamed1428() {
+buildUnnamed1644() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1428(core.List<core.String> o) {
+checkUnnamed1644(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -585,7 +585,7 @@
     o.changed = true;
     o.entityId = "foo";
     o.entityName = "foo";
-    o.errors = buildUnnamed1428();
+    o.errors = buildUnnamed1644();
     o.persisted = true;
     o.rowNumber = 42;
   }
@@ -599,7 +599,7 @@
     unittest.expect(o.changed, unittest.isTrue);
     unittest.expect(o.entityId, unittest.equals('foo'));
     unittest.expect(o.entityName, unittest.equals('foo'));
-    checkUnnamed1428(o.errors);
+    checkUnnamed1644(o.errors);
     unittest.expect(o.persisted, unittest.isTrue);
     unittest.expect(o.rowNumber, unittest.equals(42));
   }
@@ -673,27 +673,27 @@
   buildCounterUploadLineItemsResponse--;
 }
 
-buildUnnamed1429() {
+buildUnnamed1645() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1429(core.List<core.String> o) {
+checkUnnamed1645(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1430() {
+buildUnnamed1646() {
   var o = new core.List<api.RowStatus>();
   o.add(buildRowStatus());
   o.add(buildRowStatus());
   return o;
 }
 
-checkUnnamed1430(core.List<api.RowStatus> o) {
+checkUnnamed1646(core.List<api.RowStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRowStatus(o[0]);
   checkRowStatus(o[1]);
@@ -704,8 +704,8 @@
   var o = new api.UploadStatus();
   buildCounterUploadStatus++;
   if (buildCounterUploadStatus < 3) {
-    o.errors = buildUnnamed1429();
-    o.rowStatus = buildUnnamed1430();
+    o.errors = buildUnnamed1645();
+    o.rowStatus = buildUnnamed1646();
   }
   buildCounterUploadStatus--;
   return o;
@@ -714,8 +714,8 @@
 checkUploadStatus(api.UploadStatus o) {
   buildCounterUploadStatus++;
   if (buildCounterUploadStatus < 3) {
-    checkUnnamed1429(o.errors);
-    checkUnnamed1430(o.rowStatus);
+    checkUnnamed1645(o.errors);
+    checkUnnamed1646(o.rowStatus);
   }
   buildCounterUploadStatus--;
 }
@@ -940,8 +940,9 @@
         var resp = convert.JSON.encode(buildDownloadLineItemsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.downloadlineitems(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.DownloadLineItemsResponse response) {
+      res
+          .downloadlineitems(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkDownloadLineItemsResponse(response);
       })));
     });
@@ -998,7 +999,7 @@
       }), true);
       res
           .uploadlineitems(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UploadLineItemsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkUploadLineItemsResponse(response);
       })));
     });
@@ -1057,7 +1058,7 @@
       }), true);
       res
           .createquery(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Query response) {
+          .then(unittest.expectAsync1(((response) {
         checkQuery(response);
       })));
     });
@@ -1169,7 +1170,7 @@
       }), true);
       res
           .getquery(arg_queryId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Query response) {
+          .then(unittest.expectAsync1(((response) {
         checkQuery(response);
       })));
     });
@@ -1222,7 +1223,7 @@
       }), true);
       res
           .listqueries($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListQueriesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListQueriesResponse(response);
       })));
     });
@@ -1346,7 +1347,7 @@
       }), true);
       res
           .listreports(arg_queryId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListReportsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListReportsResponse(response);
       })));
     });
@@ -1404,7 +1405,7 @@
       }), true);
       res
           .download(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DownloadResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDownloadResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/doubleclicksearch/v2_test.dart b/generated/googleapis/test/doubleclicksearch/v2_test.dart
index 7c4da2b..b8b115e 100644
--- a/generated/googleapis/test/doubleclicksearch/v2_test.dart
+++ b/generated/googleapis/test/doubleclicksearch/v2_test.dart
@@ -79,27 +79,27 @@
   buildCounterAvailability--;
 }
 
-buildUnnamed596() {
+buildUnnamed1130() {
   var o = new core.List<api.CustomDimension>();
   o.add(buildCustomDimension());
   o.add(buildCustomDimension());
   return o;
 }
 
-checkUnnamed596(core.List<api.CustomDimension> o) {
+checkUnnamed1130(core.List<api.CustomDimension> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomDimension(o[0]);
   checkCustomDimension(o[1]);
 }
 
-buildUnnamed597() {
+buildUnnamed1131() {
   var o = new core.List<api.CustomMetric>();
   o.add(buildCustomMetric());
   o.add(buildCustomMetric());
   return o;
 }
 
-checkUnnamed597(core.List<api.CustomMetric> o) {
+checkUnnamed1131(core.List<api.CustomMetric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomMetric(o[0]);
   checkCustomMetric(o[1]);
@@ -124,8 +124,8 @@
     o.countMillis = "foo";
     o.criterionId = "foo";
     o.currencyCode = "foo";
-    o.customDimension = buildUnnamed596();
-    o.customMetric = buildUnnamed597();
+    o.customDimension = buildUnnamed1130();
+    o.customMetric = buildUnnamed1131();
     o.deviceType = "foo";
     o.dsConversionId = "foo";
     o.engineAccountId = "foo";
@@ -165,8 +165,8 @@
     unittest.expect(o.countMillis, unittest.equals('foo'));
     unittest.expect(o.criterionId, unittest.equals('foo'));
     unittest.expect(o.currencyCode, unittest.equals('foo'));
-    checkUnnamed596(o.customDimension);
-    checkUnnamed597(o.customMetric);
+    checkUnnamed1130(o.customDimension);
+    checkUnnamed1131(o.customMetric);
     unittest.expect(o.deviceType, unittest.equals('foo'));
     unittest.expect(o.dsConversionId, unittest.equals('foo'));
     unittest.expect(o.engineAccountId, unittest.equals('foo'));
@@ -188,14 +188,14 @@
   buildCounterConversion--;
 }
 
-buildUnnamed598() {
+buildUnnamed1132() {
   var o = new core.List<api.Conversion>();
   o.add(buildConversion());
   o.add(buildConversion());
   return o;
 }
 
-checkUnnamed598(core.List<api.Conversion> o) {
+checkUnnamed1132(core.List<api.Conversion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConversion(o[0]);
   checkConversion(o[1]);
@@ -206,7 +206,7 @@
   var o = new api.ConversionList();
   buildCounterConversionList++;
   if (buildCounterConversionList < 3) {
-    o.conversion = buildUnnamed598();
+    o.conversion = buildUnnamed1132();
     o.kind = "foo";
   }
   buildCounterConversionList--;
@@ -216,7 +216,7 @@
 checkConversionList(api.ConversionList o) {
   buildCounterConversionList++;
   if (buildCounterConversionList < 3) {
-    checkUnnamed598(o.conversion);
+    checkUnnamed1132(o.conversion);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterConversionList--;
@@ -285,27 +285,27 @@
   buildCounterReportFiles--;
 }
 
-buildUnnamed599() {
+buildUnnamed1133() {
   var o = new core.List<api.ReportFiles>();
   o.add(buildReportFiles());
   o.add(buildReportFiles());
   return o;
 }
 
-checkUnnamed599(core.List<api.ReportFiles> o) {
+checkUnnamed1133(core.List<api.ReportFiles> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportFiles(o[0]);
   checkReportFiles(o[1]);
 }
 
-buildUnnamed600() {
+buildUnnamed1134() {
   var o = new core.List<api.ReportRow>();
   o.add(buildReportRow());
   o.add(buildReportRow());
   return o;
 }
 
-checkUnnamed600(core.List<api.ReportRow> o) {
+checkUnnamed1134(core.List<api.ReportRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportRow(o[0]);
   checkReportRow(o[1]);
@@ -316,13 +316,13 @@
   var o = new api.Report();
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    o.files = buildUnnamed599();
+    o.files = buildUnnamed1133();
     o.id = "foo";
     o.isReportReady = true;
     o.kind = "foo";
     o.request = buildReportRequest();
     o.rowCount = 42;
-    o.rows = buildUnnamed600();
+    o.rows = buildUnnamed1134();
     o.statisticsCurrencyCode = "foo";
     o.statisticsTimeZone = "foo";
   }
@@ -333,13 +333,13 @@
 checkReport(api.Report o) {
   buildCounterReport++;
   if (buildCounterReport < 3) {
-    checkUnnamed599(o.files);
+    checkUnnamed1133(o.files);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.isReportReady, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkReportRequest(o.request);
     unittest.expect(o.rowCount, unittest.equals(42));
-    checkUnnamed600(o.rows);
+    checkUnnamed1134(o.rows);
     unittest.expect(o.statisticsCurrencyCode, unittest.equals('foo'));
     unittest.expect(o.statisticsTimeZone, unittest.equals('foo'));
   }
@@ -383,20 +383,20 @@
   buildCounterReportApiColumnSpec--;
 }
 
-buildUnnamed601() {
+buildUnnamed1135() {
   var o = new core.List<api.ReportApiColumnSpec>();
   o.add(buildReportApiColumnSpec());
   o.add(buildReportApiColumnSpec());
   return o;
 }
 
-checkUnnamed601(core.List<api.ReportApiColumnSpec> o) {
+checkUnnamed1135(core.List<api.ReportApiColumnSpec> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportApiColumnSpec(o[0]);
   checkReportApiColumnSpec(o[1]);
 }
 
-buildUnnamed602() {
+buildUnnamed1136() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -411,7 +411,7 @@
   return o;
 }
 
-checkUnnamed602(core.List<core.Object> o) {
+checkUnnamed1136(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -432,7 +432,7 @@
   if (buildCounterReportRequestFilters < 3) {
     o.column = buildReportApiColumnSpec();
     o.operator = "foo";
-    o.values = buildUnnamed602();
+    o.values = buildUnnamed1136();
   }
   buildCounterReportRequestFilters--;
   return o;
@@ -443,19 +443,19 @@
   if (buildCounterReportRequestFilters < 3) {
     checkReportApiColumnSpec(o.column);
     unittest.expect(o.operator, unittest.equals('foo'));
-    checkUnnamed602(o.values);
+    checkUnnamed1136(o.values);
   }
   buildCounterReportRequestFilters--;
 }
 
-buildUnnamed603() {
+buildUnnamed1137() {
   var o = new core.List<api.ReportRequestFilters>();
   o.add(buildReportRequestFilters());
   o.add(buildReportRequestFilters());
   return o;
 }
 
-checkUnnamed603(core.List<api.ReportRequestFilters> o) {
+checkUnnamed1137(core.List<api.ReportRequestFilters> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportRequestFilters(o[0]);
   checkReportRequestFilters(o[1]);
@@ -482,14 +482,14 @@
   buildCounterReportRequestOrderBy--;
 }
 
-buildUnnamed604() {
+buildUnnamed1138() {
   var o = new core.List<api.ReportRequestOrderBy>();
   o.add(buildReportRequestOrderBy());
   o.add(buildReportRequestOrderBy());
   return o;
 }
 
-checkUnnamed604(core.List<api.ReportRequestOrderBy> o) {
+checkUnnamed1138(core.List<api.ReportRequestOrderBy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportRequestOrderBy(o[0]);
   checkReportRequestOrderBy(o[1]);
@@ -559,13 +559,13 @@
   var o = new api.ReportRequest();
   buildCounterReportRequest++;
   if (buildCounterReportRequest < 3) {
-    o.columns = buildUnnamed601();
+    o.columns = buildUnnamed1135();
     o.downloadFormat = "foo";
-    o.filters = buildUnnamed603();
+    o.filters = buildUnnamed1137();
     o.includeDeletedEntities = true;
     o.includeRemovedEntities = true;
     o.maxRowsPerFile = 42;
-    o.orderBy = buildUnnamed604();
+    o.orderBy = buildUnnamed1138();
     o.reportScope = buildReportRequestReportScope();
     o.reportType = "foo";
     o.rowCount = 42;
@@ -581,13 +581,13 @@
 checkReportRequest(api.ReportRequest o) {
   buildCounterReportRequest++;
   if (buildCounterReportRequest < 3) {
-    checkUnnamed601(o.columns);
+    checkUnnamed1135(o.columns);
     unittest.expect(o.downloadFormat, unittest.equals('foo'));
-    checkUnnamed603(o.filters);
+    checkUnnamed1137(o.filters);
     unittest.expect(o.includeDeletedEntities, unittest.isTrue);
     unittest.expect(o.includeRemovedEntities, unittest.isTrue);
     unittest.expect(o.maxRowsPerFile, unittest.equals(42));
-    checkUnnamed604(o.orderBy);
+    checkUnnamed1138(o.orderBy);
     checkReportRequestReportScope(o.reportScope);
     unittest.expect(o.reportType, unittest.equals('foo'));
     unittest.expect(o.rowCount, unittest.equals(42));
@@ -651,14 +651,14 @@
   buildCounterSavedColumn--;
 }
 
-buildUnnamed605() {
+buildUnnamed1139() {
   var o = new core.List<api.SavedColumn>();
   o.add(buildSavedColumn());
   o.add(buildSavedColumn());
   return o;
 }
 
-checkUnnamed605(core.List<api.SavedColumn> o) {
+checkUnnamed1139(core.List<api.SavedColumn> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSavedColumn(o[0]);
   checkSavedColumn(o[1]);
@@ -669,7 +669,7 @@
   var o = new api.SavedColumnList();
   buildCounterSavedColumnList++;
   if (buildCounterSavedColumnList < 3) {
-    o.items = buildUnnamed605();
+    o.items = buildUnnamed1139();
     o.kind = "foo";
   }
   buildCounterSavedColumnList--;
@@ -679,20 +679,20 @@
 checkSavedColumnList(api.SavedColumnList o) {
   buildCounterSavedColumnList++;
   if (buildCounterSavedColumnList < 3) {
-    checkUnnamed605(o.items);
+    checkUnnamed1139(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterSavedColumnList--;
 }
 
-buildUnnamed606() {
+buildUnnamed1140() {
   var o = new core.List<api.Availability>();
   o.add(buildAvailability());
   o.add(buildAvailability());
   return o;
 }
 
-checkUnnamed606(core.List<api.Availability> o) {
+checkUnnamed1140(core.List<api.Availability> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAvailability(o[0]);
   checkAvailability(o[1]);
@@ -703,7 +703,7 @@
   var o = new api.UpdateAvailabilityRequest();
   buildCounterUpdateAvailabilityRequest++;
   if (buildCounterUpdateAvailabilityRequest < 3) {
-    o.availabilities = buildUnnamed606();
+    o.availabilities = buildUnnamed1140();
   }
   buildCounterUpdateAvailabilityRequest--;
   return o;
@@ -712,19 +712,19 @@
 checkUpdateAvailabilityRequest(api.UpdateAvailabilityRequest o) {
   buildCounterUpdateAvailabilityRequest++;
   if (buildCounterUpdateAvailabilityRequest < 3) {
-    checkUnnamed606(o.availabilities);
+    checkUnnamed1140(o.availabilities);
   }
   buildCounterUpdateAvailabilityRequest--;
 }
 
-buildUnnamed607() {
+buildUnnamed1141() {
   var o = new core.List<api.Availability>();
   o.add(buildAvailability());
   o.add(buildAvailability());
   return o;
 }
 
-checkUnnamed607(core.List<api.Availability> o) {
+checkUnnamed1141(core.List<api.Availability> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAvailability(o[0]);
   checkAvailability(o[1]);
@@ -735,7 +735,7 @@
   var o = new api.UpdateAvailabilityResponse();
   buildCounterUpdateAvailabilityResponse++;
   if (buildCounterUpdateAvailabilityResponse < 3) {
-    o.availabilities = buildUnnamed607();
+    o.availabilities = buildUnnamed1141();
   }
   buildCounterUpdateAvailabilityResponse--;
   return o;
@@ -744,7 +744,7 @@
 checkUpdateAvailabilityResponse(api.UpdateAvailabilityResponse o) {
   buildCounterUpdateAvailabilityResponse++;
   if (buildCounterUpdateAvailabilityResponse < 3) {
-    checkUnnamed607(o.availabilities);
+    checkUnnamed1141(o.availabilities);
   }
   buildCounterUpdateAvailabilityResponse--;
 }
@@ -1002,7 +1002,7 @@
               campaignId: arg_campaignId,
               criterionId: arg_criterionId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ConversionList response) {
+          .then(unittest.expectAsync1(((response) {
         checkConversionList(response);
       })));
     });
@@ -1059,7 +1059,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ConversionList response) {
+          .then(unittest.expectAsync1(((response) {
         checkConversionList(response);
       })));
     });
@@ -1139,7 +1139,7 @@
           .patch(arg_request, arg_advertiserId, arg_agencyId, arg_endDate,
               arg_engineAccountId, arg_rowCount, arg_startDate, arg_startRow,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ConversionList response) {
+          .then(unittest.expectAsync1(((response) {
         checkConversionList(response);
       })));
     });
@@ -1196,7 +1196,7 @@
       }), true);
       res
           .update(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ConversionList response) {
+          .then(unittest.expectAsync1(((response) {
         checkConversionList(response);
       })));
     });
@@ -1251,8 +1251,9 @@
         var resp = convert.JSON.encode(buildUpdateAvailabilityResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.updateAvailability(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.UpdateAvailabilityResponse response) {
+      res
+          .updateAvailability(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkUpdateAvailabilityResponse(response);
       })));
     });
@@ -1310,7 +1311,7 @@
       }), true);
       res
           .generate(arg_request_1, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -1366,7 +1367,7 @@
       }), true);
       res
           .get(arg_reportId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -1489,7 +1490,7 @@
       }), true);
       res
           .request(arg_request_1, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -1564,7 +1565,7 @@
       }), true);
       res
           .list(arg_agencyId, arg_advertiserId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SavedColumnList response) {
+          .then(unittest.expectAsync1(((response) {
         checkSavedColumnList(response);
       })));
     });
diff --git a/generated/googleapis/test/drive/v2_test.dart b/generated/googleapis/test/drive/v2_test.dart
index ac1adf6..2d9c4f9 100644
--- a/generated/googleapis/test/drive/v2_test.dart
+++ b/generated/googleapis/test/drive/v2_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3540() {
+buildUnnamed348() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3540(core.List<core.String> o) {
+checkUnnamed348(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -68,7 +68,7 @@
   var o = new api.AboutAdditionalRoleInfoRoleSets();
   buildCounterAboutAdditionalRoleInfoRoleSets++;
   if (buildCounterAboutAdditionalRoleInfoRoleSets < 3) {
-    o.additionalRoles = buildUnnamed3540();
+    o.additionalRoles = buildUnnamed348();
     o.primaryRole = "foo";
   }
   buildCounterAboutAdditionalRoleInfoRoleSets--;
@@ -78,20 +78,20 @@
 checkAboutAdditionalRoleInfoRoleSets(api.AboutAdditionalRoleInfoRoleSets o) {
   buildCounterAboutAdditionalRoleInfoRoleSets++;
   if (buildCounterAboutAdditionalRoleInfoRoleSets < 3) {
-    checkUnnamed3540(o.additionalRoles);
+    checkUnnamed348(o.additionalRoles);
     unittest.expect(o.primaryRole, unittest.equals('foo'));
   }
   buildCounterAboutAdditionalRoleInfoRoleSets--;
 }
 
-buildUnnamed3541() {
+buildUnnamed349() {
   var o = new core.List<api.AboutAdditionalRoleInfoRoleSets>();
   o.add(buildAboutAdditionalRoleInfoRoleSets());
   o.add(buildAboutAdditionalRoleInfoRoleSets());
   return o;
 }
 
-checkUnnamed3541(core.List<api.AboutAdditionalRoleInfoRoleSets> o) {
+checkUnnamed349(core.List<api.AboutAdditionalRoleInfoRoleSets> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutAdditionalRoleInfoRoleSets(o[0]);
   checkAboutAdditionalRoleInfoRoleSets(o[1]);
@@ -102,7 +102,7 @@
   var o = new api.AboutAdditionalRoleInfo();
   buildCounterAboutAdditionalRoleInfo++;
   if (buildCounterAboutAdditionalRoleInfo < 3) {
-    o.roleSets = buildUnnamed3541();
+    o.roleSets = buildUnnamed349();
     o.type = "foo";
   }
   buildCounterAboutAdditionalRoleInfo--;
@@ -112,33 +112,33 @@
 checkAboutAdditionalRoleInfo(api.AboutAdditionalRoleInfo o) {
   buildCounterAboutAdditionalRoleInfo++;
   if (buildCounterAboutAdditionalRoleInfo < 3) {
-    checkUnnamed3541(o.roleSets);
+    checkUnnamed349(o.roleSets);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterAboutAdditionalRoleInfo--;
 }
 
-buildUnnamed3542() {
+buildUnnamed350() {
   var o = new core.List<api.AboutAdditionalRoleInfo>();
   o.add(buildAboutAdditionalRoleInfo());
   o.add(buildAboutAdditionalRoleInfo());
   return o;
 }
 
-checkUnnamed3542(core.List<api.AboutAdditionalRoleInfo> o) {
+checkUnnamed350(core.List<api.AboutAdditionalRoleInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutAdditionalRoleInfo(o[0]);
   checkAboutAdditionalRoleInfo(o[1]);
 }
 
-buildUnnamed3543() {
+buildUnnamed351() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3543(core.List<core.String> o) {
+checkUnnamed351(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -150,7 +150,7 @@
   buildCounterAboutExportFormats++;
   if (buildCounterAboutExportFormats < 3) {
     o.source = "foo";
-    o.targets = buildUnnamed3543();
+    o.targets = buildUnnamed351();
   }
   buildCounterAboutExportFormats--;
   return o;
@@ -160,19 +160,19 @@
   buildCounterAboutExportFormats++;
   if (buildCounterAboutExportFormats < 3) {
     unittest.expect(o.source, unittest.equals('foo'));
-    checkUnnamed3543(o.targets);
+    checkUnnamed351(o.targets);
   }
   buildCounterAboutExportFormats--;
 }
 
-buildUnnamed3544() {
+buildUnnamed352() {
   var o = new core.List<api.AboutExportFormats>();
   o.add(buildAboutExportFormats());
   o.add(buildAboutExportFormats());
   return o;
 }
 
-checkUnnamed3544(core.List<api.AboutExportFormats> o) {
+checkUnnamed352(core.List<api.AboutExportFormats> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutExportFormats(o[0]);
   checkAboutExportFormats(o[1]);
@@ -199,40 +199,40 @@
   buildCounterAboutFeatures--;
 }
 
-buildUnnamed3545() {
+buildUnnamed353() {
   var o = new core.List<api.AboutFeatures>();
   o.add(buildAboutFeatures());
   o.add(buildAboutFeatures());
   return o;
 }
 
-checkUnnamed3545(core.List<api.AboutFeatures> o) {
+checkUnnamed353(core.List<api.AboutFeatures> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutFeatures(o[0]);
   checkAboutFeatures(o[1]);
 }
 
-buildUnnamed3546() {
+buildUnnamed354() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3546(core.List<core.String> o) {
+checkUnnamed354(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3547() {
+buildUnnamed355() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3547(core.List<core.String> o) {
+checkUnnamed355(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -244,7 +244,7 @@
   buildCounterAboutImportFormats++;
   if (buildCounterAboutImportFormats < 3) {
     o.source = "foo";
-    o.targets = buildUnnamed3547();
+    o.targets = buildUnnamed355();
   }
   buildCounterAboutImportFormats--;
   return o;
@@ -254,19 +254,19 @@
   buildCounterAboutImportFormats++;
   if (buildCounterAboutImportFormats < 3) {
     unittest.expect(o.source, unittest.equals('foo'));
-    checkUnnamed3547(o.targets);
+    checkUnnamed355(o.targets);
   }
   buildCounterAboutImportFormats--;
 }
 
-buildUnnamed3548() {
+buildUnnamed356() {
   var o = new core.List<api.AboutImportFormats>();
   o.add(buildAboutImportFormats());
   o.add(buildAboutImportFormats());
   return o;
 }
 
-checkUnnamed3548(core.List<api.AboutImportFormats> o) {
+checkUnnamed356(core.List<api.AboutImportFormats> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutImportFormats(o[0]);
   checkAboutImportFormats(o[1]);
@@ -293,14 +293,14 @@
   buildCounterAboutMaxUploadSizes--;
 }
 
-buildUnnamed3549() {
+buildUnnamed357() {
   var o = new core.List<api.AboutMaxUploadSizes>();
   o.add(buildAboutMaxUploadSizes());
   o.add(buildAboutMaxUploadSizes());
   return o;
 }
 
-checkUnnamed3549(core.List<api.AboutMaxUploadSizes> o) {
+checkUnnamed357(core.List<api.AboutMaxUploadSizes> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutMaxUploadSizes(o[0]);
   checkAboutMaxUploadSizes(o[1]);
@@ -327,14 +327,14 @@
   buildCounterAboutQuotaBytesByService--;
 }
 
-buildUnnamed3550() {
+buildUnnamed358() {
   var o = new core.List<api.AboutQuotaBytesByService>();
   o.add(buildAboutQuotaBytesByService());
   o.add(buildAboutQuotaBytesByService());
   return o;
 }
 
-checkUnnamed3550(core.List<api.AboutQuotaBytesByService> o) {
+checkUnnamed358(core.List<api.AboutQuotaBytesByService> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutQuotaBytesByService(o[0]);
   checkAboutQuotaBytesByService(o[1]);
@@ -363,14 +363,14 @@
   buildCounterAboutTeamDriveThemes--;
 }
 
-buildUnnamed3551() {
+buildUnnamed359() {
   var o = new core.List<api.AboutTeamDriveThemes>();
   o.add(buildAboutTeamDriveThemes());
   o.add(buildAboutTeamDriveThemes());
   return o;
 }
 
-checkUnnamed3551(core.List<api.AboutTeamDriveThemes> o) {
+checkUnnamed359(core.List<api.AboutTeamDriveThemes> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutTeamDriveThemes(o[0]);
   checkAboutTeamDriveThemes(o[1]);
@@ -381,22 +381,22 @@
   var o = new api.About();
   buildCounterAbout++;
   if (buildCounterAbout < 3) {
-    o.additionalRoleInfo = buildUnnamed3542();
+    o.additionalRoleInfo = buildUnnamed350();
     o.canCreateTeamDrives = true;
     o.domainSharingPolicy = "foo";
     o.etag = "foo";
-    o.exportFormats = buildUnnamed3544();
-    o.features = buildUnnamed3545();
-    o.folderColorPalette = buildUnnamed3546();
-    o.importFormats = buildUnnamed3548();
+    o.exportFormats = buildUnnamed352();
+    o.features = buildUnnamed353();
+    o.folderColorPalette = buildUnnamed354();
+    o.importFormats = buildUnnamed356();
     o.isCurrentAppInstalled = true;
     o.kind = "foo";
     o.languageCode = "foo";
     o.largestChangeId = "foo";
-    o.maxUploadSizes = buildUnnamed3549();
+    o.maxUploadSizes = buildUnnamed357();
     o.name = "foo";
     o.permissionId = "foo";
-    o.quotaBytesByService = buildUnnamed3550();
+    o.quotaBytesByService = buildUnnamed358();
     o.quotaBytesTotal = "foo";
     o.quotaBytesUsed = "foo";
     o.quotaBytesUsedAggregate = "foo";
@@ -405,7 +405,7 @@
     o.remainingChangeIds = "foo";
     o.rootFolderId = "foo";
     o.selfLink = "foo";
-    o.teamDriveThemes = buildUnnamed3551();
+    o.teamDriveThemes = buildUnnamed359();
     o.user = buildUser();
   }
   buildCounterAbout--;
@@ -415,22 +415,22 @@
 checkAbout(api.About o) {
   buildCounterAbout++;
   if (buildCounterAbout < 3) {
-    checkUnnamed3542(o.additionalRoleInfo);
+    checkUnnamed350(o.additionalRoleInfo);
     unittest.expect(o.canCreateTeamDrives, unittest.isTrue);
     unittest.expect(o.domainSharingPolicy, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3544(o.exportFormats);
-    checkUnnamed3545(o.features);
-    checkUnnamed3546(o.folderColorPalette);
-    checkUnnamed3548(o.importFormats);
+    checkUnnamed352(o.exportFormats);
+    checkUnnamed353(o.features);
+    checkUnnamed354(o.folderColorPalette);
+    checkUnnamed356(o.importFormats);
     unittest.expect(o.isCurrentAppInstalled, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.languageCode, unittest.equals('foo'));
     unittest.expect(o.largestChangeId, unittest.equals('foo'));
-    checkUnnamed3549(o.maxUploadSizes);
+    checkUnnamed357(o.maxUploadSizes);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.permissionId, unittest.equals('foo'));
-    checkUnnamed3550(o.quotaBytesByService);
+    checkUnnamed358(o.quotaBytesByService);
     unittest.expect(o.quotaBytesTotal, unittest.equals('foo'));
     unittest.expect(o.quotaBytesUsed, unittest.equals('foo'));
     unittest.expect(o.quotaBytesUsedAggregate, unittest.equals('foo'));
@@ -439,7 +439,7 @@
     unittest.expect(o.remainingChangeIds, unittest.equals('foo'));
     unittest.expect(o.rootFolderId, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed3551(o.teamDriveThemes);
+    checkUnnamed359(o.teamDriveThemes);
     checkUser(o.user);
   }
   buildCounterAbout--;
@@ -468,66 +468,66 @@
   buildCounterAppIcons--;
 }
 
-buildUnnamed3552() {
+buildUnnamed360() {
   var o = new core.List<api.AppIcons>();
   o.add(buildAppIcons());
   o.add(buildAppIcons());
   return o;
 }
 
-checkUnnamed3552(core.List<api.AppIcons> o) {
+checkUnnamed360(core.List<api.AppIcons> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAppIcons(o[0]);
   checkAppIcons(o[1]);
 }
 
-buildUnnamed3553() {
+buildUnnamed361() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3553(core.List<core.String> o) {
+checkUnnamed361(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3554() {
+buildUnnamed362() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3554(core.List<core.String> o) {
+checkUnnamed362(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3555() {
+buildUnnamed363() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3555(core.List<core.String> o) {
+checkUnnamed363(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3556() {
+buildUnnamed364() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3556(core.List<core.String> o) {
+checkUnnamed364(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -542,7 +542,7 @@
     o.createInFolderTemplate = "foo";
     o.createUrl = "foo";
     o.hasDriveWideScope = true;
-    o.icons = buildUnnamed3552();
+    o.icons = buildUnnamed360();
     o.id = "foo";
     o.installed = true;
     o.kind = "foo";
@@ -550,12 +550,12 @@
     o.name = "foo";
     o.objectType = "foo";
     o.openUrlTemplate = "foo";
-    o.primaryFileExtensions = buildUnnamed3553();
-    o.primaryMimeTypes = buildUnnamed3554();
+    o.primaryFileExtensions = buildUnnamed361();
+    o.primaryMimeTypes = buildUnnamed362();
     o.productId = "foo";
     o.productUrl = "foo";
-    o.secondaryFileExtensions = buildUnnamed3555();
-    o.secondaryMimeTypes = buildUnnamed3556();
+    o.secondaryFileExtensions = buildUnnamed363();
+    o.secondaryMimeTypes = buildUnnamed364();
     o.shortDescription = "foo";
     o.supportsCreate = true;
     o.supportsImport = true;
@@ -574,7 +574,7 @@
     unittest.expect(o.createInFolderTemplate, unittest.equals('foo'));
     unittest.expect(o.createUrl, unittest.equals('foo'));
     unittest.expect(o.hasDriveWideScope, unittest.isTrue);
-    checkUnnamed3552(o.icons);
+    checkUnnamed360(o.icons);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.installed, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -582,12 +582,12 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
     unittest.expect(o.openUrlTemplate, unittest.equals('foo'));
-    checkUnnamed3553(o.primaryFileExtensions);
-    checkUnnamed3554(o.primaryMimeTypes);
+    checkUnnamed361(o.primaryFileExtensions);
+    checkUnnamed362(o.primaryMimeTypes);
     unittest.expect(o.productId, unittest.equals('foo'));
     unittest.expect(o.productUrl, unittest.equals('foo'));
-    checkUnnamed3555(o.secondaryFileExtensions);
-    checkUnnamed3556(o.secondaryMimeTypes);
+    checkUnnamed363(o.secondaryFileExtensions);
+    checkUnnamed364(o.secondaryMimeTypes);
     unittest.expect(o.shortDescription, unittest.equals('foo'));
     unittest.expect(o.supportsCreate, unittest.isTrue);
     unittest.expect(o.supportsImport, unittest.isTrue);
@@ -598,27 +598,27 @@
   buildCounterApp--;
 }
 
-buildUnnamed3557() {
+buildUnnamed365() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3557(core.List<core.String> o) {
+checkUnnamed365(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3558() {
+buildUnnamed366() {
   var o = new core.List<api.App>();
   o.add(buildApp());
   o.add(buildApp());
   return o;
 }
 
-checkUnnamed3558(core.List<api.App> o) {
+checkUnnamed366(core.List<api.App> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApp(o[0]);
   checkApp(o[1]);
@@ -629,9 +629,9 @@
   var o = new api.AppList();
   buildCounterAppList++;
   if (buildCounterAppList < 3) {
-    o.defaultAppIds = buildUnnamed3557();
+    o.defaultAppIds = buildUnnamed365();
     o.etag = "foo";
-    o.items = buildUnnamed3558();
+    o.items = buildUnnamed366();
     o.kind = "foo";
     o.selfLink = "foo";
   }
@@ -642,9 +642,9 @@
 checkAppList(api.AppList o) {
   buildCounterAppList++;
   if (buildCounterAppList < 3) {
-    checkUnnamed3557(o.defaultAppIds);
+    checkUnnamed365(o.defaultAppIds);
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3558(o.items);
+    checkUnnamed366(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
@@ -689,14 +689,14 @@
   buildCounterChange--;
 }
 
-buildUnnamed3559() {
+buildUnnamed367() {
   var o = new core.List<api.Change>();
   o.add(buildChange());
   o.add(buildChange());
   return o;
 }
 
-checkUnnamed3559(core.List<api.Change> o) {
+checkUnnamed367(core.List<api.Change> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChange(o[0]);
   checkChange(o[1]);
@@ -708,7 +708,7 @@
   buildCounterChangeList++;
   if (buildCounterChangeList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3559();
+    o.items = buildUnnamed367();
     o.kind = "foo";
     o.largestChangeId = "foo";
     o.newStartPageToken = "foo";
@@ -724,7 +724,7 @@
   buildCounterChangeList++;
   if (buildCounterChangeList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3559(o.items);
+    checkUnnamed367(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.largestChangeId, unittest.equals('foo'));
     unittest.expect(o.newStartPageToken, unittest.equals('foo'));
@@ -735,14 +735,14 @@
   buildCounterChangeList--;
 }
 
-buildUnnamed3560() {
+buildUnnamed368() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3560(core.Map<core.String, core.String> o) {
+checkUnnamed368(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -757,7 +757,7 @@
     o.expiration = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.params = buildUnnamed3560();
+    o.params = buildUnnamed368();
     o.payload = true;
     o.resourceId = "foo";
     o.resourceUri = "foo";
@@ -775,7 +775,7 @@
     unittest.expect(o.expiration, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3560(o.params);
+    checkUnnamed368(o.params);
     unittest.expect(o.payload, unittest.isTrue);
     unittest.expect(o.resourceId, unittest.equals('foo'));
     unittest.expect(o.resourceUri, unittest.equals('foo'));
@@ -785,14 +785,14 @@
   buildCounterChannel--;
 }
 
-buildUnnamed3561() {
+buildUnnamed369() {
   var o = new core.List<api.ChildReference>();
   o.add(buildChildReference());
   o.add(buildChildReference());
   return o;
 }
 
-checkUnnamed3561(core.List<api.ChildReference> o) {
+checkUnnamed369(core.List<api.ChildReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChildReference(o[0]);
   checkChildReference(o[1]);
@@ -804,7 +804,7 @@
   buildCounterChildList++;
   if (buildCounterChildList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3561();
+    o.items = buildUnnamed369();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -818,7 +818,7 @@
   buildCounterChildList++;
   if (buildCounterChildList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3561(o.items);
+    checkUnnamed369(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -873,14 +873,14 @@
   buildCounterCommentContext--;
 }
 
-buildUnnamed3562() {
+buildUnnamed370() {
   var o = new core.List<api.CommentReply>();
   o.add(buildCommentReply());
   o.add(buildCommentReply());
   return o;
 }
 
-checkUnnamed3562(core.List<api.CommentReply> o) {
+checkUnnamed370(core.List<api.CommentReply> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommentReply(o[0]);
   checkCommentReply(o[1]);
@@ -903,7 +903,7 @@
     o.htmlContent = "foo";
     o.kind = "foo";
     o.modifiedDate = core.DateTime.parse("2002-02-27T14:01:02");
-    o.replies = buildUnnamed3562();
+    o.replies = buildUnnamed370();
     o.selfLink = "foo";
     o.status = "foo";
   }
@@ -928,21 +928,21 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.modifiedDate,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed3562(o.replies);
+    checkUnnamed370(o.replies);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
   }
   buildCounterComment--;
 }
 
-buildUnnamed3563() {
+buildUnnamed371() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed3563(core.List<api.Comment> o) {
+checkUnnamed371(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -953,7 +953,7 @@
   var o = new api.CommentList();
   buildCounterCommentList++;
   if (buildCounterCommentList < 3) {
-    o.items = buildUnnamed3563();
+    o.items = buildUnnamed371();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -966,7 +966,7 @@
 checkCommentList(api.CommentList o) {
   buildCounterCommentList++;
   if (buildCounterCommentList < 3) {
-    checkUnnamed3563(o.items);
+    checkUnnamed371(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -1012,14 +1012,14 @@
   buildCounterCommentReply--;
 }
 
-buildUnnamed3564() {
+buildUnnamed372() {
   var o = new core.List<api.CommentReply>();
   o.add(buildCommentReply());
   o.add(buildCommentReply());
   return o;
 }
 
-checkUnnamed3564(core.List<api.CommentReply> o) {
+checkUnnamed372(core.List<api.CommentReply> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommentReply(o[0]);
   checkCommentReply(o[1]);
@@ -1030,7 +1030,7 @@
   var o = new api.CommentReplyList();
   buildCounterCommentReplyList++;
   if (buildCounterCommentReplyList < 3) {
-    o.items = buildUnnamed3564();
+    o.items = buildUnnamed372();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -1043,7 +1043,7 @@
 checkCommentReplyList(api.CommentReplyList o) {
   buildCounterCommentReplyList++;
   if (buildCounterCommentReplyList < 3) {
-    checkUnnamed3564(o.items);
+    checkUnnamed372(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -1103,14 +1103,14 @@
   buildCounterFileCapabilities--;
 }
 
-buildUnnamed3565() {
+buildUnnamed373() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3565(core.Map<core.String, core.String> o) {
+checkUnnamed373(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1246,105 +1246,105 @@
   buildCounterFileLabels--;
 }
 
-buildUnnamed3566() {
+buildUnnamed374() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3566(core.Map<core.String, core.String> o) {
+checkUnnamed374(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed3567() {
+buildUnnamed375() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3567(core.List<core.String> o) {
+checkUnnamed375(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3568() {
+buildUnnamed376() {
   var o = new core.List<api.User>();
   o.add(buildUser());
   o.add(buildUser());
   return o;
 }
 
-checkUnnamed3568(core.List<api.User> o) {
+checkUnnamed376(core.List<api.User> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUser(o[0]);
   checkUser(o[1]);
 }
 
-buildUnnamed3569() {
+buildUnnamed377() {
   var o = new core.List<api.ParentReference>();
   o.add(buildParentReference());
   o.add(buildParentReference());
   return o;
 }
 
-checkUnnamed3569(core.List<api.ParentReference> o) {
+checkUnnamed377(core.List<api.ParentReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParentReference(o[0]);
   checkParentReference(o[1]);
 }
 
-buildUnnamed3570() {
+buildUnnamed378() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3570(core.List<core.String> o) {
+checkUnnamed378(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3571() {
+buildUnnamed379() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed3571(core.List<api.Permission> o) {
+checkUnnamed379(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
 }
 
-buildUnnamed3572() {
+buildUnnamed380() {
   var o = new core.List<api.Property>();
   o.add(buildProperty());
   o.add(buildProperty());
   return o;
 }
 
-checkUnnamed3572(core.List<api.Property> o) {
+checkUnnamed380(core.List<api.Property> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProperty(o[0]);
   checkProperty(o[1]);
 }
 
-buildUnnamed3573() {
+buildUnnamed381() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3573(core.List<core.String> o) {
+checkUnnamed381(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1413,7 +1413,7 @@
     o.embedLink = "foo";
     o.etag = "foo";
     o.explicitlyTrashed = true;
-    o.exportLinks = buildUnnamed3565();
+    o.exportLinks = buildUnnamed373();
     o.fileExtension = "foo";
     o.fileSize = "foo";
     o.folderColorRgb = "foo";
@@ -1436,22 +1436,22 @@
     o.mimeType = "foo";
     o.modifiedByMeDate = core.DateTime.parse("2002-02-27T14:01:02");
     o.modifiedDate = core.DateTime.parse("2002-02-27T14:01:02");
-    o.openWithLinks = buildUnnamed3566();
+    o.openWithLinks = buildUnnamed374();
     o.originalFilename = "foo";
     o.ownedByMe = true;
-    o.ownerNames = buildUnnamed3567();
-    o.owners = buildUnnamed3568();
-    o.parents = buildUnnamed3569();
-    o.permissionIds = buildUnnamed3570();
-    o.permissions = buildUnnamed3571();
-    o.properties = buildUnnamed3572();
+    o.ownerNames = buildUnnamed375();
+    o.owners = buildUnnamed376();
+    o.parents = buildUnnamed377();
+    o.permissionIds = buildUnnamed378();
+    o.permissions = buildUnnamed379();
+    o.properties = buildUnnamed380();
     o.quotaBytesUsed = "foo";
     o.selfLink = "foo";
     o.shareable = true;
     o.shared = true;
     o.sharedWithMeDate = core.DateTime.parse("2002-02-27T14:01:02");
     o.sharingUser = buildUser();
-    o.spaces = buildUnnamed3573();
+    o.spaces = buildUnnamed381();
     o.teamDriveId = "foo";
     o.thumbnail = buildFileThumbnail();
     o.thumbnailLink = "foo";
@@ -1488,7 +1488,7 @@
     unittest.expect(o.embedLink, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.explicitlyTrashed, unittest.isTrue);
-    checkUnnamed3565(o.exportLinks);
+    checkUnnamed373(o.exportLinks);
     unittest.expect(o.fileExtension, unittest.equals('foo'));
     unittest.expect(o.fileSize, unittest.equals('foo'));
     unittest.expect(o.folderColorRgb, unittest.equals('foo'));
@@ -1515,15 +1515,15 @@
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.modifiedDate,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed3566(o.openWithLinks);
+    checkUnnamed374(o.openWithLinks);
     unittest.expect(o.originalFilename, unittest.equals('foo'));
     unittest.expect(o.ownedByMe, unittest.isTrue);
-    checkUnnamed3567(o.ownerNames);
-    checkUnnamed3568(o.owners);
-    checkUnnamed3569(o.parents);
-    checkUnnamed3570(o.permissionIds);
-    checkUnnamed3571(o.permissions);
-    checkUnnamed3572(o.properties);
+    checkUnnamed375(o.ownerNames);
+    checkUnnamed376(o.owners);
+    checkUnnamed377(o.parents);
+    checkUnnamed378(o.permissionIds);
+    checkUnnamed379(o.permissions);
+    checkUnnamed380(o.properties);
     unittest.expect(o.quotaBytesUsed, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.shareable, unittest.isTrue);
@@ -1531,7 +1531,7 @@
     unittest.expect(o.sharedWithMeDate,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     checkUser(o.sharingUser);
-    checkUnnamed3573(o.spaces);
+    checkUnnamed381(o.spaces);
     unittest.expect(o.teamDriveId, unittest.equals('foo'));
     checkFileThumbnail(o.thumbnail);
     unittest.expect(o.thumbnailLink, unittest.equals('foo'));
@@ -1550,14 +1550,14 @@
   buildCounterFile--;
 }
 
-buildUnnamed3574() {
+buildUnnamed382() {
   var o = new core.List<api.File>();
   o.add(buildFile());
   o.add(buildFile());
   return o;
 }
 
-checkUnnamed3574(core.List<api.File> o) {
+checkUnnamed382(core.List<api.File> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFile(o[0]);
   checkFile(o[1]);
@@ -1570,7 +1570,7 @@
   if (buildCounterFileList < 3) {
     o.etag = "foo";
     o.incompleteSearch = true;
-    o.items = buildUnnamed3574();
+    o.items = buildUnnamed382();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -1585,7 +1585,7 @@
   if (buildCounterFileList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.incompleteSearch, unittest.isTrue);
-    checkUnnamed3574(o.items);
+    checkUnnamed382(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -1594,14 +1594,14 @@
   buildCounterFileList--;
 }
 
-buildUnnamed3575() {
+buildUnnamed383() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3575(core.List<core.String> o) {
+checkUnnamed383(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1612,7 +1612,7 @@
   var o = new api.GeneratedIds();
   buildCounterGeneratedIds++;
   if (buildCounterGeneratedIds < 3) {
-    o.ids = buildUnnamed3575();
+    o.ids = buildUnnamed383();
     o.kind = "foo";
     o.space = "foo";
   }
@@ -1623,21 +1623,21 @@
 checkGeneratedIds(api.GeneratedIds o) {
   buildCounterGeneratedIds++;
   if (buildCounterGeneratedIds < 3) {
-    checkUnnamed3575(o.ids);
+    checkUnnamed383(o.ids);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.space, unittest.equals('foo'));
   }
   buildCounterGeneratedIds--;
 }
 
-buildUnnamed3576() {
+buildUnnamed384() {
   var o = new core.List<api.ParentReference>();
   o.add(buildParentReference());
   o.add(buildParentReference());
   return o;
 }
 
-checkUnnamed3576(core.List<api.ParentReference> o) {
+checkUnnamed384(core.List<api.ParentReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParentReference(o[0]);
   checkParentReference(o[1]);
@@ -1649,7 +1649,7 @@
   buildCounterParentList++;
   if (buildCounterParentList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3576();
+    o.items = buildUnnamed384();
     o.kind = "foo";
     o.selfLink = "foo";
   }
@@ -1661,7 +1661,7 @@
   buildCounterParentList++;
   if (buildCounterParentList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3576(o.items);
+    checkUnnamed384(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
@@ -1695,27 +1695,27 @@
   buildCounterParentReference--;
 }
 
-buildUnnamed3577() {
+buildUnnamed385() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3577(core.List<core.String> o) {
+checkUnnamed385(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3578() {
+buildUnnamed386() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3578(core.List<core.String> o) {
+checkUnnamed386(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1726,7 +1726,7 @@
   var o = new api.PermissionTeamDrivePermissionDetails();
   buildCounterPermissionTeamDrivePermissionDetails++;
   if (buildCounterPermissionTeamDrivePermissionDetails < 3) {
-    o.additionalRoles = buildUnnamed3578();
+    o.additionalRoles = buildUnnamed386();
     o.inherited = true;
     o.inheritedFrom = "foo";
     o.role = "foo";
@@ -1740,7 +1740,7 @@
     api.PermissionTeamDrivePermissionDetails o) {
   buildCounterPermissionTeamDrivePermissionDetails++;
   if (buildCounterPermissionTeamDrivePermissionDetails < 3) {
-    checkUnnamed3578(o.additionalRoles);
+    checkUnnamed386(o.additionalRoles);
     unittest.expect(o.inherited, unittest.isTrue);
     unittest.expect(o.inheritedFrom, unittest.equals('foo'));
     unittest.expect(o.role, unittest.equals('foo'));
@@ -1749,14 +1749,14 @@
   buildCounterPermissionTeamDrivePermissionDetails--;
 }
 
-buildUnnamed3579() {
+buildUnnamed387() {
   var o = new core.List<api.PermissionTeamDrivePermissionDetails>();
   o.add(buildPermissionTeamDrivePermissionDetails());
   o.add(buildPermissionTeamDrivePermissionDetails());
   return o;
 }
 
-checkUnnamed3579(core.List<api.PermissionTeamDrivePermissionDetails> o) {
+checkUnnamed387(core.List<api.PermissionTeamDrivePermissionDetails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermissionTeamDrivePermissionDetails(o[0]);
   checkPermissionTeamDrivePermissionDetails(o[1]);
@@ -1767,7 +1767,7 @@
   var o = new api.Permission();
   buildCounterPermission++;
   if (buildCounterPermission < 3) {
-    o.additionalRoles = buildUnnamed3577();
+    o.additionalRoles = buildUnnamed385();
     o.authKey = "foo";
     o.deleted = true;
     o.domain = "foo";
@@ -1780,7 +1780,7 @@
     o.photoLink = "foo";
     o.role = "foo";
     o.selfLink = "foo";
-    o.teamDrivePermissionDetails = buildUnnamed3579();
+    o.teamDrivePermissionDetails = buildUnnamed387();
     o.type = "foo";
     o.value = "foo";
     o.withLink = true;
@@ -1792,7 +1792,7 @@
 checkPermission(api.Permission o) {
   buildCounterPermission++;
   if (buildCounterPermission < 3) {
-    checkUnnamed3577(o.additionalRoles);
+    checkUnnamed385(o.additionalRoles);
     unittest.expect(o.authKey, unittest.equals('foo'));
     unittest.expect(o.deleted, unittest.isTrue);
     unittest.expect(o.domain, unittest.equals('foo'));
@@ -1806,7 +1806,7 @@
     unittest.expect(o.photoLink, unittest.equals('foo'));
     unittest.expect(o.role, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed3579(o.teamDrivePermissionDetails);
+    checkUnnamed387(o.teamDrivePermissionDetails);
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
     unittest.expect(o.withLink, unittest.isTrue);
@@ -1835,14 +1835,14 @@
   buildCounterPermissionId--;
 }
 
-buildUnnamed3580() {
+buildUnnamed388() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed3580(core.List<api.Permission> o) {
+checkUnnamed388(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
@@ -1854,7 +1854,7 @@
   buildCounterPermissionList++;
   if (buildCounterPermissionList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3580();
+    o.items = buildUnnamed388();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1867,7 +1867,7 @@
   buildCounterPermissionList++;
   if (buildCounterPermissionList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3580(o.items);
+    checkUnnamed388(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1904,14 +1904,14 @@
   buildCounterProperty--;
 }
 
-buildUnnamed3581() {
+buildUnnamed389() {
   var o = new core.List<api.Property>();
   o.add(buildProperty());
   o.add(buildProperty());
   return o;
 }
 
-checkUnnamed3581(core.List<api.Property> o) {
+checkUnnamed389(core.List<api.Property> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProperty(o[0]);
   checkProperty(o[1]);
@@ -1923,7 +1923,7 @@
   buildCounterPropertyList++;
   if (buildCounterPropertyList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3581();
+    o.items = buildUnnamed389();
     o.kind = "foo";
     o.selfLink = "foo";
   }
@@ -1935,21 +1935,21 @@
   buildCounterPropertyList++;
   if (buildCounterPropertyList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3581(o.items);
+    checkUnnamed389(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
   buildCounterPropertyList--;
 }
 
-buildUnnamed3582() {
+buildUnnamed390() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3582(core.Map<core.String, core.String> o) {
+checkUnnamed390(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1962,7 +1962,7 @@
   if (buildCounterRevision < 3) {
     o.downloadUrl = "foo";
     o.etag = "foo";
-    o.exportLinks = buildUnnamed3582();
+    o.exportLinks = buildUnnamed390();
     o.fileSize = "foo";
     o.id = "foo";
     o.kind = "foo";
@@ -1988,7 +1988,7 @@
   if (buildCounterRevision < 3) {
     unittest.expect(o.downloadUrl, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3582(o.exportLinks);
+    checkUnnamed390(o.exportLinks);
     unittest.expect(o.fileSize, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -2009,14 +2009,14 @@
   buildCounterRevision--;
 }
 
-buildUnnamed3583() {
+buildUnnamed391() {
   var o = new core.List<api.Revision>();
   o.add(buildRevision());
   o.add(buildRevision());
   return o;
 }
 
-checkUnnamed3583(core.List<api.Revision> o) {
+checkUnnamed391(core.List<api.Revision> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRevision(o[0]);
   checkRevision(o[1]);
@@ -2028,7 +2028,7 @@
   buildCounterRevisionList++;
   if (buildCounterRevisionList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3583();
+    o.items = buildUnnamed391();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -2041,7 +2041,7 @@
   buildCounterRevisionList++;
   if (buildCounterRevisionList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3583(o.items);
+    checkUnnamed391(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -2176,14 +2176,14 @@
   buildCounterTeamDrive--;
 }
 
-buildUnnamed3584() {
+buildUnnamed392() {
   var o = new core.List<api.TeamDrive>();
   o.add(buildTeamDrive());
   o.add(buildTeamDrive());
   return o;
 }
 
-checkUnnamed3584(core.List<api.TeamDrive> o) {
+checkUnnamed392(core.List<api.TeamDrive> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTeamDrive(o[0]);
   checkTeamDrive(o[1]);
@@ -2194,7 +2194,7 @@
   var o = new api.TeamDriveList();
   buildCounterTeamDriveList++;
   if (buildCounterTeamDriveList < 3) {
-    o.items = buildUnnamed3584();
+    o.items = buildUnnamed392();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2205,7 +2205,7 @@
 checkTeamDriveList(api.TeamDriveList o) {
   buildCounterTeamDriveList++;
   if (buildCounterTeamDriveList < 3) {
-    checkUnnamed3584(o.items);
+    checkUnnamed392(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -2715,7 +2715,7 @@
               maxChangeIdCount: arg_maxChangeIdCount,
               startChangeId: arg_startChangeId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.About response) {
+          .then(unittest.expectAsync1(((response) {
         checkAbout(response);
       })));
     });
@@ -2773,7 +2773,7 @@
       }), true);
       res
           .get(arg_appId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.App response) {
+          .then(unittest.expectAsync1(((response) {
         checkApp(response);
       })));
     });
@@ -2838,7 +2838,7 @@
               appFilterMimeTypes: arg_appFilterMimeTypes,
               languageCode: arg_languageCode,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AppList response) {
+          .then(unittest.expectAsync1(((response) {
         checkAppList(response);
       })));
     });
@@ -2905,7 +2905,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               teamDriveId: arg_teamDriveId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Change response) {
+          .then(unittest.expectAsync1(((response) {
         checkChange(response);
       })));
     });
@@ -2966,7 +2966,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               teamDriveId: arg_teamDriveId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StartPageToken response) {
+          .then(unittest.expectAsync1(((response) {
         checkStartPageToken(response);
       })));
     });
@@ -3058,7 +3058,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               teamDriveId: arg_teamDriveId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChangeList response) {
+          .then(unittest.expectAsync1(((response) {
         checkChangeList(response);
       })));
     });
@@ -3154,7 +3154,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               teamDriveId: arg_teamDriveId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
@@ -3342,7 +3342,7 @@
       }), true);
       res
           .get(arg_folderId, arg_childId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChildReference response) {
+          .then(unittest.expectAsync1(((response) {
         checkChildReference(response);
       })));
     });
@@ -3412,7 +3412,7 @@
       res
           .insert(arg_request, arg_folderId,
               supportsTeamDrives: arg_supportsTeamDrives, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChildReference response) {
+          .then(unittest.expectAsync1(((response) {
         checkChildReference(response);
       })));
     });
@@ -3490,7 +3490,7 @@
               pageToken: arg_pageToken,
               q: arg_q,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChildList response) {
+          .then(unittest.expectAsync1(((response) {
         checkChildList(response);
       })));
     });
@@ -3626,7 +3626,7 @@
       res
           .get(arg_fileId, arg_commentId,
               includeDeleted: arg_includeDeleted, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -3692,7 +3692,7 @@
       }), true);
       res
           .insert(arg_request, arg_fileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -3771,7 +3771,7 @@
               pageToken: arg_pageToken,
               updatedMin: arg_updatedMin,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentList response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentList(response);
       })));
     });
@@ -3841,7 +3841,7 @@
       }), true);
       res
           .patch(arg_request, arg_fileId, arg_commentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -3911,7 +3911,7 @@
       }), true);
       res
           .update(arg_request, arg_fileId, arg_commentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -4011,7 +4011,7 @@
               timedTextTrackName: arg_timedTextTrackName,
               visibility: arg_visibility,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -4243,7 +4243,7 @@
               maxResults: arg_maxResults,
               space: arg_space,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GeneratedIds response) {
+          .then(unittest.expectAsync1(((response) {
         checkGeneratedIds(response);
       })));
     });
@@ -4323,7 +4323,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               updateViewedDate: arg_updateViewedDate,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -4418,7 +4418,7 @@
               useContentAsIndexableText: arg_useContentAsIndexableText,
               visibility: arg_visibility,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -4512,7 +4512,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               teamDriveId: arg_teamDriveId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FileList response) {
+          .then(unittest.expectAsync1(((response) {
         checkFileList(response);
       })));
     });
@@ -4628,7 +4628,7 @@
               updateViewedDate: arg_updateViewedDate,
               useContentAsIndexableText: arg_useContentAsIndexableText,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -4694,7 +4694,7 @@
       res
           .touch(arg_fileId,
               supportsTeamDrives: arg_supportsTeamDrives, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -4760,7 +4760,7 @@
       res
           .trash(arg_fileId,
               supportsTeamDrives: arg_supportsTeamDrives, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -4826,7 +4826,7 @@
       res
           .untrash(arg_fileId,
               supportsTeamDrives: arg_supportsTeamDrives, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -4945,7 +4945,7 @@
               updateViewedDate: arg_updateViewedDate,
               useContentAsIndexableText: arg_useContentAsIndexableText,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -5035,7 +5035,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               updateViewedDate: arg_updateViewedDate,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
@@ -5167,7 +5167,7 @@
       }), true);
       res
           .get(arg_fileId, arg_parentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ParentReference response) {
+          .then(unittest.expectAsync1(((response) {
         checkParentReference(response);
       })));
     });
@@ -5237,7 +5237,7 @@
       res
           .insert(arg_request, arg_fileId,
               supportsTeamDrives: arg_supportsTeamDrives, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ParentReference response) {
+          .then(unittest.expectAsync1(((response) {
         checkParentReference(response);
       })));
     });
@@ -5299,7 +5299,7 @@
       }), true);
       res
           .list(arg_fileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ParentList response) {
+          .then(unittest.expectAsync1(((response) {
         checkParentList(response);
       })));
     });
@@ -5449,7 +5449,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Permission response) {
+          .then(unittest.expectAsync1(((response) {
         checkPermission(response);
       })));
     });
@@ -5505,7 +5505,7 @@
       }), true);
       res
           .getIdForEmail(arg_email, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PermissionId response) {
+          .then(unittest.expectAsync1(((response) {
         checkPermissionId(response);
       })));
     });
@@ -5588,7 +5588,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Permission response) {
+          .then(unittest.expectAsync1(((response) {
         checkPermission(response);
       })));
     });
@@ -5667,7 +5667,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PermissionList response) {
+          .then(unittest.expectAsync1(((response) {
         checkPermissionList(response);
       })));
     });
@@ -5754,7 +5754,7 @@
               transferOwnership: arg_transferOwnership,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Permission response) {
+          .then(unittest.expectAsync1(((response) {
         checkPermission(response);
       })));
     });
@@ -5841,7 +5841,7 @@
               transferOwnership: arg_transferOwnership,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Permission response) {
+          .then(unittest.expectAsync1(((response) {
         checkPermission(response);
       })));
     });
@@ -5981,7 +5981,7 @@
       res
           .get(arg_fileId, arg_propertyKey,
               visibility: arg_visibility, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Property response) {
+          .then(unittest.expectAsync1(((response) {
         checkProperty(response);
       })));
     });
@@ -6047,7 +6047,7 @@
       }), true);
       res
           .insert(arg_request, arg_fileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Property response) {
+          .then(unittest.expectAsync1(((response) {
         checkProperty(response);
       })));
     });
@@ -6109,7 +6109,7 @@
       }), true);
       res
           .list(arg_fileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PropertyList response) {
+          .then(unittest.expectAsync1(((response) {
         checkPropertyList(response);
       })));
     });
@@ -6183,7 +6183,7 @@
       res
           .patch(arg_request, arg_fileId, arg_propertyKey,
               visibility: arg_visibility, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Property response) {
+          .then(unittest.expectAsync1(((response) {
         checkProperty(response);
       })));
     });
@@ -6257,7 +6257,7 @@
       res
           .update(arg_request, arg_fileId, arg_propertyKey,
               visibility: arg_visibility, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Property response) {
+          .then(unittest.expectAsync1(((response) {
         checkProperty(response);
       })));
     });
@@ -6548,7 +6548,7 @@
       res
           .get(arg_fileId, arg_commentId, arg_replyId,
               includeDeleted: arg_includeDeleted, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentReply response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentReply(response);
       })));
     });
@@ -6624,7 +6624,7 @@
       }), true);
       res
           .insert(arg_request, arg_fileId, arg_commentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentReply response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentReply(response);
       })));
     });
@@ -6709,7 +6709,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentReplyList response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentReplyList(response);
       })));
     });
@@ -6790,7 +6790,7 @@
       res
           .patch(arg_request, arg_fileId, arg_commentId, arg_replyId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentReply response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentReply(response);
       })));
     });
@@ -6871,7 +6871,7 @@
       res
           .update(arg_request, arg_fileId, arg_commentId, arg_replyId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentReply response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentReply(response);
       })));
     });
@@ -7003,7 +7003,7 @@
       }), true);
       res
           .get(arg_fileId, arg_revisionId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Revision response) {
+          .then(unittest.expectAsync1(((response) {
         checkRevision(response);
       })));
     });
@@ -7074,7 +7074,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RevisionList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRevisionList(response);
       })));
     });
@@ -7144,7 +7144,7 @@
       }), true);
       res
           .patch(arg_request, arg_fileId, arg_revisionId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Revision response) {
+          .then(unittest.expectAsync1(((response) {
         checkRevision(response);
       })));
     });
@@ -7214,7 +7214,7 @@
       }), true);
       res
           .update(arg_request, arg_fileId, arg_revisionId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Revision response) {
+          .then(unittest.expectAsync1(((response) {
         checkRevision(response);
       })));
     });
@@ -7331,7 +7331,7 @@
           .get(arg_teamDriveId,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TeamDrive response) {
+          .then(unittest.expectAsync1(((response) {
         checkTeamDrive(response);
       })));
     });
@@ -7390,7 +7390,7 @@
       }), true);
       res
           .insert(arg_request, arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TeamDrive response) {
+          .then(unittest.expectAsync1(((response) {
         checkTeamDrive(response);
       })));
     });
@@ -7458,7 +7458,7 @@
               q: arg_q,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TeamDriveList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTeamDriveList(response);
       })));
     });
@@ -7518,7 +7518,7 @@
       }), true);
       res
           .update(arg_request, arg_teamDriveId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TeamDrive response) {
+          .then(unittest.expectAsync1(((response) {
         checkTeamDrive(response);
       })));
     });
diff --git a/generated/googleapis/test/drive/v3_test.dart b/generated/googleapis/test/drive/v3_test.dart
index e59ac27..0368644 100644
--- a/generated/googleapis/test/drive/v3_test.dart
+++ b/generated/googleapis/test/drive/v3_test.dart
@@ -50,79 +50,79 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2827() {
+buildUnnamed2694() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2827(core.List<core.String> o) {
+checkUnnamed2694(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2828() {
+buildUnnamed2695() {
   var o = new core.Map<core.String, core.List<core.String>>();
-  o["x"] = buildUnnamed2827();
-  o["y"] = buildUnnamed2827();
+  o["x"] = buildUnnamed2694();
+  o["y"] = buildUnnamed2694();
   return o;
 }
 
-checkUnnamed2828(core.Map<core.String, core.List<core.String>> o) {
+checkUnnamed2695(core.Map<core.String, core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2827(o["x"]);
-  checkUnnamed2827(o["y"]);
+  checkUnnamed2694(o["x"]);
+  checkUnnamed2694(o["y"]);
 }
 
-buildUnnamed2829() {
+buildUnnamed2696() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2829(core.List<core.String> o) {
+checkUnnamed2696(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2830() {
+buildUnnamed2697() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2830(core.List<core.String> o) {
+checkUnnamed2697(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2831() {
+buildUnnamed2698() {
   var o = new core.Map<core.String, core.List<core.String>>();
-  o["x"] = buildUnnamed2830();
-  o["y"] = buildUnnamed2830();
+  o["x"] = buildUnnamed2697();
+  o["y"] = buildUnnamed2697();
   return o;
 }
 
-checkUnnamed2831(core.Map<core.String, core.List<core.String>> o) {
+checkUnnamed2698(core.Map<core.String, core.List<core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2830(o["x"]);
-  checkUnnamed2830(o["y"]);
+  checkUnnamed2697(o["x"]);
+  checkUnnamed2697(o["y"]);
 }
 
-buildUnnamed2832() {
+buildUnnamed2699() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2832(core.Map<core.String, core.String> o) {
+checkUnnamed2699(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -176,14 +176,14 @@
   buildCounterAboutTeamDriveThemes--;
 }
 
-buildUnnamed2833() {
+buildUnnamed2700() {
   var o = new core.List<api.AboutTeamDriveThemes>();
   o.add(buildAboutTeamDriveThemes());
   o.add(buildAboutTeamDriveThemes());
   return o;
 }
 
-checkUnnamed2833(core.List<api.AboutTeamDriveThemes> o) {
+checkUnnamed2700(core.List<api.AboutTeamDriveThemes> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAboutTeamDriveThemes(o[0]);
   checkAboutTeamDriveThemes(o[1]);
@@ -196,14 +196,14 @@
   if (buildCounterAbout < 3) {
     o.appInstalled = true;
     o.canCreateTeamDrives = true;
-    o.exportFormats = buildUnnamed2828();
-    o.folderColorPalette = buildUnnamed2829();
-    o.importFormats = buildUnnamed2831();
+    o.exportFormats = buildUnnamed2695();
+    o.folderColorPalette = buildUnnamed2696();
+    o.importFormats = buildUnnamed2698();
     o.kind = "foo";
-    o.maxImportSizes = buildUnnamed2832();
+    o.maxImportSizes = buildUnnamed2699();
     o.maxUploadSize = "foo";
     o.storageQuota = buildAboutStorageQuota();
-    o.teamDriveThemes = buildUnnamed2833();
+    o.teamDriveThemes = buildUnnamed2700();
     o.user = buildUser();
   }
   buildCounterAbout--;
@@ -215,14 +215,14 @@
   if (buildCounterAbout < 3) {
     unittest.expect(o.appInstalled, unittest.isTrue);
     unittest.expect(o.canCreateTeamDrives, unittest.isTrue);
-    checkUnnamed2828(o.exportFormats);
-    checkUnnamed2829(o.folderColorPalette);
-    checkUnnamed2831(o.importFormats);
+    checkUnnamed2695(o.exportFormats);
+    checkUnnamed2696(o.folderColorPalette);
+    checkUnnamed2698(o.importFormats);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2832(o.maxImportSizes);
+    checkUnnamed2699(o.maxImportSizes);
     unittest.expect(o.maxUploadSize, unittest.equals('foo'));
     checkAboutStorageQuota(o.storageQuota);
-    checkUnnamed2833(o.teamDriveThemes);
+    checkUnnamed2700(o.teamDriveThemes);
     checkUser(o.user);
   }
   buildCounterAbout--;
@@ -262,14 +262,14 @@
   buildCounterChange--;
 }
 
-buildUnnamed2834() {
+buildUnnamed2701() {
   var o = new core.List<api.Change>();
   o.add(buildChange());
   o.add(buildChange());
   return o;
 }
 
-checkUnnamed2834(core.List<api.Change> o) {
+checkUnnamed2701(core.List<api.Change> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChange(o[0]);
   checkChange(o[1]);
@@ -280,7 +280,7 @@
   var o = new api.ChangeList();
   buildCounterChangeList++;
   if (buildCounterChangeList < 3) {
-    o.changes = buildUnnamed2834();
+    o.changes = buildUnnamed2701();
     o.kind = "foo";
     o.newStartPageToken = "foo";
     o.nextPageToken = "foo";
@@ -292,7 +292,7 @@
 checkChangeList(api.ChangeList o) {
   buildCounterChangeList++;
   if (buildCounterChangeList < 3) {
-    checkUnnamed2834(o.changes);
+    checkUnnamed2701(o.changes);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.newStartPageToken, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -300,14 +300,14 @@
   buildCounterChangeList--;
 }
 
-buildUnnamed2835() {
+buildUnnamed2702() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2835(core.Map<core.String, core.String> o) {
+checkUnnamed2702(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -322,7 +322,7 @@
     o.expiration = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.params = buildUnnamed2835();
+    o.params = buildUnnamed2702();
     o.payload = true;
     o.resourceId = "foo";
     o.resourceUri = "foo";
@@ -340,7 +340,7 @@
     unittest.expect(o.expiration, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2835(o.params);
+    checkUnnamed2702(o.params);
     unittest.expect(o.payload, unittest.isTrue);
     unittest.expect(o.resourceId, unittest.equals('foo'));
     unittest.expect(o.resourceUri, unittest.equals('foo'));
@@ -371,14 +371,14 @@
   buildCounterCommentQuotedFileContent--;
 }
 
-buildUnnamed2836() {
+buildUnnamed2703() {
   var o = new core.List<api.Reply>();
   o.add(buildReply());
   o.add(buildReply());
   return o;
 }
 
-checkUnnamed2836(core.List<api.Reply> o) {
+checkUnnamed2703(core.List<api.Reply> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReply(o[0]);
   checkReply(o[1]);
@@ -399,7 +399,7 @@
     o.kind = "foo";
     o.modifiedTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.quotedFileContent = buildCommentQuotedFileContent();
-    o.replies = buildUnnamed2836();
+    o.replies = buildUnnamed2703();
     o.resolved = true;
   }
   buildCounterComment--;
@@ -421,20 +421,20 @@
     unittest.expect(o.modifiedTime,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     checkCommentQuotedFileContent(o.quotedFileContent);
-    checkUnnamed2836(o.replies);
+    checkUnnamed2703(o.replies);
     unittest.expect(o.resolved, unittest.isTrue);
   }
   buildCounterComment--;
 }
 
-buildUnnamed2837() {
+buildUnnamed2704() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed2837(core.List<api.Comment> o) {
+checkUnnamed2704(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -445,7 +445,7 @@
   var o = new api.CommentList();
   buildCounterCommentList++;
   if (buildCounterCommentList < 3) {
-    o.comments = buildUnnamed2837();
+    o.comments = buildUnnamed2704();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -456,21 +456,21 @@
 checkCommentList(api.CommentList o) {
   buildCounterCommentList++;
   if (buildCounterCommentList < 3) {
-    checkUnnamed2837(o.comments);
+    checkUnnamed2704(o.comments);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterCommentList--;
 }
 
-buildUnnamed2838() {
+buildUnnamed2705() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2838(core.Map<core.String, core.String> o) {
+checkUnnamed2705(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -651,79 +651,79 @@
   buildCounterFileImageMediaMetadata--;
 }
 
-buildUnnamed2839() {
+buildUnnamed2706() {
   var o = new core.List<api.User>();
   o.add(buildUser());
   o.add(buildUser());
   return o;
 }
 
-checkUnnamed2839(core.List<api.User> o) {
+checkUnnamed2706(core.List<api.User> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUser(o[0]);
   checkUser(o[1]);
 }
 
-buildUnnamed2840() {
+buildUnnamed2707() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2840(core.List<core.String> o) {
+checkUnnamed2707(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2841() {
+buildUnnamed2708() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2841(core.List<core.String> o) {
+checkUnnamed2708(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2842() {
+buildUnnamed2709() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed2842(core.List<api.Permission> o) {
+checkUnnamed2709(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
 }
 
-buildUnnamed2843() {
+buildUnnamed2710() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2843(core.Map<core.String, core.String> o) {
+checkUnnamed2710(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed2844() {
+buildUnnamed2711() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2844(core.List<core.String> o) {
+checkUnnamed2711(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -757,7 +757,7 @@
   var o = new api.File();
   buildCounterFile++;
   if (buildCounterFile < 3) {
-    o.appProperties = buildUnnamed2838();
+    o.appProperties = buildUnnamed2705();
     o.capabilities = buildFileCapabilities();
     o.contentHints = buildFileContentHints();
     o.createdTime = core.DateTime.parse("2002-02-27T14:01:02");
@@ -783,17 +783,17 @@
     o.name = "foo";
     o.originalFilename = "foo";
     o.ownedByMe = true;
-    o.owners = buildUnnamed2839();
-    o.parents = buildUnnamed2840();
-    o.permissionIds = buildUnnamed2841();
-    o.permissions = buildUnnamed2842();
-    o.properties = buildUnnamed2843();
+    o.owners = buildUnnamed2706();
+    o.parents = buildUnnamed2707();
+    o.permissionIds = buildUnnamed2708();
+    o.permissions = buildUnnamed2709();
+    o.properties = buildUnnamed2710();
     o.quotaBytesUsed = "foo";
     o.shared = true;
     o.sharedWithMeTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.sharingUser = buildUser();
     o.size = "foo";
-    o.spaces = buildUnnamed2844();
+    o.spaces = buildUnnamed2711();
     o.starred = true;
     o.teamDriveId = "foo";
     o.thumbnailLink = "foo";
@@ -817,7 +817,7 @@
 checkFile(api.File o) {
   buildCounterFile++;
   if (buildCounterFile < 3) {
-    checkUnnamed2838(o.appProperties);
+    checkUnnamed2705(o.appProperties);
     checkFileCapabilities(o.capabilities);
     checkFileContentHints(o.contentHints);
     unittest.expect(o.createdTime,
@@ -846,18 +846,18 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.originalFilename, unittest.equals('foo'));
     unittest.expect(o.ownedByMe, unittest.isTrue);
-    checkUnnamed2839(o.owners);
-    checkUnnamed2840(o.parents);
-    checkUnnamed2841(o.permissionIds);
-    checkUnnamed2842(o.permissions);
-    checkUnnamed2843(o.properties);
+    checkUnnamed2706(o.owners);
+    checkUnnamed2707(o.parents);
+    checkUnnamed2708(o.permissionIds);
+    checkUnnamed2709(o.permissions);
+    checkUnnamed2710(o.properties);
     unittest.expect(o.quotaBytesUsed, unittest.equals('foo'));
     unittest.expect(o.shared, unittest.isTrue);
     unittest.expect(o.sharedWithMeTime,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     checkUser(o.sharingUser);
     unittest.expect(o.size, unittest.equals('foo'));
-    checkUnnamed2844(o.spaces);
+    checkUnnamed2711(o.spaces);
     unittest.expect(o.starred, unittest.isTrue);
     unittest.expect(o.teamDriveId, unittest.equals('foo'));
     unittest.expect(o.thumbnailLink, unittest.equals('foo'));
@@ -879,14 +879,14 @@
   buildCounterFile--;
 }
 
-buildUnnamed2845() {
+buildUnnamed2712() {
   var o = new core.List<api.File>();
   o.add(buildFile());
   o.add(buildFile());
   return o;
 }
 
-checkUnnamed2845(core.List<api.File> o) {
+checkUnnamed2712(core.List<api.File> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFile(o[0]);
   checkFile(o[1]);
@@ -897,7 +897,7 @@
   var o = new api.FileList();
   buildCounterFileList++;
   if (buildCounterFileList < 3) {
-    o.files = buildUnnamed2845();
+    o.files = buildUnnamed2712();
     o.incompleteSearch = true;
     o.kind = "foo";
     o.nextPageToken = "foo";
@@ -909,7 +909,7 @@
 checkFileList(api.FileList o) {
   buildCounterFileList++;
   if (buildCounterFileList < 3) {
-    checkUnnamed2845(o.files);
+    checkUnnamed2712(o.files);
     unittest.expect(o.incompleteSearch, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -917,14 +917,14 @@
   buildCounterFileList--;
 }
 
-buildUnnamed2846() {
+buildUnnamed2713() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2846(core.List<core.String> o) {
+checkUnnamed2713(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -935,7 +935,7 @@
   var o = new api.GeneratedIds();
   buildCounterGeneratedIds++;
   if (buildCounterGeneratedIds < 3) {
-    o.ids = buildUnnamed2846();
+    o.ids = buildUnnamed2713();
     o.kind = "foo";
     o.space = "foo";
   }
@@ -946,7 +946,7 @@
 checkGeneratedIds(api.GeneratedIds o) {
   buildCounterGeneratedIds++;
   if (buildCounterGeneratedIds < 3) {
-    checkUnnamed2846(o.ids);
+    checkUnnamed2713(o.ids);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.space, unittest.equals('foo'));
   }
@@ -979,14 +979,14 @@
   buildCounterPermissionTeamDrivePermissionDetails--;
 }
 
-buildUnnamed2847() {
+buildUnnamed2714() {
   var o = new core.List<api.PermissionTeamDrivePermissionDetails>();
   o.add(buildPermissionTeamDrivePermissionDetails());
   o.add(buildPermissionTeamDrivePermissionDetails());
   return o;
 }
 
-checkUnnamed2847(core.List<api.PermissionTeamDrivePermissionDetails> o) {
+checkUnnamed2714(core.List<api.PermissionTeamDrivePermissionDetails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermissionTeamDrivePermissionDetails(o[0]);
   checkPermissionTeamDrivePermissionDetails(o[1]);
@@ -1007,7 +1007,7 @@
     o.kind = "foo";
     o.photoLink = "foo";
     o.role = "foo";
-    o.teamDrivePermissionDetails = buildUnnamed2847();
+    o.teamDrivePermissionDetails = buildUnnamed2714();
     o.type = "foo";
   }
   buildCounterPermission--;
@@ -1028,20 +1028,20 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.photoLink, unittest.equals('foo'));
     unittest.expect(o.role, unittest.equals('foo'));
-    checkUnnamed2847(o.teamDrivePermissionDetails);
+    checkUnnamed2714(o.teamDrivePermissionDetails);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterPermission--;
 }
 
-buildUnnamed2848() {
+buildUnnamed2715() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed2848(core.List<api.Permission> o) {
+checkUnnamed2715(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
@@ -1054,7 +1054,7 @@
   if (buildCounterPermissionList < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.permissions = buildUnnamed2848();
+    o.permissions = buildUnnamed2715();
   }
   buildCounterPermissionList--;
   return o;
@@ -1065,7 +1065,7 @@
   if (buildCounterPermissionList < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2848(o.permissions);
+    checkUnnamed2715(o.permissions);
   }
   buildCounterPermissionList--;
 }
@@ -1107,14 +1107,14 @@
   buildCounterReply--;
 }
 
-buildUnnamed2849() {
+buildUnnamed2716() {
   var o = new core.List<api.Reply>();
   o.add(buildReply());
   o.add(buildReply());
   return o;
 }
 
-checkUnnamed2849(core.List<api.Reply> o) {
+checkUnnamed2716(core.List<api.Reply> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReply(o[0]);
   checkReply(o[1]);
@@ -1127,7 +1127,7 @@
   if (buildCounterReplyList < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.replies = buildUnnamed2849();
+    o.replies = buildUnnamed2716();
   }
   buildCounterReplyList--;
   return o;
@@ -1138,7 +1138,7 @@
   if (buildCounterReplyList < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2849(o.replies);
+    checkUnnamed2716(o.replies);
   }
   buildCounterReplyList--;
 }
@@ -1185,14 +1185,14 @@
   buildCounterRevision--;
 }
 
-buildUnnamed2850() {
+buildUnnamed2717() {
   var o = new core.List<api.Revision>();
   o.add(buildRevision());
   o.add(buildRevision());
   return o;
 }
 
-checkUnnamed2850(core.List<api.Revision> o) {
+checkUnnamed2717(core.List<api.Revision> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRevision(o[0]);
   checkRevision(o[1]);
@@ -1205,7 +1205,7 @@
   if (buildCounterRevisionList < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.revisions = buildUnnamed2850();
+    o.revisions = buildUnnamed2717();
   }
   buildCounterRevisionList--;
   return o;
@@ -1216,7 +1216,7 @@
   if (buildCounterRevisionList < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2850(o.revisions);
+    checkUnnamed2717(o.revisions);
   }
   buildCounterRevisionList--;
 }
@@ -1348,14 +1348,14 @@
   buildCounterTeamDrive--;
 }
 
-buildUnnamed2851() {
+buildUnnamed2718() {
   var o = new core.List<api.TeamDrive>();
   o.add(buildTeamDrive());
   o.add(buildTeamDrive());
   return o;
 }
 
-checkUnnamed2851(core.List<api.TeamDrive> o) {
+checkUnnamed2718(core.List<api.TeamDrive> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTeamDrive(o[0]);
   checkTeamDrive(o[1]);
@@ -1368,7 +1368,7 @@
   if (buildCounterTeamDriveList < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.teamDrives = buildUnnamed2851();
+    o.teamDrives = buildUnnamed2718();
   }
   buildCounterTeamDriveList--;
   return o;
@@ -1379,7 +1379,7 @@
   if (buildCounterTeamDriveList < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2851(o.teamDrives);
+    checkUnnamed2718(o.teamDrives);
   }
   buildCounterTeamDriveList--;
 }
@@ -1709,9 +1709,7 @@
         var resp = convert.JSON.encode(buildAbout());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .get($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.About response) {
+      res.get($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkAbout(response);
       })));
     });
@@ -1774,7 +1772,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               teamDriveId: arg_teamDriveId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StartPageToken response) {
+          .then(unittest.expectAsync1(((response) {
         checkStartPageToken(response);
       })));
     });
@@ -1861,7 +1859,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               teamDriveId: arg_teamDriveId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChangeList response) {
+          .then(unittest.expectAsync1(((response) {
         checkChangeList(response);
       })));
     });
@@ -1952,7 +1950,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               teamDriveId: arg_teamDriveId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
@@ -2076,7 +2074,7 @@
       }), true);
       res
           .create(arg_request, arg_fileId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -2210,7 +2208,7 @@
       res
           .get(arg_fileId, arg_commentId,
               includeDeleted: arg_includeDeleted, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -2289,7 +2287,7 @@
               pageToken: arg_pageToken,
               startModifiedTime: arg_startModifiedTime,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentList response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentList(response);
       })));
     });
@@ -2359,7 +2357,7 @@
       }), true);
       res
           .update(arg_request, arg_fileId, arg_commentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -2444,7 +2442,7 @@
               ocrLanguage: arg_ocrLanguage,
               supportsTeamDrives: arg_supportsTeamDrives,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -2524,7 +2522,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               useContentAsIndexableText: arg_useContentAsIndexableText,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -2753,7 +2751,7 @@
       }), true);
       res
           .generateIds(count: arg_count, space: arg_space, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GeneratedIds response) {
+          .then(unittest.expectAsync1(((response) {
         checkGeneratedIds(response);
       })));
     });
@@ -2821,7 +2819,7 @@
               acknowledgeAbuse: arg_acknowledgeAbuse,
               supportsTeamDrives: arg_supportsTeamDrives,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -2911,7 +2909,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               teamDriveId: arg_teamDriveId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FileList response) {
+          .then(unittest.expectAsync1(((response) {
         checkFileList(response);
       })));
     });
@@ -2999,7 +2997,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               useContentAsIndexableText: arg_useContentAsIndexableText,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.File response) {
+          .then(unittest.expectAsync1(((response) {
         checkFile(response);
       })));
     });
@@ -3077,7 +3075,7 @@
               acknowledgeAbuse: arg_acknowledgeAbuse,
               supportsTeamDrives: arg_supportsTeamDrives,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
@@ -3166,7 +3164,7 @@
               transferOwnership: arg_transferOwnership,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Permission response) {
+          .then(unittest.expectAsync1(((response) {
         checkPermission(response);
       })));
     });
@@ -3314,7 +3312,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Permission response) {
+          .then(unittest.expectAsync1(((response) {
         checkPermission(response);
       })));
     });
@@ -3393,7 +3391,7 @@
               supportsTeamDrives: arg_supportsTeamDrives,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PermissionList response) {
+          .then(unittest.expectAsync1(((response) {
         checkPermissionList(response);
       })));
     });
@@ -3480,7 +3478,7 @@
               transferOwnership: arg_transferOwnership,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Permission response) {
+          .then(unittest.expectAsync1(((response) {
         checkPermission(response);
       })));
     });
@@ -3558,7 +3556,7 @@
       }), true);
       res
           .create(arg_request, arg_fileId, arg_commentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Reply response) {
+          .then(unittest.expectAsync1(((response) {
         checkReply(response);
       })));
     });
@@ -3712,7 +3710,7 @@
       res
           .get(arg_fileId, arg_commentId, arg_replyId,
               includeDeleted: arg_includeDeleted, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Reply response) {
+          .then(unittest.expectAsync1(((response) {
         checkReply(response);
       })));
     });
@@ -3797,7 +3795,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReplyList response) {
+          .then(unittest.expectAsync1(((response) {
         checkReplyList(response);
       })));
     });
@@ -3878,7 +3876,7 @@
       res
           .update(arg_request, arg_fileId, arg_commentId, arg_replyId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Reply response) {
+          .then(unittest.expectAsync1(((response) {
         checkReply(response);
       })));
     });
@@ -4017,7 +4015,7 @@
       res
           .get(arg_fileId, arg_revisionId,
               acknowledgeAbuse: arg_acknowledgeAbuse, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Revision response) {
+          .then(unittest.expectAsync1(((response) {
         checkRevision(response);
       })));
     });
@@ -4088,7 +4086,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RevisionList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRevisionList(response);
       })));
     });
@@ -4158,7 +4156,7 @@
       }), true);
       res
           .update(arg_request, arg_fileId, arg_revisionId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Revision response) {
+          .then(unittest.expectAsync1(((response) {
         checkRevision(response);
       })));
     });
@@ -4219,7 +4217,7 @@
       }), true);
       res
           .create(arg_request, arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TeamDrive response) {
+          .then(unittest.expectAsync1(((response) {
         checkTeamDrive(response);
       })));
     });
@@ -4334,7 +4332,7 @@
           .get(arg_teamDriveId,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TeamDrive response) {
+          .then(unittest.expectAsync1(((response) {
         checkTeamDrive(response);
       })));
     });
@@ -4402,7 +4400,7 @@
               q: arg_q,
               useDomainAdminAccess: arg_useDomainAdminAccess,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TeamDriveList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTeamDriveList(response);
       })));
     });
@@ -4462,7 +4460,7 @@
       }), true);
       res
           .update(arg_request, arg_teamDriveId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TeamDrive response) {
+          .then(unittest.expectAsync1(((response) {
         checkTeamDrive(response);
       })));
     });
diff --git a/generated/googleapis/test/firebasedynamiclinks/v1_test.dart b/generated/googleapis/test/firebasedynamiclinks/v1_test.dart
index 854c51e..3c997ce 100644
--- a/generated/googleapis/test/firebasedynamiclinks/v1_test.dart
+++ b/generated/googleapis/test/firebasedynamiclinks/v1_test.dart
@@ -119,14 +119,14 @@
   buildCounterCreateShortDynamicLinkRequest--;
 }
 
-buildUnnamed1516() {
+buildUnnamed1651() {
   var o = new core.List<api.DynamicLinkWarning>();
   o.add(buildDynamicLinkWarning());
   o.add(buildDynamicLinkWarning());
   return o;
 }
 
-checkUnnamed1516(core.List<api.DynamicLinkWarning> o) {
+checkUnnamed1651(core.List<api.DynamicLinkWarning> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDynamicLinkWarning(o[0]);
   checkDynamicLinkWarning(o[1]);
@@ -139,7 +139,7 @@
   if (buildCounterCreateShortDynamicLinkResponse < 3) {
     o.previewLink = "foo";
     o.shortLink = "foo";
-    o.warning = buildUnnamed1516();
+    o.warning = buildUnnamed1651();
   }
   buildCounterCreateShortDynamicLinkResponse--;
   return o;
@@ -150,7 +150,7 @@
   if (buildCounterCreateShortDynamicLinkResponse < 3) {
     unittest.expect(o.previewLink, unittest.equals('foo'));
     unittest.expect(o.shortLink, unittest.equals('foo'));
-    checkUnnamed1516(o.warning);
+    checkUnnamed1651(o.warning);
   }
   buildCounterCreateShortDynamicLinkResponse--;
 }
@@ -261,14 +261,14 @@
   buildCounterDynamicLinkInfo--;
 }
 
-buildUnnamed1517() {
+buildUnnamed1652() {
   var o = new core.List<api.DynamicLinkEventStat>();
   o.add(buildDynamicLinkEventStat());
   o.add(buildDynamicLinkEventStat());
   return o;
 }
 
-checkUnnamed1517(core.List<api.DynamicLinkEventStat> o) {
+checkUnnamed1652(core.List<api.DynamicLinkEventStat> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDynamicLinkEventStat(o[0]);
   checkDynamicLinkEventStat(o[1]);
@@ -279,7 +279,7 @@
   var o = new api.DynamicLinkStats();
   buildCounterDynamicLinkStats++;
   if (buildCounterDynamicLinkStats < 3) {
-    o.linkEventStats = buildUnnamed1517();
+    o.linkEventStats = buildUnnamed1652();
   }
   buildCounterDynamicLinkStats--;
   return o;
@@ -288,7 +288,7 @@
 checkDynamicLinkStats(api.DynamicLinkStats o) {
   buildCounterDynamicLinkStats++;
   if (buildCounterDynamicLinkStats < 3) {
-    checkUnnamed1517(o.linkEventStats);
+    checkUnnamed1652(o.linkEventStats);
   }
   buildCounterDynamicLinkStats--;
 }
@@ -732,8 +732,9 @@
         var resp = convert.JSON.encode(buildCreateShortDynamicLinkResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.CreateShortDynamicLinkResponse response) {
+      res
+          .create(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkCreateShortDynamicLinkResponse(response);
       })));
     });
@@ -798,7 +799,7 @@
       res
           .getLinkStats(arg_dynamicLink,
               durationDays: arg_durationDays, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DynamicLinkStats response) {
+          .then(unittest.expectAsync1(((response) {
         checkDynamicLinkStats(response);
       })));
     });
@@ -850,8 +851,9 @@
             convert.JSON.encode(buildGetIosPostInstallAttributionResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.installAttribution(arg_request, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GetIosPostInstallAttributionResponse response) {
+      res
+          .installAttribution(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGetIosPostInstallAttributionResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/firebaseremoteconfig/v1_test.dart b/generated/googleapis/test/firebaseremoteconfig/v1_test.dart
index 98bcda8..cf4efe0 100644
--- a/generated/googleapis/test/firebaseremoteconfig/v1_test.dart
+++ b/generated/googleapis/test/firebaseremoteconfig/v1_test.dart
@@ -50,27 +50,27 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed1518() {
+buildUnnamed1781() {
   var o = new core.List<api.RemoteConfigCondition>();
   o.add(buildRemoteConfigCondition());
   o.add(buildRemoteConfigCondition());
   return o;
 }
 
-checkUnnamed1518(core.List<api.RemoteConfigCondition> o) {
+checkUnnamed1781(core.List<api.RemoteConfigCondition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRemoteConfigCondition(o[0]);
   checkRemoteConfigCondition(o[1]);
 }
 
-buildUnnamed1519() {
+buildUnnamed1782() {
   var o = new core.Map<core.String, api.RemoteConfigParameter>();
   o["x"] = buildRemoteConfigParameter();
   o["y"] = buildRemoteConfigParameter();
   return o;
 }
 
-checkUnnamed1519(core.Map<core.String, api.RemoteConfigParameter> o) {
+checkUnnamed1782(core.Map<core.String, api.RemoteConfigParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRemoteConfigParameter(o["x"]);
   checkRemoteConfigParameter(o["y"]);
@@ -81,8 +81,8 @@
   var o = new api.RemoteConfig();
   buildCounterRemoteConfig++;
   if (buildCounterRemoteConfig < 3) {
-    o.conditions = buildUnnamed1518();
-    o.parameters = buildUnnamed1519();
+    o.conditions = buildUnnamed1781();
+    o.parameters = buildUnnamed1782();
   }
   buildCounterRemoteConfig--;
   return o;
@@ -91,8 +91,8 @@
 checkRemoteConfig(api.RemoteConfig o) {
   buildCounterRemoteConfig++;
   if (buildCounterRemoteConfig < 3) {
-    checkUnnamed1518(o.conditions);
-    checkUnnamed1519(o.parameters);
+    checkUnnamed1781(o.conditions);
+    checkUnnamed1782(o.parameters);
   }
   buildCounterRemoteConfig--;
 }
@@ -122,14 +122,14 @@
   buildCounterRemoteConfigCondition--;
 }
 
-buildUnnamed1520() {
+buildUnnamed1783() {
   var o = new core.Map<core.String, api.RemoteConfigParameterValue>();
   o["x"] = buildRemoteConfigParameterValue();
   o["y"] = buildRemoteConfigParameterValue();
   return o;
 }
 
-checkUnnamed1520(core.Map<core.String, api.RemoteConfigParameterValue> o) {
+checkUnnamed1783(core.Map<core.String, api.RemoteConfigParameterValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRemoteConfigParameterValue(o["x"]);
   checkRemoteConfigParameterValue(o["y"]);
@@ -140,7 +140,7 @@
   var o = new api.RemoteConfigParameter();
   buildCounterRemoteConfigParameter++;
   if (buildCounterRemoteConfigParameter < 3) {
-    o.conditionalValues = buildUnnamed1520();
+    o.conditionalValues = buildUnnamed1783();
     o.defaultValue = buildRemoteConfigParameterValue();
     o.description = "foo";
   }
@@ -151,7 +151,7 @@
 checkRemoteConfigParameter(api.RemoteConfigParameter o) {
   buildCounterRemoteConfigParameter++;
   if (buildCounterRemoteConfigParameter < 3) {
-    checkUnnamed1520(o.conditionalValues);
+    checkUnnamed1783(o.conditionalValues);
     checkRemoteConfigParameterValue(o.defaultValue);
     unittest.expect(o.description, unittest.equals('foo'));
   }
@@ -260,7 +260,7 @@
       }), true);
       res
           .getRemoteConfig(arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemoteConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemoteConfig(response);
       })));
     });
@@ -320,7 +320,7 @@
       res
           .updateRemoteConfig(arg_request, arg_project,
               validateOnly: arg_validateOnly, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RemoteConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkRemoteConfig(response);
       })));
     });
diff --git a/generated/googleapis/test/firebaserules/v1_test.dart b/generated/googleapis/test/firebaserules/v1_test.dart
index fce6694..5468a7f 100644
--- a/generated/googleapis/test/firebaserules/v1_test.dart
+++ b/generated/googleapis/test/firebaserules/v1_test.dart
@@ -117,7 +117,7 @@
   buildCounterFile--;
 }
 
-buildUnnamed557() {
+buildUnnamed3485() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -132,7 +132,7 @@
   return o;
 }
 
-checkUnnamed557(core.List<core.Object> o) {
+checkUnnamed3485(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted2 = (o[0]) as core.Map;
   unittest.expect(casted2, unittest.hasLength(3));
@@ -151,7 +151,7 @@
   var o = new api.FunctionCall();
   buildCounterFunctionCall++;
   if (buildCounterFunctionCall < 3) {
-    o.args = buildUnnamed557();
+    o.args = buildUnnamed3485();
     o.function = "foo";
   }
   buildCounterFunctionCall--;
@@ -161,20 +161,20 @@
 checkFunctionCall(api.FunctionCall o) {
   buildCounterFunctionCall++;
   if (buildCounterFunctionCall < 3) {
-    checkUnnamed557(o.args);
+    checkUnnamed3485(o.args);
     unittest.expect(o.function, unittest.equals('foo'));
   }
   buildCounterFunctionCall--;
 }
 
-buildUnnamed558() {
+buildUnnamed3486() {
   var o = new core.List<api.Arg>();
   o.add(buildArg());
   o.add(buildArg());
   return o;
 }
 
-checkUnnamed558(core.List<api.Arg> o) {
+checkUnnamed3486(core.List<api.Arg> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkArg(o[0]);
   checkArg(o[1]);
@@ -185,7 +185,7 @@
   var o = new api.FunctionMock();
   buildCounterFunctionMock++;
   if (buildCounterFunctionMock < 3) {
-    o.args = buildUnnamed558();
+    o.args = buildUnnamed3486();
     o.function = "foo";
     o.result = buildResult();
   }
@@ -196,7 +196,7 @@
 checkFunctionMock(api.FunctionMock o) {
   buildCounterFunctionMock++;
   if (buildCounterFunctionMock < 3) {
-    checkUnnamed558(o.args);
+    checkUnnamed3486(o.args);
     unittest.expect(o.function, unittest.equals('foo'));
     checkResult(o.result);
   }
@@ -253,14 +253,14 @@
   buildCounterIssue--;
 }
 
-buildUnnamed559() {
+buildUnnamed3487() {
   var o = new core.List<api.Release>();
   o.add(buildRelease());
   o.add(buildRelease());
   return o;
 }
 
-checkUnnamed559(core.List<api.Release> o) {
+checkUnnamed3487(core.List<api.Release> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRelease(o[0]);
   checkRelease(o[1]);
@@ -272,7 +272,7 @@
   buildCounterListReleasesResponse++;
   if (buildCounterListReleasesResponse < 3) {
     o.nextPageToken = "foo";
-    o.releases = buildUnnamed559();
+    o.releases = buildUnnamed3487();
   }
   buildCounterListReleasesResponse--;
   return o;
@@ -282,19 +282,19 @@
   buildCounterListReleasesResponse++;
   if (buildCounterListReleasesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed559(o.releases);
+    checkUnnamed3487(o.releases);
   }
   buildCounterListReleasesResponse--;
 }
 
-buildUnnamed560() {
+buildUnnamed3488() {
   var o = new core.List<api.Ruleset>();
   o.add(buildRuleset());
   o.add(buildRuleset());
   return o;
 }
 
-checkUnnamed560(core.List<api.Ruleset> o) {
+checkUnnamed3488(core.List<api.Ruleset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRuleset(o[0]);
   checkRuleset(o[1]);
@@ -306,7 +306,7 @@
   buildCounterListRulesetsResponse++;
   if (buildCounterListRulesetsResponse < 3) {
     o.nextPageToken = "foo";
-    o.rulesets = buildUnnamed560();
+    o.rulesets = buildUnnamed3488();
   }
   buildCounterListRulesetsResponse--;
   return o;
@@ -316,7 +316,7 @@
   buildCounterListRulesetsResponse++;
   if (buildCounterListRulesetsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed560(o.rulesets);
+    checkUnnamed3488(o.rulesets);
   }
   buildCounterListRulesetsResponse--;
 }
@@ -398,14 +398,14 @@
   buildCounterRuleset--;
 }
 
-buildUnnamed561() {
+buildUnnamed3489() {
   var o = new core.List<api.File>();
   o.add(buildFile());
   o.add(buildFile());
   return o;
 }
 
-checkUnnamed561(core.List<api.File> o) {
+checkUnnamed3489(core.List<api.File> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFile(o[0]);
   checkFile(o[1]);
@@ -416,7 +416,7 @@
   var o = new api.Source();
   buildCounterSource++;
   if (buildCounterSource < 3) {
-    o.files = buildUnnamed561();
+    o.files = buildUnnamed3489();
   }
   buildCounterSource--;
   return o;
@@ -425,7 +425,7 @@
 checkSource(api.Source o) {
   buildCounterSource++;
   if (buildCounterSource < 3) {
-    checkUnnamed561(o.files);
+    checkUnnamed3489(o.files);
   }
   buildCounterSource--;
 }
@@ -453,14 +453,14 @@
   buildCounterSourcePosition--;
 }
 
-buildUnnamed562() {
+buildUnnamed3490() {
   var o = new core.List<api.FunctionMock>();
   o.add(buildFunctionMock());
   o.add(buildFunctionMock());
   return o;
 }
 
-checkUnnamed562(core.List<api.FunctionMock> o) {
+checkUnnamed3490(core.List<api.FunctionMock> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFunctionMock(o[0]);
   checkFunctionMock(o[1]);
@@ -472,7 +472,7 @@
   buildCounterTestCase++;
   if (buildCounterTestCase < 3) {
     o.expectation = "foo";
-    o.functionMocks = buildUnnamed562();
+    o.functionMocks = buildUnnamed3490();
     o.request = {
       'list': [1, 2, 3],
       'bool': true,
@@ -492,7 +492,7 @@
   buildCounterTestCase++;
   if (buildCounterTestCase < 3) {
     unittest.expect(o.expectation, unittest.equals('foo'));
-    checkUnnamed562(o.functionMocks);
+    checkUnnamed3490(o.functionMocks);
     var casted5 = (o.request) as core.Map;
     unittest.expect(casted5, unittest.hasLength(3));
     unittest.expect(casted5["list"], unittest.equals([1, 2, 3]));
@@ -507,27 +507,27 @@
   buildCounterTestCase--;
 }
 
-buildUnnamed563() {
+buildUnnamed3491() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed563(core.List<core.String> o) {
+checkUnnamed3491(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed564() {
+buildUnnamed3492() {
   var o = new core.List<api.FunctionCall>();
   o.add(buildFunctionCall());
   o.add(buildFunctionCall());
   return o;
 }
 
-checkUnnamed564(core.List<api.FunctionCall> o) {
+checkUnnamed3492(core.List<api.FunctionCall> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFunctionCall(o[0]);
   checkFunctionCall(o[1]);
@@ -538,9 +538,9 @@
   var o = new api.TestResult();
   buildCounterTestResult++;
   if (buildCounterTestResult < 3) {
-    o.debugMessages = buildUnnamed563();
+    o.debugMessages = buildUnnamed3491();
     o.errorPosition = buildSourcePosition();
-    o.functionCalls = buildUnnamed564();
+    o.functionCalls = buildUnnamed3492();
     o.state = "foo";
   }
   buildCounterTestResult--;
@@ -550,9 +550,9 @@
 checkTestResult(api.TestResult o) {
   buildCounterTestResult++;
   if (buildCounterTestResult < 3) {
-    checkUnnamed563(o.debugMessages);
+    checkUnnamed3491(o.debugMessages);
     checkSourcePosition(o.errorPosition);
-    checkUnnamed564(o.functionCalls);
+    checkUnnamed3492(o.functionCalls);
     unittest.expect(o.state, unittest.equals('foo'));
   }
   buildCounterTestResult--;
@@ -579,27 +579,27 @@
   buildCounterTestRulesetRequest--;
 }
 
-buildUnnamed565() {
+buildUnnamed3493() {
   var o = new core.List<api.Issue>();
   o.add(buildIssue());
   o.add(buildIssue());
   return o;
 }
 
-checkUnnamed565(core.List<api.Issue> o) {
+checkUnnamed3493(core.List<api.Issue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkIssue(o[0]);
   checkIssue(o[1]);
 }
 
-buildUnnamed566() {
+buildUnnamed3494() {
   var o = new core.List<api.TestResult>();
   o.add(buildTestResult());
   o.add(buildTestResult());
   return o;
 }
 
-checkUnnamed566(core.List<api.TestResult> o) {
+checkUnnamed3494(core.List<api.TestResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTestResult(o[0]);
   checkTestResult(o[1]);
@@ -610,8 +610,8 @@
   var o = new api.TestRulesetResponse();
   buildCounterTestRulesetResponse++;
   if (buildCounterTestRulesetResponse < 3) {
-    o.issues = buildUnnamed565();
-    o.testResults = buildUnnamed566();
+    o.issues = buildUnnamed3493();
+    o.testResults = buildUnnamed3494();
   }
   buildCounterTestRulesetResponse--;
   return o;
@@ -620,20 +620,20 @@
 checkTestRulesetResponse(api.TestRulesetResponse o) {
   buildCounterTestRulesetResponse++;
   if (buildCounterTestRulesetResponse < 3) {
-    checkUnnamed565(o.issues);
-    checkUnnamed566(o.testResults);
+    checkUnnamed3493(o.issues);
+    checkUnnamed3494(o.testResults);
   }
   buildCounterTestRulesetResponse--;
 }
 
-buildUnnamed567() {
+buildUnnamed3495() {
   var o = new core.List<api.TestCase>();
   o.add(buildTestCase());
   o.add(buildTestCase());
   return o;
 }
 
-checkUnnamed567(core.List<api.TestCase> o) {
+checkUnnamed3495(core.List<api.TestCase> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTestCase(o[0]);
   checkTestCase(o[1]);
@@ -644,7 +644,7 @@
   var o = new api.TestSuite();
   buildCounterTestSuite++;
   if (buildCounterTestSuite < 3) {
-    o.testCases = buildUnnamed567();
+    o.testCases = buildUnnamed3495();
   }
   buildCounterTestSuite--;
   return o;
@@ -653,7 +653,7 @@
 checkTestSuite(api.TestSuite o) {
   buildCounterTestSuite++;
   if (buildCounterTestSuite < 3) {
-    checkUnnamed567(o.testCases);
+    checkUnnamed3495(o.testCases);
   }
   buildCounterTestSuite--;
 }
@@ -891,7 +891,7 @@
       }), true);
       res
           .test(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TestRulesetResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestRulesetResponse(response);
       })));
     });
@@ -949,7 +949,7 @@
       }), true);
       res
           .create(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Release response) {
+          .then(unittest.expectAsync1(((response) {
         checkRelease(response);
       })));
     });
@@ -1001,7 +1001,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1053,7 +1053,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Release response) {
+          .then(unittest.expectAsync1(((response) {
         checkRelease(response);
       })));
     });
@@ -1109,8 +1109,7 @@
       res
           .getExecutable(arg_name,
               executableVersion: arg_executableVersion, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.GetReleaseExecutableResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetReleaseExecutableResponse(response);
       })));
     });
@@ -1174,7 +1173,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListReleasesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListReleasesResponse(response);
       })));
     });
@@ -1230,7 +1229,7 @@
       }), true);
       res
           .patch(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Release response) {
+          .then(unittest.expectAsync1(((response) {
         checkRelease(response);
       })));
     });
@@ -1288,7 +1287,7 @@
       }), true);
       res
           .create(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Ruleset response) {
+          .then(unittest.expectAsync1(((response) {
         checkRuleset(response);
       })));
     });
@@ -1340,7 +1339,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1392,7 +1391,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Ruleset response) {
+          .then(unittest.expectAsync1(((response) {
         checkRuleset(response);
       })));
     });
@@ -1456,7 +1455,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListRulesetsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListRulesetsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/fitness/v1_test.dart b/generated/googleapis/test/fitness/v1_test.dart
index f03b185..f501ed3 100644
--- a/generated/googleapis/test/fitness/v1_test.dart
+++ b/generated/googleapis/test/fitness/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2477() {
+buildUnnamed1218() {
   var o = new core.List<api.Dataset>();
   o.add(buildDataset());
   o.add(buildDataset());
   return o;
 }
 
-checkUnnamed2477(core.List<api.Dataset> o) {
+checkUnnamed1218(core.List<api.Dataset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataset(o[0]);
   checkDataset(o[1]);
@@ -69,7 +69,7 @@
   buildCounterAggregateBucket++;
   if (buildCounterAggregateBucket < 3) {
     o.activity = 42;
-    o.dataset = buildUnnamed2477();
+    o.dataset = buildUnnamed1218();
     o.endTimeMillis = "foo";
     o.session = buildSession();
     o.startTimeMillis = "foo";
@@ -83,7 +83,7 @@
   buildCounterAggregateBucket++;
   if (buildCounterAggregateBucket < 3) {
     unittest.expect(o.activity, unittest.equals(42));
-    checkUnnamed2477(o.dataset);
+    checkUnnamed1218(o.dataset);
     unittest.expect(o.endTimeMillis, unittest.equals('foo'));
     checkSession(o.session);
     unittest.expect(o.startTimeMillis, unittest.equals('foo'));
@@ -113,27 +113,27 @@
   buildCounterAggregateBy--;
 }
 
-buildUnnamed2478() {
+buildUnnamed1219() {
   var o = new core.List<api.AggregateBy>();
   o.add(buildAggregateBy());
   o.add(buildAggregateBy());
   return o;
 }
 
-checkUnnamed2478(core.List<api.AggregateBy> o) {
+checkUnnamed1219(core.List<api.AggregateBy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAggregateBy(o[0]);
   checkAggregateBy(o[1]);
 }
 
-buildUnnamed2479() {
+buildUnnamed1220() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2479(core.List<core.String> o) {
+checkUnnamed1220(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -144,13 +144,13 @@
   var o = new api.AggregateRequest();
   buildCounterAggregateRequest++;
   if (buildCounterAggregateRequest < 3) {
-    o.aggregateBy = buildUnnamed2478();
+    o.aggregateBy = buildUnnamed1219();
     o.bucketByActivitySegment = buildBucketByActivity();
     o.bucketByActivityType = buildBucketByActivity();
     o.bucketBySession = buildBucketBySession();
     o.bucketByTime = buildBucketByTime();
     o.endTimeMillis = "foo";
-    o.filteredDataQualityStandard = buildUnnamed2479();
+    o.filteredDataQualityStandard = buildUnnamed1220();
     o.startTimeMillis = "foo";
   }
   buildCounterAggregateRequest--;
@@ -160,26 +160,26 @@
 checkAggregateRequest(api.AggregateRequest o) {
   buildCounterAggregateRequest++;
   if (buildCounterAggregateRequest < 3) {
-    checkUnnamed2478(o.aggregateBy);
+    checkUnnamed1219(o.aggregateBy);
     checkBucketByActivity(o.bucketByActivitySegment);
     checkBucketByActivity(o.bucketByActivityType);
     checkBucketBySession(o.bucketBySession);
     checkBucketByTime(o.bucketByTime);
     unittest.expect(o.endTimeMillis, unittest.equals('foo'));
-    checkUnnamed2479(o.filteredDataQualityStandard);
+    checkUnnamed1220(o.filteredDataQualityStandard);
     unittest.expect(o.startTimeMillis, unittest.equals('foo'));
   }
   buildCounterAggregateRequest--;
 }
 
-buildUnnamed2480() {
+buildUnnamed1221() {
   var o = new core.List<api.AggregateBucket>();
   o.add(buildAggregateBucket());
   o.add(buildAggregateBucket());
   return o;
 }
 
-checkUnnamed2480(core.List<api.AggregateBucket> o) {
+checkUnnamed1221(core.List<api.AggregateBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAggregateBucket(o[0]);
   checkAggregateBucket(o[1]);
@@ -190,7 +190,7 @@
   var o = new api.AggregateResponse();
   buildCounterAggregateResponse++;
   if (buildCounterAggregateResponse < 3) {
-    o.bucket = buildUnnamed2480();
+    o.bucket = buildUnnamed1221();
   }
   buildCounterAggregateResponse--;
   return o;
@@ -199,7 +199,7 @@
 checkAggregateResponse(api.AggregateResponse o) {
   buildCounterAggregateResponse++;
   if (buildCounterAggregateResponse < 3) {
-    checkUnnamed2480(o.bucket);
+    checkUnnamed1221(o.bucket);
   }
   buildCounterAggregateResponse--;
 }
@@ -313,14 +313,14 @@
   buildCounterBucketByTimePeriod--;
 }
 
-buildUnnamed2481() {
+buildUnnamed1222() {
   var o = new core.List<api.Value>();
   o.add(buildValue());
   o.add(buildValue());
   return o;
 }
 
-checkUnnamed2481(core.List<api.Value> o) {
+checkUnnamed1222(core.List<api.Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValue(o[0]);
   checkValue(o[1]);
@@ -338,7 +338,7 @@
     o.originDataSourceId = "foo";
     o.rawTimestampNanos = "foo";
     o.startTimeNanos = "foo";
-    o.value = buildUnnamed2481();
+    o.value = buildUnnamed1222();
   }
   buildCounterDataPoint--;
   return o;
@@ -354,19 +354,19 @@
     unittest.expect(o.originDataSourceId, unittest.equals('foo'));
     unittest.expect(o.rawTimestampNanos, unittest.equals('foo'));
     unittest.expect(o.startTimeNanos, unittest.equals('foo'));
-    checkUnnamed2481(o.value);
+    checkUnnamed1222(o.value);
   }
   buildCounterDataPoint--;
 }
 
-buildUnnamed2482() {
+buildUnnamed1223() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2482(core.List<core.String> o) {
+checkUnnamed1223(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -378,7 +378,7 @@
   buildCounterDataSource++;
   if (buildCounterDataSource < 3) {
     o.application = buildApplication();
-    o.dataQualityStandard = buildUnnamed2482();
+    o.dataQualityStandard = buildUnnamed1223();
     o.dataStreamId = "foo";
     o.dataStreamName = "foo";
     o.dataType = buildDataType();
@@ -394,7 +394,7 @@
   buildCounterDataSource++;
   if (buildCounterDataSource < 3) {
     checkApplication(o.application);
-    checkUnnamed2482(o.dataQualityStandard);
+    checkUnnamed1223(o.dataQualityStandard);
     unittest.expect(o.dataStreamId, unittest.equals('foo'));
     unittest.expect(o.dataStreamName, unittest.equals('foo'));
     checkDataType(o.dataType);
@@ -405,14 +405,14 @@
   buildCounterDataSource--;
 }
 
-buildUnnamed2483() {
+buildUnnamed1224() {
   var o = new core.List<api.DataTypeField>();
   o.add(buildDataTypeField());
   o.add(buildDataTypeField());
   return o;
 }
 
-checkUnnamed2483(core.List<api.DataTypeField> o) {
+checkUnnamed1224(core.List<api.DataTypeField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataTypeField(o[0]);
   checkDataTypeField(o[1]);
@@ -423,7 +423,7 @@
   var o = new api.DataType();
   buildCounterDataType++;
   if (buildCounterDataType < 3) {
-    o.field = buildUnnamed2483();
+    o.field = buildUnnamed1224();
     o.name = "foo";
   }
   buildCounterDataType--;
@@ -433,7 +433,7 @@
 checkDataType(api.DataType o) {
   buildCounterDataType++;
   if (buildCounterDataType < 3) {
-    checkUnnamed2483(o.field);
+    checkUnnamed1224(o.field);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterDataType--;
@@ -462,14 +462,14 @@
   buildCounterDataTypeField--;
 }
 
-buildUnnamed2484() {
+buildUnnamed1225() {
   var o = new core.List<api.DataPoint>();
   o.add(buildDataPoint());
   o.add(buildDataPoint());
   return o;
 }
 
-checkUnnamed2484(core.List<api.DataPoint> o) {
+checkUnnamed1225(core.List<api.DataPoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataPoint(o[0]);
   checkDataPoint(o[1]);
@@ -484,7 +484,7 @@
     o.maxEndTimeNs = "foo";
     o.minStartTimeNs = "foo";
     o.nextPageToken = "foo";
-    o.point = buildUnnamed2484();
+    o.point = buildUnnamed1225();
   }
   buildCounterDataset--;
   return o;
@@ -497,7 +497,7 @@
     unittest.expect(o.maxEndTimeNs, unittest.equals('foo'));
     unittest.expect(o.minStartTimeNs, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2484(o.point);
+    checkUnnamed1225(o.point);
   }
   buildCounterDataset--;
 }
@@ -529,27 +529,27 @@
   buildCounterDevice--;
 }
 
-buildUnnamed2485() {
+buildUnnamed1226() {
   var o = new core.List<api.DataPoint>();
   o.add(buildDataPoint());
   o.add(buildDataPoint());
   return o;
 }
 
-checkUnnamed2485(core.List<api.DataPoint> o) {
+checkUnnamed1226(core.List<api.DataPoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataPoint(o[0]);
   checkDataPoint(o[1]);
 }
 
-buildUnnamed2486() {
+buildUnnamed1227() {
   var o = new core.List<api.DataPoint>();
   o.add(buildDataPoint());
   o.add(buildDataPoint());
   return o;
 }
 
-checkUnnamed2486(core.List<api.DataPoint> o) {
+checkUnnamed1227(core.List<api.DataPoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataPoint(o[0]);
   checkDataPoint(o[1]);
@@ -561,8 +561,8 @@
   buildCounterListDataPointChangesResponse++;
   if (buildCounterListDataPointChangesResponse < 3) {
     o.dataSourceId = "foo";
-    o.deletedDataPoint = buildUnnamed2485();
-    o.insertedDataPoint = buildUnnamed2486();
+    o.deletedDataPoint = buildUnnamed1226();
+    o.insertedDataPoint = buildUnnamed1227();
     o.nextPageToken = "foo";
   }
   buildCounterListDataPointChangesResponse--;
@@ -573,21 +573,21 @@
   buildCounterListDataPointChangesResponse++;
   if (buildCounterListDataPointChangesResponse < 3) {
     unittest.expect(o.dataSourceId, unittest.equals('foo'));
-    checkUnnamed2485(o.deletedDataPoint);
-    checkUnnamed2486(o.insertedDataPoint);
+    checkUnnamed1226(o.deletedDataPoint);
+    checkUnnamed1227(o.insertedDataPoint);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDataPointChangesResponse--;
 }
 
-buildUnnamed2487() {
+buildUnnamed1228() {
   var o = new core.List<api.DataSource>();
   o.add(buildDataSource());
   o.add(buildDataSource());
   return o;
 }
 
-checkUnnamed2487(core.List<api.DataSource> o) {
+checkUnnamed1228(core.List<api.DataSource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataSource(o[0]);
   checkDataSource(o[1]);
@@ -598,7 +598,7 @@
   var o = new api.ListDataSourcesResponse();
   buildCounterListDataSourcesResponse++;
   if (buildCounterListDataSourcesResponse < 3) {
-    o.dataSource = buildUnnamed2487();
+    o.dataSource = buildUnnamed1228();
   }
   buildCounterListDataSourcesResponse--;
   return o;
@@ -607,32 +607,32 @@
 checkListDataSourcesResponse(api.ListDataSourcesResponse o) {
   buildCounterListDataSourcesResponse++;
   if (buildCounterListDataSourcesResponse < 3) {
-    checkUnnamed2487(o.dataSource);
+    checkUnnamed1228(o.dataSource);
   }
   buildCounterListDataSourcesResponse--;
 }
 
-buildUnnamed2488() {
+buildUnnamed1229() {
   var o = new core.List<api.Session>();
   o.add(buildSession());
   o.add(buildSession());
   return o;
 }
 
-checkUnnamed2488(core.List<api.Session> o) {
+checkUnnamed1229(core.List<api.Session> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSession(o[0]);
   checkSession(o[1]);
 }
 
-buildUnnamed2489() {
+buildUnnamed1230() {
   var o = new core.List<api.Session>();
   o.add(buildSession());
   o.add(buildSession());
   return o;
 }
 
-checkUnnamed2489(core.List<api.Session> o) {
+checkUnnamed1230(core.List<api.Session> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSession(o[0]);
   checkSession(o[1]);
@@ -643,10 +643,10 @@
   var o = new api.ListSessionsResponse();
   buildCounterListSessionsResponse++;
   if (buildCounterListSessionsResponse < 3) {
-    o.deletedSession = buildUnnamed2488();
+    o.deletedSession = buildUnnamed1229();
     o.hasMoreData = true;
     o.nextPageToken = "foo";
-    o.session = buildUnnamed2489();
+    o.session = buildUnnamed1230();
   }
   buildCounterListSessionsResponse--;
   return o;
@@ -655,10 +655,10 @@
 checkListSessionsResponse(api.ListSessionsResponse o) {
   buildCounterListSessionsResponse++;
   if (buildCounterListSessionsResponse < 3) {
-    checkUnnamed2488(o.deletedSession);
+    checkUnnamed1229(o.deletedSession);
     unittest.expect(o.hasMoreData, unittest.isTrue);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2489(o.session);
+    checkUnnamed1230(o.session);
   }
   buildCounterListSessionsResponse--;
 }
@@ -717,14 +717,14 @@
   buildCounterSession--;
 }
 
-buildUnnamed2490() {
+buildUnnamed1231() {
   var o = new core.List<api.ValueMapValEntry>();
   o.add(buildValueMapValEntry());
   o.add(buildValueMapValEntry());
   return o;
 }
 
-checkUnnamed2490(core.List<api.ValueMapValEntry> o) {
+checkUnnamed1231(core.List<api.ValueMapValEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValueMapValEntry(o[0]);
   checkValueMapValEntry(o[1]);
@@ -737,7 +737,7 @@
   if (buildCounterValue < 3) {
     o.fpVal = 42.0;
     o.intVal = 42;
-    o.mapVal = buildUnnamed2490();
+    o.mapVal = buildUnnamed1231();
     o.stringVal = "foo";
   }
   buildCounterValue--;
@@ -749,7 +749,7 @@
   if (buildCounterValue < 3) {
     unittest.expect(o.fpVal, unittest.equals(42.0));
     unittest.expect(o.intVal, unittest.equals(42));
-    checkUnnamed2490(o.mapVal);
+    checkUnnamed1231(o.mapVal);
     unittest.expect(o.stringVal, unittest.equals('foo'));
   }
   buildCounterValue--;
@@ -776,14 +776,14 @@
   buildCounterValueMapValEntry--;
 }
 
-buildUnnamed2491() {
+buildUnnamed1232() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2491(core.List<core.String> o) {
+checkUnnamed1232(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1014,7 +1014,7 @@
       }), true);
       res
           .create(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DataSource response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataSource(response);
       })));
     });
@@ -1063,7 +1063,7 @@
       }), true);
       res
           .delete(arg_userId, arg_dataSourceId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DataSource response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataSource(response);
       })));
     });
@@ -1112,7 +1112,7 @@
       }), true);
       res
           .get(arg_userId, arg_dataSourceId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DataSource response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataSource(response);
       })));
     });
@@ -1122,7 +1122,7 @@
       api.UsersDataSourcesResourceApi res =
           new api.FitnessApi(mock).users.dataSources;
       var arg_userId = "foo";
-      var arg_dataTypeName = buildUnnamed2491();
+      var arg_dataTypeName = buildUnnamed1232();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -1164,7 +1164,7 @@
       res
           .list(arg_userId,
               dataTypeName: arg_dataTypeName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDataSourcesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDataSourcesResponse(response);
       })));
     });
@@ -1218,7 +1218,7 @@
       res
           .patch(arg_request, arg_userId, arg_dataSourceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DataSource response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataSource(response);
       })));
     });
@@ -1272,7 +1272,7 @@
       res
           .update(arg_request, arg_userId, arg_dataSourceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DataSource response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataSource(response);
       })));
     });
@@ -1330,8 +1330,7 @@
       res
           .list(arg_userId, arg_dataSourceId,
               limit: arg_limit, pageToken: arg_pageToken, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListDataPointChangesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDataPointChangesResponse(response);
       })));
     });
@@ -1447,7 +1446,7 @@
       res
           .get(arg_userId, arg_dataSourceId, arg_datasetId,
               limit: arg_limit, pageToken: arg_pageToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Dataset response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataset(response);
       })));
     });
@@ -1505,7 +1504,7 @@
       res
           .patch(arg_request, arg_userId, arg_dataSourceId, arg_datasetId,
               currentTimeMillis: arg_currentTimeMillis, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Dataset response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataset(response);
       })));
     });
@@ -1558,7 +1557,7 @@
       }), true);
       res
           .aggregate(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AggregateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAggregateResponse(response);
       })));
     });
@@ -1676,7 +1675,7 @@
               pageToken: arg_pageToken,
               startTime: arg_startTime,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListSessionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSessionsResponse(response);
       })));
     });
@@ -1733,7 +1732,7 @@
       res
           .update(arg_request, arg_userId, arg_sessionId,
               currentTimeMillis: arg_currentTimeMillis, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Session response) {
+          .then(unittest.expectAsync1(((response) {
         checkSession(response);
       })));
     });
diff --git a/generated/googleapis/test/fusiontables/v1_test.dart b/generated/googleapis/test/fusiontables/v1_test.dart
index 5314d6f..897fc00 100644
--- a/generated/googleapis/test/fusiontables/v1_test.dart
+++ b/generated/googleapis/test/fusiontables/v1_test.dart
@@ -131,14 +131,14 @@
   buildCounterColumn--;
 }
 
-buildUnnamed1058() {
+buildUnnamed1988() {
   var o = new core.List<api.Column>();
   o.add(buildColumn());
   o.add(buildColumn());
   return o;
 }
 
-checkUnnamed1058(core.List<api.Column> o) {
+checkUnnamed1988(core.List<api.Column> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColumn(o[0]);
   checkColumn(o[1]);
@@ -149,7 +149,7 @@
   var o = new api.ColumnList();
   buildCounterColumnList++;
   if (buildCounterColumnList < 3) {
-    o.items = buildUnnamed1058();
+    o.items = buildUnnamed1988();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -161,7 +161,7 @@
 checkColumnList(api.ColumnList o) {
   buildCounterColumnList++;
   if (buildCounterColumnList < 3) {
-    checkUnnamed1058(o.items);
+    checkUnnamed1988(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -169,7 +169,7 @@
   buildCounterColumnList--;
 }
 
-buildUnnamed1059() {
+buildUnnamed1989() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -184,7 +184,7 @@
   return o;
 }
 
-checkUnnamed1059(core.List<core.Object> o) {
+checkUnnamed1989(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -203,7 +203,7 @@
   var o = new api.Geometry();
   buildCounterGeometry++;
   if (buildCounterGeometry < 3) {
-    o.geometries = buildUnnamed1059();
+    o.geometries = buildUnnamed1989();
     o.geometry = {
       'list': [1, 2, 3],
       'bool': true,
@@ -218,7 +218,7 @@
 checkGeometry(api.Geometry o) {
   buildCounterGeometry++;
   if (buildCounterGeometry < 3) {
-    checkUnnamed1059(o.geometries);
+    checkUnnamed1989(o.geometries);
     var casted3 = (o.geometry) as core.Map;
     unittest.expect(casted3, unittest.hasLength(3));
     unittest.expect(casted3["list"], unittest.equals([1, 2, 3]));
@@ -250,30 +250,30 @@
   buildCounterImport--;
 }
 
-buildUnnamed1060() {
+buildUnnamed1990() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed1060(core.List<core.double> o) {
+checkUnnamed1990(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed1061() {
+buildUnnamed1991() {
   var o = new core.List<core.List<core.double>>();
-  o.add(buildUnnamed1060());
-  o.add(buildUnnamed1060());
+  o.add(buildUnnamed1990());
+  o.add(buildUnnamed1990());
   return o;
 }
 
-checkUnnamed1061(core.List<core.List<core.double>> o) {
+checkUnnamed1991(core.List<core.List<core.double>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1060(o[0]);
-  checkUnnamed1060(o[1]);
+  checkUnnamed1990(o[0]);
+  checkUnnamed1990(o[1]);
 }
 
 core.int buildCounterLine = 0;
@@ -281,7 +281,7 @@
   var o = new api.Line();
   buildCounterLine++;
   if (buildCounterLine < 3) {
-    o.coordinates = buildUnnamed1061();
+    o.coordinates = buildUnnamed1991();
     o.type = "foo";
   }
   buildCounterLine--;
@@ -291,7 +291,7 @@
 checkLine(api.Line o) {
   buildCounterLine++;
   if (buildCounterLine < 3) {
-    checkUnnamed1061(o.coordinates);
+    checkUnnamed1991(o.coordinates);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterLine--;
@@ -324,14 +324,14 @@
   buildCounterLineStyle--;
 }
 
-buildUnnamed1062() {
+buildUnnamed1992() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed1062(core.List<core.double> o) {
+checkUnnamed1992(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -342,7 +342,7 @@
   var o = new api.Point();
   buildCounterPoint++;
   if (buildCounterPoint < 3) {
-    o.coordinates = buildUnnamed1062();
+    o.coordinates = buildUnnamed1992();
     o.type = "foo";
   }
   buildCounterPoint--;
@@ -352,7 +352,7 @@
 checkPoint(api.Point o) {
   buildCounterPoint++;
   if (buildCounterPoint < 3) {
-    checkUnnamed1062(o.coordinates);
+    checkUnnamed1992(o.coordinates);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterPoint--;
@@ -379,43 +379,43 @@
   buildCounterPointStyle--;
 }
 
-buildUnnamed1063() {
+buildUnnamed1993() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed1063(core.List<core.double> o) {
+checkUnnamed1993(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed1064() {
+buildUnnamed1994() {
   var o = new core.List<core.List<core.double>>();
-  o.add(buildUnnamed1063());
-  o.add(buildUnnamed1063());
+  o.add(buildUnnamed1993());
+  o.add(buildUnnamed1993());
   return o;
 }
 
-checkUnnamed1064(core.List<core.List<core.double>> o) {
+checkUnnamed1994(core.List<core.List<core.double>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1063(o[0]);
-  checkUnnamed1063(o[1]);
+  checkUnnamed1993(o[0]);
+  checkUnnamed1993(o[1]);
 }
 
-buildUnnamed1065() {
+buildUnnamed1995() {
   var o = new core.List<core.List<core.List<core.double>>>();
-  o.add(buildUnnamed1064());
-  o.add(buildUnnamed1064());
+  o.add(buildUnnamed1994());
+  o.add(buildUnnamed1994());
   return o;
 }
 
-checkUnnamed1065(core.List<core.List<core.List<core.double>>> o) {
+checkUnnamed1995(core.List<core.List<core.List<core.double>>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1064(o[0]);
-  checkUnnamed1064(o[1]);
+  checkUnnamed1994(o[0]);
+  checkUnnamed1994(o[1]);
 }
 
 core.int buildCounterPolygon = 0;
@@ -423,7 +423,7 @@
   var o = new api.Polygon();
   buildCounterPolygon++;
   if (buildCounterPolygon < 3) {
-    o.coordinates = buildUnnamed1065();
+    o.coordinates = buildUnnamed1995();
     o.type = "foo";
   }
   buildCounterPolygon--;
@@ -433,7 +433,7 @@
 checkPolygon(api.Polygon o) {
   buildCounterPolygon++;
   if (buildCounterPolygon < 3) {
-    checkUnnamed1065(o.coordinates);
+    checkUnnamed1995(o.coordinates);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterPolygon--;
@@ -472,20 +472,20 @@
   buildCounterPolygonStyle--;
 }
 
-buildUnnamed1066() {
+buildUnnamed1996() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1066(core.List<core.String> o) {
+checkUnnamed1996(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1067() {
+buildUnnamed1997() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -500,7 +500,7 @@
   return o;
 }
 
-checkUnnamed1067(core.List<core.Object> o) {
+checkUnnamed1997(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted4 = (o[0]) as core.Map;
   unittest.expect(casted4, unittest.hasLength(3));
@@ -514,17 +514,17 @@
   unittest.expect(casted5["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1068() {
+buildUnnamed1998() {
   var o = new core.List<core.List<core.Object>>();
-  o.add(buildUnnamed1067());
-  o.add(buildUnnamed1067());
+  o.add(buildUnnamed1997());
+  o.add(buildUnnamed1997());
   return o;
 }
 
-checkUnnamed1068(core.List<core.List<core.Object>> o) {
+checkUnnamed1998(core.List<core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1067(o[0]);
-  checkUnnamed1067(o[1]);
+  checkUnnamed1997(o[0]);
+  checkUnnamed1997(o[1]);
 }
 
 core.int buildCounterSqlresponse = 0;
@@ -532,9 +532,9 @@
   var o = new api.Sqlresponse();
   buildCounterSqlresponse++;
   if (buildCounterSqlresponse < 3) {
-    o.columns = buildUnnamed1066();
+    o.columns = buildUnnamed1996();
     o.kind = "foo";
-    o.rows = buildUnnamed1068();
+    o.rows = buildUnnamed1998();
   }
   buildCounterSqlresponse--;
   return o;
@@ -543,21 +543,21 @@
 checkSqlresponse(api.Sqlresponse o) {
   buildCounterSqlresponse++;
   if (buildCounterSqlresponse < 3) {
-    checkUnnamed1066(o.columns);
+    checkUnnamed1996(o.columns);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1068(o.rows);
+    checkUnnamed1998(o.rows);
   }
   buildCounterSqlresponse--;
 }
 
-buildUnnamed1069() {
+buildUnnamed1999() {
   var o = new core.List<api.Bucket>();
   o.add(buildBucket());
   o.add(buildBucket());
   return o;
 }
 
-checkUnnamed1069(core.List<api.Bucket> o) {
+checkUnnamed1999(core.List<api.Bucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucket(o[0]);
   checkBucket(o[1]);
@@ -584,14 +584,14 @@
   buildCounterStyleFunctionGradientColors--;
 }
 
-buildUnnamed1070() {
+buildUnnamed2000() {
   var o = new core.List<api.StyleFunctionGradientColors>();
   o.add(buildStyleFunctionGradientColors());
   o.add(buildStyleFunctionGradientColors());
   return o;
 }
 
-checkUnnamed1070(core.List<api.StyleFunctionGradientColors> o) {
+checkUnnamed2000(core.List<api.StyleFunctionGradientColors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStyleFunctionGradientColors(o[0]);
   checkStyleFunctionGradientColors(o[1]);
@@ -602,7 +602,7 @@
   var o = new api.StyleFunctionGradient();
   buildCounterStyleFunctionGradient++;
   if (buildCounterStyleFunctionGradient < 3) {
-    o.colors = buildUnnamed1070();
+    o.colors = buildUnnamed2000();
     o.max = 42.0;
     o.min = 42.0;
   }
@@ -613,7 +613,7 @@
 checkStyleFunctionGradient(api.StyleFunctionGradient o) {
   buildCounterStyleFunctionGradient++;
   if (buildCounterStyleFunctionGradient < 3) {
-    checkUnnamed1070(o.colors);
+    checkUnnamed2000(o.colors);
     unittest.expect(o.max, unittest.equals(42.0));
     unittest.expect(o.min, unittest.equals(42.0));
   }
@@ -625,7 +625,7 @@
   var o = new api.StyleFunction();
   buildCounterStyleFunction++;
   if (buildCounterStyleFunction < 3) {
-    o.buckets = buildUnnamed1069();
+    o.buckets = buildUnnamed1999();
     o.columnName = "foo";
     o.gradient = buildStyleFunctionGradient();
     o.kind = "foo";
@@ -637,7 +637,7 @@
 checkStyleFunction(api.StyleFunction o) {
   buildCounterStyleFunction++;
   if (buildCounterStyleFunction < 3) {
-    checkUnnamed1069(o.buckets);
+    checkUnnamed1999(o.buckets);
     unittest.expect(o.columnName, unittest.equals('foo'));
     checkStyleFunctionGradient(o.gradient);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -676,14 +676,14 @@
   buildCounterStyleSetting--;
 }
 
-buildUnnamed1071() {
+buildUnnamed2001() {
   var o = new core.List<api.StyleSetting>();
   o.add(buildStyleSetting());
   o.add(buildStyleSetting());
   return o;
 }
 
-checkUnnamed1071(core.List<api.StyleSetting> o) {
+checkUnnamed2001(core.List<api.StyleSetting> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStyleSetting(o[0]);
   checkStyleSetting(o[1]);
@@ -694,7 +694,7 @@
   var o = new api.StyleSettingList();
   buildCounterStyleSettingList++;
   if (buildCounterStyleSettingList < 3) {
-    o.items = buildUnnamed1071();
+    o.items = buildUnnamed2001();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -706,7 +706,7 @@
 checkStyleSettingList(api.StyleSettingList o) {
   buildCounterStyleSettingList++;
   if (buildCounterStyleSettingList < 3) {
-    checkUnnamed1071(o.items);
+    checkUnnamed2001(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -714,27 +714,27 @@
   buildCounterStyleSettingList--;
 }
 
-buildUnnamed1072() {
+buildUnnamed2002() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1072(core.List<core.String> o) {
+checkUnnamed2002(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1073() {
+buildUnnamed2003() {
   var o = new core.List<api.Column>();
   o.add(buildColumn());
   o.add(buildColumn());
   return o;
 }
 
-checkUnnamed1073(core.List<api.Column> o) {
+checkUnnamed2003(core.List<api.Column> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColumn(o[0]);
   checkColumn(o[1]);
@@ -747,8 +747,8 @@
   if (buildCounterTable < 3) {
     o.attribution = "foo";
     o.attributionLink = "foo";
-    o.baseTableIds = buildUnnamed1072();
-    o.columns = buildUnnamed1073();
+    o.baseTableIds = buildUnnamed2002();
+    o.columns = buildUnnamed2003();
     o.description = "foo";
     o.isExportable = true;
     o.kind = "foo";
@@ -765,8 +765,8 @@
   if (buildCounterTable < 3) {
     unittest.expect(o.attribution, unittest.equals('foo'));
     unittest.expect(o.attributionLink, unittest.equals('foo'));
-    checkUnnamed1072(o.baseTableIds);
-    checkUnnamed1073(o.columns);
+    checkUnnamed2002(o.baseTableIds);
+    checkUnnamed2003(o.columns);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.isExportable, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -777,14 +777,14 @@
   buildCounterTable--;
 }
 
-buildUnnamed1074() {
+buildUnnamed2004() {
   var o = new core.List<api.Table>();
   o.add(buildTable());
   o.add(buildTable());
   return o;
 }
 
-checkUnnamed1074(core.List<api.Table> o) {
+checkUnnamed2004(core.List<api.Table> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTable(o[0]);
   checkTable(o[1]);
@@ -795,7 +795,7 @@
   var o = new api.TableList();
   buildCounterTableList++;
   if (buildCounterTableList < 3) {
-    o.items = buildUnnamed1074();
+    o.items = buildUnnamed2004();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -806,7 +806,7 @@
 checkTableList(api.TableList o) {
   buildCounterTableList++;
   if (buildCounterTableList < 3) {
-    checkUnnamed1074(o.items);
+    checkUnnamed2004(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -840,14 +840,14 @@
   buildCounterTask--;
 }
 
-buildUnnamed1075() {
+buildUnnamed2005() {
   var o = new core.List<api.Task>();
   o.add(buildTask());
   o.add(buildTask());
   return o;
 }
 
-checkUnnamed1075(core.List<api.Task> o) {
+checkUnnamed2005(core.List<api.Task> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTask(o[0]);
   checkTask(o[1]);
@@ -858,7 +858,7 @@
   var o = new api.TaskList();
   buildCounterTaskList++;
   if (buildCounterTaskList < 3) {
-    o.items = buildUnnamed1075();
+    o.items = buildUnnamed2005();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -870,7 +870,7 @@
 checkTaskList(api.TaskList o) {
   buildCounterTaskList++;
   if (buildCounterTaskList < 3) {
-    checkUnnamed1075(o.items);
+    checkUnnamed2005(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -878,14 +878,14 @@
   buildCounterTaskList--;
 }
 
-buildUnnamed1076() {
+buildUnnamed2006() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1076(core.List<core.String> o) {
+checkUnnamed2006(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -896,7 +896,7 @@
   var o = new api.Template();
   buildCounterTemplate++;
   if (buildCounterTemplate < 3) {
-    o.automaticColumnNames = buildUnnamed1076();
+    o.automaticColumnNames = buildUnnamed2006();
     o.body = "foo";
     o.kind = "foo";
     o.name = "foo";
@@ -910,7 +910,7 @@
 checkTemplate(api.Template o) {
   buildCounterTemplate++;
   if (buildCounterTemplate < 3) {
-    checkUnnamed1076(o.automaticColumnNames);
+    checkUnnamed2006(o.automaticColumnNames);
     unittest.expect(o.body, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -920,14 +920,14 @@
   buildCounterTemplate--;
 }
 
-buildUnnamed1077() {
+buildUnnamed2007() {
   var o = new core.List<api.Template>();
   o.add(buildTemplate());
   o.add(buildTemplate());
   return o;
 }
 
-checkUnnamed1077(core.List<api.Template> o) {
+checkUnnamed2007(core.List<api.Template> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTemplate(o[0]);
   checkTemplate(o[1]);
@@ -938,7 +938,7 @@
   var o = new api.TemplateList();
   buildCounterTemplateList++;
   if (buildCounterTemplateList < 3) {
-    o.items = buildUnnamed1077();
+    o.items = buildUnnamed2007();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -950,7 +950,7 @@
 checkTemplateList(api.TemplateList o) {
   buildCounterTemplateList++;
   if (buildCounterTemplateList < 3) {
-    checkUnnamed1077(o.items);
+    checkUnnamed2007(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -1277,7 +1277,7 @@
       }), true);
       res
           .get(arg_tableId, arg_columnId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Column response) {
+          .then(unittest.expectAsync1(((response) {
         checkColumn(response);
       })));
     });
@@ -1343,7 +1343,7 @@
       }), true);
       res
           .insert(arg_request, arg_tableId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Column response) {
+          .then(unittest.expectAsync1(((response) {
         checkColumn(response);
       })));
     });
@@ -1414,7 +1414,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ColumnList response) {
+          .then(unittest.expectAsync1(((response) {
         checkColumnList(response);
       })));
     });
@@ -1484,7 +1484,7 @@
       }), true);
       res
           .patch(arg_request, arg_tableId, arg_columnId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Column response) {
+          .then(unittest.expectAsync1(((response) {
         checkColumn(response);
       })));
     });
@@ -1554,7 +1554,7 @@
       }), true);
       res
           .update(arg_request, arg_tableId, arg_columnId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Column response) {
+          .then(unittest.expectAsync1(((response) {
         checkColumn(response);
       })));
     });
@@ -1618,7 +1618,7 @@
       res
           .sql(arg_sql_1,
               hdrs: arg_hdrs, typed: arg_typed, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Sqlresponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSqlresponse(response);
       })));
     });
@@ -1680,7 +1680,7 @@
       res
           .sqlGet(arg_sql_1,
               hdrs: arg_hdrs, typed: arg_typed, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Sqlresponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSqlresponse(response);
       })));
     });
@@ -1812,7 +1812,7 @@
       }), true);
       res
           .get(arg_tableId, arg_styleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StyleSetting response) {
+          .then(unittest.expectAsync1(((response) {
         checkStyleSetting(response);
       })));
     });
@@ -1878,7 +1878,7 @@
       }), true);
       res
           .insert(arg_request, arg_tableId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StyleSetting response) {
+          .then(unittest.expectAsync1(((response) {
         checkStyleSetting(response);
       })));
     });
@@ -1949,7 +1949,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StyleSettingList response) {
+          .then(unittest.expectAsync1(((response) {
         checkStyleSettingList(response);
       })));
     });
@@ -2019,7 +2019,7 @@
       }), true);
       res
           .patch(arg_request, arg_tableId, arg_styleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StyleSetting response) {
+          .then(unittest.expectAsync1(((response) {
         checkStyleSetting(response);
       })));
     });
@@ -2089,7 +2089,7 @@
       }), true);
       res
           .update(arg_request, arg_tableId, arg_styleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StyleSetting response) {
+          .then(unittest.expectAsync1(((response) {
         checkStyleSetting(response);
       })));
     });
@@ -2157,7 +2157,7 @@
       res
           .copy(arg_tableId,
               copyPresentation: arg_copyPresentation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -2267,7 +2267,7 @@
       }), true);
       res
           .get(arg_tableId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -2353,7 +2353,7 @@
               isStrict: arg_isStrict,
               startLine: arg_startLine,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Import response) {
+          .then(unittest.expectAsync1(((response) {
         checkImport(response);
       })));
     });
@@ -2419,7 +2419,7 @@
               delimiter: arg_delimiter,
               encoding: arg_encoding,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -2475,7 +2475,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -2536,7 +2536,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TableList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTableList(response);
       })));
     });
@@ -2601,7 +2601,7 @@
           .patch(arg_request, arg_tableId,
               replaceViewDefinition: arg_replaceViewDefinition,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -2666,7 +2666,7 @@
           .update(arg_request, arg_tableId,
               replaceViewDefinition: arg_replaceViewDefinition,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -2798,7 +2798,7 @@
       }), true);
       res
           .get(arg_tableId, arg_taskId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -2873,7 +2873,7 @@
               pageToken: arg_pageToken,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TaskList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTaskList(response);
       })));
     });
@@ -3005,7 +3005,7 @@
       }), true);
       res
           .get(arg_tableId, arg_templateId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Template response) {
+          .then(unittest.expectAsync1(((response) {
         checkTemplate(response);
       })));
     });
@@ -3071,7 +3071,7 @@
       }), true);
       res
           .insert(arg_request, arg_tableId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Template response) {
+          .then(unittest.expectAsync1(((response) {
         checkTemplate(response);
       })));
     });
@@ -3142,7 +3142,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TemplateList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTemplateList(response);
       })));
     });
@@ -3212,7 +3212,7 @@
       }), true);
       res
           .patch(arg_request, arg_tableId, arg_templateId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Template response) {
+          .then(unittest.expectAsync1(((response) {
         checkTemplate(response);
       })));
     });
@@ -3283,7 +3283,7 @@
       res
           .update(arg_request, arg_tableId, arg_templateId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Template response) {
+          .then(unittest.expectAsync1(((response) {
         checkTemplate(response);
       })));
     });
diff --git a/generated/googleapis/test/fusiontables/v2_test.dart b/generated/googleapis/test/fusiontables/v2_test.dart
index ab2fabd..8337031 100644
--- a/generated/googleapis/test/fusiontables/v2_test.dart
+++ b/generated/googleapis/test/fusiontables/v2_test.dart
@@ -100,14 +100,14 @@
   buildCounterColumnBaseColumn--;
 }
 
-buildUnnamed636() {
+buildUnnamed1342() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed636(core.List<core.String> o) {
+checkUnnamed1342(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -128,7 +128,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.type = "foo";
-    o.validValues = buildUnnamed636();
+    o.validValues = buildUnnamed1342();
     o.validateData = true;
   }
   buildCounterColumn--;
@@ -148,20 +148,20 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
-    checkUnnamed636(o.validValues);
+    checkUnnamed1342(o.validValues);
     unittest.expect(o.validateData, unittest.isTrue);
   }
   buildCounterColumn--;
 }
 
-buildUnnamed637() {
+buildUnnamed1343() {
   var o = new core.List<api.Column>();
   o.add(buildColumn());
   o.add(buildColumn());
   return o;
 }
 
-checkUnnamed637(core.List<api.Column> o) {
+checkUnnamed1343(core.List<api.Column> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColumn(o[0]);
   checkColumn(o[1]);
@@ -172,7 +172,7 @@
   var o = new api.ColumnList();
   buildCounterColumnList++;
   if (buildCounterColumnList < 3) {
-    o.items = buildUnnamed637();
+    o.items = buildUnnamed1343();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -184,7 +184,7 @@
 checkColumnList(api.ColumnList o) {
   buildCounterColumnList++;
   if (buildCounterColumnList < 3) {
-    checkUnnamed637(o.items);
+    checkUnnamed1343(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -192,7 +192,7 @@
   buildCounterColumnList--;
 }
 
-buildUnnamed638() {
+buildUnnamed1344() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -207,7 +207,7 @@
   return o;
 }
 
-checkUnnamed638(core.List<core.Object> o) {
+checkUnnamed1344(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -226,7 +226,7 @@
   var o = new api.Geometry();
   buildCounterGeometry++;
   if (buildCounterGeometry < 3) {
-    o.geometries = buildUnnamed638();
+    o.geometries = buildUnnamed1344();
     o.geometry = {
       'list': [1, 2, 3],
       'bool': true,
@@ -241,7 +241,7 @@
 checkGeometry(api.Geometry o) {
   buildCounterGeometry++;
   if (buildCounterGeometry < 3) {
-    checkUnnamed638(o.geometries);
+    checkUnnamed1344(o.geometries);
     var casted3 = (o.geometry) as core.Map;
     unittest.expect(casted3, unittest.hasLength(3));
     unittest.expect(casted3["list"], unittest.equals([1, 2, 3]));
@@ -273,30 +273,30 @@
   buildCounterImport--;
 }
 
-buildUnnamed639() {
+buildUnnamed1345() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed639(core.List<core.double> o) {
+checkUnnamed1345(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed640() {
+buildUnnamed1346() {
   var o = new core.List<core.List<core.double>>();
-  o.add(buildUnnamed639());
-  o.add(buildUnnamed639());
+  o.add(buildUnnamed1345());
+  o.add(buildUnnamed1345());
   return o;
 }
 
-checkUnnamed640(core.List<core.List<core.double>> o) {
+checkUnnamed1346(core.List<core.List<core.double>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed639(o[0]);
-  checkUnnamed639(o[1]);
+  checkUnnamed1345(o[0]);
+  checkUnnamed1345(o[1]);
 }
 
 core.int buildCounterLine = 0;
@@ -304,7 +304,7 @@
   var o = new api.Line();
   buildCounterLine++;
   if (buildCounterLine < 3) {
-    o.coordinates = buildUnnamed640();
+    o.coordinates = buildUnnamed1346();
     o.type = "foo";
   }
   buildCounterLine--;
@@ -314,7 +314,7 @@
 checkLine(api.Line o) {
   buildCounterLine++;
   if (buildCounterLine < 3) {
-    checkUnnamed640(o.coordinates);
+    checkUnnamed1346(o.coordinates);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterLine--;
@@ -347,14 +347,14 @@
   buildCounterLineStyle--;
 }
 
-buildUnnamed641() {
+buildUnnamed1347() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed641(core.List<core.double> o) {
+checkUnnamed1347(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -365,7 +365,7 @@
   var o = new api.Point();
   buildCounterPoint++;
   if (buildCounterPoint < 3) {
-    o.coordinates = buildUnnamed641();
+    o.coordinates = buildUnnamed1347();
     o.type = "foo";
   }
   buildCounterPoint--;
@@ -375,7 +375,7 @@
 checkPoint(api.Point o) {
   buildCounterPoint++;
   if (buildCounterPoint < 3) {
-    checkUnnamed641(o.coordinates);
+    checkUnnamed1347(o.coordinates);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterPoint--;
@@ -402,43 +402,43 @@
   buildCounterPointStyle--;
 }
 
-buildUnnamed642() {
+buildUnnamed1348() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed642(core.List<core.double> o) {
+checkUnnamed1348(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed643() {
+buildUnnamed1349() {
   var o = new core.List<core.List<core.double>>();
-  o.add(buildUnnamed642());
-  o.add(buildUnnamed642());
+  o.add(buildUnnamed1348());
+  o.add(buildUnnamed1348());
   return o;
 }
 
-checkUnnamed643(core.List<core.List<core.double>> o) {
+checkUnnamed1349(core.List<core.List<core.double>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed642(o[0]);
-  checkUnnamed642(o[1]);
+  checkUnnamed1348(o[0]);
+  checkUnnamed1348(o[1]);
 }
 
-buildUnnamed644() {
+buildUnnamed1350() {
   var o = new core.List<core.List<core.List<core.double>>>();
-  o.add(buildUnnamed643());
-  o.add(buildUnnamed643());
+  o.add(buildUnnamed1349());
+  o.add(buildUnnamed1349());
   return o;
 }
 
-checkUnnamed644(core.List<core.List<core.List<core.double>>> o) {
+checkUnnamed1350(core.List<core.List<core.List<core.double>>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed643(o[0]);
-  checkUnnamed643(o[1]);
+  checkUnnamed1349(o[0]);
+  checkUnnamed1349(o[1]);
 }
 
 core.int buildCounterPolygon = 0;
@@ -446,7 +446,7 @@
   var o = new api.Polygon();
   buildCounterPolygon++;
   if (buildCounterPolygon < 3) {
-    o.coordinates = buildUnnamed644();
+    o.coordinates = buildUnnamed1350();
     o.type = "foo";
   }
   buildCounterPolygon--;
@@ -456,7 +456,7 @@
 checkPolygon(api.Polygon o) {
   buildCounterPolygon++;
   if (buildCounterPolygon < 3) {
-    checkUnnamed644(o.coordinates);
+    checkUnnamed1350(o.coordinates);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterPolygon--;
@@ -495,20 +495,20 @@
   buildCounterPolygonStyle--;
 }
 
-buildUnnamed645() {
+buildUnnamed1351() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed645(core.List<core.String> o) {
+checkUnnamed1351(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed646() {
+buildUnnamed1352() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -523,7 +523,7 @@
   return o;
 }
 
-checkUnnamed646(core.List<core.Object> o) {
+checkUnnamed1352(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted4 = (o[0]) as core.Map;
   unittest.expect(casted4, unittest.hasLength(3));
@@ -537,17 +537,17 @@
   unittest.expect(casted5["string"], unittest.equals('foo'));
 }
 
-buildUnnamed647() {
+buildUnnamed1353() {
   var o = new core.List<core.List<core.Object>>();
-  o.add(buildUnnamed646());
-  o.add(buildUnnamed646());
+  o.add(buildUnnamed1352());
+  o.add(buildUnnamed1352());
   return o;
 }
 
-checkUnnamed647(core.List<core.List<core.Object>> o) {
+checkUnnamed1353(core.List<core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed646(o[0]);
-  checkUnnamed646(o[1]);
+  checkUnnamed1352(o[0]);
+  checkUnnamed1352(o[1]);
 }
 
 core.int buildCounterSqlresponse = 0;
@@ -555,9 +555,9 @@
   var o = new api.Sqlresponse();
   buildCounterSqlresponse++;
   if (buildCounterSqlresponse < 3) {
-    o.columns = buildUnnamed645();
+    o.columns = buildUnnamed1351();
     o.kind = "foo";
-    o.rows = buildUnnamed647();
+    o.rows = buildUnnamed1353();
   }
   buildCounterSqlresponse--;
   return o;
@@ -566,21 +566,21 @@
 checkSqlresponse(api.Sqlresponse o) {
   buildCounterSqlresponse++;
   if (buildCounterSqlresponse < 3) {
-    checkUnnamed645(o.columns);
+    checkUnnamed1351(o.columns);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed647(o.rows);
+    checkUnnamed1353(o.rows);
   }
   buildCounterSqlresponse--;
 }
 
-buildUnnamed648() {
+buildUnnamed1354() {
   var o = new core.List<api.Bucket>();
   o.add(buildBucket());
   o.add(buildBucket());
   return o;
 }
 
-checkUnnamed648(core.List<api.Bucket> o) {
+checkUnnamed1354(core.List<api.Bucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucket(o[0]);
   checkBucket(o[1]);
@@ -607,14 +607,14 @@
   buildCounterStyleFunctionGradientColors--;
 }
 
-buildUnnamed649() {
+buildUnnamed1355() {
   var o = new core.List<api.StyleFunctionGradientColors>();
   o.add(buildStyleFunctionGradientColors());
   o.add(buildStyleFunctionGradientColors());
   return o;
 }
 
-checkUnnamed649(core.List<api.StyleFunctionGradientColors> o) {
+checkUnnamed1355(core.List<api.StyleFunctionGradientColors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStyleFunctionGradientColors(o[0]);
   checkStyleFunctionGradientColors(o[1]);
@@ -625,7 +625,7 @@
   var o = new api.StyleFunctionGradient();
   buildCounterStyleFunctionGradient++;
   if (buildCounterStyleFunctionGradient < 3) {
-    o.colors = buildUnnamed649();
+    o.colors = buildUnnamed1355();
     o.max = 42.0;
     o.min = 42.0;
   }
@@ -636,7 +636,7 @@
 checkStyleFunctionGradient(api.StyleFunctionGradient o) {
   buildCounterStyleFunctionGradient++;
   if (buildCounterStyleFunctionGradient < 3) {
-    checkUnnamed649(o.colors);
+    checkUnnamed1355(o.colors);
     unittest.expect(o.max, unittest.equals(42.0));
     unittest.expect(o.min, unittest.equals(42.0));
   }
@@ -648,7 +648,7 @@
   var o = new api.StyleFunction();
   buildCounterStyleFunction++;
   if (buildCounterStyleFunction < 3) {
-    o.buckets = buildUnnamed648();
+    o.buckets = buildUnnamed1354();
     o.columnName = "foo";
     o.gradient = buildStyleFunctionGradient();
     o.kind = "foo";
@@ -660,7 +660,7 @@
 checkStyleFunction(api.StyleFunction o) {
   buildCounterStyleFunction++;
   if (buildCounterStyleFunction < 3) {
-    checkUnnamed648(o.buckets);
+    checkUnnamed1354(o.buckets);
     unittest.expect(o.columnName, unittest.equals('foo'));
     checkStyleFunctionGradient(o.gradient);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -699,14 +699,14 @@
   buildCounterStyleSetting--;
 }
 
-buildUnnamed650() {
+buildUnnamed1356() {
   var o = new core.List<api.StyleSetting>();
   o.add(buildStyleSetting());
   o.add(buildStyleSetting());
   return o;
 }
 
-checkUnnamed650(core.List<api.StyleSetting> o) {
+checkUnnamed1356(core.List<api.StyleSetting> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStyleSetting(o[0]);
   checkStyleSetting(o[1]);
@@ -717,7 +717,7 @@
   var o = new api.StyleSettingList();
   buildCounterStyleSettingList++;
   if (buildCounterStyleSettingList < 3) {
-    o.items = buildUnnamed650();
+    o.items = buildUnnamed1356();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -729,7 +729,7 @@
 checkStyleSettingList(api.StyleSettingList o) {
   buildCounterStyleSettingList++;
   if (buildCounterStyleSettingList < 3) {
-    checkUnnamed650(o.items);
+    checkUnnamed1356(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -737,27 +737,27 @@
   buildCounterStyleSettingList--;
 }
 
-buildUnnamed651() {
+buildUnnamed1357() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed651(core.List<core.String> o) {
+checkUnnamed1357(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed652() {
+buildUnnamed1358() {
   var o = new core.List<api.Column>();
   o.add(buildColumn());
   o.add(buildColumn());
   return o;
 }
 
-checkUnnamed652(core.List<api.Column> o) {
+checkUnnamed1358(core.List<api.Column> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColumn(o[0]);
   checkColumn(o[1]);
@@ -770,9 +770,9 @@
   if (buildCounterTable < 3) {
     o.attribution = "foo";
     o.attributionLink = "foo";
-    o.baseTableIds = buildUnnamed651();
+    o.baseTableIds = buildUnnamed1357();
     o.columnPropertiesJsonSchema = "foo";
-    o.columns = buildUnnamed652();
+    o.columns = buildUnnamed1358();
     o.description = "foo";
     o.isExportable = true;
     o.kind = "foo";
@@ -791,9 +791,9 @@
   if (buildCounterTable < 3) {
     unittest.expect(o.attribution, unittest.equals('foo'));
     unittest.expect(o.attributionLink, unittest.equals('foo'));
-    checkUnnamed651(o.baseTableIds);
+    checkUnnamed1357(o.baseTableIds);
     unittest.expect(o.columnPropertiesJsonSchema, unittest.equals('foo'));
-    checkUnnamed652(o.columns);
+    checkUnnamed1358(o.columns);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.isExportable, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -806,14 +806,14 @@
   buildCounterTable--;
 }
 
-buildUnnamed653() {
+buildUnnamed1359() {
   var o = new core.List<api.Table>();
   o.add(buildTable());
   o.add(buildTable());
   return o;
 }
 
-checkUnnamed653(core.List<api.Table> o) {
+checkUnnamed1359(core.List<api.Table> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTable(o[0]);
   checkTable(o[1]);
@@ -824,7 +824,7 @@
   var o = new api.TableList();
   buildCounterTableList++;
   if (buildCounterTableList < 3) {
-    o.items = buildUnnamed653();
+    o.items = buildUnnamed1359();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -835,7 +835,7 @@
 checkTableList(api.TableList o) {
   buildCounterTableList++;
   if (buildCounterTableList < 3) {
-    checkUnnamed653(o.items);
+    checkUnnamed1359(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -869,14 +869,14 @@
   buildCounterTask--;
 }
 
-buildUnnamed654() {
+buildUnnamed1360() {
   var o = new core.List<api.Task>();
   o.add(buildTask());
   o.add(buildTask());
   return o;
 }
 
-checkUnnamed654(core.List<api.Task> o) {
+checkUnnamed1360(core.List<api.Task> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTask(o[0]);
   checkTask(o[1]);
@@ -887,7 +887,7 @@
   var o = new api.TaskList();
   buildCounterTaskList++;
   if (buildCounterTaskList < 3) {
-    o.items = buildUnnamed654();
+    o.items = buildUnnamed1360();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -899,7 +899,7 @@
 checkTaskList(api.TaskList o) {
   buildCounterTaskList++;
   if (buildCounterTaskList < 3) {
-    checkUnnamed654(o.items);
+    checkUnnamed1360(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -907,14 +907,14 @@
   buildCounterTaskList--;
 }
 
-buildUnnamed655() {
+buildUnnamed1361() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed655(core.List<core.String> o) {
+checkUnnamed1361(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -925,7 +925,7 @@
   var o = new api.Template();
   buildCounterTemplate++;
   if (buildCounterTemplate < 3) {
-    o.automaticColumnNames = buildUnnamed655();
+    o.automaticColumnNames = buildUnnamed1361();
     o.body = "foo";
     o.kind = "foo";
     o.name = "foo";
@@ -939,7 +939,7 @@
 checkTemplate(api.Template o) {
   buildCounterTemplate++;
   if (buildCounterTemplate < 3) {
-    checkUnnamed655(o.automaticColumnNames);
+    checkUnnamed1361(o.automaticColumnNames);
     unittest.expect(o.body, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -949,14 +949,14 @@
   buildCounterTemplate--;
 }
 
-buildUnnamed656() {
+buildUnnamed1362() {
   var o = new core.List<api.Template>();
   o.add(buildTemplate());
   o.add(buildTemplate());
   return o;
 }
 
-checkUnnamed656(core.List<api.Template> o) {
+checkUnnamed1362(core.List<api.Template> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTemplate(o[0]);
   checkTemplate(o[1]);
@@ -967,7 +967,7 @@
   var o = new api.TemplateList();
   buildCounterTemplateList++;
   if (buildCounterTemplateList < 3) {
-    o.items = buildUnnamed656();
+    o.items = buildUnnamed1362();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -979,7 +979,7 @@
 checkTemplateList(api.TemplateList o) {
   buildCounterTemplateList++;
   if (buildCounterTemplateList < 3) {
-    checkUnnamed656(o.items);
+    checkUnnamed1362(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -1306,7 +1306,7 @@
       }), true);
       res
           .get(arg_tableId, arg_columnId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Column response) {
+          .then(unittest.expectAsync1(((response) {
         checkColumn(response);
       })));
     });
@@ -1372,7 +1372,7 @@
       }), true);
       res
           .insert(arg_request, arg_tableId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Column response) {
+          .then(unittest.expectAsync1(((response) {
         checkColumn(response);
       })));
     });
@@ -1443,7 +1443,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ColumnList response) {
+          .then(unittest.expectAsync1(((response) {
         checkColumnList(response);
       })));
     });
@@ -1513,7 +1513,7 @@
       }), true);
       res
           .patch(arg_request, arg_tableId, arg_columnId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Column response) {
+          .then(unittest.expectAsync1(((response) {
         checkColumn(response);
       })));
     });
@@ -1583,7 +1583,7 @@
       }), true);
       res
           .update(arg_request, arg_tableId, arg_columnId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Column response) {
+          .then(unittest.expectAsync1(((response) {
         checkColumn(response);
       })));
     });
@@ -1647,7 +1647,7 @@
       res
           .sql(arg_sql_1,
               hdrs: arg_hdrs, typed: arg_typed, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Sqlresponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSqlresponse(response);
       })));
     });
@@ -1709,7 +1709,7 @@
       res
           .sqlGet(arg_sql_1,
               hdrs: arg_hdrs, typed: arg_typed, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Sqlresponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSqlresponse(response);
       })));
     });
@@ -1841,7 +1841,7 @@
       }), true);
       res
           .get(arg_tableId, arg_styleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StyleSetting response) {
+          .then(unittest.expectAsync1(((response) {
         checkStyleSetting(response);
       })));
     });
@@ -1907,7 +1907,7 @@
       }), true);
       res
           .insert(arg_request, arg_tableId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StyleSetting response) {
+          .then(unittest.expectAsync1(((response) {
         checkStyleSetting(response);
       })));
     });
@@ -1978,7 +1978,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StyleSettingList response) {
+          .then(unittest.expectAsync1(((response) {
         checkStyleSettingList(response);
       })));
     });
@@ -2048,7 +2048,7 @@
       }), true);
       res
           .patch(arg_request, arg_tableId, arg_styleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StyleSetting response) {
+          .then(unittest.expectAsync1(((response) {
         checkStyleSetting(response);
       })));
     });
@@ -2118,7 +2118,7 @@
       }), true);
       res
           .update(arg_request, arg_tableId, arg_styleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.StyleSetting response) {
+          .then(unittest.expectAsync1(((response) {
         checkStyleSetting(response);
       })));
     });
@@ -2186,7 +2186,7 @@
       res
           .copy(arg_tableId,
               copyPresentation: arg_copyPresentation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -2296,7 +2296,7 @@
       }), true);
       res
           .get(arg_tableId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -2382,7 +2382,7 @@
               isStrict: arg_isStrict,
               startLine: arg_startLine,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Import response) {
+          .then(unittest.expectAsync1(((response) {
         checkImport(response);
       })));
     });
@@ -2448,7 +2448,7 @@
               delimiter: arg_delimiter,
               encoding: arg_encoding,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -2504,7 +2504,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -2565,7 +2565,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TableList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTableList(response);
       })));
     });
@@ -2630,7 +2630,7 @@
           .patch(arg_request, arg_tableId,
               replaceViewDefinition: arg_replaceViewDefinition,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -2692,7 +2692,7 @@
       }), true);
       res
           .refetchSheet(arg_tableId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -2778,7 +2778,7 @@
               isStrict: arg_isStrict,
               startLine: arg_startLine,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -2843,7 +2843,7 @@
           .update(arg_request, arg_tableId,
               replaceViewDefinition: arg_replaceViewDefinition,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Table response) {
+          .then(unittest.expectAsync1(((response) {
         checkTable(response);
       })));
     });
@@ -2975,7 +2975,7 @@
       }), true);
       res
           .get(arg_tableId, arg_taskId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -3050,7 +3050,7 @@
               pageToken: arg_pageToken,
               startIndex: arg_startIndex,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TaskList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTaskList(response);
       })));
     });
@@ -3182,7 +3182,7 @@
       }), true);
       res
           .get(arg_tableId, arg_templateId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Template response) {
+          .then(unittest.expectAsync1(((response) {
         checkTemplate(response);
       })));
     });
@@ -3248,7 +3248,7 @@
       }), true);
       res
           .insert(arg_request, arg_tableId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Template response) {
+          .then(unittest.expectAsync1(((response) {
         checkTemplate(response);
       })));
     });
@@ -3319,7 +3319,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TemplateList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTemplateList(response);
       })));
     });
@@ -3389,7 +3389,7 @@
       }), true);
       res
           .patch(arg_request, arg_tableId, arg_templateId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Template response) {
+          .then(unittest.expectAsync1(((response) {
         checkTemplate(response);
       })));
     });
@@ -3460,7 +3460,7 @@
       res
           .update(arg_request, arg_tableId, arg_templateId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Template response) {
+          .then(unittest.expectAsync1(((response) {
         checkTemplate(response);
       })));
     });
diff --git a/generated/googleapis/test/games/v1_test.dart b/generated/googleapis/test/games/v1_test.dart
index 3a9eb1c..4c9f6c5 100644
--- a/generated/googleapis/test/games/v1_test.dart
+++ b/generated/googleapis/test/games/v1_test.dart
@@ -93,14 +93,14 @@
   buildCounterAchievementDefinition--;
 }
 
-buildUnnamed3232() {
+buildUnnamed1502() {
   var o = new core.List<api.AchievementDefinition>();
   o.add(buildAchievementDefinition());
   o.add(buildAchievementDefinition());
   return o;
 }
 
-checkUnnamed3232(core.List<api.AchievementDefinition> o) {
+checkUnnamed1502(core.List<api.AchievementDefinition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementDefinition(o[0]);
   checkAchievementDefinition(o[1]);
@@ -111,7 +111,7 @@
   var o = new api.AchievementDefinitionsListResponse();
   buildCounterAchievementDefinitionsListResponse++;
   if (buildCounterAchievementDefinitionsListResponse < 3) {
-    o.items = buildUnnamed3232();
+    o.items = buildUnnamed1502();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -123,7 +123,7 @@
     api.AchievementDefinitionsListResponse o) {
   buildCounterAchievementDefinitionsListResponse++;
   if (buildCounterAchievementDefinitionsListResponse < 3) {
-    checkUnnamed3232(o.items);
+    checkUnnamed1502(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -219,14 +219,14 @@
   buildCounterAchievementUnlockResponse--;
 }
 
-buildUnnamed3233() {
+buildUnnamed1503() {
   var o = new core.List<api.AchievementUpdateRequest>();
   o.add(buildAchievementUpdateRequest());
   o.add(buildAchievementUpdateRequest());
   return o;
 }
 
-checkUnnamed3233(core.List<api.AchievementUpdateRequest> o) {
+checkUnnamed1503(core.List<api.AchievementUpdateRequest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementUpdateRequest(o[0]);
   checkAchievementUpdateRequest(o[1]);
@@ -238,7 +238,7 @@
   buildCounterAchievementUpdateMultipleRequest++;
   if (buildCounterAchievementUpdateMultipleRequest < 3) {
     o.kind = "foo";
-    o.updates = buildUnnamed3233();
+    o.updates = buildUnnamed1503();
   }
   buildCounterAchievementUpdateMultipleRequest--;
   return o;
@@ -248,19 +248,19 @@
   buildCounterAchievementUpdateMultipleRequest++;
   if (buildCounterAchievementUpdateMultipleRequest < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3233(o.updates);
+    checkUnnamed1503(o.updates);
   }
   buildCounterAchievementUpdateMultipleRequest--;
 }
 
-buildUnnamed3234() {
+buildUnnamed1504() {
   var o = new core.List<api.AchievementUpdateResponse>();
   o.add(buildAchievementUpdateResponse());
   o.add(buildAchievementUpdateResponse());
   return o;
 }
 
-checkUnnamed3234(core.List<api.AchievementUpdateResponse> o) {
+checkUnnamed1504(core.List<api.AchievementUpdateResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementUpdateResponse(o[0]);
   checkAchievementUpdateResponse(o[1]);
@@ -272,7 +272,7 @@
   buildCounterAchievementUpdateMultipleResponse++;
   if (buildCounterAchievementUpdateMultipleResponse < 3) {
     o.kind = "foo";
-    o.updatedAchievements = buildUnnamed3234();
+    o.updatedAchievements = buildUnnamed1504();
   }
   buildCounterAchievementUpdateMultipleResponse--;
   return o;
@@ -283,7 +283,7 @@
   buildCounterAchievementUpdateMultipleResponse++;
   if (buildCounterAchievementUpdateMultipleResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3234(o.updatedAchievements);
+    checkUnnamed1504(o.updatedAchievements);
   }
   buildCounterAchievementUpdateMultipleResponse--;
 }
@@ -394,40 +394,40 @@
   buildCounterAnonymousPlayer--;
 }
 
-buildUnnamed3235() {
+buildUnnamed1505() {
   var o = new core.List<api.ImageAsset>();
   o.add(buildImageAsset());
   o.add(buildImageAsset());
   return o;
 }
 
-checkUnnamed3235(core.List<api.ImageAsset> o) {
+checkUnnamed1505(core.List<api.ImageAsset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImageAsset(o[0]);
   checkImageAsset(o[1]);
 }
 
-buildUnnamed3236() {
+buildUnnamed1506() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3236(core.List<core.String> o) {
+checkUnnamed1506(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3237() {
+buildUnnamed1507() {
   var o = new core.List<api.Instance>();
   o.add(buildInstance());
   o.add(buildInstance());
   return o;
 }
 
-checkUnnamed3237(core.List<api.Instance> o) {
+checkUnnamed1507(core.List<api.Instance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstance(o[0]);
   checkInstance(o[1]);
@@ -439,13 +439,13 @@
   buildCounterApplication++;
   if (buildCounterApplication < 3) {
     o.achievementCount = 42;
-    o.assets = buildUnnamed3235();
+    o.assets = buildUnnamed1505();
     o.author = "foo";
     o.category = buildApplicationCategory();
     o.description = "foo";
-    o.enabledFeatures = buildUnnamed3236();
+    o.enabledFeatures = buildUnnamed1506();
     o.id = "foo";
-    o.instances = buildUnnamed3237();
+    o.instances = buildUnnamed1507();
     o.kind = "foo";
     o.lastUpdatedTimestamp = "foo";
     o.leaderboardCount = 42;
@@ -460,13 +460,13 @@
   buildCounterApplication++;
   if (buildCounterApplication < 3) {
     unittest.expect(o.achievementCount, unittest.equals(42));
-    checkUnnamed3235(o.assets);
+    checkUnnamed1505(o.assets);
     unittest.expect(o.author, unittest.equals('foo'));
     checkApplicationCategory(o.category);
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed3236(o.enabledFeatures);
+    checkUnnamed1506(o.enabledFeatures);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed3237(o.instances);
+    checkUnnamed1507(o.instances);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastUpdatedTimestamp, unittest.equals('foo'));
     unittest.expect(o.leaderboardCount, unittest.equals(42));
@@ -545,14 +545,14 @@
   buildCounterCategory--;
 }
 
-buildUnnamed3238() {
+buildUnnamed1508() {
   var o = new core.List<api.Category>();
   o.add(buildCategory());
   o.add(buildCategory());
   return o;
 }
 
-checkUnnamed3238(core.List<api.Category> o) {
+checkUnnamed1508(core.List<api.Category> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCategory(o[0]);
   checkCategory(o[1]);
@@ -563,7 +563,7 @@
   var o = new api.CategoryListResponse();
   buildCounterCategoryListResponse++;
   if (buildCounterCategoryListResponse < 3) {
-    o.items = buildUnnamed3238();
+    o.items = buildUnnamed1508();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -574,7 +574,7 @@
 checkCategoryListResponse(api.CategoryListResponse o) {
   buildCounterCategoryListResponse++;
   if (buildCounterCategoryListResponse < 3) {
-    checkUnnamed3238(o.items);
+    checkUnnamed1508(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -625,14 +625,14 @@
   buildCounterEventChild--;
 }
 
-buildUnnamed3239() {
+buildUnnamed1509() {
   var o = new core.List<api.EventChild>();
   o.add(buildEventChild());
   o.add(buildEventChild());
   return o;
 }
 
-checkUnnamed3239(core.List<api.EventChild> o) {
+checkUnnamed1509(core.List<api.EventChild> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventChild(o[0]);
   checkEventChild(o[1]);
@@ -643,7 +643,7 @@
   var o = new api.EventDefinition();
   buildCounterEventDefinition++;
   if (buildCounterEventDefinition < 3) {
-    o.childEvents = buildUnnamed3239();
+    o.childEvents = buildUnnamed1509();
     o.description = "foo";
     o.displayName = "foo";
     o.id = "foo";
@@ -659,7 +659,7 @@
 checkEventDefinition(api.EventDefinition o) {
   buildCounterEventDefinition++;
   if (buildCounterEventDefinition < 3) {
-    checkUnnamed3239(o.childEvents);
+    checkUnnamed1509(o.childEvents);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
@@ -671,14 +671,14 @@
   buildCounterEventDefinition--;
 }
 
-buildUnnamed3240() {
+buildUnnamed1510() {
   var o = new core.List<api.EventDefinition>();
   o.add(buildEventDefinition());
   o.add(buildEventDefinition());
   return o;
 }
 
-checkUnnamed3240(core.List<api.EventDefinition> o) {
+checkUnnamed1510(core.List<api.EventDefinition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventDefinition(o[0]);
   checkEventDefinition(o[1]);
@@ -689,7 +689,7 @@
   var o = new api.EventDefinitionListResponse();
   buildCounterEventDefinitionListResponse++;
   if (buildCounterEventDefinitionListResponse < 3) {
-    o.items = buildUnnamed3240();
+    o.items = buildUnnamed1510();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -700,7 +700,7 @@
 checkEventDefinitionListResponse(api.EventDefinitionListResponse o) {
   buildCounterEventDefinitionListResponse++;
   if (buildCounterEventDefinitionListResponse < 3) {
-    checkUnnamed3240(o.items);
+    checkUnnamed1510(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -730,14 +730,14 @@
   buildCounterEventPeriodRange--;
 }
 
-buildUnnamed3241() {
+buildUnnamed1511() {
   var o = new core.List<api.EventUpdateRequest>();
   o.add(buildEventUpdateRequest());
   o.add(buildEventUpdateRequest());
   return o;
 }
 
-checkUnnamed3241(core.List<api.EventUpdateRequest> o) {
+checkUnnamed1511(core.List<api.EventUpdateRequest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventUpdateRequest(o[0]);
   checkEventUpdateRequest(o[1]);
@@ -750,7 +750,7 @@
   if (buildCounterEventPeriodUpdate < 3) {
     o.kind = "foo";
     o.timePeriod = buildEventPeriodRange();
-    o.updates = buildUnnamed3241();
+    o.updates = buildUnnamed1511();
   }
   buildCounterEventPeriodUpdate--;
   return o;
@@ -761,7 +761,7 @@
   if (buildCounterEventPeriodUpdate < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     checkEventPeriodRange(o.timePeriod);
-    checkUnnamed3241(o.updates);
+    checkUnnamed1511(o.updates);
   }
   buildCounterEventPeriodUpdate--;
 }
@@ -789,14 +789,14 @@
   buildCounterEventRecordFailure--;
 }
 
-buildUnnamed3242() {
+buildUnnamed1512() {
   var o = new core.List<api.EventPeriodUpdate>();
   o.add(buildEventPeriodUpdate());
   o.add(buildEventPeriodUpdate());
   return o;
 }
 
-checkUnnamed3242(core.List<api.EventPeriodUpdate> o) {
+checkUnnamed1512(core.List<api.EventPeriodUpdate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventPeriodUpdate(o[0]);
   checkEventPeriodUpdate(o[1]);
@@ -810,7 +810,7 @@
     o.currentTimeMillis = "foo";
     o.kind = "foo";
     o.requestId = "foo";
-    o.timePeriods = buildUnnamed3242();
+    o.timePeriods = buildUnnamed1512();
   }
   buildCounterEventRecordRequest--;
   return o;
@@ -822,7 +822,7 @@
     unittest.expect(o.currentTimeMillis, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.requestId, unittest.equals('foo'));
-    checkUnnamed3242(o.timePeriods);
+    checkUnnamed1512(o.timePeriods);
   }
   buildCounterEventRecordRequest--;
 }
@@ -850,40 +850,40 @@
   buildCounterEventUpdateRequest--;
 }
 
-buildUnnamed3243() {
+buildUnnamed1513() {
   var o = new core.List<api.EventBatchRecordFailure>();
   o.add(buildEventBatchRecordFailure());
   o.add(buildEventBatchRecordFailure());
   return o;
 }
 
-checkUnnamed3243(core.List<api.EventBatchRecordFailure> o) {
+checkUnnamed1513(core.List<api.EventBatchRecordFailure> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventBatchRecordFailure(o[0]);
   checkEventBatchRecordFailure(o[1]);
 }
 
-buildUnnamed3244() {
+buildUnnamed1514() {
   var o = new core.List<api.EventRecordFailure>();
   o.add(buildEventRecordFailure());
   o.add(buildEventRecordFailure());
   return o;
 }
 
-checkUnnamed3244(core.List<api.EventRecordFailure> o) {
+checkUnnamed1514(core.List<api.EventRecordFailure> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventRecordFailure(o[0]);
   checkEventRecordFailure(o[1]);
 }
 
-buildUnnamed3245() {
+buildUnnamed1515() {
   var o = new core.List<api.PlayerEvent>();
   o.add(buildPlayerEvent());
   o.add(buildPlayerEvent());
   return o;
 }
 
-checkUnnamed3245(core.List<api.PlayerEvent> o) {
+checkUnnamed1515(core.List<api.PlayerEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerEvent(o[0]);
   checkPlayerEvent(o[1]);
@@ -894,10 +894,10 @@
   var o = new api.EventUpdateResponse();
   buildCounterEventUpdateResponse++;
   if (buildCounterEventUpdateResponse < 3) {
-    o.batchFailures = buildUnnamed3243();
-    o.eventFailures = buildUnnamed3244();
+    o.batchFailures = buildUnnamed1513();
+    o.eventFailures = buildUnnamed1514();
     o.kind = "foo";
-    o.playerEvents = buildUnnamed3245();
+    o.playerEvents = buildUnnamed1515();
   }
   buildCounterEventUpdateResponse--;
   return o;
@@ -906,10 +906,10 @@
 checkEventUpdateResponse(api.EventUpdateResponse o) {
   buildCounterEventUpdateResponse++;
   if (buildCounterEventUpdateResponse < 3) {
-    checkUnnamed3243(o.batchFailures);
-    checkUnnamed3244(o.eventFailures);
+    checkUnnamed1513(o.batchFailures);
+    checkUnnamed1514(o.eventFailures);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3245(o.playerEvents);
+    checkUnnamed1515(o.playerEvents);
   }
   buildCounterEventUpdateResponse--;
 }
@@ -1163,14 +1163,14 @@
   buildCounterLeaderboardEntry--;
 }
 
-buildUnnamed3246() {
+buildUnnamed1516() {
   var o = new core.List<api.Leaderboard>();
   o.add(buildLeaderboard());
   o.add(buildLeaderboard());
   return o;
 }
 
-checkUnnamed3246(core.List<api.Leaderboard> o) {
+checkUnnamed1516(core.List<api.Leaderboard> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLeaderboard(o[0]);
   checkLeaderboard(o[1]);
@@ -1181,7 +1181,7 @@
   var o = new api.LeaderboardListResponse();
   buildCounterLeaderboardListResponse++;
   if (buildCounterLeaderboardListResponse < 3) {
-    o.items = buildUnnamed3246();
+    o.items = buildUnnamed1516();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1192,7 +1192,7 @@
 checkLeaderboardListResponse(api.LeaderboardListResponse o) {
   buildCounterLeaderboardListResponse++;
   if (buildCounterLeaderboardListResponse < 3) {
-    checkUnnamed3246(o.items);
+    checkUnnamed1516(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1226,14 +1226,14 @@
   buildCounterLeaderboardScoreRank--;
 }
 
-buildUnnamed3247() {
+buildUnnamed1517() {
   var o = new core.List<api.LeaderboardEntry>();
   o.add(buildLeaderboardEntry());
   o.add(buildLeaderboardEntry());
   return o;
 }
 
-checkUnnamed3247(core.List<api.LeaderboardEntry> o) {
+checkUnnamed1517(core.List<api.LeaderboardEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLeaderboardEntry(o[0]);
   checkLeaderboardEntry(o[1]);
@@ -1244,7 +1244,7 @@
   var o = new api.LeaderboardScores();
   buildCounterLeaderboardScores++;
   if (buildCounterLeaderboardScores < 3) {
-    o.items = buildUnnamed3247();
+    o.items = buildUnnamed1517();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.numScores = "foo";
@@ -1258,7 +1258,7 @@
 checkLeaderboardScores(api.LeaderboardScores o) {
   buildCounterLeaderboardScores++;
   if (buildCounterLeaderboardScores < 3) {
-    checkUnnamed3247(o.items);
+    checkUnnamed1517(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.numScores, unittest.equals('foo'));
@@ -1268,14 +1268,14 @@
   buildCounterLeaderboardScores--;
 }
 
-buildUnnamed3248() {
+buildUnnamed1518() {
   var o = new core.List<api.PlayerLevel>();
   o.add(buildPlayerLevel());
   o.add(buildPlayerLevel());
   return o;
 }
 
-checkUnnamed3248(core.List<api.PlayerLevel> o) {
+checkUnnamed1518(core.List<api.PlayerLevel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerLevel(o[0]);
   checkPlayerLevel(o[1]);
@@ -1288,7 +1288,7 @@
   if (buildCounterMetagameConfig < 3) {
     o.currentVersion = 42;
     o.kind = "foo";
-    o.playerLevels = buildUnnamed3248();
+    o.playerLevels = buildUnnamed1518();
   }
   buildCounterMetagameConfig--;
   return o;
@@ -1299,7 +1299,7 @@
   if (buildCounterMetagameConfig < 3) {
     unittest.expect(o.currentVersion, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3248(o.playerLevels);
+    checkUnnamed1518(o.playerLevels);
   }
   buildCounterMetagameConfig--;
 }
@@ -1536,14 +1536,14 @@
   buildCounterPlayerAchievement--;
 }
 
-buildUnnamed3249() {
+buildUnnamed1519() {
   var o = new core.List<api.PlayerAchievement>();
   o.add(buildPlayerAchievement());
   o.add(buildPlayerAchievement());
   return o;
 }
 
-checkUnnamed3249(core.List<api.PlayerAchievement> o) {
+checkUnnamed1519(core.List<api.PlayerAchievement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerAchievement(o[0]);
   checkPlayerAchievement(o[1]);
@@ -1554,7 +1554,7 @@
   var o = new api.PlayerAchievementListResponse();
   buildCounterPlayerAchievementListResponse++;
   if (buildCounterPlayerAchievementListResponse < 3) {
-    o.items = buildUnnamed3249();
+    o.items = buildUnnamed1519();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1565,7 +1565,7 @@
 checkPlayerAchievementListResponse(api.PlayerAchievementListResponse o) {
   buildCounterPlayerAchievementListResponse++;
   if (buildCounterPlayerAchievementListResponse < 3) {
-    checkUnnamed3249(o.items);
+    checkUnnamed1519(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1599,14 +1599,14 @@
   buildCounterPlayerEvent--;
 }
 
-buildUnnamed3250() {
+buildUnnamed1520() {
   var o = new core.List<api.PlayerEvent>();
   o.add(buildPlayerEvent());
   o.add(buildPlayerEvent());
   return o;
 }
 
-checkUnnamed3250(core.List<api.PlayerEvent> o) {
+checkUnnamed1520(core.List<api.PlayerEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerEvent(o[0]);
   checkPlayerEvent(o[1]);
@@ -1617,7 +1617,7 @@
   var o = new api.PlayerEventListResponse();
   buildCounterPlayerEventListResponse++;
   if (buildCounterPlayerEventListResponse < 3) {
-    o.items = buildUnnamed3250();
+    o.items = buildUnnamed1520();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1628,7 +1628,7 @@
 checkPlayerEventListResponse(api.PlayerEventListResponse o) {
   buildCounterPlayerEventListResponse++;
   if (buildCounterPlayerEventListResponse < 3) {
-    checkUnnamed3250(o.items);
+    checkUnnamed1520(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1697,14 +1697,14 @@
   buildCounterPlayerLeaderboardScore--;
 }
 
-buildUnnamed3251() {
+buildUnnamed1521() {
   var o = new core.List<api.PlayerLeaderboardScore>();
   o.add(buildPlayerLeaderboardScore());
   o.add(buildPlayerLeaderboardScore());
   return o;
 }
 
-checkUnnamed3251(core.List<api.PlayerLeaderboardScore> o) {
+checkUnnamed1521(core.List<api.PlayerLeaderboardScore> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerLeaderboardScore(o[0]);
   checkPlayerLeaderboardScore(o[1]);
@@ -1715,7 +1715,7 @@
   var o = new api.PlayerLeaderboardScoreListResponse();
   buildCounterPlayerLeaderboardScoreListResponse++;
   if (buildCounterPlayerLeaderboardScoreListResponse < 3) {
-    o.items = buildUnnamed3251();
+    o.items = buildUnnamed1521();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.player = buildPlayer();
@@ -1728,7 +1728,7 @@
     api.PlayerLeaderboardScoreListResponse o) {
   buildCounterPlayerLeaderboardScoreListResponse++;
   if (buildCounterPlayerLeaderboardScoreListResponse < 3) {
-    checkUnnamed3251(o.items);
+    checkUnnamed1521(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPlayer(o.player);
@@ -1761,14 +1761,14 @@
   buildCounterPlayerLevel--;
 }
 
-buildUnnamed3252() {
+buildUnnamed1522() {
   var o = new core.List<api.Player>();
   o.add(buildPlayer());
   o.add(buildPlayer());
   return o;
 }
 
-checkUnnamed3252(core.List<api.Player> o) {
+checkUnnamed1522(core.List<api.Player> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayer(o[0]);
   checkPlayer(o[1]);
@@ -1779,7 +1779,7 @@
   var o = new api.PlayerListResponse();
   buildCounterPlayerListResponse++;
   if (buildCounterPlayerListResponse < 3) {
-    o.items = buildUnnamed3252();
+    o.items = buildUnnamed1522();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1790,7 +1790,7 @@
 checkPlayerListResponse(api.PlayerListResponse o) {
   buildCounterPlayerListResponse++;
   if (buildCounterPlayerListResponse < 3) {
-    checkUnnamed3252(o.items);
+    checkUnnamed1522(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1824,14 +1824,14 @@
   buildCounterPlayerScore--;
 }
 
-buildUnnamed3253() {
+buildUnnamed1523() {
   var o = new core.List<api.PlayerScoreResponse>();
   o.add(buildPlayerScoreResponse());
   o.add(buildPlayerScoreResponse());
   return o;
 }
 
-checkUnnamed3253(core.List<api.PlayerScoreResponse> o) {
+checkUnnamed1523(core.List<api.PlayerScoreResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerScoreResponse(o[0]);
   checkPlayerScoreResponse(o[1]);
@@ -1843,7 +1843,7 @@
   buildCounterPlayerScoreListResponse++;
   if (buildCounterPlayerScoreListResponse < 3) {
     o.kind = "foo";
-    o.submittedScores = buildUnnamed3253();
+    o.submittedScores = buildUnnamed1523();
   }
   buildCounterPlayerScoreListResponse--;
   return o;
@@ -1853,32 +1853,32 @@
   buildCounterPlayerScoreListResponse++;
   if (buildCounterPlayerScoreListResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3253(o.submittedScores);
+    checkUnnamed1523(o.submittedScores);
   }
   buildCounterPlayerScoreListResponse--;
 }
 
-buildUnnamed3254() {
+buildUnnamed1524() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3254(core.List<core.String> o) {
+checkUnnamed1524(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3255() {
+buildUnnamed1525() {
   var o = new core.List<api.PlayerScore>();
   o.add(buildPlayerScore());
   o.add(buildPlayerScore());
   return o;
 }
 
-checkUnnamed3255(core.List<api.PlayerScore> o) {
+checkUnnamed1525(core.List<api.PlayerScore> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerScore(o[0]);
   checkPlayerScore(o[1]);
@@ -1889,12 +1889,12 @@
   var o = new api.PlayerScoreResponse();
   buildCounterPlayerScoreResponse++;
   if (buildCounterPlayerScoreResponse < 3) {
-    o.beatenScoreTimeSpans = buildUnnamed3254();
+    o.beatenScoreTimeSpans = buildUnnamed1524();
     o.formattedScore = "foo";
     o.kind = "foo";
     o.leaderboardId = "foo";
     o.scoreTag = "foo";
-    o.unbeatenScores = buildUnnamed3255();
+    o.unbeatenScores = buildUnnamed1525();
   }
   buildCounterPlayerScoreResponse--;
   return o;
@@ -1903,24 +1903,24 @@
 checkPlayerScoreResponse(api.PlayerScoreResponse o) {
   buildCounterPlayerScoreResponse++;
   if (buildCounterPlayerScoreResponse < 3) {
-    checkUnnamed3254(o.beatenScoreTimeSpans);
+    checkUnnamed1524(o.beatenScoreTimeSpans);
     unittest.expect(o.formattedScore, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.leaderboardId, unittest.equals('foo'));
     unittest.expect(o.scoreTag, unittest.equals('foo'));
-    checkUnnamed3255(o.unbeatenScores);
+    checkUnnamed1525(o.unbeatenScores);
   }
   buildCounterPlayerScoreResponse--;
 }
 
-buildUnnamed3256() {
+buildUnnamed1526() {
   var o = new core.List<api.ScoreSubmission>();
   o.add(buildScoreSubmission());
   o.add(buildScoreSubmission());
   return o;
 }
 
-checkUnnamed3256(core.List<api.ScoreSubmission> o) {
+checkUnnamed1526(core.List<api.ScoreSubmission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkScoreSubmission(o[0]);
   checkScoreSubmission(o[1]);
@@ -1932,7 +1932,7 @@
   buildCounterPlayerScoreSubmissionList++;
   if (buildCounterPlayerScoreSubmissionList < 3) {
     o.kind = "foo";
-    o.scores = buildUnnamed3256();
+    o.scores = buildUnnamed1526();
   }
   buildCounterPlayerScoreSubmissionList--;
   return o;
@@ -1942,7 +1942,7 @@
   buildCounterPlayerScoreSubmissionList++;
   if (buildCounterPlayerScoreSubmissionList < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3256(o.scores);
+    checkUnnamed1526(o.scores);
   }
   buildCounterPlayerScoreSubmissionList--;
 }
@@ -2035,14 +2035,14 @@
   buildCounterPushTokenId--;
 }
 
-buildUnnamed3257() {
+buildUnnamed1527() {
   var o = new core.List<api.QuestMilestone>();
   o.add(buildQuestMilestone());
   o.add(buildQuestMilestone());
   return o;
 }
 
-checkUnnamed3257(core.List<api.QuestMilestone> o) {
+checkUnnamed1527(core.List<api.QuestMilestone> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuestMilestone(o[0]);
   checkQuestMilestone(o[1]);
@@ -2064,7 +2064,7 @@
     o.isDefaultIconUrl = true;
     o.kind = "foo";
     o.lastUpdatedTimestampMillis = "foo";
-    o.milestones = buildUnnamed3257();
+    o.milestones = buildUnnamed1527();
     o.name = "foo";
     o.notifyTimestampMillis = "foo";
     o.startTimestampMillis = "foo";
@@ -2088,7 +2088,7 @@
     unittest.expect(o.isDefaultIconUrl, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastUpdatedTimestampMillis, unittest.equals('foo'));
-    checkUnnamed3257(o.milestones);
+    checkUnnamed1527(o.milestones);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notifyTimestampMillis, unittest.equals('foo'));
     unittest.expect(o.startTimestampMillis, unittest.equals('foo'));
@@ -2147,14 +2147,14 @@
   buildCounterQuestCriterion--;
 }
 
-buildUnnamed3258() {
+buildUnnamed1528() {
   var o = new core.List<api.Quest>();
   o.add(buildQuest());
   o.add(buildQuest());
   return o;
 }
 
-checkUnnamed3258(core.List<api.Quest> o) {
+checkUnnamed1528(core.List<api.Quest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuest(o[0]);
   checkQuest(o[1]);
@@ -2165,7 +2165,7 @@
   var o = new api.QuestListResponse();
   buildCounterQuestListResponse++;
   if (buildCounterQuestListResponse < 3) {
-    o.items = buildUnnamed3258();
+    o.items = buildUnnamed1528();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2176,21 +2176,21 @@
 checkQuestListResponse(api.QuestListResponse o) {
   buildCounterQuestListResponse++;
   if (buildCounterQuestListResponse < 3) {
-    checkUnnamed3258(o.items);
+    checkUnnamed1528(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterQuestListResponse--;
 }
 
-buildUnnamed3259() {
+buildUnnamed1529() {
   var o = new core.List<api.QuestCriterion>();
   o.add(buildQuestCriterion());
   o.add(buildQuestCriterion());
   return o;
 }
 
-checkUnnamed3259(core.List<api.QuestCriterion> o) {
+checkUnnamed1529(core.List<api.QuestCriterion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuestCriterion(o[0]);
   checkQuestCriterion(o[1]);
@@ -2202,7 +2202,7 @@
   buildCounterQuestMilestone++;
   if (buildCounterQuestMilestone < 3) {
     o.completionRewardData = "foo";
-    o.criteria = buildUnnamed3259();
+    o.criteria = buildUnnamed1529();
     o.id = "foo";
     o.kind = "foo";
     o.state = "foo";
@@ -2215,7 +2215,7 @@
   buildCounterQuestMilestone++;
   if (buildCounterQuestMilestone < 3) {
     unittest.expect(o.completionRewardData, unittest.equals('foo'));
-    checkUnnamed3259(o.criteria);
+    checkUnnamed1529(o.criteria);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
@@ -2246,14 +2246,14 @@
   buildCounterRevisionCheckResponse--;
 }
 
-buildUnnamed3260() {
+buildUnnamed1530() {
   var o = new core.List<api.RoomParticipant>();
   o.add(buildRoomParticipant());
   o.add(buildRoomParticipant());
   return o;
 }
 
-checkUnnamed3260(core.List<api.RoomParticipant> o) {
+checkUnnamed1530(core.List<api.RoomParticipant> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoomParticipant(o[0]);
   checkRoomParticipant(o[1]);
@@ -2272,7 +2272,7 @@
     o.inviterId = "foo";
     o.kind = "foo";
     o.lastUpdateDetails = buildRoomModification();
-    o.participants = buildUnnamed3260();
+    o.participants = buildUnnamed1530();
     o.roomId = "foo";
     o.roomStatusVersion = 42;
     o.status = "foo";
@@ -2293,7 +2293,7 @@
     unittest.expect(o.inviterId, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkRoomModification(o.lastUpdateDetails);
-    checkUnnamed3260(o.participants);
+    checkUnnamed1530(o.participants);
     unittest.expect(o.roomId, unittest.equals('foo'));
     unittest.expect(o.roomStatusVersion, unittest.equals(42));
     unittest.expect(o.status, unittest.equals('foo'));
@@ -2369,27 +2369,27 @@
   buildCounterRoomClientAddress--;
 }
 
-buildUnnamed3261() {
+buildUnnamed1531() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3261(core.List<core.String> o) {
+checkUnnamed1531(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3262() {
+buildUnnamed1532() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3262(core.List<core.String> o) {
+checkUnnamed1532(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2401,9 +2401,9 @@
   buildCounterRoomCreateRequest++;
   if (buildCounterRoomCreateRequest < 3) {
     o.autoMatchingCriteria = buildRoomAutoMatchingCriteria();
-    o.capabilities = buildUnnamed3261();
+    o.capabilities = buildUnnamed1531();
     o.clientAddress = buildRoomClientAddress();
-    o.invitedPlayerIds = buildUnnamed3262();
+    o.invitedPlayerIds = buildUnnamed1532();
     o.kind = "foo";
     o.networkDiagnostics = buildNetworkDiagnostics();
     o.requestId = "foo";
@@ -2417,9 +2417,9 @@
   buildCounterRoomCreateRequest++;
   if (buildCounterRoomCreateRequest < 3) {
     checkRoomAutoMatchingCriteria(o.autoMatchingCriteria);
-    checkUnnamed3261(o.capabilities);
+    checkUnnamed1531(o.capabilities);
     checkRoomClientAddress(o.clientAddress);
-    checkUnnamed3262(o.invitedPlayerIds);
+    checkUnnamed1532(o.invitedPlayerIds);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkNetworkDiagnostics(o.networkDiagnostics);
     unittest.expect(o.requestId, unittest.equals('foo'));
@@ -2428,14 +2428,14 @@
   buildCounterRoomCreateRequest--;
 }
 
-buildUnnamed3263() {
+buildUnnamed1533() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3263(core.List<core.String> o) {
+checkUnnamed1533(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2446,7 +2446,7 @@
   var o = new api.RoomJoinRequest();
   buildCounterRoomJoinRequest++;
   if (buildCounterRoomJoinRequest < 3) {
-    o.capabilities = buildUnnamed3263();
+    o.capabilities = buildUnnamed1533();
     o.clientAddress = buildRoomClientAddress();
     o.kind = "foo";
     o.networkDiagnostics = buildNetworkDiagnostics();
@@ -2458,7 +2458,7 @@
 checkRoomJoinRequest(api.RoomJoinRequest o) {
   buildCounterRoomJoinRequest++;
   if (buildCounterRoomJoinRequest < 3) {
-    checkUnnamed3263(o.capabilities);
+    checkUnnamed1533(o.capabilities);
     checkRoomClientAddress(o.clientAddress);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkNetworkDiagnostics(o.networkDiagnostics);
@@ -2466,14 +2466,14 @@
   buildCounterRoomJoinRequest--;
 }
 
-buildUnnamed3264() {
+buildUnnamed1534() {
   var o = new core.List<api.PeerSessionDiagnostics>();
   o.add(buildPeerSessionDiagnostics());
   o.add(buildPeerSessionDiagnostics());
   return o;
 }
 
-checkUnnamed3264(core.List<api.PeerSessionDiagnostics> o) {
+checkUnnamed1534(core.List<api.PeerSessionDiagnostics> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPeerSessionDiagnostics(o[0]);
   checkPeerSessionDiagnostics(o[1]);
@@ -2490,7 +2490,7 @@
     o.kind = "foo";
     o.networkOperatorCode = "foo";
     o.networkOperatorName = "foo";
-    o.peerSession = buildUnnamed3264();
+    o.peerSession = buildUnnamed1534();
     o.socketsUsed = true;
   }
   buildCounterRoomLeaveDiagnostics--;
@@ -2506,7 +2506,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.networkOperatorCode, unittest.equals('foo'));
     unittest.expect(o.networkOperatorName, unittest.equals('foo'));
-    checkUnnamed3264(o.peerSession);
+    checkUnnamed1534(o.peerSession);
     unittest.expect(o.socketsUsed, unittest.isTrue);
   }
   buildCounterRoomLeaveDiagnostics--;
@@ -2535,14 +2535,14 @@
   buildCounterRoomLeaveRequest--;
 }
 
-buildUnnamed3265() {
+buildUnnamed1535() {
   var o = new core.List<api.Room>();
   o.add(buildRoom());
   o.add(buildRoom());
   return o;
 }
 
-checkUnnamed3265(core.List<api.Room> o) {
+checkUnnamed1535(core.List<api.Room> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoom(o[0]);
   checkRoom(o[1]);
@@ -2553,7 +2553,7 @@
   var o = new api.RoomList();
   buildCounterRoomList++;
   if (buildCounterRoomList < 3) {
-    o.items = buildUnnamed3265();
+    o.items = buildUnnamed1535();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2564,7 +2564,7 @@
 checkRoomList(api.RoomList o) {
   buildCounterRoomList++;
   if (buildCounterRoomList < 3) {
-    checkUnnamed3265(o.items);
+    checkUnnamed1535(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -2625,14 +2625,14 @@
   buildCounterRoomP2PStatus--;
 }
 
-buildUnnamed3266() {
+buildUnnamed1536() {
   var o = new core.List<api.RoomP2PStatus>();
   o.add(buildRoomP2PStatus());
   o.add(buildRoomP2PStatus());
   return o;
 }
 
-checkUnnamed3266(core.List<api.RoomP2PStatus> o) {
+checkUnnamed1536(core.List<api.RoomP2PStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoomP2PStatus(o[0]);
   checkRoomP2PStatus(o[1]);
@@ -2644,7 +2644,7 @@
   buildCounterRoomP2PStatuses++;
   if (buildCounterRoomP2PStatuses < 3) {
     o.kind = "foo";
-    o.updates = buildUnnamed3266();
+    o.updates = buildUnnamed1536();
   }
   buildCounterRoomP2PStatuses--;
   return o;
@@ -2654,19 +2654,19 @@
   buildCounterRoomP2PStatuses++;
   if (buildCounterRoomP2PStatuses < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3266(o.updates);
+    checkUnnamed1536(o.updates);
   }
   buildCounterRoomP2PStatuses--;
 }
 
-buildUnnamed3267() {
+buildUnnamed1537() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3267(core.List<core.String> o) {
+checkUnnamed1537(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2679,7 +2679,7 @@
   if (buildCounterRoomParticipant < 3) {
     o.autoMatched = true;
     o.autoMatchedPlayer = buildAnonymousPlayer();
-    o.capabilities = buildUnnamed3267();
+    o.capabilities = buildUnnamed1537();
     o.clientAddress = buildRoomClientAddress();
     o.connected = true;
     o.id = "foo";
@@ -2697,7 +2697,7 @@
   if (buildCounterRoomParticipant < 3) {
     unittest.expect(o.autoMatched, unittest.isTrue);
     checkAnonymousPlayer(o.autoMatchedPlayer);
-    checkUnnamed3267(o.capabilities);
+    checkUnnamed1537(o.capabilities);
     checkRoomClientAddress(o.clientAddress);
     unittest.expect(o.connected, unittest.isTrue);
     unittest.expect(o.id, unittest.equals('foo'));
@@ -2709,14 +2709,14 @@
   buildCounterRoomParticipant--;
 }
 
-buildUnnamed3268() {
+buildUnnamed1538() {
   var o = new core.List<api.RoomParticipant>();
   o.add(buildRoomParticipant());
   o.add(buildRoomParticipant());
   return o;
 }
 
-checkUnnamed3268(core.List<api.RoomParticipant> o) {
+checkUnnamed1538(core.List<api.RoomParticipant> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoomParticipant(o[0]);
   checkRoomParticipant(o[1]);
@@ -2729,7 +2729,7 @@
   if (buildCounterRoomStatus < 3) {
     o.autoMatchingStatus = buildRoomAutoMatchStatus();
     o.kind = "foo";
-    o.participants = buildUnnamed3268();
+    o.participants = buildUnnamed1538();
     o.roomId = "foo";
     o.status = "foo";
     o.statusVersion = 42;
@@ -2743,7 +2743,7 @@
   if (buildCounterRoomStatus < 3) {
     checkRoomAutoMatchStatus(o.autoMatchingStatus);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3268(o.participants);
+    checkUnnamed1538(o.participants);
     unittest.expect(o.roomId, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.statusVersion, unittest.equals(42));
@@ -2844,14 +2844,14 @@
   buildCounterSnapshotImage--;
 }
 
-buildUnnamed3269() {
+buildUnnamed1539() {
   var o = new core.List<api.Snapshot>();
   o.add(buildSnapshot());
   o.add(buildSnapshot());
   return o;
 }
 
-checkUnnamed3269(core.List<api.Snapshot> o) {
+checkUnnamed1539(core.List<api.Snapshot> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSnapshot(o[0]);
   checkSnapshot(o[1]);
@@ -2862,7 +2862,7 @@
   var o = new api.SnapshotListResponse();
   buildCounterSnapshotListResponse++;
   if (buildCounterSnapshotListResponse < 3) {
-    o.items = buildUnnamed3269();
+    o.items = buildUnnamed1539();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -2873,7 +2873,7 @@
 checkSnapshotListResponse(api.SnapshotListResponse o) {
   buildCounterSnapshotListResponse++;
   if (buildCounterSnapshotListResponse < 3) {
-    checkUnnamed3269(o.items);
+    checkUnnamed1539(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -2905,27 +2905,27 @@
   buildCounterTurnBasedAutoMatchingCriteria--;
 }
 
-buildUnnamed3270() {
+buildUnnamed1540() {
   var o = new core.List<api.TurnBasedMatchParticipant>();
   o.add(buildTurnBasedMatchParticipant());
   o.add(buildTurnBasedMatchParticipant());
   return o;
 }
 
-checkUnnamed3270(core.List<api.TurnBasedMatchParticipant> o) {
+checkUnnamed1540(core.List<api.TurnBasedMatchParticipant> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTurnBasedMatchParticipant(o[0]);
   checkTurnBasedMatchParticipant(o[1]);
 }
 
-buildUnnamed3271() {
+buildUnnamed1541() {
   var o = new core.List<api.ParticipantResult>();
   o.add(buildParticipantResult());
   o.add(buildParticipantResult());
   return o;
 }
 
-checkUnnamed3271(core.List<api.ParticipantResult> o) {
+checkUnnamed1541(core.List<api.ParticipantResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParticipantResult(o[0]);
   checkParticipantResult(o[1]);
@@ -2947,11 +2947,11 @@
     o.matchId = "foo";
     o.matchNumber = 42;
     o.matchVersion = 42;
-    o.participants = buildUnnamed3270();
+    o.participants = buildUnnamed1540();
     o.pendingParticipantId = "foo";
     o.previousMatchData = buildTurnBasedMatchData();
     o.rematchId = "foo";
-    o.results = buildUnnamed3271();
+    o.results = buildUnnamed1541();
     o.status = "foo";
     o.userMatchStatus = "foo";
     o.variant = 42;
@@ -2975,11 +2975,11 @@
     unittest.expect(o.matchId, unittest.equals('foo'));
     unittest.expect(o.matchNumber, unittest.equals(42));
     unittest.expect(o.matchVersion, unittest.equals(42));
-    checkUnnamed3270(o.participants);
+    checkUnnamed1540(o.participants);
     unittest.expect(o.pendingParticipantId, unittest.equals('foo'));
     checkTurnBasedMatchData(o.previousMatchData);
     unittest.expect(o.rematchId, unittest.equals('foo'));
-    checkUnnamed3271(o.results);
+    checkUnnamed1541(o.results);
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.userMatchStatus, unittest.equals('foo'));
     unittest.expect(o.variant, unittest.equals(42));
@@ -2988,14 +2988,14 @@
   buildCounterTurnBasedMatch--;
 }
 
-buildUnnamed3272() {
+buildUnnamed1542() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3272(core.List<core.String> o) {
+checkUnnamed1542(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3007,7 +3007,7 @@
   buildCounterTurnBasedMatchCreateRequest++;
   if (buildCounterTurnBasedMatchCreateRequest < 3) {
     o.autoMatchingCriteria = buildTurnBasedAutoMatchingCriteria();
-    o.invitedPlayerIds = buildUnnamed3272();
+    o.invitedPlayerIds = buildUnnamed1542();
     o.kind = "foo";
     o.requestId = "foo";
     o.variant = 42;
@@ -3020,7 +3020,7 @@
   buildCounterTurnBasedMatchCreateRequest++;
   if (buildCounterTurnBasedMatchCreateRequest < 3) {
     checkTurnBasedAutoMatchingCriteria(o.autoMatchingCriteria);
-    checkUnnamed3272(o.invitedPlayerIds);
+    checkUnnamed1542(o.invitedPlayerIds);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.requestId, unittest.equals('foo'));
     unittest.expect(o.variant, unittest.equals(42));
@@ -3072,14 +3072,14 @@
   buildCounterTurnBasedMatchDataRequest--;
 }
 
-buildUnnamed3273() {
+buildUnnamed1543() {
   var o = new core.List<api.TurnBasedMatch>();
   o.add(buildTurnBasedMatch());
   o.add(buildTurnBasedMatch());
   return o;
 }
 
-checkUnnamed3273(core.List<api.TurnBasedMatch> o) {
+checkUnnamed1543(core.List<api.TurnBasedMatch> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTurnBasedMatch(o[0]);
   checkTurnBasedMatch(o[1]);
@@ -3090,7 +3090,7 @@
   var o = new api.TurnBasedMatchList();
   buildCounterTurnBasedMatchList++;
   if (buildCounterTurnBasedMatchList < 3) {
-    o.items = buildUnnamed3273();
+    o.items = buildUnnamed1543();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -3101,7 +3101,7 @@
 checkTurnBasedMatchList(api.TurnBasedMatchList o) {
   buildCounterTurnBasedMatchList++;
   if (buildCounterTurnBasedMatchList < 3) {
-    checkUnnamed3273(o.items);
+    checkUnnamed1543(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -3183,14 +3183,14 @@
   buildCounterTurnBasedMatchRematch--;
 }
 
-buildUnnamed3274() {
+buildUnnamed1544() {
   var o = new core.List<api.ParticipantResult>();
   o.add(buildParticipantResult());
   o.add(buildParticipantResult());
   return o;
 }
 
-checkUnnamed3274(core.List<api.ParticipantResult> o) {
+checkUnnamed1544(core.List<api.ParticipantResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParticipantResult(o[0]);
   checkParticipantResult(o[1]);
@@ -3204,7 +3204,7 @@
     o.data = buildTurnBasedMatchDataRequest();
     o.kind = "foo";
     o.matchVersion = 42;
-    o.results = buildUnnamed3274();
+    o.results = buildUnnamed1544();
   }
   buildCounterTurnBasedMatchResults--;
   return o;
@@ -3216,19 +3216,19 @@
     checkTurnBasedMatchDataRequest(o.data);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.matchVersion, unittest.equals(42));
-    checkUnnamed3274(o.results);
+    checkUnnamed1544(o.results);
   }
   buildCounterTurnBasedMatchResults--;
 }
 
-buildUnnamed3275() {
+buildUnnamed1545() {
   var o = new core.List<api.TurnBasedMatch>();
   o.add(buildTurnBasedMatch());
   o.add(buildTurnBasedMatch());
   return o;
 }
 
-checkUnnamed3275(core.List<api.TurnBasedMatch> o) {
+checkUnnamed1545(core.List<api.TurnBasedMatch> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTurnBasedMatch(o[0]);
   checkTurnBasedMatch(o[1]);
@@ -3239,7 +3239,7 @@
   var o = new api.TurnBasedMatchSync();
   buildCounterTurnBasedMatchSync++;
   if (buildCounterTurnBasedMatchSync < 3) {
-    o.items = buildUnnamed3275();
+    o.items = buildUnnamed1545();
     o.kind = "foo";
     o.moreAvailable = true;
     o.nextPageToken = "foo";
@@ -3251,7 +3251,7 @@
 checkTurnBasedMatchSync(api.TurnBasedMatchSync o) {
   buildCounterTurnBasedMatchSync++;
   if (buildCounterTurnBasedMatchSync < 3) {
-    checkUnnamed3275(o.items);
+    checkUnnamed1545(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.moreAvailable, unittest.isTrue);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -3259,14 +3259,14 @@
   buildCounterTurnBasedMatchSync--;
 }
 
-buildUnnamed3276() {
+buildUnnamed1546() {
   var o = new core.List<api.ParticipantResult>();
   o.add(buildParticipantResult());
   o.add(buildParticipantResult());
   return o;
 }
 
-checkUnnamed3276(core.List<api.ParticipantResult> o) {
+checkUnnamed1546(core.List<api.ParticipantResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParticipantResult(o[0]);
   checkParticipantResult(o[1]);
@@ -3281,7 +3281,7 @@
     o.kind = "foo";
     o.matchVersion = 42;
     o.pendingParticipantId = "foo";
-    o.results = buildUnnamed3276();
+    o.results = buildUnnamed1546();
   }
   buildCounterTurnBasedMatchTurn--;
   return o;
@@ -3294,7 +3294,7 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.matchVersion, unittest.equals(42));
     unittest.expect(o.pendingParticipantId, unittest.equals('foo'));
-    checkUnnamed3276(o.results);
+    checkUnnamed1546(o.results);
   }
   buildCounterTurnBasedMatchTurn--;
 }
@@ -4163,8 +4163,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AchievementDefinitionsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAchievementDefinitionsListResponse(response);
       })));
     });
@@ -4235,8 +4234,7 @@
       res
           .increment(arg_achievementId, arg_stepsToIncrement,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AchievementIncrementResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAchievementIncrementResponse(response);
       })));
     });
@@ -4314,8 +4312,7 @@
               pageToken: arg_pageToken,
               state: arg_state,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.PlayerAchievementListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlayerAchievementListResponse(response);
       })));
     });
@@ -4375,8 +4372,9 @@
         var resp = convert.JSON.encode(buildAchievementRevealResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.reveal(arg_achievementId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.AchievementRevealResponse response) {
+      res
+          .reveal(arg_achievementId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkAchievementRevealResponse(response);
       })));
     });
@@ -4442,8 +4440,7 @@
       }), true);
       res
           .setStepsAtLeast(arg_achievementId, arg_steps, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.AchievementSetStepsAtLeastResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAchievementSetStepsAtLeastResponse(response);
       })));
     });
@@ -4503,8 +4500,9 @@
         var resp = convert.JSON.encode(buildAchievementUnlockResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.unlock(arg_achievementId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.AchievementUnlockResponse response) {
+      res
+          .unlock(arg_achievementId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkAchievementUnlockResponse(response);
       })));
     });
@@ -4559,8 +4557,9 @@
             convert.JSON.encode(buildAchievementUpdateMultipleResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.updateMultiple(arg_request, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.AchievementUpdateMultipleResponse response) {
+      res
+          .updateMultiple(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkAchievementUpdateMultipleResponse(response);
       })));
     });
@@ -4627,7 +4626,7 @@
               language: arg_language,
               platformType: arg_platformType,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Application response) {
+          .then(unittest.expectAsync1(((response) {
         checkApplication(response);
       })));
     });
@@ -4735,8 +4734,9 @@
         var resp = convert.JSON.encode(buildApplicationVerifyResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.verify(arg_applicationId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ApplicationVerifyResponse response) {
+      res
+          .verify(arg_applicationId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkApplicationVerifyResponse(response);
       })));
     });
@@ -4803,7 +4803,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlayerEventListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlayerEventListResponse(response);
       })));
     });
@@ -4868,8 +4868,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.EventDefinitionListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkEventDefinitionListResponse(response);
       })));
     });
@@ -4928,7 +4927,7 @@
       }), true);
       res
           .record(arg_request, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EventUpdateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkEventUpdateResponse(response);
       })));
     });
@@ -4989,7 +4988,7 @@
       }), true);
       res
           .get(arg_leaderboardId, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Leaderboard response) {
+          .then(unittest.expectAsync1(((response) {
         checkLeaderboard(response);
       })));
     });
@@ -5054,7 +5053,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LeaderboardListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLeaderboardListResponse(response);
       })));
     });
@@ -5108,7 +5107,7 @@
       }), true);
       res
           .getMetagameConfig($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MetagameConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkMetagameConfig(response);
       })));
     });
@@ -5187,7 +5186,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CategoryListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCategoryListResponse(response);
       })));
     });
@@ -5248,7 +5247,7 @@
       }), true);
       res
           .get(arg_playerId, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Player response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlayer(response);
       })));
     });
@@ -5317,7 +5316,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlayerListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlayerListResponse(response);
       })));
     });
@@ -5571,7 +5570,7 @@
       }), true);
       res
           .accept(arg_questId, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Quest response) {
+          .then(unittest.expectAsync1(((response) {
         checkQuest(response);
       })));
     });
@@ -5646,7 +5645,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.QuestListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkQuestListResponse(response);
       })));
     });
@@ -5703,7 +5702,7 @@
       }), true);
       res
           .check(arg_clientRevision, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RevisionCheckResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRevisionCheckResponse(response);
       })));
     });
@@ -5764,7 +5763,7 @@
       }), true);
       res
           .create(arg_request, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Room response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoom(response);
       })));
     });
@@ -5829,7 +5828,7 @@
       }), true);
       res
           .decline(arg_roomId, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Room response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoom(response);
       })));
     });
@@ -5948,7 +5947,7 @@
       }), true);
       res
           .get(arg_roomId, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Room response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoom(response);
       })));
     });
@@ -6018,7 +6017,7 @@
       res
           .join(arg_request, arg_roomId,
               language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Room response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoom(response);
       })));
     });
@@ -6088,7 +6087,7 @@
       res
           .leave(arg_request, arg_roomId,
               language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Room response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoom(response);
       })));
     });
@@ -6153,7 +6152,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RoomList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoomList(response);
       })));
     });
@@ -6223,7 +6222,7 @@
       res
           .reportStatus(arg_request, arg_roomId,
               language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RoomStatus response) {
+          .then(unittest.expectAsync1(((response) {
         checkRoomStatus(response);
       })));
     });
@@ -6319,8 +6318,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.PlayerLeaderboardScoreListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlayerLeaderboardScoreListResponse(response);
       })));
     });
@@ -6402,7 +6400,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LeaderboardScores response) {
+          .then(unittest.expectAsync1(((response) {
         checkLeaderboardScores(response);
       })));
     });
@@ -6492,7 +6490,7 @@
               resultsAbove: arg_resultsAbove,
               returnTopIfAbsent: arg_returnTopIfAbsent,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LeaderboardScores response) {
+          .then(unittest.expectAsync1(((response) {
         checkLeaderboardScores(response);
       })));
     });
@@ -6565,7 +6563,7 @@
               language: arg_language,
               scoreTag: arg_scoreTag,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlayerScoreResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlayerScoreResponse(response);
       })));
     });
@@ -6625,7 +6623,7 @@
       res
           .submitMultiple(arg_request,
               language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlayerScoreListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlayerScoreListResponse(response);
       })));
     });
@@ -6686,7 +6684,7 @@
       }), true);
       res
           .get(arg_snapshotId, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Snapshot response) {
+          .then(unittest.expectAsync1(((response) {
         checkSnapshot(response);
       })));
     });
@@ -6761,7 +6759,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SnapshotListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSnapshotListResponse(response);
       })));
     });
@@ -6884,7 +6882,7 @@
       }), true);
       res
           .create(arg_request, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TurnBasedMatch response) {
+          .then(unittest.expectAsync1(((response) {
         checkTurnBasedMatch(response);
       })));
     });
@@ -6950,7 +6948,7 @@
       }), true);
       res
           .decline(arg_matchId, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TurnBasedMatch response) {
+          .then(unittest.expectAsync1(((response) {
         checkTurnBasedMatch(response);
       })));
     });
@@ -7082,7 +7080,7 @@
       res
           .finish(arg_request, arg_matchId,
               language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TurnBasedMatch response) {
+          .then(unittest.expectAsync1(((response) {
         checkTurnBasedMatch(response);
       })));
     });
@@ -7148,7 +7146,7 @@
               includeMatchData: arg_includeMatchData,
               language: arg_language,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TurnBasedMatch response) {
+          .then(unittest.expectAsync1(((response) {
         checkTurnBasedMatch(response);
       })));
     });
@@ -7214,7 +7212,7 @@
       }), true);
       res
           .join(arg_matchId, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TurnBasedMatch response) {
+          .then(unittest.expectAsync1(((response) {
         checkTurnBasedMatch(response);
       })));
     });
@@ -7280,7 +7278,7 @@
       }), true);
       res
           .leave(arg_matchId, language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TurnBasedMatch response) {
+          .then(unittest.expectAsync1(((response) {
         checkTurnBasedMatch(response);
       })));
     });
@@ -7355,7 +7353,7 @@
               language: arg_language,
               pendingParticipantId: arg_pendingParticipantId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TurnBasedMatch response) {
+          .then(unittest.expectAsync1(((response) {
         checkTurnBasedMatch(response);
       })));
     });
@@ -7429,7 +7427,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TurnBasedMatchList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTurnBasedMatchList(response);
       })));
     });
@@ -7501,7 +7499,7 @@
               language: arg_language,
               requestId: arg_requestId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TurnBasedMatchRematch response) {
+          .then(unittest.expectAsync1(((response) {
         checkTurnBasedMatchRematch(response);
       })));
     });
@@ -7575,7 +7573,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TurnBasedMatchSync response) {
+          .then(unittest.expectAsync1(((response) {
         checkTurnBasedMatchSync(response);
       })));
     });
@@ -7646,7 +7644,7 @@
       res
           .takeTurn(arg_request, arg_matchId,
               language: arg_language, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TurnBasedMatch response) {
+          .then(unittest.expectAsync1(((response) {
         checkTurnBasedMatch(response);
       })));
     });
diff --git a/generated/googleapis/test/gamesconfiguration/v1configuration_test.dart b/generated/googleapis/test/gamesconfiguration/v1configuration_test.dart
index b828ffa..21982ed 100644
--- a/generated/googleapis/test/gamesconfiguration/v1configuration_test.dart
+++ b/generated/googleapis/test/gamesconfiguration/v1configuration_test.dart
@@ -112,14 +112,14 @@
   buildCounterAchievementConfigurationDetail--;
 }
 
-buildUnnamed1165() {
+buildUnnamed3496() {
   var o = new core.List<api.AchievementConfiguration>();
   o.add(buildAchievementConfiguration());
   o.add(buildAchievementConfiguration());
   return o;
 }
 
-checkUnnamed1165(core.List<api.AchievementConfiguration> o) {
+checkUnnamed3496(core.List<api.AchievementConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementConfiguration(o[0]);
   checkAchievementConfiguration(o[1]);
@@ -130,7 +130,7 @@
   var o = new api.AchievementConfigurationListResponse();
   buildCounterAchievementConfigurationListResponse++;
   if (buildCounterAchievementConfigurationListResponse < 3) {
-    o.items = buildUnnamed1165();
+    o.items = buildUnnamed3496();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -142,7 +142,7 @@
     api.AchievementConfigurationListResponse o) {
   buildCounterAchievementConfigurationListResponse++;
   if (buildCounterAchievementConfigurationListResponse < 3) {
-    checkUnnamed1165(o.items);
+    checkUnnamed3496(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -288,14 +288,14 @@
   buildCounterLeaderboardConfigurationDetail--;
 }
 
-buildUnnamed1166() {
+buildUnnamed3497() {
   var o = new core.List<api.LeaderboardConfiguration>();
   o.add(buildLeaderboardConfiguration());
   o.add(buildLeaderboardConfiguration());
   return o;
 }
 
-checkUnnamed1166(core.List<api.LeaderboardConfiguration> o) {
+checkUnnamed3497(core.List<api.LeaderboardConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLeaderboardConfiguration(o[0]);
   checkLeaderboardConfiguration(o[1]);
@@ -306,7 +306,7 @@
   var o = new api.LeaderboardConfigurationListResponse();
   buildCounterLeaderboardConfigurationListResponse++;
   if (buildCounterLeaderboardConfigurationListResponse < 3) {
-    o.items = buildUnnamed1166();
+    o.items = buildUnnamed3497();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -318,7 +318,7 @@
     api.LeaderboardConfigurationListResponse o) {
   buildCounterLeaderboardConfigurationListResponse++;
   if (buildCounterLeaderboardConfigurationListResponse < 3) {
-    checkUnnamed1166(o.items);
+    checkUnnamed3497(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -348,14 +348,14 @@
   buildCounterLocalizedString--;
 }
 
-buildUnnamed1167() {
+buildUnnamed3498() {
   var o = new core.List<api.LocalizedString>();
   o.add(buildLocalizedString());
   o.add(buildLocalizedString());
   return o;
 }
 
-checkUnnamed1167(core.List<api.LocalizedString> o) {
+checkUnnamed3498(core.List<api.LocalizedString> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocalizedString(o[0]);
   checkLocalizedString(o[1]);
@@ -367,7 +367,7 @@
   buildCounterLocalizedStringBundle++;
   if (buildCounterLocalizedStringBundle < 3) {
     o.kind = "foo";
-    o.translations = buildUnnamed1167();
+    o.translations = buildUnnamed3498();
   }
   buildCounterLocalizedStringBundle--;
   return o;
@@ -377,7 +377,7 @@
   buildCounterLocalizedStringBundle++;
   if (buildCounterLocalizedStringBundle < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1167(o.translations);
+    checkUnnamed3498(o.translations);
   }
   buildCounterLocalizedStringBundle--;
 }
@@ -581,7 +581,7 @@
       }), true);
       res
           .get(arg_achievementId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AchievementConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkAchievementConfiguration(response);
       })));
     });
@@ -648,7 +648,7 @@
       }), true);
       res
           .insert(arg_request, arg_applicationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AchievementConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkAchievementConfiguration(response);
       })));
     });
@@ -721,8 +721,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.AchievementConfigurationListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAchievementConfigurationListResponse(response);
       })));
     });
@@ -783,7 +782,7 @@
       }), true);
       res
           .patch(arg_request, arg_achievementId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AchievementConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkAchievementConfiguration(response);
       })));
     });
@@ -844,7 +843,7 @@
       }), true);
       res
           .update(arg_request, arg_achievementId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AchievementConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkAchievementConfiguration(response);
       })));
     });
@@ -916,7 +915,7 @@
       }), true);
       res
           .upload(arg_resourceId, arg_imageType, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ImageConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkImageConfiguration(response);
       })));
     });
@@ -1030,7 +1029,7 @@
       }), true);
       res
           .get(arg_leaderboardId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LeaderboardConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkLeaderboardConfiguration(response);
       })));
     });
@@ -1097,7 +1096,7 @@
       }), true);
       res
           .insert(arg_request, arg_applicationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LeaderboardConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkLeaderboardConfiguration(response);
       })));
     });
@@ -1170,8 +1169,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.LeaderboardConfigurationListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLeaderboardConfigurationListResponse(response);
       })));
     });
@@ -1232,7 +1230,7 @@
       }), true);
       res
           .patch(arg_request, arg_leaderboardId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LeaderboardConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkLeaderboardConfiguration(response);
       })));
     });
@@ -1293,7 +1291,7 @@
       }), true);
       res
           .update(arg_request, arg_leaderboardId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LeaderboardConfiguration response) {
+          .then(unittest.expectAsync1(((response) {
         checkLeaderboardConfiguration(response);
       })));
     });
diff --git a/generated/googleapis/test/gamesmanagement/v1management_test.dart b/generated/googleapis/test/gamesmanagement/v1management_test.dart
index db63821..b57659e 100644
--- a/generated/googleapis/test/gamesmanagement/v1management_test.dart
+++ b/generated/googleapis/test/gamesmanagement/v1management_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2852() {
+buildUnnamed6() {
   var o = new core.List<api.AchievementResetResponse>();
   o.add(buildAchievementResetResponse());
   o.add(buildAchievementResetResponse());
   return o;
 }
 
-checkUnnamed2852(core.List<api.AchievementResetResponse> o) {
+checkUnnamed6(core.List<api.AchievementResetResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAchievementResetResponse(o[0]);
   checkAchievementResetResponse(o[1]);
@@ -69,7 +69,7 @@
   buildCounterAchievementResetAllResponse++;
   if (buildCounterAchievementResetAllResponse < 3) {
     o.kind = "foo";
-    o.results = buildUnnamed2852();
+    o.results = buildUnnamed6();
   }
   buildCounterAchievementResetAllResponse--;
   return o;
@@ -79,19 +79,19 @@
   buildCounterAchievementResetAllResponse++;
   if (buildCounterAchievementResetAllResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2852(o.results);
+    checkUnnamed6(o.results);
   }
   buildCounterAchievementResetAllResponse--;
 }
 
-buildUnnamed2853() {
+buildUnnamed7() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2853(core.List<core.String> o) {
+checkUnnamed7(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -102,7 +102,7 @@
   var o = new api.AchievementResetMultipleForAllRequest();
   buildCounterAchievementResetMultipleForAllRequest++;
   if (buildCounterAchievementResetMultipleForAllRequest < 3) {
-    o.achievementIds = buildUnnamed2853();
+    o.achievementIds = buildUnnamed7();
     o.kind = "foo";
   }
   buildCounterAchievementResetMultipleForAllRequest--;
@@ -113,7 +113,7 @@
     api.AchievementResetMultipleForAllRequest o) {
   buildCounterAchievementResetMultipleForAllRequest++;
   if (buildCounterAchievementResetMultipleForAllRequest < 3) {
-    checkUnnamed2853(o.achievementIds);
+    checkUnnamed7(o.achievementIds);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAchievementResetMultipleForAllRequest--;
@@ -144,14 +144,14 @@
   buildCounterAchievementResetResponse--;
 }
 
-buildUnnamed2854() {
+buildUnnamed8() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2854(core.List<core.String> o) {
+checkUnnamed8(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -162,7 +162,7 @@
   var o = new api.EventsResetMultipleForAllRequest();
   buildCounterEventsResetMultipleForAllRequest++;
   if (buildCounterEventsResetMultipleForAllRequest < 3) {
-    o.eventIds = buildUnnamed2854();
+    o.eventIds = buildUnnamed8();
     o.kind = "foo";
   }
   buildCounterEventsResetMultipleForAllRequest--;
@@ -172,7 +172,7 @@
 checkEventsResetMultipleForAllRequest(api.EventsResetMultipleForAllRequest o) {
   buildCounterEventsResetMultipleForAllRequest++;
   if (buildCounterEventsResetMultipleForAllRequest < 3) {
-    checkUnnamed2854(o.eventIds);
+    checkUnnamed8(o.eventIds);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterEventsResetMultipleForAllRequest--;
@@ -271,14 +271,14 @@
   buildCounterHiddenPlayer--;
 }
 
-buildUnnamed2855() {
+buildUnnamed9() {
   var o = new core.List<api.HiddenPlayer>();
   o.add(buildHiddenPlayer());
   o.add(buildHiddenPlayer());
   return o;
 }
 
-checkUnnamed2855(core.List<api.HiddenPlayer> o) {
+checkUnnamed9(core.List<api.HiddenPlayer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHiddenPlayer(o[0]);
   checkHiddenPlayer(o[1]);
@@ -289,7 +289,7 @@
   var o = new api.HiddenPlayerList();
   buildCounterHiddenPlayerList++;
   if (buildCounterHiddenPlayerList < 3) {
-    o.items = buildUnnamed2855();
+    o.items = buildUnnamed9();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -300,7 +300,7 @@
 checkHiddenPlayerList(api.HiddenPlayerList o) {
   buildCounterHiddenPlayerList++;
   if (buildCounterHiddenPlayerList < 3) {
-    checkUnnamed2855(o.items);
+    checkUnnamed9(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -369,14 +369,14 @@
   buildCounterPlayer--;
 }
 
-buildUnnamed2856() {
+buildUnnamed10() {
   var o = new core.List<api.PlayerScoreResetResponse>();
   o.add(buildPlayerScoreResetResponse());
   o.add(buildPlayerScoreResetResponse());
   return o;
 }
 
-checkUnnamed2856(core.List<api.PlayerScoreResetResponse> o) {
+checkUnnamed10(core.List<api.PlayerScoreResetResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlayerScoreResetResponse(o[0]);
   checkPlayerScoreResetResponse(o[1]);
@@ -388,7 +388,7 @@
   buildCounterPlayerScoreResetAllResponse++;
   if (buildCounterPlayerScoreResetAllResponse < 3) {
     o.kind = "foo";
-    o.results = buildUnnamed2856();
+    o.results = buildUnnamed10();
   }
   buildCounterPlayerScoreResetAllResponse--;
   return o;
@@ -398,19 +398,19 @@
   buildCounterPlayerScoreResetAllResponse++;
   if (buildCounterPlayerScoreResetAllResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2856(o.results);
+    checkUnnamed10(o.results);
   }
   buildCounterPlayerScoreResetAllResponse--;
 }
 
-buildUnnamed2857() {
+buildUnnamed11() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2857(core.List<core.String> o) {
+checkUnnamed11(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -423,7 +423,7 @@
   if (buildCounterPlayerScoreResetResponse < 3) {
     o.definitionId = "foo";
     o.kind = "foo";
-    o.resetScoreTimeSpans = buildUnnamed2857();
+    o.resetScoreTimeSpans = buildUnnamed11();
   }
   buildCounterPlayerScoreResetResponse--;
   return o;
@@ -434,7 +434,7 @@
   if (buildCounterPlayerScoreResetResponse < 3) {
     unittest.expect(o.definitionId, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2857(o.resetScoreTimeSpans);
+    checkUnnamed11(o.resetScoreTimeSpans);
   }
   buildCounterPlayerScoreResetResponse--;
 }
@@ -460,14 +460,14 @@
   buildCounterProfileSettings--;
 }
 
-buildUnnamed2858() {
+buildUnnamed12() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2858(core.List<core.String> o) {
+checkUnnamed12(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -479,7 +479,7 @@
   buildCounterQuestsResetMultipleForAllRequest++;
   if (buildCounterQuestsResetMultipleForAllRequest < 3) {
     o.kind = "foo";
-    o.questIds = buildUnnamed2858();
+    o.questIds = buildUnnamed12();
   }
   buildCounterQuestsResetMultipleForAllRequest--;
   return o;
@@ -489,19 +489,19 @@
   buildCounterQuestsResetMultipleForAllRequest++;
   if (buildCounterQuestsResetMultipleForAllRequest < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2858(o.questIds);
+    checkUnnamed12(o.questIds);
   }
   buildCounterQuestsResetMultipleForAllRequest--;
 }
 
-buildUnnamed2859() {
+buildUnnamed13() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2859(core.List<core.String> o) {
+checkUnnamed13(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -513,7 +513,7 @@
   buildCounterScoresResetMultipleForAllRequest++;
   if (buildCounterScoresResetMultipleForAllRequest < 3) {
     o.kind = "foo";
-    o.leaderboardIds = buildUnnamed2859();
+    o.leaderboardIds = buildUnnamed13();
   }
   buildCounterScoresResetMultipleForAllRequest--;
   return o;
@@ -523,7 +523,7 @@
   buildCounterScoresResetMultipleForAllRequest++;
   if (buildCounterScoresResetMultipleForAllRequest < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2859(o.leaderboardIds);
+    checkUnnamed13(o.leaderboardIds);
   }
   buildCounterScoresResetMultipleForAllRequest--;
 }
@@ -717,7 +717,7 @@
       }), true);
       res
           .reset(arg_achievementId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AchievementResetResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAchievementResetResponse(response);
       })));
     });
@@ -768,8 +768,9 @@
         var resp = convert.JSON.encode(buildAchievementResetAllResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.resetAll($fields: arg_$fields).then(
-          unittest.expectAsync1(((api.AchievementResetAllResponse response) {
+      res
+          .resetAll($fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkAchievementResetAllResponse(response);
       })));
     });
@@ -1010,7 +1011,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.HiddenPlayerList response) {
+          .then(unittest.expectAsync1(((response) {
         checkHiddenPlayerList(response);
       })));
     });
@@ -1852,7 +1853,7 @@
       }), true);
       res
           .reset(arg_leaderboardId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlayerScoreResetResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlayerScoreResetResponse(response);
       })));
     });
@@ -1902,8 +1903,9 @@
         var resp = convert.JSON.encode(buildPlayerScoreResetAllResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.resetAll($fields: arg_$fields).then(
-          unittest.expectAsync1(((api.PlayerScoreResetAllResponse response) {
+      res
+          .resetAll($fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkPlayerScoreResetAllResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/genomics/v1_test.dart b/generated/googleapis/test/genomics/v1_test.dart
index 0a9de1e..f24871a 100644
--- a/generated/googleapis/test/genomics/v1_test.dart
+++ b/generated/googleapis/test/genomics/v1_test.dart
@@ -50,7 +50,7 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed1953() {
+buildUnnamed1002() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -65,7 +65,7 @@
   return o;
 }
 
-checkUnnamed1953(core.List<core.Object> o) {
+checkUnnamed1002(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -79,17 +79,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1954() {
+buildUnnamed1003() {
   var o = new core.Map<core.String, core.List<core.Object>>();
-  o["x"] = buildUnnamed1953();
-  o["y"] = buildUnnamed1953();
+  o["x"] = buildUnnamed1002();
+  o["y"] = buildUnnamed1002();
   return o;
 }
 
-checkUnnamed1954(core.Map<core.String, core.List<core.Object>> o) {
+checkUnnamed1003(core.Map<core.String, core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1953(o["x"]);
-  checkUnnamed1953(o["y"]);
+  checkUnnamed1002(o["x"]);
+  checkUnnamed1002(o["y"]);
 }
 
 core.int buildCounterAnnotation = 0;
@@ -100,7 +100,7 @@
     o.annotationSetId = "foo";
     o.end = "foo";
     o.id = "foo";
-    o.info = buildUnnamed1954();
+    o.info = buildUnnamed1003();
     o.name = "foo";
     o.referenceId = "foo";
     o.referenceName = "foo";
@@ -120,7 +120,7 @@
     unittest.expect(o.annotationSetId, unittest.equals('foo'));
     unittest.expect(o.end, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1954(o.info);
+    checkUnnamed1003(o.info);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.referenceId, unittest.equals('foo'));
     unittest.expect(o.referenceName, unittest.equals('foo'));
@@ -133,7 +133,7 @@
   buildCounterAnnotation--;
 }
 
-buildUnnamed1955() {
+buildUnnamed1004() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -148,7 +148,7 @@
   return o;
 }
 
-checkUnnamed1955(core.List<core.Object> o) {
+checkUnnamed1004(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o[0]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -162,17 +162,17 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1956() {
+buildUnnamed1005() {
   var o = new core.Map<core.String, core.List<core.Object>>();
-  o["x"] = buildUnnamed1955();
-  o["y"] = buildUnnamed1955();
+  o["x"] = buildUnnamed1004();
+  o["y"] = buildUnnamed1004();
   return o;
 }
 
-checkUnnamed1956(core.Map<core.String, core.List<core.Object>> o) {
+checkUnnamed1005(core.Map<core.String, core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1955(o["x"]);
-  checkUnnamed1955(o["y"]);
+  checkUnnamed1004(o["x"]);
+  checkUnnamed1004(o["y"]);
 }
 
 core.int buildCounterAnnotationSet = 0;
@@ -182,7 +182,7 @@
   if (buildCounterAnnotationSet < 3) {
     o.datasetId = "foo";
     o.id = "foo";
-    o.info = buildUnnamed1956();
+    o.info = buildUnnamed1005();
     o.name = "foo";
     o.referenceSetId = "foo";
     o.sourceUri = "foo";
@@ -197,7 +197,7 @@
   if (buildCounterAnnotationSet < 3) {
     unittest.expect(o.datasetId, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1956(o.info);
+    checkUnnamed1005(o.info);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.referenceSetId, unittest.equals('foo'));
     unittest.expect(o.sourceUri, unittest.equals('foo'));
@@ -206,14 +206,14 @@
   buildCounterAnnotationSet--;
 }
 
-buildUnnamed1957() {
+buildUnnamed1006() {
   var o = new core.List<api.Annotation>();
   o.add(buildAnnotation());
   o.add(buildAnnotation());
   return o;
 }
 
-checkUnnamed1957(core.List<api.Annotation> o) {
+checkUnnamed1006(core.List<api.Annotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnnotation(o[0]);
   checkAnnotation(o[1]);
@@ -224,7 +224,7 @@
   var o = new api.BatchCreateAnnotationsRequest();
   buildCounterBatchCreateAnnotationsRequest++;
   if (buildCounterBatchCreateAnnotationsRequest < 3) {
-    o.annotations = buildUnnamed1957();
+    o.annotations = buildUnnamed1006();
     o.requestId = "foo";
   }
   buildCounterBatchCreateAnnotationsRequest--;
@@ -234,20 +234,20 @@
 checkBatchCreateAnnotationsRequest(api.BatchCreateAnnotationsRequest o) {
   buildCounterBatchCreateAnnotationsRequest++;
   if (buildCounterBatchCreateAnnotationsRequest < 3) {
-    checkUnnamed1957(o.annotations);
+    checkUnnamed1006(o.annotations);
     unittest.expect(o.requestId, unittest.equals('foo'));
   }
   buildCounterBatchCreateAnnotationsRequest--;
 }
 
-buildUnnamed1958() {
+buildUnnamed1007() {
   var o = new core.List<api.Entry>();
   o.add(buildEntry());
   o.add(buildEntry());
   return o;
 }
 
-checkUnnamed1958(core.List<api.Entry> o) {
+checkUnnamed1007(core.List<api.Entry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntry(o[0]);
   checkEntry(o[1]);
@@ -258,7 +258,7 @@
   var o = new api.BatchCreateAnnotationsResponse();
   buildCounterBatchCreateAnnotationsResponse++;
   if (buildCounterBatchCreateAnnotationsResponse < 3) {
-    o.entries = buildUnnamed1958();
+    o.entries = buildUnnamed1007();
   }
   buildCounterBatchCreateAnnotationsResponse--;
   return o;
@@ -267,19 +267,19 @@
 checkBatchCreateAnnotationsResponse(api.BatchCreateAnnotationsResponse o) {
   buildCounterBatchCreateAnnotationsResponse++;
   if (buildCounterBatchCreateAnnotationsResponse < 3) {
-    checkUnnamed1958(o.entries);
+    checkUnnamed1007(o.entries);
   }
   buildCounterBatchCreateAnnotationsResponse--;
 }
 
-buildUnnamed1959() {
+buildUnnamed1008() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1959(core.List<core.String> o) {
+checkUnnamed1008(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -290,7 +290,7 @@
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed1959();
+    o.members = buildUnnamed1008();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -300,13 +300,13 @@
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed1959(o.members);
+    checkUnnamed1008(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
 }
 
-buildUnnamed1960() {
+buildUnnamed1009() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -321,7 +321,7 @@
   return o;
 }
 
-checkUnnamed1960(core.List<core.Object> o) {
+checkUnnamed1009(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o[0]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -335,27 +335,27 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1961() {
+buildUnnamed1010() {
   var o = new core.Map<core.String, core.List<core.Object>>();
-  o["x"] = buildUnnamed1960();
-  o["y"] = buildUnnamed1960();
+  o["x"] = buildUnnamed1009();
+  o["y"] = buildUnnamed1009();
   return o;
 }
 
-checkUnnamed1961(core.Map<core.String, core.List<core.Object>> o) {
+checkUnnamed1010(core.Map<core.String, core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1960(o["x"]);
-  checkUnnamed1960(o["y"]);
+  checkUnnamed1009(o["x"]);
+  checkUnnamed1009(o["y"]);
 }
 
-buildUnnamed1962() {
+buildUnnamed1011() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1962(core.List<core.String> o) {
+checkUnnamed1011(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -368,10 +368,10 @@
   if (buildCounterCallSet < 3) {
     o.created = "foo";
     o.id = "foo";
-    o.info = buildUnnamed1961();
+    o.info = buildUnnamed1010();
     o.name = "foo";
     o.sampleId = "foo";
-    o.variantSetIds = buildUnnamed1962();
+    o.variantSetIds = buildUnnamed1011();
   }
   buildCounterCallSet--;
   return o;
@@ -382,10 +382,10 @@
   if (buildCounterCallSet < 3) {
     unittest.expect(o.created, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1961(o.info);
+    checkUnnamed1010(o.info);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.sampleId, unittest.equals('foo'));
-    checkUnnamed1962(o.variantSetIds);
+    checkUnnamed1011(o.variantSetIds);
   }
   buildCounterCallSet--;
 }
@@ -428,27 +428,27 @@
   buildCounterCigarUnit--;
 }
 
-buildUnnamed1963() {
+buildUnnamed1012() {
   var o = new core.List<api.ExternalId>();
   o.add(buildExternalId());
   o.add(buildExternalId());
   return o;
 }
 
-checkUnnamed1963(core.List<api.ExternalId> o) {
+checkUnnamed1012(core.List<api.ExternalId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExternalId(o[0]);
   checkExternalId(o[1]);
 }
 
-buildUnnamed1964() {
+buildUnnamed1013() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1964(core.List<core.String> o) {
+checkUnnamed1013(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -460,8 +460,8 @@
   buildCounterClinicalCondition++;
   if (buildCounterClinicalCondition < 3) {
     o.conceptId = "foo";
-    o.externalIds = buildUnnamed1963();
-    o.names = buildUnnamed1964();
+    o.externalIds = buildUnnamed1012();
+    o.names = buildUnnamed1013();
     o.omimId = "foo";
   }
   buildCounterClinicalCondition--;
@@ -472,8 +472,8 @@
   buildCounterClinicalCondition++;
   if (buildCounterClinicalCondition < 3) {
     unittest.expect(o.conceptId, unittest.equals('foo'));
-    checkUnnamed1963(o.externalIds);
-    checkUnnamed1964(o.names);
+    checkUnnamed1012(o.externalIds);
+    checkUnnamed1013(o.names);
     unittest.expect(o.omimId, unittest.equals('foo'));
   }
   buildCounterClinicalCondition--;
@@ -500,14 +500,14 @@
   buildCounterCodingSequence--;
 }
 
-buildUnnamed1965() {
+buildUnnamed1014() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1965(core.List<core.String> o) {
+checkUnnamed1014(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -518,7 +518,7 @@
   var o = new api.ComputeEngine();
   buildCounterComputeEngine++;
   if (buildCounterComputeEngine < 3) {
-    o.diskNames = buildUnnamed1965();
+    o.diskNames = buildUnnamed1014();
     o.instanceName = "foo";
     o.machineType = "foo";
     o.zone = "foo";
@@ -530,7 +530,7 @@
 checkComputeEngine(api.ComputeEngine o) {
   buildCounterComputeEngine++;
   if (buildCounterComputeEngine < 3) {
-    checkUnnamed1965(o.diskNames);
+    checkUnnamed1014(o.diskNames);
     unittest.expect(o.instanceName, unittest.equals('foo'));
     unittest.expect(o.machineType, unittest.equals('foo'));
     unittest.expect(o.zone, unittest.equals('foo'));
@@ -668,14 +668,14 @@
   buildCounterExperiment--;
 }
 
-buildUnnamed1966() {
+buildUnnamed1015() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1966(core.List<core.String> o) {
+checkUnnamed1015(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -688,7 +688,7 @@
   if (buildCounterExportReadGroupSetRequest < 3) {
     o.exportUri = "foo";
     o.projectId = "foo";
-    o.referenceNames = buildUnnamed1966();
+    o.referenceNames = buildUnnamed1015();
   }
   buildCounterExportReadGroupSetRequest--;
   return o;
@@ -699,19 +699,19 @@
   if (buildCounterExportReadGroupSetRequest < 3) {
     unittest.expect(o.exportUri, unittest.equals('foo'));
     unittest.expect(o.projectId, unittest.equals('foo'));
-    checkUnnamed1966(o.referenceNames);
+    checkUnnamed1015(o.referenceNames);
   }
   buildCounterExportReadGroupSetRequest--;
 }
 
-buildUnnamed1967() {
+buildUnnamed1016() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1967(core.List<core.String> o) {
+checkUnnamed1016(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -724,7 +724,7 @@
   if (buildCounterExportVariantSetRequest < 3) {
     o.bigqueryDataset = "foo";
     o.bigqueryTable = "foo";
-    o.callSetIds = buildUnnamed1967();
+    o.callSetIds = buildUnnamed1016();
     o.format = "foo";
     o.projectId = "foo";
   }
@@ -737,7 +737,7 @@
   if (buildCounterExportVariantSetRequest < 3) {
     unittest.expect(o.bigqueryDataset, unittest.equals('foo'));
     unittest.expect(o.bigqueryTable, unittest.equals('foo'));
-    checkUnnamed1967(o.callSetIds);
+    checkUnnamed1016(o.callSetIds);
     unittest.expect(o.format, unittest.equals('foo'));
     unittest.expect(o.projectId, unittest.equals('foo'));
   }
@@ -780,14 +780,14 @@
   buildCounterGetIamPolicyRequest--;
 }
 
-buildUnnamed1968() {
+buildUnnamed1017() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1968(core.List<core.String> o) {
+checkUnnamed1017(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -801,7 +801,7 @@
     o.datasetId = "foo";
     o.partitionStrategy = "foo";
     o.referenceSetId = "foo";
-    o.sourceUris = buildUnnamed1968();
+    o.sourceUris = buildUnnamed1017();
   }
   buildCounterImportReadGroupSetsRequest--;
   return o;
@@ -813,19 +813,19 @@
     unittest.expect(o.datasetId, unittest.equals('foo'));
     unittest.expect(o.partitionStrategy, unittest.equals('foo'));
     unittest.expect(o.referenceSetId, unittest.equals('foo'));
-    checkUnnamed1968(o.sourceUris);
+    checkUnnamed1017(o.sourceUris);
   }
   buildCounterImportReadGroupSetsRequest--;
 }
 
-buildUnnamed1969() {
+buildUnnamed1018() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1969(core.List<core.String> o) {
+checkUnnamed1018(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -836,7 +836,7 @@
   var o = new api.ImportReadGroupSetsResponse();
   buildCounterImportReadGroupSetsResponse++;
   if (buildCounterImportReadGroupSetsResponse < 3) {
-    o.readGroupSetIds = buildUnnamed1969();
+    o.readGroupSetIds = buildUnnamed1018();
   }
   buildCounterImportReadGroupSetsResponse--;
   return o;
@@ -845,32 +845,32 @@
 checkImportReadGroupSetsResponse(api.ImportReadGroupSetsResponse o) {
   buildCounterImportReadGroupSetsResponse++;
   if (buildCounterImportReadGroupSetsResponse < 3) {
-    checkUnnamed1969(o.readGroupSetIds);
+    checkUnnamed1018(o.readGroupSetIds);
   }
   buildCounterImportReadGroupSetsResponse--;
 }
 
-buildUnnamed1970() {
+buildUnnamed1019() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1970(core.Map<core.String, core.String> o) {
+checkUnnamed1019(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1971() {
+buildUnnamed1020() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1971(core.List<core.String> o) {
+checkUnnamed1020(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -882,9 +882,9 @@
   buildCounterImportVariantsRequest++;
   if (buildCounterImportVariantsRequest < 3) {
     o.format = "foo";
-    o.infoMergeConfig = buildUnnamed1970();
+    o.infoMergeConfig = buildUnnamed1019();
     o.normalizeReferenceNames = true;
-    o.sourceUris = buildUnnamed1971();
+    o.sourceUris = buildUnnamed1020();
     o.variantSetId = "foo";
   }
   buildCounterImportVariantsRequest--;
@@ -895,22 +895,22 @@
   buildCounterImportVariantsRequest++;
   if (buildCounterImportVariantsRequest < 3) {
     unittest.expect(o.format, unittest.equals('foo'));
-    checkUnnamed1970(o.infoMergeConfig);
+    checkUnnamed1019(o.infoMergeConfig);
     unittest.expect(o.normalizeReferenceNames, unittest.isTrue);
-    checkUnnamed1971(o.sourceUris);
+    checkUnnamed1020(o.sourceUris);
     unittest.expect(o.variantSetId, unittest.equals('foo'));
   }
   buildCounterImportVariantsRequest--;
 }
 
-buildUnnamed1972() {
+buildUnnamed1021() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1972(core.List<core.String> o) {
+checkUnnamed1021(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -921,7 +921,7 @@
   var o = new api.ImportVariantsResponse();
   buildCounterImportVariantsResponse++;
   if (buildCounterImportVariantsResponse < 3) {
-    o.callSetIds = buildUnnamed1972();
+    o.callSetIds = buildUnnamed1021();
   }
   buildCounterImportVariantsResponse--;
   return o;
@@ -930,19 +930,19 @@
 checkImportVariantsResponse(api.ImportVariantsResponse o) {
   buildCounterImportVariantsResponse++;
   if (buildCounterImportVariantsResponse < 3) {
-    checkUnnamed1972(o.callSetIds);
+    checkUnnamed1021(o.callSetIds);
   }
   buildCounterImportVariantsResponse--;
 }
 
-buildUnnamed1973() {
+buildUnnamed1022() {
   var o = new core.List<api.CigarUnit>();
   o.add(buildCigarUnit());
   o.add(buildCigarUnit());
   return o;
 }
 
-checkUnnamed1973(core.List<api.CigarUnit> o) {
+checkUnnamed1022(core.List<api.CigarUnit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCigarUnit(o[0]);
   checkCigarUnit(o[1]);
@@ -953,7 +953,7 @@
   var o = new api.LinearAlignment();
   buildCounterLinearAlignment++;
   if (buildCounterLinearAlignment < 3) {
-    o.cigar = buildUnnamed1973();
+    o.cigar = buildUnnamed1022();
     o.mappingQuality = 42;
     o.position = buildPosition();
   }
@@ -964,7 +964,7 @@
 checkLinearAlignment(api.LinearAlignment o) {
   buildCounterLinearAlignment++;
   if (buildCounterLinearAlignment < 3) {
-    checkUnnamed1973(o.cigar);
+    checkUnnamed1022(o.cigar);
     unittest.expect(o.mappingQuality, unittest.equals(42));
     checkPosition(o.position);
   }
@@ -994,14 +994,14 @@
   buildCounterListBasesResponse--;
 }
 
-buildUnnamed1974() {
+buildUnnamed1023() {
   var o = new core.List<api.CoverageBucket>();
   o.add(buildCoverageBucket());
   o.add(buildCoverageBucket());
   return o;
 }
 
-checkUnnamed1974(core.List<api.CoverageBucket> o) {
+checkUnnamed1023(core.List<api.CoverageBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCoverageBucket(o[0]);
   checkCoverageBucket(o[1]);
@@ -1013,7 +1013,7 @@
   buildCounterListCoverageBucketsResponse++;
   if (buildCounterListCoverageBucketsResponse < 3) {
     o.bucketWidth = "foo";
-    o.coverageBuckets = buildUnnamed1974();
+    o.coverageBuckets = buildUnnamed1023();
     o.nextPageToken = "foo";
   }
   buildCounterListCoverageBucketsResponse--;
@@ -1024,20 +1024,20 @@
   buildCounterListCoverageBucketsResponse++;
   if (buildCounterListCoverageBucketsResponse < 3) {
     unittest.expect(o.bucketWidth, unittest.equals('foo'));
-    checkUnnamed1974(o.coverageBuckets);
+    checkUnnamed1023(o.coverageBuckets);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListCoverageBucketsResponse--;
 }
 
-buildUnnamed1975() {
+buildUnnamed1024() {
   var o = new core.List<api.Dataset>();
   o.add(buildDataset());
   o.add(buildDataset());
   return o;
 }
 
-checkUnnamed1975(core.List<api.Dataset> o) {
+checkUnnamed1024(core.List<api.Dataset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataset(o[0]);
   checkDataset(o[1]);
@@ -1048,7 +1048,7 @@
   var o = new api.ListDatasetsResponse();
   buildCounterListDatasetsResponse++;
   if (buildCounterListDatasetsResponse < 3) {
-    o.datasets = buildUnnamed1975();
+    o.datasets = buildUnnamed1024();
     o.nextPageToken = "foo";
   }
   buildCounterListDatasetsResponse--;
@@ -1058,20 +1058,20 @@
 checkListDatasetsResponse(api.ListDatasetsResponse o) {
   buildCounterListDatasetsResponse++;
   if (buildCounterListDatasetsResponse < 3) {
-    checkUnnamed1975(o.datasets);
+    checkUnnamed1024(o.datasets);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDatasetsResponse--;
 }
 
-buildUnnamed1976() {
+buildUnnamed1025() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed1976(core.List<api.Operation> o) {
+checkUnnamed1025(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -1083,7 +1083,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed1976();
+    o.operations = buildUnnamed1025();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -1093,32 +1093,32 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1976(o.operations);
+    checkUnnamed1025(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed1977() {
+buildUnnamed1026() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1977(core.Map<core.String, core.String> o) {
+checkUnnamed1026(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1978() {
+buildUnnamed1027() {
   var o = new core.List<api.Variant>();
   o.add(buildVariant());
   o.add(buildVariant());
   return o;
 }
 
-checkUnnamed1978(core.List<api.Variant> o) {
+checkUnnamed1027(core.List<api.Variant> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariant(o[0]);
   checkVariant(o[1]);
@@ -1129,9 +1129,9 @@
   var o = new api.MergeVariantsRequest();
   buildCounterMergeVariantsRequest++;
   if (buildCounterMergeVariantsRequest < 3) {
-    o.infoMergeConfig = buildUnnamed1977();
+    o.infoMergeConfig = buildUnnamed1026();
     o.variantSetId = "foo";
-    o.variants = buildUnnamed1978();
+    o.variants = buildUnnamed1027();
   }
   buildCounterMergeVariantsRequest--;
   return o;
@@ -1140,14 +1140,14 @@
 checkMergeVariantsRequest(api.MergeVariantsRequest o) {
   buildCounterMergeVariantsRequest++;
   if (buildCounterMergeVariantsRequest < 3) {
-    checkUnnamed1977(o.infoMergeConfig);
+    checkUnnamed1026(o.infoMergeConfig);
     unittest.expect(o.variantSetId, unittest.equals('foo'));
-    checkUnnamed1978(o.variants);
+    checkUnnamed1027(o.variants);
   }
   buildCounterMergeVariantsRequest--;
 }
 
-buildUnnamed1979() {
+buildUnnamed1028() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1162,7 +1162,7 @@
   return o;
 }
 
-checkUnnamed1979(core.Map<core.String, core.Object> o) {
+checkUnnamed1028(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -1176,7 +1176,7 @@
   unittest.expect(casted8["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1980() {
+buildUnnamed1029() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1191,7 +1191,7 @@
   return o;
 }
 
-checkUnnamed1980(core.Map<core.String, core.Object> o) {
+checkUnnamed1029(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted9 = (o["x"]) as core.Map;
   unittest.expect(casted9, unittest.hasLength(3));
@@ -1212,9 +1212,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed1979();
+    o.metadata = buildUnnamed1028();
     o.name = "foo";
-    o.response = buildUnnamed1980();
+    o.response = buildUnnamed1029();
   }
   buildCounterOperation--;
   return o;
@@ -1225,9 +1225,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed1979(o.metadata);
+    checkUnnamed1028(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1980(o.response);
+    checkUnnamed1029(o.response);
   }
   buildCounterOperation--;
 }
@@ -1255,33 +1255,33 @@
   buildCounterOperationEvent--;
 }
 
-buildUnnamed1981() {
+buildUnnamed1030() {
   var o = new core.List<api.OperationEvent>();
   o.add(buildOperationEvent());
   o.add(buildOperationEvent());
   return o;
 }
 
-checkUnnamed1981(core.List<api.OperationEvent> o) {
+checkUnnamed1030(core.List<api.OperationEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationEvent(o[0]);
   checkOperationEvent(o[1]);
 }
 
-buildUnnamed1982() {
+buildUnnamed1031() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1982(core.Map<core.String, core.String> o) {
+checkUnnamed1031(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1983() {
+buildUnnamed1032() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1296,7 +1296,7 @@
   return o;
 }
 
-checkUnnamed1983(core.Map<core.String, core.Object> o) {
+checkUnnamed1032(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted11 = (o["x"]) as core.Map;
   unittest.expect(casted11, unittest.hasLength(3));
@@ -1310,7 +1310,7 @@
   unittest.expect(casted12["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1984() {
+buildUnnamed1033() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1325,7 +1325,7 @@
   return o;
 }
 
-checkUnnamed1984(core.Map<core.String, core.Object> o) {
+checkUnnamed1033(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted13 = (o["x"]) as core.Map;
   unittest.expect(casted13, unittest.hasLength(3));
@@ -1347,11 +1347,11 @@
     o.clientId = "foo";
     o.createTime = "foo";
     o.endTime = "foo";
-    o.events = buildUnnamed1981();
-    o.labels = buildUnnamed1982();
+    o.events = buildUnnamed1030();
+    o.labels = buildUnnamed1031();
     o.projectId = "foo";
-    o.request = buildUnnamed1983();
-    o.runtimeMetadata = buildUnnamed1984();
+    o.request = buildUnnamed1032();
+    o.runtimeMetadata = buildUnnamed1033();
     o.startTime = "foo";
   }
   buildCounterOperationMetadata--;
@@ -1364,24 +1364,24 @@
     unittest.expect(o.clientId, unittest.equals('foo'));
     unittest.expect(o.createTime, unittest.equals('foo'));
     unittest.expect(o.endTime, unittest.equals('foo'));
-    checkUnnamed1981(o.events);
-    checkUnnamed1982(o.labels);
+    checkUnnamed1030(o.events);
+    checkUnnamed1031(o.labels);
     unittest.expect(o.projectId, unittest.equals('foo'));
-    checkUnnamed1983(o.request);
-    checkUnnamed1984(o.runtimeMetadata);
+    checkUnnamed1032(o.request);
+    checkUnnamed1033(o.runtimeMetadata);
     unittest.expect(o.startTime, unittest.equals('foo'));
   }
   buildCounterOperationMetadata--;
 }
 
-buildUnnamed1985() {
+buildUnnamed1034() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed1985(core.List<api.Binding> o) {
+checkUnnamed1034(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -1392,7 +1392,7 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.bindings = buildUnnamed1985();
+    o.bindings = buildUnnamed1034();
     o.etag = "foo";
     o.version = 42;
   }
@@ -1403,7 +1403,7 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed1985(o.bindings);
+    checkUnnamed1034(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
@@ -1483,20 +1483,20 @@
   buildCounterRange--;
 }
 
-buildUnnamed1986() {
+buildUnnamed1035() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1986(core.List<core.int> o) {
+checkUnnamed1035(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed1987() {
+buildUnnamed1036() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -1511,7 +1511,7 @@
   return o;
 }
 
-checkUnnamed1987(core.List<core.Object> o) {
+checkUnnamed1036(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted15 = (o[0]) as core.Map;
   unittest.expect(casted15, unittest.hasLength(3));
@@ -1525,17 +1525,17 @@
   unittest.expect(casted16["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1988() {
+buildUnnamed1037() {
   var o = new core.Map<core.String, core.List<core.Object>>();
-  o["x"] = buildUnnamed1987();
-  o["y"] = buildUnnamed1987();
+  o["x"] = buildUnnamed1036();
+  o["y"] = buildUnnamed1036();
   return o;
 }
 
-checkUnnamed1988(core.Map<core.String, core.List<core.Object>> o) {
+checkUnnamed1037(core.Map<core.String, core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1987(o["x"]);
-  checkUnnamed1987(o["y"]);
+  checkUnnamed1036(o["x"]);
+  checkUnnamed1036(o["y"]);
 }
 
 core.int buildCounterRead = 0;
@@ -1543,7 +1543,7 @@
   var o = new api.Read();
   buildCounterRead++;
   if (buildCounterRead < 3) {
-    o.alignedQuality = buildUnnamed1986();
+    o.alignedQuality = buildUnnamed1035();
     o.alignedSequence = "foo";
     o.alignment = buildLinearAlignment();
     o.duplicateFragment = true;
@@ -1551,7 +1551,7 @@
     o.fragmentLength = 42;
     o.fragmentName = "foo";
     o.id = "foo";
-    o.info = buildUnnamed1988();
+    o.info = buildUnnamed1037();
     o.nextMatePosition = buildPosition();
     o.numberReads = 42;
     o.properPlacement = true;
@@ -1568,7 +1568,7 @@
 checkRead(api.Read o) {
   buildCounterRead++;
   if (buildCounterRead < 3) {
-    checkUnnamed1986(o.alignedQuality);
+    checkUnnamed1035(o.alignedQuality);
     unittest.expect(o.alignedSequence, unittest.equals('foo'));
     checkLinearAlignment(o.alignment);
     unittest.expect(o.duplicateFragment, unittest.isTrue);
@@ -1576,7 +1576,7 @@
     unittest.expect(o.fragmentLength, unittest.equals(42));
     unittest.expect(o.fragmentName, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1988(o.info);
+    checkUnnamed1037(o.info);
     checkPosition(o.nextMatePosition);
     unittest.expect(o.numberReads, unittest.equals(42));
     unittest.expect(o.properPlacement, unittest.isTrue);
@@ -1589,7 +1589,7 @@
   buildCounterRead--;
 }
 
-buildUnnamed1989() {
+buildUnnamed1038() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -1604,7 +1604,7 @@
   return o;
 }
 
-checkUnnamed1989(core.List<core.Object> o) {
+checkUnnamed1038(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted17 = (o[0]) as core.Map;
   unittest.expect(casted17, unittest.hasLength(3));
@@ -1618,27 +1618,27 @@
   unittest.expect(casted18["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1990() {
+buildUnnamed1039() {
   var o = new core.Map<core.String, core.List<core.Object>>();
-  o["x"] = buildUnnamed1989();
-  o["y"] = buildUnnamed1989();
+  o["x"] = buildUnnamed1038();
+  o["y"] = buildUnnamed1038();
   return o;
 }
 
-checkUnnamed1990(core.Map<core.String, core.List<core.Object>> o) {
+checkUnnamed1039(core.Map<core.String, core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1989(o["x"]);
-  checkUnnamed1989(o["y"]);
+  checkUnnamed1038(o["x"]);
+  checkUnnamed1038(o["y"]);
 }
 
-buildUnnamed1991() {
+buildUnnamed1040() {
   var o = new core.List<api.Program>();
   o.add(buildProgram());
   o.add(buildProgram());
   return o;
 }
 
-checkUnnamed1991(core.List<api.Program> o) {
+checkUnnamed1040(core.List<api.Program> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProgram(o[0]);
   checkProgram(o[1]);
@@ -1653,10 +1653,10 @@
     o.description = "foo";
     o.experiment = buildExperiment();
     o.id = "foo";
-    o.info = buildUnnamed1990();
+    o.info = buildUnnamed1039();
     o.name = "foo";
     o.predictedInsertSize = 42;
-    o.programs = buildUnnamed1991();
+    o.programs = buildUnnamed1040();
     o.referenceSetId = "foo";
     o.sampleId = "foo";
   }
@@ -1671,17 +1671,17 @@
     unittest.expect(o.description, unittest.equals('foo'));
     checkExperiment(o.experiment);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1990(o.info);
+    checkUnnamed1039(o.info);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.predictedInsertSize, unittest.equals(42));
-    checkUnnamed1991(o.programs);
+    checkUnnamed1040(o.programs);
     unittest.expect(o.referenceSetId, unittest.equals('foo'));
     unittest.expect(o.sampleId, unittest.equals('foo'));
   }
   buildCounterReadGroup--;
 }
 
-buildUnnamed1992() {
+buildUnnamed1041() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -1696,7 +1696,7 @@
   return o;
 }
 
-checkUnnamed1992(core.List<core.Object> o) {
+checkUnnamed1041(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted19 = (o[0]) as core.Map;
   unittest.expect(casted19, unittest.hasLength(3));
@@ -1710,27 +1710,27 @@
   unittest.expect(casted20["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1993() {
+buildUnnamed1042() {
   var o = new core.Map<core.String, core.List<core.Object>>();
-  o["x"] = buildUnnamed1992();
-  o["y"] = buildUnnamed1992();
+  o["x"] = buildUnnamed1041();
+  o["y"] = buildUnnamed1041();
   return o;
 }
 
-checkUnnamed1993(core.Map<core.String, core.List<core.Object>> o) {
+checkUnnamed1042(core.Map<core.String, core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1992(o["x"]);
-  checkUnnamed1992(o["y"]);
+  checkUnnamed1041(o["x"]);
+  checkUnnamed1041(o["y"]);
 }
 
-buildUnnamed1994() {
+buildUnnamed1043() {
   var o = new core.List<api.ReadGroup>();
   o.add(buildReadGroup());
   o.add(buildReadGroup());
   return o;
 }
 
-checkUnnamed1994(core.List<api.ReadGroup> o) {
+checkUnnamed1043(core.List<api.ReadGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReadGroup(o[0]);
   checkReadGroup(o[1]);
@@ -1744,9 +1744,9 @@
     o.datasetId = "foo";
     o.filename = "foo";
     o.id = "foo";
-    o.info = buildUnnamed1993();
+    o.info = buildUnnamed1042();
     o.name = "foo";
-    o.readGroups = buildUnnamed1994();
+    o.readGroups = buildUnnamed1043();
     o.referenceSetId = "foo";
   }
   buildCounterReadGroupSet--;
@@ -1759,22 +1759,22 @@
     unittest.expect(o.datasetId, unittest.equals('foo'));
     unittest.expect(o.filename, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1993(o.info);
+    checkUnnamed1042(o.info);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1994(o.readGroups);
+    checkUnnamed1043(o.readGroups);
     unittest.expect(o.referenceSetId, unittest.equals('foo'));
   }
   buildCounterReadGroupSet--;
 }
 
-buildUnnamed1995() {
+buildUnnamed1044() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1995(core.List<core.String> o) {
+checkUnnamed1044(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1790,7 +1790,7 @@
     o.md5checksum = "foo";
     o.name = "foo";
     o.ncbiTaxonId = 42;
-    o.sourceAccessions = buildUnnamed1995();
+    o.sourceAccessions = buildUnnamed1044();
     o.sourceUri = "foo";
   }
   buildCounterReference--;
@@ -1805,7 +1805,7 @@
     unittest.expect(o.md5checksum, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.ncbiTaxonId, unittest.equals(42));
-    checkUnnamed1995(o.sourceAccessions);
+    checkUnnamed1044(o.sourceAccessions);
     unittest.expect(o.sourceUri, unittest.equals('foo'));
   }
   buildCounterReference--;
@@ -1832,27 +1832,27 @@
   buildCounterReferenceBound--;
 }
 
-buildUnnamed1996() {
+buildUnnamed1045() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1996(core.List<core.String> o) {
+checkUnnamed1045(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1997() {
+buildUnnamed1046() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1997(core.List<core.String> o) {
+checkUnnamed1046(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1868,8 +1868,8 @@
     o.id = "foo";
     o.md5checksum = "foo";
     o.ncbiTaxonId = 42;
-    o.referenceIds = buildUnnamed1996();
-    o.sourceAccessions = buildUnnamed1997();
+    o.referenceIds = buildUnnamed1045();
+    o.sourceAccessions = buildUnnamed1046();
     o.sourceUri = "foo";
   }
   buildCounterReferenceSet--;
@@ -1884,8 +1884,8 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.md5checksum, unittest.equals('foo'));
     unittest.expect(o.ncbiTaxonId, unittest.equals(42));
-    checkUnnamed1996(o.referenceIds);
-    checkUnnamed1997(o.sourceAccessions);
+    checkUnnamed1045(o.referenceIds);
+    checkUnnamed1046(o.sourceAccessions);
     unittest.expect(o.sourceUri, unittest.equals('foo'));
   }
   buildCounterReferenceSet--;
@@ -1910,27 +1910,27 @@
   buildCounterRuntimeMetadata--;
 }
 
-buildUnnamed1998() {
+buildUnnamed1047() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1998(core.List<core.String> o) {
+checkUnnamed1047(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1999() {
+buildUnnamed1048() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1999(core.List<core.String> o) {
+checkUnnamed1048(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1941,12 +1941,12 @@
   var o = new api.SearchAnnotationSetsRequest();
   buildCounterSearchAnnotationSetsRequest++;
   if (buildCounterSearchAnnotationSetsRequest < 3) {
-    o.datasetIds = buildUnnamed1998();
+    o.datasetIds = buildUnnamed1047();
     o.name = "foo";
     o.pageSize = 42;
     o.pageToken = "foo";
     o.referenceSetId = "foo";
-    o.types = buildUnnamed1999();
+    o.types = buildUnnamed1048();
   }
   buildCounterSearchAnnotationSetsRequest--;
   return o;
@@ -1955,24 +1955,24 @@
 checkSearchAnnotationSetsRequest(api.SearchAnnotationSetsRequest o) {
   buildCounterSearchAnnotationSetsRequest++;
   if (buildCounterSearchAnnotationSetsRequest < 3) {
-    checkUnnamed1998(o.datasetIds);
+    checkUnnamed1047(o.datasetIds);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.pageSize, unittest.equals(42));
     unittest.expect(o.pageToken, unittest.equals('foo'));
     unittest.expect(o.referenceSetId, unittest.equals('foo'));
-    checkUnnamed1999(o.types);
+    checkUnnamed1048(o.types);
   }
   buildCounterSearchAnnotationSetsRequest--;
 }
 
-buildUnnamed2000() {
+buildUnnamed1049() {
   var o = new core.List<api.AnnotationSet>();
   o.add(buildAnnotationSet());
   o.add(buildAnnotationSet());
   return o;
 }
 
-checkUnnamed2000(core.List<api.AnnotationSet> o) {
+checkUnnamed1049(core.List<api.AnnotationSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnnotationSet(o[0]);
   checkAnnotationSet(o[1]);
@@ -1983,7 +1983,7 @@
   var o = new api.SearchAnnotationSetsResponse();
   buildCounterSearchAnnotationSetsResponse++;
   if (buildCounterSearchAnnotationSetsResponse < 3) {
-    o.annotationSets = buildUnnamed2000();
+    o.annotationSets = buildUnnamed1049();
     o.nextPageToken = "foo";
   }
   buildCounterSearchAnnotationSetsResponse--;
@@ -1993,20 +1993,20 @@
 checkSearchAnnotationSetsResponse(api.SearchAnnotationSetsResponse o) {
   buildCounterSearchAnnotationSetsResponse++;
   if (buildCounterSearchAnnotationSetsResponse < 3) {
-    checkUnnamed2000(o.annotationSets);
+    checkUnnamed1049(o.annotationSets);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterSearchAnnotationSetsResponse--;
 }
 
-buildUnnamed2001() {
+buildUnnamed1050() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2001(core.List<core.String> o) {
+checkUnnamed1050(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2017,7 +2017,7 @@
   var o = new api.SearchAnnotationsRequest();
   buildCounterSearchAnnotationsRequest++;
   if (buildCounterSearchAnnotationsRequest < 3) {
-    o.annotationSetIds = buildUnnamed2001();
+    o.annotationSetIds = buildUnnamed1050();
     o.end = "foo";
     o.pageSize = 42;
     o.pageToken = "foo";
@@ -2032,7 +2032,7 @@
 checkSearchAnnotationsRequest(api.SearchAnnotationsRequest o) {
   buildCounterSearchAnnotationsRequest++;
   if (buildCounterSearchAnnotationsRequest < 3) {
-    checkUnnamed2001(o.annotationSetIds);
+    checkUnnamed1050(o.annotationSetIds);
     unittest.expect(o.end, unittest.equals('foo'));
     unittest.expect(o.pageSize, unittest.equals(42));
     unittest.expect(o.pageToken, unittest.equals('foo'));
@@ -2043,14 +2043,14 @@
   buildCounterSearchAnnotationsRequest--;
 }
 
-buildUnnamed2002() {
+buildUnnamed1051() {
   var o = new core.List<api.Annotation>();
   o.add(buildAnnotation());
   o.add(buildAnnotation());
   return o;
 }
 
-checkUnnamed2002(core.List<api.Annotation> o) {
+checkUnnamed1051(core.List<api.Annotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnnotation(o[0]);
   checkAnnotation(o[1]);
@@ -2061,7 +2061,7 @@
   var o = new api.SearchAnnotationsResponse();
   buildCounterSearchAnnotationsResponse++;
   if (buildCounterSearchAnnotationsResponse < 3) {
-    o.annotations = buildUnnamed2002();
+    o.annotations = buildUnnamed1051();
     o.nextPageToken = "foo";
   }
   buildCounterSearchAnnotationsResponse--;
@@ -2071,20 +2071,20 @@
 checkSearchAnnotationsResponse(api.SearchAnnotationsResponse o) {
   buildCounterSearchAnnotationsResponse++;
   if (buildCounterSearchAnnotationsResponse < 3) {
-    checkUnnamed2002(o.annotations);
+    checkUnnamed1051(o.annotations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterSearchAnnotationsResponse--;
 }
 
-buildUnnamed2003() {
+buildUnnamed1052() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2003(core.List<core.String> o) {
+checkUnnamed1052(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2098,7 +2098,7 @@
     o.name = "foo";
     o.pageSize = 42;
     o.pageToken = "foo";
-    o.variantSetIds = buildUnnamed2003();
+    o.variantSetIds = buildUnnamed1052();
   }
   buildCounterSearchCallSetsRequest--;
   return o;
@@ -2110,19 +2110,19 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.pageSize, unittest.equals(42));
     unittest.expect(o.pageToken, unittest.equals('foo'));
-    checkUnnamed2003(o.variantSetIds);
+    checkUnnamed1052(o.variantSetIds);
   }
   buildCounterSearchCallSetsRequest--;
 }
 
-buildUnnamed2004() {
+buildUnnamed1053() {
   var o = new core.List<api.CallSet>();
   o.add(buildCallSet());
   o.add(buildCallSet());
   return o;
 }
 
-checkUnnamed2004(core.List<api.CallSet> o) {
+checkUnnamed1053(core.List<api.CallSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCallSet(o[0]);
   checkCallSet(o[1]);
@@ -2133,7 +2133,7 @@
   var o = new api.SearchCallSetsResponse();
   buildCounterSearchCallSetsResponse++;
   if (buildCounterSearchCallSetsResponse < 3) {
-    o.callSets = buildUnnamed2004();
+    o.callSets = buildUnnamed1053();
     o.nextPageToken = "foo";
   }
   buildCounterSearchCallSetsResponse--;
@@ -2143,20 +2143,20 @@
 checkSearchCallSetsResponse(api.SearchCallSetsResponse o) {
   buildCounterSearchCallSetsResponse++;
   if (buildCounterSearchCallSetsResponse < 3) {
-    checkUnnamed2004(o.callSets);
+    checkUnnamed1053(o.callSets);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterSearchCallSetsResponse--;
 }
 
-buildUnnamed2005() {
+buildUnnamed1054() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2005(core.List<core.String> o) {
+checkUnnamed1054(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2167,7 +2167,7 @@
   var o = new api.SearchReadGroupSetsRequest();
   buildCounterSearchReadGroupSetsRequest++;
   if (buildCounterSearchReadGroupSetsRequest < 3) {
-    o.datasetIds = buildUnnamed2005();
+    o.datasetIds = buildUnnamed1054();
     o.name = "foo";
     o.pageSize = 42;
     o.pageToken = "foo";
@@ -2179,7 +2179,7 @@
 checkSearchReadGroupSetsRequest(api.SearchReadGroupSetsRequest o) {
   buildCounterSearchReadGroupSetsRequest++;
   if (buildCounterSearchReadGroupSetsRequest < 3) {
-    checkUnnamed2005(o.datasetIds);
+    checkUnnamed1054(o.datasetIds);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.pageSize, unittest.equals(42));
     unittest.expect(o.pageToken, unittest.equals('foo'));
@@ -2187,14 +2187,14 @@
   buildCounterSearchReadGroupSetsRequest--;
 }
 
-buildUnnamed2006() {
+buildUnnamed1055() {
   var o = new core.List<api.ReadGroupSet>();
   o.add(buildReadGroupSet());
   o.add(buildReadGroupSet());
   return o;
 }
 
-checkUnnamed2006(core.List<api.ReadGroupSet> o) {
+checkUnnamed1055(core.List<api.ReadGroupSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReadGroupSet(o[0]);
   checkReadGroupSet(o[1]);
@@ -2206,7 +2206,7 @@
   buildCounterSearchReadGroupSetsResponse++;
   if (buildCounterSearchReadGroupSetsResponse < 3) {
     o.nextPageToken = "foo";
-    o.readGroupSets = buildUnnamed2006();
+    o.readGroupSets = buildUnnamed1055();
   }
   buildCounterSearchReadGroupSetsResponse--;
   return o;
@@ -2216,32 +2216,32 @@
   buildCounterSearchReadGroupSetsResponse++;
   if (buildCounterSearchReadGroupSetsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2006(o.readGroupSets);
+    checkUnnamed1055(o.readGroupSets);
   }
   buildCounterSearchReadGroupSetsResponse--;
 }
 
-buildUnnamed2007() {
+buildUnnamed1056() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2007(core.List<core.String> o) {
+checkUnnamed1056(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2008() {
+buildUnnamed1057() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2008(core.List<core.String> o) {
+checkUnnamed1057(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2255,8 +2255,8 @@
     o.end = "foo";
     o.pageSize = 42;
     o.pageToken = "foo";
-    o.readGroupIds = buildUnnamed2007();
-    o.readGroupSetIds = buildUnnamed2008();
+    o.readGroupIds = buildUnnamed1056();
+    o.readGroupSetIds = buildUnnamed1057();
     o.referenceName = "foo";
     o.start = "foo";
   }
@@ -2270,22 +2270,22 @@
     unittest.expect(o.end, unittest.equals('foo'));
     unittest.expect(o.pageSize, unittest.equals(42));
     unittest.expect(o.pageToken, unittest.equals('foo'));
-    checkUnnamed2007(o.readGroupIds);
-    checkUnnamed2008(o.readGroupSetIds);
+    checkUnnamed1056(o.readGroupIds);
+    checkUnnamed1057(o.readGroupSetIds);
     unittest.expect(o.referenceName, unittest.equals('foo'));
     unittest.expect(o.start, unittest.equals('foo'));
   }
   buildCounterSearchReadsRequest--;
 }
 
-buildUnnamed2009() {
+buildUnnamed1058() {
   var o = new core.List<api.Read>();
   o.add(buildRead());
   o.add(buildRead());
   return o;
 }
 
-checkUnnamed2009(core.List<api.Read> o) {
+checkUnnamed1058(core.List<api.Read> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRead(o[0]);
   checkRead(o[1]);
@@ -2296,7 +2296,7 @@
   var o = new api.SearchReadsResponse();
   buildCounterSearchReadsResponse++;
   if (buildCounterSearchReadsResponse < 3) {
-    o.alignments = buildUnnamed2009();
+    o.alignments = buildUnnamed1058();
     o.nextPageToken = "foo";
   }
   buildCounterSearchReadsResponse--;
@@ -2306,33 +2306,33 @@
 checkSearchReadsResponse(api.SearchReadsResponse o) {
   buildCounterSearchReadsResponse++;
   if (buildCounterSearchReadsResponse < 3) {
-    checkUnnamed2009(o.alignments);
+    checkUnnamed1058(o.alignments);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterSearchReadsResponse--;
 }
 
-buildUnnamed2010() {
+buildUnnamed1059() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2010(core.List<core.String> o) {
+checkUnnamed1059(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2011() {
+buildUnnamed1060() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2011(core.List<core.String> o) {
+checkUnnamed1060(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2343,9 +2343,9 @@
   var o = new api.SearchReferenceSetsRequest();
   buildCounterSearchReferenceSetsRequest++;
   if (buildCounterSearchReferenceSetsRequest < 3) {
-    o.accessions = buildUnnamed2010();
+    o.accessions = buildUnnamed1059();
     o.assemblyId = "foo";
-    o.md5checksums = buildUnnamed2011();
+    o.md5checksums = buildUnnamed1060();
     o.pageSize = 42;
     o.pageToken = "foo";
   }
@@ -2356,23 +2356,23 @@
 checkSearchReferenceSetsRequest(api.SearchReferenceSetsRequest o) {
   buildCounterSearchReferenceSetsRequest++;
   if (buildCounterSearchReferenceSetsRequest < 3) {
-    checkUnnamed2010(o.accessions);
+    checkUnnamed1059(o.accessions);
     unittest.expect(o.assemblyId, unittest.equals('foo'));
-    checkUnnamed2011(o.md5checksums);
+    checkUnnamed1060(o.md5checksums);
     unittest.expect(o.pageSize, unittest.equals(42));
     unittest.expect(o.pageToken, unittest.equals('foo'));
   }
   buildCounterSearchReferenceSetsRequest--;
 }
 
-buildUnnamed2012() {
+buildUnnamed1061() {
   var o = new core.List<api.ReferenceSet>();
   o.add(buildReferenceSet());
   o.add(buildReferenceSet());
   return o;
 }
 
-checkUnnamed2012(core.List<api.ReferenceSet> o) {
+checkUnnamed1061(core.List<api.ReferenceSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReferenceSet(o[0]);
   checkReferenceSet(o[1]);
@@ -2384,7 +2384,7 @@
   buildCounterSearchReferenceSetsResponse++;
   if (buildCounterSearchReferenceSetsResponse < 3) {
     o.nextPageToken = "foo";
-    o.referenceSets = buildUnnamed2012();
+    o.referenceSets = buildUnnamed1061();
   }
   buildCounterSearchReferenceSetsResponse--;
   return o;
@@ -2394,32 +2394,32 @@
   buildCounterSearchReferenceSetsResponse++;
   if (buildCounterSearchReferenceSetsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2012(o.referenceSets);
+    checkUnnamed1061(o.referenceSets);
   }
   buildCounterSearchReferenceSetsResponse--;
 }
 
-buildUnnamed2013() {
+buildUnnamed1062() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2013(core.List<core.String> o) {
+checkUnnamed1062(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2014() {
+buildUnnamed1063() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2014(core.List<core.String> o) {
+checkUnnamed1063(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2430,8 +2430,8 @@
   var o = new api.SearchReferencesRequest();
   buildCounterSearchReferencesRequest++;
   if (buildCounterSearchReferencesRequest < 3) {
-    o.accessions = buildUnnamed2013();
-    o.md5checksums = buildUnnamed2014();
+    o.accessions = buildUnnamed1062();
+    o.md5checksums = buildUnnamed1063();
     o.pageSize = 42;
     o.pageToken = "foo";
     o.referenceSetId = "foo";
@@ -2443,8 +2443,8 @@
 checkSearchReferencesRequest(api.SearchReferencesRequest o) {
   buildCounterSearchReferencesRequest++;
   if (buildCounterSearchReferencesRequest < 3) {
-    checkUnnamed2013(o.accessions);
-    checkUnnamed2014(o.md5checksums);
+    checkUnnamed1062(o.accessions);
+    checkUnnamed1063(o.md5checksums);
     unittest.expect(o.pageSize, unittest.equals(42));
     unittest.expect(o.pageToken, unittest.equals('foo'));
     unittest.expect(o.referenceSetId, unittest.equals('foo'));
@@ -2452,14 +2452,14 @@
   buildCounterSearchReferencesRequest--;
 }
 
-buildUnnamed2015() {
+buildUnnamed1064() {
   var o = new core.List<api.Reference>();
   o.add(buildReference());
   o.add(buildReference());
   return o;
 }
 
-checkUnnamed2015(core.List<api.Reference> o) {
+checkUnnamed1064(core.List<api.Reference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReference(o[0]);
   checkReference(o[1]);
@@ -2471,7 +2471,7 @@
   buildCounterSearchReferencesResponse++;
   if (buildCounterSearchReferencesResponse < 3) {
     o.nextPageToken = "foo";
-    o.references = buildUnnamed2015();
+    o.references = buildUnnamed1064();
   }
   buildCounterSearchReferencesResponse--;
   return o;
@@ -2481,19 +2481,19 @@
   buildCounterSearchReferencesResponse++;
   if (buildCounterSearchReferencesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2015(o.references);
+    checkUnnamed1064(o.references);
   }
   buildCounterSearchReferencesResponse--;
 }
 
-buildUnnamed2016() {
+buildUnnamed1065() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2016(core.List<core.String> o) {
+checkUnnamed1065(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2504,7 +2504,7 @@
   var o = new api.SearchVariantSetsRequest();
   buildCounterSearchVariantSetsRequest++;
   if (buildCounterSearchVariantSetsRequest < 3) {
-    o.datasetIds = buildUnnamed2016();
+    o.datasetIds = buildUnnamed1065();
     o.pageSize = 42;
     o.pageToken = "foo";
   }
@@ -2515,21 +2515,21 @@
 checkSearchVariantSetsRequest(api.SearchVariantSetsRequest o) {
   buildCounterSearchVariantSetsRequest++;
   if (buildCounterSearchVariantSetsRequest < 3) {
-    checkUnnamed2016(o.datasetIds);
+    checkUnnamed1065(o.datasetIds);
     unittest.expect(o.pageSize, unittest.equals(42));
     unittest.expect(o.pageToken, unittest.equals('foo'));
   }
   buildCounterSearchVariantSetsRequest--;
 }
 
-buildUnnamed2017() {
+buildUnnamed1066() {
   var o = new core.List<api.VariantSet>();
   o.add(buildVariantSet());
   o.add(buildVariantSet());
   return o;
 }
 
-checkUnnamed2017(core.List<api.VariantSet> o) {
+checkUnnamed1066(core.List<api.VariantSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariantSet(o[0]);
   checkVariantSet(o[1]);
@@ -2541,7 +2541,7 @@
   buildCounterSearchVariantSetsResponse++;
   if (buildCounterSearchVariantSetsResponse < 3) {
     o.nextPageToken = "foo";
-    o.variantSets = buildUnnamed2017();
+    o.variantSets = buildUnnamed1066();
   }
   buildCounterSearchVariantSetsResponse--;
   return o;
@@ -2551,32 +2551,32 @@
   buildCounterSearchVariantSetsResponse++;
   if (buildCounterSearchVariantSetsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2017(o.variantSets);
+    checkUnnamed1066(o.variantSets);
   }
   buildCounterSearchVariantSetsResponse--;
 }
 
-buildUnnamed2018() {
+buildUnnamed1067() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2018(core.List<core.String> o) {
+checkUnnamed1067(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2019() {
+buildUnnamed1068() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2019(core.List<core.String> o) {
+checkUnnamed1068(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2587,7 +2587,7 @@
   var o = new api.SearchVariantsRequest();
   buildCounterSearchVariantsRequest++;
   if (buildCounterSearchVariantsRequest < 3) {
-    o.callSetIds = buildUnnamed2018();
+    o.callSetIds = buildUnnamed1067();
     o.end = "foo";
     o.maxCalls = 42;
     o.pageSize = 42;
@@ -2595,7 +2595,7 @@
     o.referenceName = "foo";
     o.start = "foo";
     o.variantName = "foo";
-    o.variantSetIds = buildUnnamed2019();
+    o.variantSetIds = buildUnnamed1068();
   }
   buildCounterSearchVariantsRequest--;
   return o;
@@ -2604,7 +2604,7 @@
 checkSearchVariantsRequest(api.SearchVariantsRequest o) {
   buildCounterSearchVariantsRequest++;
   if (buildCounterSearchVariantsRequest < 3) {
-    checkUnnamed2018(o.callSetIds);
+    checkUnnamed1067(o.callSetIds);
     unittest.expect(o.end, unittest.equals('foo'));
     unittest.expect(o.maxCalls, unittest.equals(42));
     unittest.expect(o.pageSize, unittest.equals(42));
@@ -2612,19 +2612,19 @@
     unittest.expect(o.referenceName, unittest.equals('foo'));
     unittest.expect(o.start, unittest.equals('foo'));
     unittest.expect(o.variantName, unittest.equals('foo'));
-    checkUnnamed2019(o.variantSetIds);
+    checkUnnamed1068(o.variantSetIds);
   }
   buildCounterSearchVariantsRequest--;
 }
 
-buildUnnamed2020() {
+buildUnnamed1069() {
   var o = new core.List<api.Variant>();
   o.add(buildVariant());
   o.add(buildVariant());
   return o;
 }
 
-checkUnnamed2020(core.List<api.Variant> o) {
+checkUnnamed1069(core.List<api.Variant> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariant(o[0]);
   checkVariant(o[1]);
@@ -2636,7 +2636,7 @@
   buildCounterSearchVariantsResponse++;
   if (buildCounterSearchVariantsResponse < 3) {
     o.nextPageToken = "foo";
-    o.variants = buildUnnamed2020();
+    o.variants = buildUnnamed1069();
   }
   buildCounterSearchVariantsResponse--;
   return o;
@@ -2646,7 +2646,7 @@
   buildCounterSearchVariantsResponse++;
   if (buildCounterSearchVariantsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2020(o.variants);
+    checkUnnamed1069(o.variants);
   }
   buildCounterSearchVariantsResponse--;
 }
@@ -2670,7 +2670,7 @@
   buildCounterSetIamPolicyRequest--;
 }
 
-buildUnnamed2021() {
+buildUnnamed1070() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2685,7 +2685,7 @@
   return o;
 }
 
-checkUnnamed2021(core.Map<core.String, core.Object> o) {
+checkUnnamed1070(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted21 = (o["x"]) as core.Map;
   unittest.expect(casted21, unittest.hasLength(3));
@@ -2699,17 +2699,17 @@
   unittest.expect(casted22["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2022() {
+buildUnnamed1071() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2021());
-  o.add(buildUnnamed2021());
+  o.add(buildUnnamed1070());
+  o.add(buildUnnamed1070());
   return o;
 }
 
-checkUnnamed2022(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1071(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2021(o[0]);
-  checkUnnamed2021(o[1]);
+  checkUnnamed1070(o[0]);
+  checkUnnamed1070(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -2718,7 +2718,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed2022();
+    o.details = buildUnnamed1071();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -2729,20 +2729,20 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed2022(o.details);
+    checkUnnamed1071(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed2023() {
+buildUnnamed1072() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2023(core.List<core.String> o) {
+checkUnnamed1072(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2753,7 +2753,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed2023();
+    o.permissions = buildUnnamed1072();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -2762,19 +2762,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed2023(o.permissions);
+    checkUnnamed1072(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed2024() {
+buildUnnamed1073() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2024(core.List<core.String> o) {
+checkUnnamed1073(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2785,7 +2785,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed2024();
+    o.permissions = buildUnnamed1073();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -2794,19 +2794,19 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed2024(o.permissions);
+    checkUnnamed1073(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
 
-buildUnnamed2025() {
+buildUnnamed1074() {
   var o = new core.List<api.Exon>();
   o.add(buildExon());
   o.add(buildExon());
   return o;
 }
 
-checkUnnamed2025(core.List<api.Exon> o) {
+checkUnnamed1074(core.List<api.Exon> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExon(o[0]);
   checkExon(o[1]);
@@ -2818,7 +2818,7 @@
   buildCounterTranscript++;
   if (buildCounterTranscript < 3) {
     o.codingSequence = buildCodingSequence();
-    o.exons = buildUnnamed2025();
+    o.exons = buildUnnamed1074();
     o.geneId = "foo";
   }
   buildCounterTranscript--;
@@ -2829,7 +2829,7 @@
   buildCounterTranscript++;
   if (buildCounterTranscript < 3) {
     checkCodingSequence(o.codingSequence);
-    checkUnnamed2025(o.exons);
+    checkUnnamed1074(o.exons);
     unittest.expect(o.geneId, unittest.equals('foo'));
   }
   buildCounterTranscript--;
@@ -2850,46 +2850,46 @@
   buildCounterUndeleteDatasetRequest--;
 }
 
-buildUnnamed2026() {
+buildUnnamed1075() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2026(core.List<core.String> o) {
+checkUnnamed1075(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2027() {
+buildUnnamed1076() {
   var o = new core.List<api.VariantCall>();
   o.add(buildVariantCall());
   o.add(buildVariantCall());
   return o;
 }
 
-checkUnnamed2027(core.List<api.VariantCall> o) {
+checkUnnamed1076(core.List<api.VariantCall> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariantCall(o[0]);
   checkVariantCall(o[1]);
 }
 
-buildUnnamed2028() {
+buildUnnamed1077() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2028(core.List<core.String> o) {
+checkUnnamed1077(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2029() {
+buildUnnamed1078() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -2904,7 +2904,7 @@
   return o;
 }
 
-checkUnnamed2029(core.List<core.Object> o) {
+checkUnnamed1078(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted23 = (o[0]) as core.Map;
   unittest.expect(casted23, unittest.hasLength(3));
@@ -2918,27 +2918,27 @@
   unittest.expect(casted24["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2030() {
+buildUnnamed1079() {
   var o = new core.Map<core.String, core.List<core.Object>>();
-  o["x"] = buildUnnamed2029();
-  o["y"] = buildUnnamed2029();
+  o["x"] = buildUnnamed1078();
+  o["y"] = buildUnnamed1078();
   return o;
 }
 
-checkUnnamed2030(core.Map<core.String, core.List<core.Object>> o) {
+checkUnnamed1079(core.Map<core.String, core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2029(o["x"]);
-  checkUnnamed2029(o["y"]);
+  checkUnnamed1078(o["x"]);
+  checkUnnamed1078(o["y"]);
 }
 
-buildUnnamed2031() {
+buildUnnamed1080() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2031(core.List<core.String> o) {
+checkUnnamed1080(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2949,14 +2949,14 @@
   var o = new api.Variant();
   buildCounterVariant++;
   if (buildCounterVariant < 3) {
-    o.alternateBases = buildUnnamed2026();
-    o.calls = buildUnnamed2027();
+    o.alternateBases = buildUnnamed1075();
+    o.calls = buildUnnamed1076();
     o.created = "foo";
     o.end = "foo";
-    o.filter = buildUnnamed2028();
+    o.filter = buildUnnamed1077();
     o.id = "foo";
-    o.info = buildUnnamed2030();
-    o.names = buildUnnamed2031();
+    o.info = buildUnnamed1079();
+    o.names = buildUnnamed1080();
     o.quality = 42.0;
     o.referenceBases = "foo";
     o.referenceName = "foo";
@@ -2970,14 +2970,14 @@
 checkVariant(api.Variant o) {
   buildCounterVariant++;
   if (buildCounterVariant < 3) {
-    checkUnnamed2026(o.alternateBases);
-    checkUnnamed2027(o.calls);
+    checkUnnamed1075(o.alternateBases);
+    checkUnnamed1076(o.calls);
     unittest.expect(o.created, unittest.equals('foo'));
     unittest.expect(o.end, unittest.equals('foo'));
-    checkUnnamed2028(o.filter);
+    checkUnnamed1077(o.filter);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2030(o.info);
-    checkUnnamed2031(o.names);
+    checkUnnamed1079(o.info);
+    checkUnnamed1080(o.names);
     unittest.expect(o.quality, unittest.equals(42.0));
     unittest.expect(o.referenceBases, unittest.equals('foo'));
     unittest.expect(o.referenceName, unittest.equals('foo'));
@@ -2987,27 +2987,27 @@
   buildCounterVariant--;
 }
 
-buildUnnamed2032() {
+buildUnnamed1081() {
   var o = new core.List<api.ClinicalCondition>();
   o.add(buildClinicalCondition());
   o.add(buildClinicalCondition());
   return o;
 }
 
-checkUnnamed2032(core.List<api.ClinicalCondition> o) {
+checkUnnamed1081(core.List<api.ClinicalCondition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClinicalCondition(o[0]);
   checkClinicalCondition(o[1]);
 }
 
-buildUnnamed2033() {
+buildUnnamed1082() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2033(core.List<core.String> o) {
+checkUnnamed1082(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3020,10 +3020,10 @@
   if (buildCounterVariantAnnotation < 3) {
     o.alternateBases = "foo";
     o.clinicalSignificance = "foo";
-    o.conditions = buildUnnamed2032();
+    o.conditions = buildUnnamed1081();
     o.effect = "foo";
     o.geneId = "foo";
-    o.transcriptIds = buildUnnamed2033();
+    o.transcriptIds = buildUnnamed1082();
     o.type = "foo";
   }
   buildCounterVariantAnnotation--;
@@ -3035,42 +3035,42 @@
   if (buildCounterVariantAnnotation < 3) {
     unittest.expect(o.alternateBases, unittest.equals('foo'));
     unittest.expect(o.clinicalSignificance, unittest.equals('foo'));
-    checkUnnamed2032(o.conditions);
+    checkUnnamed1081(o.conditions);
     unittest.expect(o.effect, unittest.equals('foo'));
     unittest.expect(o.geneId, unittest.equals('foo'));
-    checkUnnamed2033(o.transcriptIds);
+    checkUnnamed1082(o.transcriptIds);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterVariantAnnotation--;
 }
 
-buildUnnamed2034() {
+buildUnnamed1083() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed2034(core.List<core.int> o) {
+checkUnnamed1083(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed2035() {
+buildUnnamed1084() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2035(core.List<core.double> o) {
+checkUnnamed1084(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
 }
 
-buildUnnamed2036() {
+buildUnnamed1085() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -3085,7 +3085,7 @@
   return o;
 }
 
-checkUnnamed2036(core.List<core.Object> o) {
+checkUnnamed1085(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted25 = (o[0]) as core.Map;
   unittest.expect(casted25, unittest.hasLength(3));
@@ -3099,17 +3099,17 @@
   unittest.expect(casted26["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2037() {
+buildUnnamed1086() {
   var o = new core.Map<core.String, core.List<core.Object>>();
-  o["x"] = buildUnnamed2036();
-  o["y"] = buildUnnamed2036();
+  o["x"] = buildUnnamed1085();
+  o["y"] = buildUnnamed1085();
   return o;
 }
 
-checkUnnamed2037(core.Map<core.String, core.List<core.Object>> o) {
+checkUnnamed1086(core.Map<core.String, core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2036(o["x"]);
-  checkUnnamed2036(o["y"]);
+  checkUnnamed1085(o["x"]);
+  checkUnnamed1085(o["y"]);
 }
 
 core.int buildCounterVariantCall = 0;
@@ -3119,9 +3119,9 @@
   if (buildCounterVariantCall < 3) {
     o.callSetId = "foo";
     o.callSetName = "foo";
-    o.genotype = buildUnnamed2034();
-    o.genotypeLikelihood = buildUnnamed2035();
-    o.info = buildUnnamed2037();
+    o.genotype = buildUnnamed1083();
+    o.genotypeLikelihood = buildUnnamed1084();
+    o.info = buildUnnamed1086();
     o.phaseset = "foo";
   }
   buildCounterVariantCall--;
@@ -3133,35 +3133,35 @@
   if (buildCounterVariantCall < 3) {
     unittest.expect(o.callSetId, unittest.equals('foo'));
     unittest.expect(o.callSetName, unittest.equals('foo'));
-    checkUnnamed2034(o.genotype);
-    checkUnnamed2035(o.genotypeLikelihood);
-    checkUnnamed2037(o.info);
+    checkUnnamed1083(o.genotype);
+    checkUnnamed1084(o.genotypeLikelihood);
+    checkUnnamed1086(o.info);
     unittest.expect(o.phaseset, unittest.equals('foo'));
   }
   buildCounterVariantCall--;
 }
 
-buildUnnamed2038() {
+buildUnnamed1087() {
   var o = new core.List<api.VariantSetMetadata>();
   o.add(buildVariantSetMetadata());
   o.add(buildVariantSetMetadata());
   return o;
 }
 
-checkUnnamed2038(core.List<api.VariantSetMetadata> o) {
+checkUnnamed1087(core.List<api.VariantSetMetadata> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariantSetMetadata(o[0]);
   checkVariantSetMetadata(o[1]);
 }
 
-buildUnnamed2039() {
+buildUnnamed1088() {
   var o = new core.List<api.ReferenceBound>();
   o.add(buildReferenceBound());
   o.add(buildReferenceBound());
   return o;
 }
 
-checkUnnamed2039(core.List<api.ReferenceBound> o) {
+checkUnnamed1088(core.List<api.ReferenceBound> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReferenceBound(o[0]);
   checkReferenceBound(o[1]);
@@ -3175,9 +3175,9 @@
     o.datasetId = "foo";
     o.description = "foo";
     o.id = "foo";
-    o.metadata = buildUnnamed2038();
+    o.metadata = buildUnnamed1087();
     o.name = "foo";
-    o.referenceBounds = buildUnnamed2039();
+    o.referenceBounds = buildUnnamed1088();
     o.referenceSetId = "foo";
   }
   buildCounterVariantSet--;
@@ -3190,15 +3190,15 @@
     unittest.expect(o.datasetId, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2038(o.metadata);
+    checkUnnamed1087(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2039(o.referenceBounds);
+    checkUnnamed1088(o.referenceBounds);
     unittest.expect(o.referenceSetId, unittest.equals('foo'));
   }
   buildCounterVariantSet--;
 }
 
-buildUnnamed2040() {
+buildUnnamed1089() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -3213,7 +3213,7 @@
   return o;
 }
 
-checkUnnamed2040(core.List<core.Object> o) {
+checkUnnamed1089(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted27 = (o[0]) as core.Map;
   unittest.expect(casted27, unittest.hasLength(3));
@@ -3227,17 +3227,17 @@
   unittest.expect(casted28["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2041() {
+buildUnnamed1090() {
   var o = new core.Map<core.String, core.List<core.Object>>();
-  o["x"] = buildUnnamed2040();
-  o["y"] = buildUnnamed2040();
+  o["x"] = buildUnnamed1089();
+  o["y"] = buildUnnamed1089();
   return o;
 }
 
-checkUnnamed2041(core.Map<core.String, core.List<core.Object>> o) {
+checkUnnamed1090(core.Map<core.String, core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2040(o["x"]);
-  checkUnnamed2040(o["y"]);
+  checkUnnamed1089(o["x"]);
+  checkUnnamed1089(o["y"]);
 }
 
 core.int buildCounterVariantSetMetadata = 0;
@@ -3247,7 +3247,7 @@
   if (buildCounterVariantSetMetadata < 3) {
     o.description = "foo";
     o.id = "foo";
-    o.info = buildUnnamed2041();
+    o.info = buildUnnamed1090();
     o.key = "foo";
     o.number = "foo";
     o.type = "foo";
@@ -3262,7 +3262,7 @@
   if (buildCounterVariantSetMetadata < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2041(o.info);
+    checkUnnamed1090(o.info);
     unittest.expect(o.key, unittest.equals('foo'));
     unittest.expect(o.number, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -3911,8 +3911,9 @@
         var resp = convert.JSON.encode(buildBatchCreateAnnotationsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchCreate(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.BatchCreateAnnotationsResponse response) {
+      res
+          .batchCreate(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkBatchCreateAnnotationsResponse(response);
       })));
     });
@@ -3965,7 +3966,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Annotation response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotation(response);
       })));
     });
@@ -4018,7 +4019,7 @@
       }), true);
       res
           .delete(arg_annotationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4071,7 +4072,7 @@
       }), true);
       res
           .get(arg_annotationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Annotation response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotation(response);
       })));
     });
@@ -4122,8 +4123,9 @@
         var resp = convert.JSON.encode(buildSearchAnnotationsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.search(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.SearchAnnotationsResponse response) {
+      res
+          .search(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSearchAnnotationsResponse(response);
       })));
     });
@@ -4184,7 +4186,7 @@
       res
           .update(arg_request, arg_annotationId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Annotation response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotation(response);
       })));
     });
@@ -4240,7 +4242,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnnotationSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotationSet(response);
       })));
     });
@@ -4294,7 +4296,7 @@
       }), true);
       res
           .delete(arg_annotationSetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4348,7 +4350,7 @@
       }), true);
       res
           .get(arg_annotationSetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnnotationSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotationSet(response);
       })));
     });
@@ -4400,8 +4402,9 @@
         var resp = convert.JSON.encode(buildSearchAnnotationSetsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.search(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.SearchAnnotationSetsResponse response) {
+      res
+          .search(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSearchAnnotationSetsResponse(response);
       })));
     });
@@ -4463,7 +4466,7 @@
       res
           .update(arg_request, arg_annotationSetId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnnotationSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotationSet(response);
       })));
     });
@@ -4518,7 +4521,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CallSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkCallSet(response);
       })));
     });
@@ -4571,7 +4574,7 @@
       }), true);
       res
           .delete(arg_callSetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4624,7 +4627,7 @@
       }), true);
       res
           .get(arg_callSetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CallSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkCallSet(response);
       })));
     });
@@ -4685,7 +4688,7 @@
       res
           .patch(arg_request, arg_callSetId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CallSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkCallSet(response);
       })));
     });
@@ -4738,7 +4741,7 @@
       }), true);
       res
           .search(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SearchCallSetsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSearchCallSetsResponse(response);
       })));
     });
@@ -4793,7 +4796,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Dataset response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataset(response);
       })));
     });
@@ -4846,7 +4849,7 @@
       }), true);
       res
           .delete(arg_datasetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4899,7 +4902,7 @@
       }), true);
       res
           .get(arg_datasetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Dataset response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataset(response);
       })));
     });
@@ -4954,7 +4957,7 @@
       }), true);
       res
           .getIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -5016,7 +5019,7 @@
               pageSize: arg_pageSize,
               projectId: arg_projectId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDatasetsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDatasetsResponse(response);
       })));
     });
@@ -5077,7 +5080,7 @@
       res
           .patch(arg_request, arg_datasetId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Dataset response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataset(response);
       })));
     });
@@ -5132,7 +5135,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -5187,8 +5190,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -5251,7 +5253,7 @@
       }), true);
       res
           .undelete(arg_request, arg_datasetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Dataset response) {
+          .then(unittest.expectAsync1(((response) {
         checkDataset(response);
       })));
     });
@@ -5308,7 +5310,7 @@
       }), true);
       res
           .cancel(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -5359,7 +5361,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5422,7 +5424,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -5478,7 +5480,7 @@
       }), true);
       res
           .delete(arg_readGroupSetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -5542,7 +5544,7 @@
       }), true);
       res
           .export(arg_request, arg_readGroupSetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5596,7 +5598,7 @@
       }), true);
       res
           .get(arg_readGroupSetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReadGroupSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkReadGroupSet(response);
       })));
     });
@@ -5650,7 +5652,7 @@
       }), true);
       res
           .import(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5712,7 +5714,7 @@
       res
           .patch(arg_request, arg_readGroupSetId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReadGroupSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkReadGroupSet(response);
       })));
     });
@@ -5764,8 +5766,9 @@
         var resp = convert.JSON.encode(buildSearchReadGroupSetsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.search(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.SearchReadGroupSetsResponse response) {
+      res
+          .search(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSearchReadGroupSetsResponse(response);
       })));
     });
@@ -5850,8 +5853,7 @@
               start: arg_start,
               targetBucketWidth: arg_targetBucketWidth,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListCoverageBucketsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCoverageBucketsResponse(response);
       })));
     });
@@ -5906,7 +5908,7 @@
       }), true);
       res
           .search(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SearchReadsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSearchReadsResponse(response);
       })));
     });
@@ -5961,7 +5963,7 @@
       }), true);
       res
           .get(arg_referenceId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Reference response) {
+          .then(unittest.expectAsync1(((response) {
         checkReference(response);
       })));
     });
@@ -6014,7 +6016,7 @@
       }), true);
       res
           .search(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SearchReferencesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSearchReferencesResponse(response);
       })));
     });
@@ -6091,7 +6093,7 @@
               start: arg_start,
               end: arg_end,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListBasesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListBasesResponse(response);
       })));
     });
@@ -6147,7 +6149,7 @@
       }), true);
       res
           .get(arg_referenceSetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReferenceSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkReferenceSet(response);
       })));
     });
@@ -6199,8 +6201,9 @@
         var resp = convert.JSON.encode(buildSearchReferenceSetsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.search(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.SearchReferenceSetsResponse response) {
+      res
+          .search(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSearchReferenceSetsResponse(response);
       })));
     });
@@ -6255,7 +6258,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variant response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariant(response);
       })));
     });
@@ -6308,7 +6311,7 @@
       }), true);
       res
           .delete(arg_variantId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -6361,7 +6364,7 @@
       }), true);
       res
           .get(arg_variantId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variant response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariant(response);
       })));
     });
@@ -6414,7 +6417,7 @@
       }), true);
       res
           .import(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -6467,7 +6470,7 @@
       }), true);
       res
           .merge(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -6528,7 +6531,7 @@
       res
           .patch(arg_request, arg_variantId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variant response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariant(response);
       })));
     });
@@ -6581,7 +6584,7 @@
       }), true);
       res
           .search(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SearchVariantsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSearchVariantsResponse(response);
       })));
     });
@@ -6636,7 +6639,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VariantSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariantSet(response);
       })));
     });
@@ -6689,7 +6692,7 @@
       }), true);
       res
           .delete(arg_variantSetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -6752,7 +6755,7 @@
       }), true);
       res
           .export(arg_request, arg_variantSetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -6805,7 +6808,7 @@
       }), true);
       res
           .get(arg_variantSetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VariantSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariantSet(response);
       })));
     });
@@ -6866,7 +6869,7 @@
       res
           .patch(arg_request, arg_variantSetId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VariantSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariantSet(response);
       })));
     });
@@ -6917,8 +6920,9 @@
         var resp = convert.JSON.encode(buildSearchVariantSetsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.search(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.SearchVariantSetsResponse response) {
+      res
+          .search(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSearchVariantSetsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/gmail/v1_test.dart b/generated/googleapis/test/gmail/v1_test.dart
index 615e7b7..58e03a6 100644
--- a/generated/googleapis/test/gmail/v1_test.dart
+++ b/generated/googleapis/test/gmail/v1_test.dart
@@ -73,14 +73,14 @@
   buildCounterAutoForwarding--;
 }
 
-buildUnnamed2042() {
+buildUnnamed1831() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2042(core.List<core.String> o) {
+checkUnnamed1831(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -91,7 +91,7 @@
   var o = new api.BatchDeleteMessagesRequest();
   buildCounterBatchDeleteMessagesRequest++;
   if (buildCounterBatchDeleteMessagesRequest < 3) {
-    o.ids = buildUnnamed2042();
+    o.ids = buildUnnamed1831();
   }
   buildCounterBatchDeleteMessagesRequest--;
   return o;
@@ -100,45 +100,45 @@
 checkBatchDeleteMessagesRequest(api.BatchDeleteMessagesRequest o) {
   buildCounterBatchDeleteMessagesRequest++;
   if (buildCounterBatchDeleteMessagesRequest < 3) {
-    checkUnnamed2042(o.ids);
+    checkUnnamed1831(o.ids);
   }
   buildCounterBatchDeleteMessagesRequest--;
 }
 
-buildUnnamed2043() {
+buildUnnamed1832() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2043(core.List<core.String> o) {
+checkUnnamed1832(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2044() {
+buildUnnamed1833() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2044(core.List<core.String> o) {
+checkUnnamed1833(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2045() {
+buildUnnamed1834() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2045(core.List<core.String> o) {
+checkUnnamed1834(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -149,9 +149,9 @@
   var o = new api.BatchModifyMessagesRequest();
   buildCounterBatchModifyMessagesRequest++;
   if (buildCounterBatchModifyMessagesRequest < 3) {
-    o.addLabelIds = buildUnnamed2043();
-    o.ids = buildUnnamed2044();
-    o.removeLabelIds = buildUnnamed2045();
+    o.addLabelIds = buildUnnamed1832();
+    o.ids = buildUnnamed1833();
+    o.removeLabelIds = buildUnnamed1834();
   }
   buildCounterBatchModifyMessagesRequest--;
   return o;
@@ -160,9 +160,9 @@
 checkBatchModifyMessagesRequest(api.BatchModifyMessagesRequest o) {
   buildCounterBatchModifyMessagesRequest++;
   if (buildCounterBatchModifyMessagesRequest < 3) {
-    checkUnnamed2043(o.addLabelIds);
-    checkUnnamed2044(o.ids);
-    checkUnnamed2045(o.removeLabelIds);
+    checkUnnamed1832(o.addLabelIds);
+    checkUnnamed1833(o.ids);
+    checkUnnamed1834(o.removeLabelIds);
   }
   buildCounterBatchModifyMessagesRequest--;
 }
@@ -211,27 +211,27 @@
   buildCounterFilter--;
 }
 
-buildUnnamed2046() {
+buildUnnamed1835() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2046(core.List<core.String> o) {
+checkUnnamed1835(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2047() {
+buildUnnamed1836() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2047(core.List<core.String> o) {
+checkUnnamed1836(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -242,9 +242,9 @@
   var o = new api.FilterAction();
   buildCounterFilterAction++;
   if (buildCounterFilterAction < 3) {
-    o.addLabelIds = buildUnnamed2046();
+    o.addLabelIds = buildUnnamed1835();
     o.forward = "foo";
-    o.removeLabelIds = buildUnnamed2047();
+    o.removeLabelIds = buildUnnamed1836();
   }
   buildCounterFilterAction--;
   return o;
@@ -253,9 +253,9 @@
 checkFilterAction(api.FilterAction o) {
   buildCounterFilterAction++;
   if (buildCounterFilterAction < 3) {
-    checkUnnamed2046(o.addLabelIds);
+    checkUnnamed1835(o.addLabelIds);
     unittest.expect(o.forward, unittest.equals('foo'));
-    checkUnnamed2047(o.removeLabelIds);
+    checkUnnamed1836(o.removeLabelIds);
   }
   buildCounterFilterAction--;
 }
@@ -316,66 +316,66 @@
   buildCounterForwardingAddress--;
 }
 
-buildUnnamed2048() {
+buildUnnamed1837() {
   var o = new core.List<api.HistoryLabelAdded>();
   o.add(buildHistoryLabelAdded());
   o.add(buildHistoryLabelAdded());
   return o;
 }
 
-checkUnnamed2048(core.List<api.HistoryLabelAdded> o) {
+checkUnnamed1837(core.List<api.HistoryLabelAdded> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistoryLabelAdded(o[0]);
   checkHistoryLabelAdded(o[1]);
 }
 
-buildUnnamed2049() {
+buildUnnamed1838() {
   var o = new core.List<api.HistoryLabelRemoved>();
   o.add(buildHistoryLabelRemoved());
   o.add(buildHistoryLabelRemoved());
   return o;
 }
 
-checkUnnamed2049(core.List<api.HistoryLabelRemoved> o) {
+checkUnnamed1838(core.List<api.HistoryLabelRemoved> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistoryLabelRemoved(o[0]);
   checkHistoryLabelRemoved(o[1]);
 }
 
-buildUnnamed2050() {
+buildUnnamed1839() {
   var o = new core.List<api.Message>();
   o.add(buildMessage());
   o.add(buildMessage());
   return o;
 }
 
-checkUnnamed2050(core.List<api.Message> o) {
+checkUnnamed1839(core.List<api.Message> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMessage(o[0]);
   checkMessage(o[1]);
 }
 
-buildUnnamed2051() {
+buildUnnamed1840() {
   var o = new core.List<api.HistoryMessageAdded>();
   o.add(buildHistoryMessageAdded());
   o.add(buildHistoryMessageAdded());
   return o;
 }
 
-checkUnnamed2051(core.List<api.HistoryMessageAdded> o) {
+checkUnnamed1840(core.List<api.HistoryMessageAdded> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistoryMessageAdded(o[0]);
   checkHistoryMessageAdded(o[1]);
 }
 
-buildUnnamed2052() {
+buildUnnamed1841() {
   var o = new core.List<api.HistoryMessageDeleted>();
   o.add(buildHistoryMessageDeleted());
   o.add(buildHistoryMessageDeleted());
   return o;
 }
 
-checkUnnamed2052(core.List<api.HistoryMessageDeleted> o) {
+checkUnnamed1841(core.List<api.HistoryMessageDeleted> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistoryMessageDeleted(o[0]);
   checkHistoryMessageDeleted(o[1]);
@@ -387,11 +387,11 @@
   buildCounterHistory++;
   if (buildCounterHistory < 3) {
     o.id = "foo";
-    o.labelsAdded = buildUnnamed2048();
-    o.labelsRemoved = buildUnnamed2049();
-    o.messages = buildUnnamed2050();
-    o.messagesAdded = buildUnnamed2051();
-    o.messagesDeleted = buildUnnamed2052();
+    o.labelsAdded = buildUnnamed1837();
+    o.labelsRemoved = buildUnnamed1838();
+    o.messages = buildUnnamed1839();
+    o.messagesAdded = buildUnnamed1840();
+    o.messagesDeleted = buildUnnamed1841();
   }
   buildCounterHistory--;
   return o;
@@ -401,23 +401,23 @@
   buildCounterHistory++;
   if (buildCounterHistory < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2048(o.labelsAdded);
-    checkUnnamed2049(o.labelsRemoved);
-    checkUnnamed2050(o.messages);
-    checkUnnamed2051(o.messagesAdded);
-    checkUnnamed2052(o.messagesDeleted);
+    checkUnnamed1837(o.labelsAdded);
+    checkUnnamed1838(o.labelsRemoved);
+    checkUnnamed1839(o.messages);
+    checkUnnamed1840(o.messagesAdded);
+    checkUnnamed1841(o.messagesDeleted);
   }
   buildCounterHistory--;
 }
 
-buildUnnamed2053() {
+buildUnnamed1842() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2053(core.List<core.String> o) {
+checkUnnamed1842(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -428,7 +428,7 @@
   var o = new api.HistoryLabelAdded();
   buildCounterHistoryLabelAdded++;
   if (buildCounterHistoryLabelAdded < 3) {
-    o.labelIds = buildUnnamed2053();
+    o.labelIds = buildUnnamed1842();
     o.message = buildMessage();
   }
   buildCounterHistoryLabelAdded--;
@@ -438,20 +438,20 @@
 checkHistoryLabelAdded(api.HistoryLabelAdded o) {
   buildCounterHistoryLabelAdded++;
   if (buildCounterHistoryLabelAdded < 3) {
-    checkUnnamed2053(o.labelIds);
+    checkUnnamed1842(o.labelIds);
     checkMessage(o.message);
   }
   buildCounterHistoryLabelAdded--;
 }
 
-buildUnnamed2054() {
+buildUnnamed1843() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2054(core.List<core.String> o) {
+checkUnnamed1843(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -462,7 +462,7 @@
   var o = new api.HistoryLabelRemoved();
   buildCounterHistoryLabelRemoved++;
   if (buildCounterHistoryLabelRemoved < 3) {
-    o.labelIds = buildUnnamed2054();
+    o.labelIds = buildUnnamed1843();
     o.message = buildMessage();
   }
   buildCounterHistoryLabelRemoved--;
@@ -472,7 +472,7 @@
 checkHistoryLabelRemoved(api.HistoryLabelRemoved o) {
   buildCounterHistoryLabelRemoved++;
   if (buildCounterHistoryLabelRemoved < 3) {
-    checkUnnamed2054(o.labelIds);
+    checkUnnamed1843(o.labelIds);
     checkMessage(o.message);
   }
   buildCounterHistoryLabelRemoved--;
@@ -599,14 +599,14 @@
   buildCounterLabelColor--;
 }
 
-buildUnnamed2055() {
+buildUnnamed1844() {
   var o = new core.List<api.Draft>();
   o.add(buildDraft());
   o.add(buildDraft());
   return o;
 }
 
-checkUnnamed2055(core.List<api.Draft> o) {
+checkUnnamed1844(core.List<api.Draft> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDraft(o[0]);
   checkDraft(o[1]);
@@ -617,7 +617,7 @@
   var o = new api.ListDraftsResponse();
   buildCounterListDraftsResponse++;
   if (buildCounterListDraftsResponse < 3) {
-    o.drafts = buildUnnamed2055();
+    o.drafts = buildUnnamed1844();
     o.nextPageToken = "foo";
     o.resultSizeEstimate = 42;
   }
@@ -628,21 +628,21 @@
 checkListDraftsResponse(api.ListDraftsResponse o) {
   buildCounterListDraftsResponse++;
   if (buildCounterListDraftsResponse < 3) {
-    checkUnnamed2055(o.drafts);
+    checkUnnamed1844(o.drafts);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.resultSizeEstimate, unittest.equals(42));
   }
   buildCounterListDraftsResponse--;
 }
 
-buildUnnamed2056() {
+buildUnnamed1845() {
   var o = new core.List<api.Filter>();
   o.add(buildFilter());
   o.add(buildFilter());
   return o;
 }
 
-checkUnnamed2056(core.List<api.Filter> o) {
+checkUnnamed1845(core.List<api.Filter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilter(o[0]);
   checkFilter(o[1]);
@@ -653,7 +653,7 @@
   var o = new api.ListFiltersResponse();
   buildCounterListFiltersResponse++;
   if (buildCounterListFiltersResponse < 3) {
-    o.filter = buildUnnamed2056();
+    o.filter = buildUnnamed1845();
   }
   buildCounterListFiltersResponse--;
   return o;
@@ -662,19 +662,19 @@
 checkListFiltersResponse(api.ListFiltersResponse o) {
   buildCounterListFiltersResponse++;
   if (buildCounterListFiltersResponse < 3) {
-    checkUnnamed2056(o.filter);
+    checkUnnamed1845(o.filter);
   }
   buildCounterListFiltersResponse--;
 }
 
-buildUnnamed2057() {
+buildUnnamed1846() {
   var o = new core.List<api.ForwardingAddress>();
   o.add(buildForwardingAddress());
   o.add(buildForwardingAddress());
   return o;
 }
 
-checkUnnamed2057(core.List<api.ForwardingAddress> o) {
+checkUnnamed1846(core.List<api.ForwardingAddress> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkForwardingAddress(o[0]);
   checkForwardingAddress(o[1]);
@@ -685,7 +685,7 @@
   var o = new api.ListForwardingAddressesResponse();
   buildCounterListForwardingAddressesResponse++;
   if (buildCounterListForwardingAddressesResponse < 3) {
-    o.forwardingAddresses = buildUnnamed2057();
+    o.forwardingAddresses = buildUnnamed1846();
   }
   buildCounterListForwardingAddressesResponse--;
   return o;
@@ -694,19 +694,19 @@
 checkListForwardingAddressesResponse(api.ListForwardingAddressesResponse o) {
   buildCounterListForwardingAddressesResponse++;
   if (buildCounterListForwardingAddressesResponse < 3) {
-    checkUnnamed2057(o.forwardingAddresses);
+    checkUnnamed1846(o.forwardingAddresses);
   }
   buildCounterListForwardingAddressesResponse--;
 }
 
-buildUnnamed2058() {
+buildUnnamed1847() {
   var o = new core.List<api.History>();
   o.add(buildHistory());
   o.add(buildHistory());
   return o;
 }
 
-checkUnnamed2058(core.List<api.History> o) {
+checkUnnamed1847(core.List<api.History> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistory(o[0]);
   checkHistory(o[1]);
@@ -717,7 +717,7 @@
   var o = new api.ListHistoryResponse();
   buildCounterListHistoryResponse++;
   if (buildCounterListHistoryResponse < 3) {
-    o.history = buildUnnamed2058();
+    o.history = buildUnnamed1847();
     o.historyId = "foo";
     o.nextPageToken = "foo";
   }
@@ -728,21 +728,21 @@
 checkListHistoryResponse(api.ListHistoryResponse o) {
   buildCounterListHistoryResponse++;
   if (buildCounterListHistoryResponse < 3) {
-    checkUnnamed2058(o.history);
+    checkUnnamed1847(o.history);
     unittest.expect(o.historyId, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListHistoryResponse--;
 }
 
-buildUnnamed2059() {
+buildUnnamed1848() {
   var o = new core.List<api.Label>();
   o.add(buildLabel());
   o.add(buildLabel());
   return o;
 }
 
-checkUnnamed2059(core.List<api.Label> o) {
+checkUnnamed1848(core.List<api.Label> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabel(o[0]);
   checkLabel(o[1]);
@@ -753,7 +753,7 @@
   var o = new api.ListLabelsResponse();
   buildCounterListLabelsResponse++;
   if (buildCounterListLabelsResponse < 3) {
-    o.labels = buildUnnamed2059();
+    o.labels = buildUnnamed1848();
   }
   buildCounterListLabelsResponse--;
   return o;
@@ -762,19 +762,19 @@
 checkListLabelsResponse(api.ListLabelsResponse o) {
   buildCounterListLabelsResponse++;
   if (buildCounterListLabelsResponse < 3) {
-    checkUnnamed2059(o.labels);
+    checkUnnamed1848(o.labels);
   }
   buildCounterListLabelsResponse--;
 }
 
-buildUnnamed2060() {
+buildUnnamed1849() {
   var o = new core.List<api.Message>();
   o.add(buildMessage());
   o.add(buildMessage());
   return o;
 }
 
-checkUnnamed2060(core.List<api.Message> o) {
+checkUnnamed1849(core.List<api.Message> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMessage(o[0]);
   checkMessage(o[1]);
@@ -785,7 +785,7 @@
   var o = new api.ListMessagesResponse();
   buildCounterListMessagesResponse++;
   if (buildCounterListMessagesResponse < 3) {
-    o.messages = buildUnnamed2060();
+    o.messages = buildUnnamed1849();
     o.nextPageToken = "foo";
     o.resultSizeEstimate = 42;
   }
@@ -796,21 +796,21 @@
 checkListMessagesResponse(api.ListMessagesResponse o) {
   buildCounterListMessagesResponse++;
   if (buildCounterListMessagesResponse < 3) {
-    checkUnnamed2060(o.messages);
+    checkUnnamed1849(o.messages);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.resultSizeEstimate, unittest.equals(42));
   }
   buildCounterListMessagesResponse--;
 }
 
-buildUnnamed2061() {
+buildUnnamed1850() {
   var o = new core.List<api.SendAs>();
   o.add(buildSendAs());
   o.add(buildSendAs());
   return o;
 }
 
-checkUnnamed2061(core.List<api.SendAs> o) {
+checkUnnamed1850(core.List<api.SendAs> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSendAs(o[0]);
   checkSendAs(o[1]);
@@ -821,7 +821,7 @@
   var o = new api.ListSendAsResponse();
   buildCounterListSendAsResponse++;
   if (buildCounterListSendAsResponse < 3) {
-    o.sendAs = buildUnnamed2061();
+    o.sendAs = buildUnnamed1850();
   }
   buildCounterListSendAsResponse--;
   return o;
@@ -830,19 +830,19 @@
 checkListSendAsResponse(api.ListSendAsResponse o) {
   buildCounterListSendAsResponse++;
   if (buildCounterListSendAsResponse < 3) {
-    checkUnnamed2061(o.sendAs);
+    checkUnnamed1850(o.sendAs);
   }
   buildCounterListSendAsResponse--;
 }
 
-buildUnnamed2062() {
+buildUnnamed1851() {
   var o = new core.List<api.SmimeInfo>();
   o.add(buildSmimeInfo());
   o.add(buildSmimeInfo());
   return o;
 }
 
-checkUnnamed2062(core.List<api.SmimeInfo> o) {
+checkUnnamed1851(core.List<api.SmimeInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSmimeInfo(o[0]);
   checkSmimeInfo(o[1]);
@@ -853,7 +853,7 @@
   var o = new api.ListSmimeInfoResponse();
   buildCounterListSmimeInfoResponse++;
   if (buildCounterListSmimeInfoResponse < 3) {
-    o.smimeInfo = buildUnnamed2062();
+    o.smimeInfo = buildUnnamed1851();
   }
   buildCounterListSmimeInfoResponse--;
   return o;
@@ -862,19 +862,19 @@
 checkListSmimeInfoResponse(api.ListSmimeInfoResponse o) {
   buildCounterListSmimeInfoResponse++;
   if (buildCounterListSmimeInfoResponse < 3) {
-    checkUnnamed2062(o.smimeInfo);
+    checkUnnamed1851(o.smimeInfo);
   }
   buildCounterListSmimeInfoResponse--;
 }
 
-buildUnnamed2063() {
+buildUnnamed1852() {
   var o = new core.List<api.Thread>();
   o.add(buildThread());
   o.add(buildThread());
   return o;
 }
 
-checkUnnamed2063(core.List<api.Thread> o) {
+checkUnnamed1852(core.List<api.Thread> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThread(o[0]);
   checkThread(o[1]);
@@ -887,7 +887,7 @@
   if (buildCounterListThreadsResponse < 3) {
     o.nextPageToken = "foo";
     o.resultSizeEstimate = 42;
-    o.threads = buildUnnamed2063();
+    o.threads = buildUnnamed1852();
   }
   buildCounterListThreadsResponse--;
   return o;
@@ -898,19 +898,19 @@
   if (buildCounterListThreadsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.resultSizeEstimate, unittest.equals(42));
-    checkUnnamed2063(o.threads);
+    checkUnnamed1852(o.threads);
   }
   buildCounterListThreadsResponse--;
 }
 
-buildUnnamed2064() {
+buildUnnamed1853() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2064(core.List<core.String> o) {
+checkUnnamed1853(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -924,7 +924,7 @@
     o.historyId = "foo";
     o.id = "foo";
     o.internalDate = "foo";
-    o.labelIds = buildUnnamed2064();
+    o.labelIds = buildUnnamed1853();
     o.payload = buildMessagePart();
     o.raw = "foo";
     o.sizeEstimate = 42;
@@ -941,7 +941,7 @@
     unittest.expect(o.historyId, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.internalDate, unittest.equals('foo'));
-    checkUnnamed2064(o.labelIds);
+    checkUnnamed1853(o.labelIds);
     checkMessagePart(o.payload);
     unittest.expect(o.raw, unittest.equals('foo'));
     unittest.expect(o.sizeEstimate, unittest.equals(42));
@@ -951,27 +951,27 @@
   buildCounterMessage--;
 }
 
-buildUnnamed2065() {
+buildUnnamed1854() {
   var o = new core.List<api.MessagePartHeader>();
   o.add(buildMessagePartHeader());
   o.add(buildMessagePartHeader());
   return o;
 }
 
-checkUnnamed2065(core.List<api.MessagePartHeader> o) {
+checkUnnamed1854(core.List<api.MessagePartHeader> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMessagePartHeader(o[0]);
   checkMessagePartHeader(o[1]);
 }
 
-buildUnnamed2066() {
+buildUnnamed1855() {
   var o = new core.List<api.MessagePart>();
   o.add(buildMessagePart());
   o.add(buildMessagePart());
   return o;
 }
 
-checkUnnamed2066(core.List<api.MessagePart> o) {
+checkUnnamed1855(core.List<api.MessagePart> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMessagePart(o[0]);
   checkMessagePart(o[1]);
@@ -984,10 +984,10 @@
   if (buildCounterMessagePart < 3) {
     o.body = buildMessagePartBody();
     o.filename = "foo";
-    o.headers = buildUnnamed2065();
+    o.headers = buildUnnamed1854();
     o.mimeType = "foo";
     o.partId = "foo";
-    o.parts = buildUnnamed2066();
+    o.parts = buildUnnamed1855();
   }
   buildCounterMessagePart--;
   return o;
@@ -998,10 +998,10 @@
   if (buildCounterMessagePart < 3) {
     checkMessagePartBody(o.body);
     unittest.expect(o.filename, unittest.equals('foo'));
-    checkUnnamed2065(o.headers);
+    checkUnnamed1854(o.headers);
     unittest.expect(o.mimeType, unittest.equals('foo'));
     unittest.expect(o.partId, unittest.equals('foo'));
-    checkUnnamed2066(o.parts);
+    checkUnnamed1855(o.parts);
   }
   buildCounterMessagePart--;
 }
@@ -1050,27 +1050,27 @@
   buildCounterMessagePartHeader--;
 }
 
-buildUnnamed2067() {
+buildUnnamed1856() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2067(core.List<core.String> o) {
+checkUnnamed1856(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2068() {
+buildUnnamed1857() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2068(core.List<core.String> o) {
+checkUnnamed1857(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1081,8 +1081,8 @@
   var o = new api.ModifyMessageRequest();
   buildCounterModifyMessageRequest++;
   if (buildCounterModifyMessageRequest < 3) {
-    o.addLabelIds = buildUnnamed2067();
-    o.removeLabelIds = buildUnnamed2068();
+    o.addLabelIds = buildUnnamed1856();
+    o.removeLabelIds = buildUnnamed1857();
   }
   buildCounterModifyMessageRequest--;
   return o;
@@ -1091,33 +1091,33 @@
 checkModifyMessageRequest(api.ModifyMessageRequest o) {
   buildCounterModifyMessageRequest++;
   if (buildCounterModifyMessageRequest < 3) {
-    checkUnnamed2067(o.addLabelIds);
-    checkUnnamed2068(o.removeLabelIds);
+    checkUnnamed1856(o.addLabelIds);
+    checkUnnamed1857(o.removeLabelIds);
   }
   buildCounterModifyMessageRequest--;
 }
 
-buildUnnamed2069() {
+buildUnnamed1858() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2069(core.List<core.String> o) {
+checkUnnamed1858(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2070() {
+buildUnnamed1859() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2070(core.List<core.String> o) {
+checkUnnamed1859(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1128,8 +1128,8 @@
   var o = new api.ModifyThreadRequest();
   buildCounterModifyThreadRequest++;
   if (buildCounterModifyThreadRequest < 3) {
-    o.addLabelIds = buildUnnamed2069();
-    o.removeLabelIds = buildUnnamed2070();
+    o.addLabelIds = buildUnnamed1858();
+    o.removeLabelIds = buildUnnamed1859();
   }
   buildCounterModifyThreadRequest--;
   return o;
@@ -1138,8 +1138,8 @@
 checkModifyThreadRequest(api.ModifyThreadRequest o) {
   buildCounterModifyThreadRequest++;
   if (buildCounterModifyThreadRequest < 3) {
-    checkUnnamed2069(o.addLabelIds);
-    checkUnnamed2070(o.removeLabelIds);
+    checkUnnamed1858(o.addLabelIds);
+    checkUnnamed1859(o.removeLabelIds);
   }
   buildCounterModifyThreadRequest--;
 }
@@ -1283,14 +1283,14 @@
   buildCounterSmtpMsa--;
 }
 
-buildUnnamed2071() {
+buildUnnamed1860() {
   var o = new core.List<api.Message>();
   o.add(buildMessage());
   o.add(buildMessage());
   return o;
 }
 
-checkUnnamed2071(core.List<api.Message> o) {
+checkUnnamed1860(core.List<api.Message> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMessage(o[0]);
   checkMessage(o[1]);
@@ -1303,7 +1303,7 @@
   if (buildCounterThread < 3) {
     o.historyId = "foo";
     o.id = "foo";
-    o.messages = buildUnnamed2071();
+    o.messages = buildUnnamed1860();
     o.snippet = "foo";
   }
   buildCounterThread--;
@@ -1315,7 +1315,7 @@
   if (buildCounterThread < 3) {
     unittest.expect(o.historyId, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2071(o.messages);
+    checkUnnamed1860(o.messages);
     unittest.expect(o.snippet, unittest.equals('foo'));
   }
   buildCounterThread--;
@@ -1354,14 +1354,14 @@
   buildCounterVacationSettings--;
 }
 
-buildUnnamed2072() {
+buildUnnamed1861() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2072(core.List<core.String> o) {
+checkUnnamed1861(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1373,7 +1373,7 @@
   buildCounterWatchRequest++;
   if (buildCounterWatchRequest < 3) {
     o.labelFilterAction = "foo";
-    o.labelIds = buildUnnamed2072();
+    o.labelIds = buildUnnamed1861();
     o.topicName = "foo";
   }
   buildCounterWatchRequest--;
@@ -1384,7 +1384,7 @@
   buildCounterWatchRequest++;
   if (buildCounterWatchRequest < 3) {
     unittest.expect(o.labelFilterAction, unittest.equals('foo'));
-    checkUnnamed2072(o.labelIds);
+    checkUnnamed1861(o.labelIds);
     unittest.expect(o.topicName, unittest.equals('foo'));
   }
   buildCounterWatchRequest--;
@@ -1411,66 +1411,66 @@
   buildCounterWatchResponse--;
 }
 
-buildUnnamed2073() {
+buildUnnamed1862() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2073(core.List<core.String> o) {
+checkUnnamed1862(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2074() {
+buildUnnamed1863() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2074(core.List<core.String> o) {
+checkUnnamed1863(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2075() {
+buildUnnamed1864() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2075(core.List<core.String> o) {
+checkUnnamed1864(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2076() {
+buildUnnamed1865() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2076(core.List<core.String> o) {
+checkUnnamed1865(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2077() {
+buildUnnamed1866() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2077(core.List<core.String> o) {
+checkUnnamed1866(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1840,7 +1840,7 @@
       }), true);
       res
           .getProfile(arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Profile response) {
+          .then(unittest.expectAsync1(((response) {
         checkProfile(response);
       })));
     });
@@ -1936,7 +1936,7 @@
       }), true);
       res
           .watch(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WatchResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkWatchResponse(response);
       })));
     });
@@ -1992,7 +1992,7 @@
       }), true);
       res
           .create(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Draft response) {
+          .then(unittest.expectAsync1(((response) {
         checkDraft(response);
       })));
     });
@@ -2088,7 +2088,7 @@
       }), true);
       res
           .get(arg_userId, arg_id, format: arg_format, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Draft response) {
+          .then(unittest.expectAsync1(((response) {
         checkDraft(response);
       })));
     });
@@ -2151,7 +2151,7 @@
               pageToken: arg_pageToken,
               q: arg_q,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDraftsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDraftsResponse(response);
       })));
     });
@@ -2205,7 +2205,7 @@
       }), true);
       res
           .send(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Message response) {
+          .then(unittest.expectAsync1(((response) {
         checkMessage(response);
       })));
     });
@@ -2260,7 +2260,7 @@
       }), true);
       res
           .update(arg_request, arg_userId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Draft response) {
+          .then(unittest.expectAsync1(((response) {
         checkDraft(response);
       })));
     });
@@ -2271,7 +2271,7 @@
       var mock = new HttpServerMock();
       api.UsersHistoryResourceApi res = new api.GmailApi(mock).users.history;
       var arg_userId = "foo";
-      var arg_historyTypes = buildUnnamed2073();
+      var arg_historyTypes = buildUnnamed1862();
       var arg_labelId = "foo";
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
@@ -2330,7 +2330,7 @@
               pageToken: arg_pageToken,
               startHistoryId: arg_startHistoryId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListHistoryResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListHistoryResponse(response);
       })));
     });
@@ -2383,7 +2383,7 @@
       }), true);
       res
           .create(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Label response) {
+          .then(unittest.expectAsync1(((response) {
         checkLabel(response);
       })));
     });
@@ -2477,7 +2477,7 @@
       }), true);
       res
           .get(arg_userId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Label response) {
+          .then(unittest.expectAsync1(((response) {
         checkLabel(response);
       })));
     });
@@ -2524,7 +2524,7 @@
       }), true);
       res
           .list(arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLabelsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLabelsResponse(response);
       })));
     });
@@ -2576,7 +2576,7 @@
       }), true);
       res
           .patch(arg_request, arg_userId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Label response) {
+          .then(unittest.expectAsync1(((response) {
         checkLabel(response);
       })));
     });
@@ -2628,7 +2628,7 @@
       }), true);
       res
           .update(arg_request, arg_userId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Label response) {
+          .then(unittest.expectAsync1(((response) {
         checkLabel(response);
       })));
     });
@@ -2785,7 +2785,7 @@
       var arg_userId = "foo";
       var arg_id = "foo";
       var arg_format = "foo";
-      var arg_metadataHeaders = buildUnnamed2074();
+      var arg_metadataHeaders = buildUnnamed1863();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2830,7 +2830,7 @@
               format: arg_format,
               metadataHeaders: arg_metadataHeaders,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Message response) {
+          .then(unittest.expectAsync1(((response) {
         checkMessage(response);
       })));
     });
@@ -2901,7 +2901,7 @@
               neverMarkSpam: arg_neverMarkSpam,
               processForCalendar: arg_processForCalendar,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Message response) {
+          .then(unittest.expectAsync1(((response) {
         checkMessage(response);
       })));
     });
@@ -2964,7 +2964,7 @@
               deleted: arg_deleted,
               internalDateSource: arg_internalDateSource,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Message response) {
+          .then(unittest.expectAsync1(((response) {
         checkMessage(response);
       })));
     });
@@ -2974,7 +2974,7 @@
       api.UsersMessagesResourceApi res = new api.GmailApi(mock).users.messages;
       var arg_userId = "foo";
       var arg_includeSpamTrash = true;
-      var arg_labelIds = buildUnnamed2075();
+      var arg_labelIds = buildUnnamed1864();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_q = "foo";
@@ -3030,7 +3030,7 @@
               pageToken: arg_pageToken,
               q: arg_q,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListMessagesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListMessagesResponse(response);
       })));
     });
@@ -3082,7 +3082,7 @@
       }), true);
       res
           .modify(arg_request, arg_userId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Message response) {
+          .then(unittest.expectAsync1(((response) {
         checkMessage(response);
       })));
     });
@@ -3136,7 +3136,7 @@
       }), true);
       res
           .send(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Message response) {
+          .then(unittest.expectAsync1(((response) {
         checkMessage(response);
       })));
     });
@@ -3184,7 +3184,7 @@
       }), true);
       res
           .trash(arg_userId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Message response) {
+          .then(unittest.expectAsync1(((response) {
         checkMessage(response);
       })));
     });
@@ -3232,7 +3232,7 @@
       }), true);
       res
           .untrash(arg_userId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Message response) {
+          .then(unittest.expectAsync1(((response) {
         checkMessage(response);
       })));
     });
@@ -3284,7 +3284,7 @@
       }), true);
       res
           .get(arg_userId, arg_messageId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MessagePartBody response) {
+          .then(unittest.expectAsync1(((response) {
         checkMessagePartBody(response);
       })));
     });
@@ -3333,7 +3333,7 @@
       }), true);
       res
           .getAutoForwarding(arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AutoForwarding response) {
+          .then(unittest.expectAsync1(((response) {
         checkAutoForwarding(response);
       })));
     });
@@ -3380,7 +3380,7 @@
       }), true);
       res
           .getImap(arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ImapSettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkImapSettings(response);
       })));
     });
@@ -3427,7 +3427,7 @@
       }), true);
       res
           .getPop(arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PopSettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkPopSettings(response);
       })));
     });
@@ -3474,7 +3474,7 @@
       }), true);
       res
           .getVacation(arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VacationSettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkVacationSettings(response);
       })));
     });
@@ -3525,7 +3525,7 @@
       }), true);
       res
           .updateAutoForwarding(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AutoForwarding response) {
+          .then(unittest.expectAsync1(((response) {
         checkAutoForwarding(response);
       })));
     });
@@ -3576,7 +3576,7 @@
       }), true);
       res
           .updateImap(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ImapSettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkImapSettings(response);
       })));
     });
@@ -3627,7 +3627,7 @@
       }), true);
       res
           .updatePop(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PopSettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkPopSettings(response);
       })));
     });
@@ -3678,7 +3678,7 @@
       }), true);
       res
           .updateVacation(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VacationSettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkVacationSettings(response);
       })));
     });
@@ -3732,7 +3732,7 @@
       }), true);
       res
           .create(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Filter response) {
+          .then(unittest.expectAsync1(((response) {
         checkFilter(response);
       })));
     });
@@ -3828,7 +3828,7 @@
       }), true);
       res
           .get(arg_userId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Filter response) {
+          .then(unittest.expectAsync1(((response) {
         checkFilter(response);
       })));
     });
@@ -3876,7 +3876,7 @@
       }), true);
       res
           .list(arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListFiltersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListFiltersResponse(response);
       })));
     });
@@ -3930,7 +3930,7 @@
       }), true);
       res
           .create(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ForwardingAddress response) {
+          .then(unittest.expectAsync1(((response) {
         checkForwardingAddress(response);
       })));
     });
@@ -4026,7 +4026,7 @@
       }), true);
       res
           .get(arg_userId, arg_forwardingEmail, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ForwardingAddress response) {
+          .then(unittest.expectAsync1(((response) {
         checkForwardingAddress(response);
       })));
     });
@@ -4072,8 +4072,9 @@
         var resp = convert.JSON.encode(buildListForwardingAddressesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_userId, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.ListForwardingAddressesResponse response) {
+      res
+          .list(arg_userId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkListForwardingAddressesResponse(response);
       })));
     });
@@ -4127,7 +4128,7 @@
       }), true);
       res
           .create(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SendAs response) {
+          .then(unittest.expectAsync1(((response) {
         checkSendAs(response);
       })));
     });
@@ -4223,7 +4224,7 @@
       }), true);
       res
           .get(arg_userId, arg_sendAsEmail, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SendAs response) {
+          .then(unittest.expectAsync1(((response) {
         checkSendAs(response);
       })));
     });
@@ -4271,7 +4272,7 @@
       }), true);
       res
           .list(arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListSendAsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSendAsResponse(response);
       })));
     });
@@ -4324,7 +4325,7 @@
       }), true);
       res
           .patch(arg_request, arg_userId, arg_sendAsEmail, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SendAs response) {
+          .then(unittest.expectAsync1(((response) {
         checkSendAs(response);
       })));
     });
@@ -4378,7 +4379,7 @@
       res
           .update(arg_request, arg_userId, arg_sendAsEmail,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SendAs response) {
+          .then(unittest.expectAsync1(((response) {
         checkSendAs(response);
       })));
     });
@@ -4525,7 +4526,7 @@
       }), true);
       res
           .get(arg_userId, arg_sendAsEmail, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SmimeInfo response) {
+          .then(unittest.expectAsync1(((response) {
         checkSmimeInfo(response);
       })));
     });
@@ -4579,7 +4580,7 @@
       res
           .insert(arg_request, arg_userId, arg_sendAsEmail,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SmimeInfo response) {
+          .then(unittest.expectAsync1(((response) {
         checkSmimeInfo(response);
       })));
     });
@@ -4628,7 +4629,7 @@
       }), true);
       res
           .list(arg_userId, arg_sendAsEmail, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListSmimeInfoResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSmimeInfoResponse(response);
       })));
     });
@@ -4735,7 +4736,7 @@
       var arg_userId = "foo";
       var arg_id = "foo";
       var arg_format = "foo";
-      var arg_metadataHeaders = buildUnnamed2076();
+      var arg_metadataHeaders = buildUnnamed1865();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -4780,7 +4781,7 @@
               format: arg_format,
               metadataHeaders: arg_metadataHeaders,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Thread response) {
+          .then(unittest.expectAsync1(((response) {
         checkThread(response);
       })));
     });
@@ -4790,7 +4791,7 @@
       api.UsersThreadsResourceApi res = new api.GmailApi(mock).users.threads;
       var arg_userId = "foo";
       var arg_includeSpamTrash = true;
-      var arg_labelIds = buildUnnamed2077();
+      var arg_labelIds = buildUnnamed1866();
       var arg_maxResults = 42;
       var arg_pageToken = "foo";
       var arg_q = "foo";
@@ -4846,7 +4847,7 @@
               pageToken: arg_pageToken,
               q: arg_q,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListThreadsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListThreadsResponse(response);
       })));
     });
@@ -4898,7 +4899,7 @@
       }), true);
       res
           .modify(arg_request, arg_userId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Thread response) {
+          .then(unittest.expectAsync1(((response) {
         checkThread(response);
       })));
     });
@@ -4946,7 +4947,7 @@
       }), true);
       res
           .trash(arg_userId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Thread response) {
+          .then(unittest.expectAsync1(((response) {
         checkThread(response);
       })));
     });
@@ -4994,7 +4995,7 @@
       }), true);
       res
           .untrash(arg_userId, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Thread response) {
+          .then(unittest.expectAsync1(((response) {
         checkThread(response);
       })));
     });
diff --git a/generated/googleapis/test/groupsmigration/v1_test.dart b/generated/googleapis/test/groupsmigration/v1_test.dart
index 7000f72..039c8a2 100644
--- a/generated/googleapis/test/groupsmigration/v1_test.dart
+++ b/generated/googleapis/test/groupsmigration/v1_test.dart
@@ -126,7 +126,7 @@
       }), true);
       res
           .insert(arg_groupId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Groups response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroups(response);
       })));
     });
diff --git a/generated/googleapis/test/groupssettings/v1_test.dart b/generated/googleapis/test/groupssettings/v1_test.dart
index 674b203..5140eef 100644
--- a/generated/googleapis/test/groupssettings/v1_test.dart
+++ b/generated/googleapis/test/groupssettings/v1_test.dart
@@ -182,7 +182,7 @@
       }), true);
       res
           .get(arg_groupUniqueId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Groups response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroups(response);
       })));
     });
@@ -233,7 +233,7 @@
       }), true);
       res
           .patch(arg_request, arg_groupUniqueId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Groups response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroups(response);
       })));
     });
@@ -284,7 +284,7 @@
       }), true);
       res
           .update(arg_request, arg_groupUniqueId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Groups response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroups(response);
       })));
     });
diff --git a/generated/googleapis/test/iam/v1_test.dart b/generated/googleapis/test/iam/v1_test.dart
index 98b8cae..4b07f7c 100644
--- a/generated/googleapis/test/iam/v1_test.dart
+++ b/generated/googleapis/test/iam/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2653() {
+buildUnnamed110() {
   var o = new core.List<api.AuditLogConfig>();
   o.add(buildAuditLogConfig());
   o.add(buildAuditLogConfig());
   return o;
 }
 
-checkUnnamed2653(core.List<api.AuditLogConfig> o) {
+checkUnnamed110(core.List<api.AuditLogConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditLogConfig(o[0]);
   checkAuditLogConfig(o[1]);
@@ -68,7 +68,7 @@
   var o = new api.AuditConfig();
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    o.auditLogConfigs = buildUnnamed2653();
+    o.auditLogConfigs = buildUnnamed110();
     o.service = "foo";
   }
   buildCounterAuditConfig--;
@@ -78,7 +78,7 @@
 checkAuditConfig(api.AuditConfig o) {
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    checkUnnamed2653(o.auditLogConfigs);
+    checkUnnamed110(o.auditLogConfigs);
     unittest.expect(o.service, unittest.equals('foo'));
   }
   buildCounterAuditConfig--;
@@ -103,14 +103,14 @@
   buildCounterAuditData--;
 }
 
-buildUnnamed2654() {
+buildUnnamed111() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2654(core.List<core.String> o) {
+checkUnnamed111(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -121,7 +121,7 @@
   var o = new api.AuditLogConfig();
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    o.exemptedMembers = buildUnnamed2654();
+    o.exemptedMembers = buildUnnamed111();
     o.logType = "foo";
   }
   buildCounterAuditLogConfig--;
@@ -131,7 +131,7 @@
 checkAuditLogConfig(api.AuditLogConfig o) {
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    checkUnnamed2654(o.exemptedMembers);
+    checkUnnamed111(o.exemptedMembers);
     unittest.expect(o.logType, unittest.equals('foo'));
   }
   buildCounterAuditLogConfig--;
@@ -156,14 +156,14 @@
   buildCounterAuditableService--;
 }
 
-buildUnnamed2655() {
+buildUnnamed112() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2655(core.List<core.String> o) {
+checkUnnamed112(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -174,7 +174,7 @@
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed2655();
+    o.members = buildUnnamed112();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -184,7 +184,7 @@
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed2655(o.members);
+    checkUnnamed112(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
@@ -291,14 +291,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed2656() {
+buildUnnamed113() {
   var o = new core.List<api.Role>();
   o.add(buildRole());
   o.add(buildRole());
   return o;
 }
 
-checkUnnamed2656(core.List<api.Role> o) {
+checkUnnamed113(core.List<api.Role> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRole(o[0]);
   checkRole(o[1]);
@@ -310,7 +310,7 @@
   buildCounterListRolesResponse++;
   if (buildCounterListRolesResponse < 3) {
     o.nextPageToken = "foo";
-    o.roles = buildUnnamed2656();
+    o.roles = buildUnnamed113();
   }
   buildCounterListRolesResponse--;
   return o;
@@ -320,19 +320,19 @@
   buildCounterListRolesResponse++;
   if (buildCounterListRolesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2656(o.roles);
+    checkUnnamed113(o.roles);
   }
   buildCounterListRolesResponse--;
 }
 
-buildUnnamed2657() {
+buildUnnamed114() {
   var o = new core.List<api.ServiceAccountKey>();
   o.add(buildServiceAccountKey());
   o.add(buildServiceAccountKey());
   return o;
 }
 
-checkUnnamed2657(core.List<api.ServiceAccountKey> o) {
+checkUnnamed114(core.List<api.ServiceAccountKey> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServiceAccountKey(o[0]);
   checkServiceAccountKey(o[1]);
@@ -343,7 +343,7 @@
   var o = new api.ListServiceAccountKeysResponse();
   buildCounterListServiceAccountKeysResponse++;
   if (buildCounterListServiceAccountKeysResponse < 3) {
-    o.keys = buildUnnamed2657();
+    o.keys = buildUnnamed114();
   }
   buildCounterListServiceAccountKeysResponse--;
   return o;
@@ -352,19 +352,19 @@
 checkListServiceAccountKeysResponse(api.ListServiceAccountKeysResponse o) {
   buildCounterListServiceAccountKeysResponse++;
   if (buildCounterListServiceAccountKeysResponse < 3) {
-    checkUnnamed2657(o.keys);
+    checkUnnamed114(o.keys);
   }
   buildCounterListServiceAccountKeysResponse--;
 }
 
-buildUnnamed2658() {
+buildUnnamed115() {
   var o = new core.List<api.ServiceAccount>();
   o.add(buildServiceAccount());
   o.add(buildServiceAccount());
   return o;
 }
 
-checkUnnamed2658(core.List<api.ServiceAccount> o) {
+checkUnnamed115(core.List<api.ServiceAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServiceAccount(o[0]);
   checkServiceAccount(o[1]);
@@ -375,7 +375,7 @@
   var o = new api.ListServiceAccountsResponse();
   buildCounterListServiceAccountsResponse++;
   if (buildCounterListServiceAccountsResponse < 3) {
-    o.accounts = buildUnnamed2658();
+    o.accounts = buildUnnamed115();
     o.nextPageToken = "foo";
   }
   buildCounterListServiceAccountsResponse--;
@@ -385,7 +385,7 @@
 checkListServiceAccountsResponse(api.ListServiceAccountsResponse o) {
   buildCounterListServiceAccountsResponse++;
   if (buildCounterListServiceAccountsResponse < 3) {
-    checkUnnamed2658(o.accounts);
+    checkUnnamed115(o.accounts);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListServiceAccountsResponse--;
@@ -422,27 +422,27 @@
   buildCounterPermission--;
 }
 
-buildUnnamed2659() {
+buildUnnamed116() {
   var o = new core.List<api.AuditConfig>();
   o.add(buildAuditConfig());
   o.add(buildAuditConfig());
   return o;
 }
 
-checkUnnamed2659(core.List<api.AuditConfig> o) {
+checkUnnamed116(core.List<api.AuditConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditConfig(o[0]);
   checkAuditConfig(o[1]);
 }
 
-buildUnnamed2660() {
+buildUnnamed117() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed2660(core.List<api.Binding> o) {
+checkUnnamed117(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -453,8 +453,8 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.auditConfigs = buildUnnamed2659();
-    o.bindings = buildUnnamed2660();
+    o.auditConfigs = buildUnnamed116();
+    o.bindings = buildUnnamed117();
     o.etag = "foo";
     o.version = 42;
   }
@@ -465,22 +465,22 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed2659(o.auditConfigs);
-    checkUnnamed2660(o.bindings);
+    checkUnnamed116(o.auditConfigs);
+    checkUnnamed117(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
   buildCounterPolicy--;
 }
 
-buildUnnamed2661() {
+buildUnnamed118() {
   var o = new core.List<api.BindingDelta>();
   o.add(buildBindingDelta());
   o.add(buildBindingDelta());
   return o;
 }
 
-checkUnnamed2661(core.List<api.BindingDelta> o) {
+checkUnnamed118(core.List<api.BindingDelta> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBindingDelta(o[0]);
   checkBindingDelta(o[1]);
@@ -491,7 +491,7 @@
   var o = new api.PolicyDelta();
   buildCounterPolicyDelta++;
   if (buildCounterPolicyDelta < 3) {
-    o.bindingDeltas = buildUnnamed2661();
+    o.bindingDeltas = buildUnnamed118();
   }
   buildCounterPolicyDelta--;
   return o;
@@ -500,7 +500,7 @@
 checkPolicyDelta(api.PolicyDelta o) {
   buildCounterPolicyDelta++;
   if (buildCounterPolicyDelta < 3) {
-    checkUnnamed2661(o.bindingDeltas);
+    checkUnnamed118(o.bindingDeltas);
   }
   buildCounterPolicyDelta--;
 }
@@ -524,14 +524,14 @@
   buildCounterQueryAuditableServicesRequest--;
 }
 
-buildUnnamed2662() {
+buildUnnamed119() {
   var o = new core.List<api.AuditableService>();
   o.add(buildAuditableService());
   o.add(buildAuditableService());
   return o;
 }
 
-checkUnnamed2662(core.List<api.AuditableService> o) {
+checkUnnamed119(core.List<api.AuditableService> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditableService(o[0]);
   checkAuditableService(o[1]);
@@ -542,7 +542,7 @@
   var o = new api.QueryAuditableServicesResponse();
   buildCounterQueryAuditableServicesResponse++;
   if (buildCounterQueryAuditableServicesResponse < 3) {
-    o.services = buildUnnamed2662();
+    o.services = buildUnnamed119();
   }
   buildCounterQueryAuditableServicesResponse--;
   return o;
@@ -551,7 +551,7 @@
 checkQueryAuditableServicesResponse(api.QueryAuditableServicesResponse o) {
   buildCounterQueryAuditableServicesResponse++;
   if (buildCounterQueryAuditableServicesResponse < 3) {
-    checkUnnamed2662(o.services);
+    checkUnnamed119(o.services);
   }
   buildCounterQueryAuditableServicesResponse--;
 }
@@ -581,14 +581,14 @@
   buildCounterQueryGrantableRolesRequest--;
 }
 
-buildUnnamed2663() {
+buildUnnamed120() {
   var o = new core.List<api.Role>();
   o.add(buildRole());
   o.add(buildRole());
   return o;
 }
 
-checkUnnamed2663(core.List<api.Role> o) {
+checkUnnamed120(core.List<api.Role> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRole(o[0]);
   checkRole(o[1]);
@@ -600,7 +600,7 @@
   buildCounterQueryGrantableRolesResponse++;
   if (buildCounterQueryGrantableRolesResponse < 3) {
     o.nextPageToken = "foo";
-    o.roles = buildUnnamed2663();
+    o.roles = buildUnnamed120();
   }
   buildCounterQueryGrantableRolesResponse--;
   return o;
@@ -610,7 +610,7 @@
   buildCounterQueryGrantableRolesResponse++;
   if (buildCounterQueryGrantableRolesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2663(o.roles);
+    checkUnnamed120(o.roles);
   }
   buildCounterQueryGrantableRolesResponse--;
 }
@@ -638,14 +638,14 @@
   buildCounterQueryTestablePermissionsRequest--;
 }
 
-buildUnnamed2664() {
+buildUnnamed121() {
   var o = new core.List<api.Permission>();
   o.add(buildPermission());
   o.add(buildPermission());
   return o;
 }
 
-checkUnnamed2664(core.List<api.Permission> o) {
+checkUnnamed121(core.List<api.Permission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPermission(o[0]);
   checkPermission(o[1]);
@@ -657,7 +657,7 @@
   buildCounterQueryTestablePermissionsResponse++;
   if (buildCounterQueryTestablePermissionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.permissions = buildUnnamed2664();
+    o.permissions = buildUnnamed121();
   }
   buildCounterQueryTestablePermissionsResponse--;
   return o;
@@ -667,19 +667,19 @@
   buildCounterQueryTestablePermissionsResponse++;
   if (buildCounterQueryTestablePermissionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2664(o.permissions);
+    checkUnnamed121(o.permissions);
   }
   buildCounterQueryTestablePermissionsResponse--;
 }
 
-buildUnnamed2665() {
+buildUnnamed122() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2665(core.List<core.String> o) {
+checkUnnamed122(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -693,7 +693,7 @@
     o.deleted = true;
     o.description = "foo";
     o.etag = "foo";
-    o.includedPermissions = buildUnnamed2665();
+    o.includedPermissions = buildUnnamed122();
     o.name = "foo";
     o.stage = "foo";
     o.title = "foo";
@@ -708,7 +708,7 @@
     unittest.expect(o.deleted, unittest.isTrue);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2665(o.includedPermissions);
+    checkUnnamed122(o.includedPermissions);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.stage, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
@@ -879,14 +879,14 @@
   buildCounterSignJwtResponse--;
 }
 
-buildUnnamed2666() {
+buildUnnamed123() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2666(core.List<core.String> o) {
+checkUnnamed123(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -897,7 +897,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed2666();
+    o.permissions = buildUnnamed123();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -906,19 +906,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed2666(o.permissions);
+    checkUnnamed123(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed2667() {
+buildUnnamed124() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2667(core.List<core.String> o) {
+checkUnnamed124(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -929,7 +929,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed2667();
+    o.permissions = buildUnnamed124();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -938,7 +938,7 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed2667(o.permissions);
+    checkUnnamed124(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
@@ -962,14 +962,14 @@
   buildCounterUndeleteRoleRequest--;
 }
 
-buildUnnamed2668() {
+buildUnnamed125() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2668(core.List<core.String> o) {
+checkUnnamed125(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1287,8 +1287,9 @@
         var resp = convert.JSON.encode(buildQueryAuditableServicesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.queryAuditableServices(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.QueryAuditableServicesResponse response) {
+      res
+          .queryAuditableServices(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkQueryAuditableServicesResponse(response);
       })));
     });
@@ -1346,7 +1347,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -1400,7 +1401,7 @@
       }), true);
       res
           .delete(arg_name, etag: arg_etag, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -1452,7 +1453,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -1520,7 +1521,7 @@
               pageSize: arg_pageSize,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListRolesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListRolesResponse(response);
       })));
     });
@@ -1580,7 +1581,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -1636,7 +1637,7 @@
       }), true);
       res
           .undelete(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -1689,9 +1690,9 @@
         var resp = convert.JSON.encode(buildQueryTestablePermissionsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.queryTestablePermissions(arg_request, $fields: arg_$fields).then(
-          unittest
-              .expectAsync1(((api.QueryTestablePermissionsResponse response) {
+      res
+          .queryTestablePermissions(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkQueryTestablePermissionsResponse(response);
       })));
     });
@@ -1748,7 +1749,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -1801,7 +1802,7 @@
       }), true);
       res
           .delete(arg_name, etag: arg_etag, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -1852,7 +1853,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -1919,7 +1920,7 @@
               pageSize: arg_pageSize,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListRolesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListRolesResponse(response);
       })));
     });
@@ -1978,7 +1979,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -2033,7 +2034,7 @@
       }), true);
       res
           .undelete(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -2091,7 +2092,7 @@
       }), true);
       res
           .create(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ServiceAccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkServiceAccount(response);
       })));
     });
@@ -2143,7 +2144,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2195,7 +2196,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ServiceAccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkServiceAccount(response);
       })));
     });
@@ -2247,7 +2248,7 @@
       }), true);
       res
           .getIamPolicy(arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -2308,8 +2309,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListServiceAccountsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListServiceAccountsResponse(response);
       })));
     });
@@ -2365,7 +2365,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -2421,7 +2421,7 @@
       }), true);
       res
           .signBlob(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SignBlobResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSignBlobResponse(response);
       })));
     });
@@ -2477,7 +2477,7 @@
       }), true);
       res
           .signJwt(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SignJwtResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSignJwtResponse(response);
       })));
     });
@@ -2533,8 +2533,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -2590,7 +2589,7 @@
       }), true);
       res
           .update(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ServiceAccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkServiceAccount(response);
       })));
     });
@@ -2648,7 +2647,7 @@
       }), true);
       res
           .create(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ServiceAccountKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkServiceAccountKey(response);
       })));
     });
@@ -2700,7 +2699,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2755,7 +2754,7 @@
       }), true);
       res
           .get(arg_name, publicKeyType: arg_publicKeyType, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ServiceAccountKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkServiceAccountKey(response);
       })));
     });
@@ -2765,7 +2764,7 @@
       api.ProjectsServiceAccountsKeysResourceApi res =
           new api.IamApi(mock).projects.serviceAccounts.keys;
       var arg_name = "foo";
-      var arg_keyTypes = buildUnnamed2668();
+      var arg_keyTypes = buildUnnamed125();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2807,8 +2806,9 @@
         var resp = convert.JSON.encode(buildListServiceAccountKeysResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_name, keyTypes: arg_keyTypes, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ListServiceAccountKeysResponse response) {
+      res
+          .list(arg_name, keyTypes: arg_keyTypes, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkListServiceAccountKeysResponse(response);
       })));
     });
@@ -2861,7 +2861,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Role response) {
+          .then(unittest.expectAsync1(((response) {
         checkRole(response);
       })));
     });
@@ -2929,7 +2929,7 @@
               view: arg_view,
               parent: arg_parent,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListRolesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListRolesResponse(response);
       })));
     });
@@ -2980,8 +2980,9 @@
         var resp = convert.JSON.encode(buildQueryGrantableRolesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.queryGrantableRoles(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.QueryGrantableRolesResponse response) {
+      res
+          .queryGrantableRoles(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkQueryGrantableRolesResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/identitytoolkit/v3_test.dart b/generated/googleapis/test/identitytoolkit/v3_test.dart
index e02e1f5..a95aafd 100644
--- a/generated/googleapis/test/identitytoolkit/v3_test.dart
+++ b/generated/googleapis/test/identitytoolkit/v3_test.dart
@@ -50,27 +50,27 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed139() {
+buildUnnamed89() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed139(core.List<core.String> o) {
+checkUnnamed89(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed140() {
+buildUnnamed90() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed140(core.List<core.String> o) {
+checkUnnamed90(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -81,7 +81,7 @@
   var o = new api.CreateAuthUriResponse();
   buildCounterCreateAuthUriResponse++;
   if (buildCounterCreateAuthUriResponse < 3) {
-    o.allProviders = buildUnnamed139();
+    o.allProviders = buildUnnamed89();
     o.authUri = "foo";
     o.captchaRequired = true;
     o.forExistingProvider = true;
@@ -89,7 +89,7 @@
     o.providerId = "foo";
     o.registered = true;
     o.sessionId = "foo";
-    o.signinMethods = buildUnnamed140();
+    o.signinMethods = buildUnnamed90();
   }
   buildCounterCreateAuthUriResponse--;
   return o;
@@ -98,7 +98,7 @@
 checkCreateAuthUriResponse(api.CreateAuthUriResponse o) {
   buildCounterCreateAuthUriResponse++;
   if (buildCounterCreateAuthUriResponse < 3) {
-    checkUnnamed139(o.allProviders);
+    checkUnnamed89(o.allProviders);
     unittest.expect(o.authUri, unittest.equals('foo'));
     unittest.expect(o.captchaRequired, unittest.isTrue);
     unittest.expect(o.forExistingProvider, unittest.isTrue);
@@ -106,7 +106,7 @@
     unittest.expect(o.providerId, unittest.equals('foo'));
     unittest.expect(o.registered, unittest.isTrue);
     unittest.expect(o.sessionId, unittest.equals('foo'));
-    checkUnnamed140(o.signinMethods);
+    checkUnnamed90(o.signinMethods);
   }
   buildCounterCreateAuthUriResponse--;
 }
@@ -130,14 +130,14 @@
   buildCounterDeleteAccountResponse--;
 }
 
-buildUnnamed141() {
+buildUnnamed91() {
   var o = new core.List<api.UserInfo>();
   o.add(buildUserInfo());
   o.add(buildUserInfo());
   return o;
 }
 
-checkUnnamed141(core.List<api.UserInfo> o) {
+checkUnnamed91(core.List<api.UserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserInfo(o[0]);
   checkUserInfo(o[1]);
@@ -150,7 +150,7 @@
   if (buildCounterDownloadAccountResponse < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.users = buildUnnamed141();
+    o.users = buildUnnamed91();
   }
   buildCounterDownloadAccountResponse--;
   return o;
@@ -161,7 +161,7 @@
   if (buildCounterDownloadAccountResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed141(o.users);
+    checkUnnamed91(o.users);
   }
   buildCounterDownloadAccountResponse--;
 }
@@ -226,14 +226,14 @@
   buildCounterEmailTemplate--;
 }
 
-buildUnnamed142() {
+buildUnnamed92() {
   var o = new core.List<api.UserInfo>();
   o.add(buildUserInfo());
   o.add(buildUserInfo());
   return o;
 }
 
-checkUnnamed142(core.List<api.UserInfo> o) {
+checkUnnamed92(core.List<api.UserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserInfo(o[0]);
   checkUserInfo(o[1]);
@@ -245,7 +245,7 @@
   buildCounterGetAccountInfoResponse++;
   if (buildCounterGetAccountInfoResponse < 3) {
     o.kind = "foo";
-    o.users = buildUnnamed142();
+    o.users = buildUnnamed92();
   }
   buildCounterGetAccountInfoResponse--;
   return o;
@@ -255,7 +255,7 @@
   buildCounterGetAccountInfoResponse++;
   if (buildCounterGetAccountInfoResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed142(o.users);
+    checkUnnamed92(o.users);
   }
   buildCounterGetAccountInfoResponse--;
 }
@@ -306,14 +306,14 @@
   buildCounterGetRecaptchaParamResponse--;
 }
 
-buildUnnamed143() {
+buildUnnamed93() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed143(core.Map<core.String, core.String> o) {
+checkUnnamed93(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -329,7 +329,7 @@
     o.clientId = "foo";
     o.context = "foo";
     o.continueUri = "foo";
-    o.customParameter = buildUnnamed143();
+    o.customParameter = buildUnnamed93();
     o.hostedDomain = "foo";
     o.identifier = "foo";
     o.oauthConsumerKey = "foo";
@@ -352,7 +352,7 @@
     unittest.expect(o.clientId, unittest.equals('foo'));
     unittest.expect(o.context, unittest.equals('foo'));
     unittest.expect(o.continueUri, unittest.equals('foo'));
-    checkUnnamed143(o.customParameter);
+    checkUnnamed93(o.customParameter);
     unittest.expect(o.hostedDomain, unittest.equals('foo'));
     unittest.expect(o.identifier, unittest.equals('foo'));
     unittest.expect(o.oauthConsumerKey, unittest.equals('foo'));
@@ -439,40 +439,40 @@
   buildCounterIdentitytoolkitRelyingpartyEmailLinkSigninRequest--;
 }
 
-buildUnnamed144() {
+buildUnnamed94() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed144(core.List<core.String> o) {
+checkUnnamed94(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed145() {
+buildUnnamed95() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed145(core.List<core.String> o) {
+checkUnnamed95(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed146() {
+buildUnnamed96() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed146(core.List<core.String> o) {
+checkUnnamed96(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -484,10 +484,10 @@
   buildCounterIdentitytoolkitRelyingpartyGetAccountInfoRequest++;
   if (buildCounterIdentitytoolkitRelyingpartyGetAccountInfoRequest < 3) {
     o.delegatedProjectNumber = "foo";
-    o.email = buildUnnamed144();
+    o.email = buildUnnamed94();
     o.idToken = "foo";
-    o.localId = buildUnnamed145();
-    o.phoneNumber = buildUnnamed146();
+    o.localId = buildUnnamed95();
+    o.phoneNumber = buildUnnamed96();
   }
   buildCounterIdentitytoolkitRelyingpartyGetAccountInfoRequest--;
   return o;
@@ -498,35 +498,35 @@
   buildCounterIdentitytoolkitRelyingpartyGetAccountInfoRequest++;
   if (buildCounterIdentitytoolkitRelyingpartyGetAccountInfoRequest < 3) {
     unittest.expect(o.delegatedProjectNumber, unittest.equals('foo'));
-    checkUnnamed144(o.email);
+    checkUnnamed94(o.email);
     unittest.expect(o.idToken, unittest.equals('foo'));
-    checkUnnamed145(o.localId);
-    checkUnnamed146(o.phoneNumber);
+    checkUnnamed95(o.localId);
+    checkUnnamed96(o.phoneNumber);
   }
   buildCounterIdentitytoolkitRelyingpartyGetAccountInfoRequest--;
 }
 
-buildUnnamed147() {
+buildUnnamed97() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed147(core.List<core.String> o) {
+checkUnnamed97(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed148() {
+buildUnnamed98() {
   var o = new core.List<api.IdpConfig>();
   o.add(buildIdpConfig());
   o.add(buildIdpConfig());
   return o;
 }
 
-checkUnnamed148(core.List<api.IdpConfig> o) {
+checkUnnamed98(core.List<api.IdpConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkIdpConfig(o[0]);
   checkIdpConfig(o[1]);
@@ -539,11 +539,11 @@
   if (buildCounterIdentitytoolkitRelyingpartyGetProjectConfigResponse < 3) {
     o.allowPasswordUser = true;
     o.apiKey = "foo";
-    o.authorizedDomains = buildUnnamed147();
+    o.authorizedDomains = buildUnnamed97();
     o.changeEmailTemplate = buildEmailTemplate();
     o.dynamicLinksDomain = "foo";
     o.enableAnonymousUser = true;
-    o.idpConfig = buildUnnamed148();
+    o.idpConfig = buildUnnamed98();
     o.legacyResetPasswordTemplate = buildEmailTemplate();
     o.projectId = "foo";
     o.resetPasswordTemplate = buildEmailTemplate();
@@ -560,11 +560,11 @@
   if (buildCounterIdentitytoolkitRelyingpartyGetProjectConfigResponse < 3) {
     unittest.expect(o.allowPasswordUser, unittest.isTrue);
     unittest.expect(o.apiKey, unittest.equals('foo'));
-    checkUnnamed147(o.authorizedDomains);
+    checkUnnamed97(o.authorizedDomains);
     checkEmailTemplate(o.changeEmailTemplate);
     unittest.expect(o.dynamicLinksDomain, unittest.equals('foo'));
     unittest.expect(o.enableAnonymousUser, unittest.isTrue);
-    checkUnnamed148(o.idpConfig);
+    checkUnnamed98(o.idpConfig);
     checkEmailTemplate(o.legacyResetPasswordTemplate);
     unittest.expect(o.projectId, unittest.equals('foo'));
     checkEmailTemplate(o.resetPasswordTemplate);
@@ -661,40 +661,40 @@
   buildCounterIdentitytoolkitRelyingpartySendVerificationCodeResponse--;
 }
 
-buildUnnamed149() {
+buildUnnamed99() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed149(core.List<core.String> o) {
+checkUnnamed99(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed150() {
+buildUnnamed100() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed150(core.List<core.String> o) {
+checkUnnamed100(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed151() {
+buildUnnamed101() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed151(core.List<core.String> o) {
+checkUnnamed101(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -710,8 +710,8 @@
     o.createdAt = "foo";
     o.customAttributes = "foo";
     o.delegatedProjectNumber = "foo";
-    o.deleteAttribute = buildUnnamed149();
-    o.deleteProvider = buildUnnamed150();
+    o.deleteAttribute = buildUnnamed99();
+    o.deleteProvider = buildUnnamed100();
     o.disableUser = true;
     o.displayName = "foo";
     o.email = "foo";
@@ -724,7 +724,7 @@
     o.password = "foo";
     o.phoneNumber = "foo";
     o.photoUrl = "foo";
-    o.provider = buildUnnamed151();
+    o.provider = buildUnnamed101();
     o.returnSecureToken = true;
     o.upgradeToFederatedLogin = true;
     o.validSince = "foo";
@@ -742,8 +742,8 @@
     unittest.expect(o.createdAt, unittest.equals('foo'));
     unittest.expect(o.customAttributes, unittest.equals('foo'));
     unittest.expect(o.delegatedProjectNumber, unittest.equals('foo'));
-    checkUnnamed149(o.deleteAttribute);
-    checkUnnamed150(o.deleteProvider);
+    checkUnnamed99(o.deleteAttribute);
+    checkUnnamed100(o.deleteProvider);
     unittest.expect(o.disableUser, unittest.isTrue);
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.email, unittest.equals('foo'));
@@ -756,7 +756,7 @@
     unittest.expect(o.password, unittest.equals('foo'));
     unittest.expect(o.phoneNumber, unittest.equals('foo'));
     unittest.expect(o.photoUrl, unittest.equals('foo'));
-    checkUnnamed151(o.provider);
+    checkUnnamed101(o.provider);
     unittest.expect(o.returnSecureToken, unittest.isTrue);
     unittest.expect(o.upgradeToFederatedLogin, unittest.isTrue);
     unittest.expect(o.validSince, unittest.equals('foo'));
@@ -764,27 +764,27 @@
   buildCounterIdentitytoolkitRelyingpartySetAccountInfoRequest--;
 }
 
-buildUnnamed152() {
+buildUnnamed102() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed152(core.List<core.String> o) {
+checkUnnamed102(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed153() {
+buildUnnamed103() {
   var o = new core.List<api.IdpConfig>();
   o.add(buildIdpConfig());
   o.add(buildIdpConfig());
   return o;
 }
 
-checkUnnamed153(core.List<api.IdpConfig> o) {
+checkUnnamed103(core.List<api.IdpConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkIdpConfig(o[0]);
   checkIdpConfig(o[1]);
@@ -797,11 +797,11 @@
   if (buildCounterIdentitytoolkitRelyingpartySetProjectConfigRequest < 3) {
     o.allowPasswordUser = true;
     o.apiKey = "foo";
-    o.authorizedDomains = buildUnnamed152();
+    o.authorizedDomains = buildUnnamed102();
     o.changeEmailTemplate = buildEmailTemplate();
     o.delegatedProjectNumber = "foo";
     o.enableAnonymousUser = true;
-    o.idpConfig = buildUnnamed153();
+    o.idpConfig = buildUnnamed103();
     o.legacyResetPasswordTemplate = buildEmailTemplate();
     o.resetPasswordTemplate = buildEmailTemplate();
     o.useEmailSending = true;
@@ -817,11 +817,11 @@
   if (buildCounterIdentitytoolkitRelyingpartySetProjectConfigRequest < 3) {
     unittest.expect(o.allowPasswordUser, unittest.isTrue);
     unittest.expect(o.apiKey, unittest.equals('foo'));
-    checkUnnamed152(o.authorizedDomains);
+    checkUnnamed102(o.authorizedDomains);
     checkEmailTemplate(o.changeEmailTemplate);
     unittest.expect(o.delegatedProjectNumber, unittest.equals('foo'));
     unittest.expect(o.enableAnonymousUser, unittest.isTrue);
-    checkUnnamed153(o.idpConfig);
+    checkUnnamed103(o.idpConfig);
     checkEmailTemplate(o.legacyResetPasswordTemplate);
     checkEmailTemplate(o.resetPasswordTemplate);
     unittest.expect(o.useEmailSending, unittest.isTrue);
@@ -934,14 +934,14 @@
   buildCounterIdentitytoolkitRelyingpartySignupNewUserRequest--;
 }
 
-buildUnnamed154() {
+buildUnnamed104() {
   var o = new core.List<api.UserInfo>();
   o.add(buildUserInfo());
   o.add(buildUserInfo());
   return o;
 }
 
-checkUnnamed154(core.List<api.UserInfo> o) {
+checkUnnamed104(core.List<api.UserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserInfo(o[0]);
   checkUserInfo(o[1]);
@@ -965,7 +965,7 @@
     o.sanityCheck = true;
     o.signerKey = "foo";
     o.targetProjectId = "foo";
-    o.users = buildUnnamed154();
+    o.users = buildUnnamed104();
   }
   buildCounterIdentitytoolkitRelyingpartyUploadAccountRequest--;
   return o;
@@ -988,7 +988,7 @@
     unittest.expect(o.sanityCheck, unittest.isTrue);
     unittest.expect(o.signerKey, unittest.equals('foo'));
     unittest.expect(o.targetProjectId, unittest.equals('foo'));
-    checkUnnamed154(o.users);
+    checkUnnamed104(o.users);
   }
   buildCounterIdentitytoolkitRelyingpartyUploadAccountRequest--;
 }
@@ -1165,14 +1165,14 @@
   buildCounterIdentitytoolkitRelyingpartyVerifyPhoneNumberResponse--;
 }
 
-buildUnnamed155() {
+buildUnnamed105() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed155(core.List<core.String> o) {
+checkUnnamed105(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1188,7 +1188,7 @@
     o.experimentPercent = 42;
     o.provider = "foo";
     o.secret = "foo";
-    o.whitelistedAudiences = buildUnnamed155();
+    o.whitelistedAudiences = buildUnnamed105();
   }
   buildCounterIdpConfig--;
   return o;
@@ -1202,7 +1202,7 @@
     unittest.expect(o.experimentPercent, unittest.equals(42));
     unittest.expect(o.provider, unittest.equals('foo'));
     unittest.expect(o.secret, unittest.equals('foo'));
-    checkUnnamed155(o.whitelistedAudiences);
+    checkUnnamed105(o.whitelistedAudiences);
   }
   buildCounterIdpConfig--;
 }
@@ -1305,14 +1305,14 @@
   buildCounterSetAccountInfoResponseProviderUserInfo--;
 }
 
-buildUnnamed156() {
+buildUnnamed106() {
   var o = new core.List<api.SetAccountInfoResponseProviderUserInfo>();
   o.add(buildSetAccountInfoResponseProviderUserInfo());
   o.add(buildSetAccountInfoResponseProviderUserInfo());
   return o;
 }
 
-checkUnnamed156(core.List<api.SetAccountInfoResponseProviderUserInfo> o) {
+checkUnnamed106(core.List<api.SetAccountInfoResponseProviderUserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSetAccountInfoResponseProviderUserInfo(o[0]);
   checkSetAccountInfoResponseProviderUserInfo(o[1]);
@@ -1333,7 +1333,7 @@
     o.newEmail = "foo";
     o.passwordHash = "foo";
     o.photoUrl = "foo";
-    o.providerUserInfo = buildUnnamed156();
+    o.providerUserInfo = buildUnnamed106();
     o.refreshToken = "foo";
   }
   buildCounterSetAccountInfoResponse--;
@@ -1353,7 +1353,7 @@
     unittest.expect(o.newEmail, unittest.equals('foo'));
     unittest.expect(o.passwordHash, unittest.equals('foo'));
     unittest.expect(o.photoUrl, unittest.equals('foo'));
-    checkUnnamed156(o.providerUserInfo);
+    checkUnnamed106(o.providerUserInfo);
     unittest.expect(o.refreshToken, unittest.equals('foo'));
   }
   buildCounterSetAccountInfoResponse--;
@@ -1411,14 +1411,14 @@
   buildCounterUploadAccountResponseError--;
 }
 
-buildUnnamed157() {
+buildUnnamed107() {
   var o = new core.List<api.UploadAccountResponseError>();
   o.add(buildUploadAccountResponseError());
   o.add(buildUploadAccountResponseError());
   return o;
 }
 
-checkUnnamed157(core.List<api.UploadAccountResponseError> o) {
+checkUnnamed107(core.List<api.UploadAccountResponseError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUploadAccountResponseError(o[0]);
   checkUploadAccountResponseError(o[1]);
@@ -1429,7 +1429,7 @@
   var o = new api.UploadAccountResponse();
   buildCounterUploadAccountResponse++;
   if (buildCounterUploadAccountResponse < 3) {
-    o.error = buildUnnamed157();
+    o.error = buildUnnamed107();
     o.kind = "foo";
   }
   buildCounterUploadAccountResponse--;
@@ -1439,7 +1439,7 @@
 checkUploadAccountResponse(api.UploadAccountResponse o) {
   buildCounterUploadAccountResponse++;
   if (buildCounterUploadAccountResponse < 3) {
-    checkUnnamed157(o.error);
+    checkUnnamed107(o.error);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterUploadAccountResponse--;
@@ -1478,14 +1478,14 @@
   buildCounterUserInfoProviderUserInfo--;
 }
 
-buildUnnamed158() {
+buildUnnamed108() {
   var o = new core.List<api.UserInfoProviderUserInfo>();
   o.add(buildUserInfoProviderUserInfo());
   o.add(buildUserInfoProviderUserInfo());
   return o;
 }
 
-checkUnnamed158(core.List<api.UserInfoProviderUserInfo> o) {
+checkUnnamed108(core.List<api.UserInfoProviderUserInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserInfoProviderUserInfo(o[0]);
   checkUserInfoProviderUserInfo(o[1]);
@@ -1509,7 +1509,7 @@
     o.passwordUpdatedAt = 42.0;
     o.phoneNumber = "foo";
     o.photoUrl = "foo";
-    o.providerUserInfo = buildUnnamed158();
+    o.providerUserInfo = buildUnnamed108();
     o.rawPassword = "foo";
     o.salt = "foo";
     o.screenName = "foo";
@@ -1536,7 +1536,7 @@
     unittest.expect(o.passwordUpdatedAt, unittest.equals(42.0));
     unittest.expect(o.phoneNumber, unittest.equals('foo'));
     unittest.expect(o.photoUrl, unittest.equals('foo'));
-    checkUnnamed158(o.providerUserInfo);
+    checkUnnamed108(o.providerUserInfo);
     unittest.expect(o.rawPassword, unittest.equals('foo'));
     unittest.expect(o.salt, unittest.equals('foo'));
     unittest.expect(o.screenName, unittest.equals('foo'));
@@ -1546,14 +1546,14 @@
   buildCounterUserInfo--;
 }
 
-buildUnnamed159() {
+buildUnnamed109() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed159(core.List<core.String> o) {
+checkUnnamed109(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1602,7 +1602,7 @@
     o.refreshToken = "foo";
     o.screenName = "foo";
     o.timeZone = "foo";
-    o.verifiedProvider = buildUnnamed159();
+    o.verifiedProvider = buildUnnamed109();
   }
   buildCounterVerifyAssertionResponse--;
   return o;
@@ -1649,7 +1649,7 @@
     unittest.expect(o.refreshToken, unittest.equals('foo'));
     unittest.expect(o.screenName, unittest.equals('foo'));
     unittest.expect(o.timeZone, unittest.equals('foo'));
-    checkUnnamed159(o.verifiedProvider);
+    checkUnnamed109(o.verifiedProvider);
   }
   buildCounterVerifyAssertionResponse--;
 }
@@ -2182,7 +2182,7 @@
       }), true);
       res
           .createAuthUri(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreateAuthUriResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreateAuthUriResponse(response);
       })));
     });
@@ -2241,7 +2241,7 @@
       }), true);
       res
           .deleteAccount(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DeleteAccountResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeleteAccountResponse(response);
       })));
     });
@@ -2301,7 +2301,7 @@
       }), true);
       res
           .downloadAccount(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DownloadAccountResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDownloadAccountResponse(response);
       })));
     });
@@ -2361,7 +2361,7 @@
       }), true);
       res
           .emailLinkSignin(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.EmailLinkSigninResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmailLinkSigninResponse(response);
       })));
     });
@@ -2420,7 +2420,7 @@
       }), true);
       res
           .getAccountInfo(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetAccountInfoResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetAccountInfoResponse(response);
       })));
     });
@@ -2475,8 +2475,9 @@
         var resp = convert.JSON.encode(buildGetOobConfirmationCodeResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getOobConfirmationCode(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GetOobConfirmationCodeResponse response) {
+      res
+          .getOobConfirmationCode(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGetOobConfirmationCodeResponse(response);
       })));
     });
@@ -2539,9 +2540,7 @@
               delegatedProjectNumber: arg_delegatedProjectNumber,
               projectNumber: arg_projectNumber,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.IdentitytoolkitRelyingpartyGetProjectConfigResponse
-                  response) {
+          .then(unittest.expectAsync1(((response) {
         checkIdentitytoolkitRelyingpartyGetProjectConfigResponse(response);
       })));
     });
@@ -2593,8 +2592,9 @@
             .encode(buildIdentitytoolkitRelyingpartyGetPublicKeysResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getPublicKeys($fields: arg_$fields).then(unittest.expectAsync1(
-          ((api.IdentitytoolkitRelyingpartyGetPublicKeysResponse response) {
+      res
+          .getPublicKeys($fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkIdentitytoolkitRelyingpartyGetPublicKeysResponse(response);
       })));
     });
@@ -2645,8 +2645,9 @@
         var resp = convert.JSON.encode(buildGetRecaptchaParamResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getRecaptchaParam($fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GetRecaptchaParamResponse response) {
+      res
+          .getRecaptchaParam($fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGetRecaptchaParamResponse(response);
       })));
     });
@@ -2705,7 +2706,7 @@
       }), true);
       res
           .resetPassword(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ResetPasswordResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkResetPasswordResponse(response);
       })));
     });
@@ -2764,10 +2765,9 @@
             buildIdentitytoolkitRelyingpartySendVerificationCodeResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.sendVerificationCode(arg_request, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.IdentitytoolkitRelyingpartySendVerificationCodeResponse
-                  response) {
+      res
+          .sendVerificationCode(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkIdentitytoolkitRelyingpartySendVerificationCodeResponse(response);
       })));
     });
@@ -2826,7 +2826,7 @@
       }), true);
       res
           .setAccountInfo(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SetAccountInfoResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSetAccountInfoResponse(response);
       })));
     });
@@ -2885,10 +2885,9 @@
             .encode(buildIdentitytoolkitRelyingpartySetProjectConfigResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.setProjectConfig(arg_request, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.IdentitytoolkitRelyingpartySetProjectConfigResponse
-                  response) {
+      res
+          .setProjectConfig(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkIdentitytoolkitRelyingpartySetProjectConfigResponse(response);
       })));
     });
@@ -2946,9 +2945,9 @@
             .encode(buildIdentitytoolkitRelyingpartySignOutUserResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.signOutUser(arg_request, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.IdentitytoolkitRelyingpartySignOutUserResponse response) {
+      res
+          .signOutUser(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkIdentitytoolkitRelyingpartySignOutUserResponse(response);
       })));
     });
@@ -3007,7 +3006,7 @@
       }), true);
       res
           .signupNewUser(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SignupNewUserResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSignupNewUserResponse(response);
       })));
     });
@@ -3066,7 +3065,7 @@
       }), true);
       res
           .uploadAccount(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UploadAccountResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkUploadAccountResponse(response);
       })));
     });
@@ -3126,7 +3125,7 @@
       }), true);
       res
           .verifyAssertion(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VerifyAssertionResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkVerifyAssertionResponse(response);
       })));
     });
@@ -3183,8 +3182,9 @@
         var resp = convert.JSON.encode(buildVerifyCustomTokenResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.verifyCustomToken(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.VerifyCustomTokenResponse response) {
+      res
+          .verifyCustomToken(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkVerifyCustomTokenResponse(response);
       })));
     });
@@ -3243,7 +3243,7 @@
       }), true);
       res
           .verifyPassword(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VerifyPasswordResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkVerifyPasswordResponse(response);
       })));
     });
@@ -3301,10 +3301,9 @@
             buildIdentitytoolkitRelyingpartyVerifyPhoneNumberResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.verifyPhoneNumber(arg_request, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.IdentitytoolkitRelyingpartyVerifyPhoneNumberResponse
-                  response) {
+      res
+          .verifyPhoneNumber(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkIdentitytoolkitRelyingpartyVerifyPhoneNumberResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/kgsearch/v1_test.dart b/generated/googleapis/test/kgsearch/v1_test.dart
index 7d413fb..9496c43 100644
--- a/generated/googleapis/test/kgsearch/v1_test.dart
+++ b/generated/googleapis/test/kgsearch/v1_test.dart
@@ -50,7 +50,7 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed32() {
+buildUnnamed3559() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -65,7 +65,7 @@
   return o;
 }
 
-checkUnnamed32(core.List<core.Object> o) {
+checkUnnamed3559(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -94,7 +94,7 @@
       'bool': true,
       'string': 'foo'
     };
-    o.itemListElement = buildUnnamed32();
+    o.itemListElement = buildUnnamed3559();
   }
   buildCounterSearchResponse--;
   return o;
@@ -113,45 +113,45 @@
     unittest.expect(casted4["list"], unittest.equals([1, 2, 3]));
     unittest.expect(casted4["bool"], unittest.equals(true));
     unittest.expect(casted4["string"], unittest.equals('foo'));
-    checkUnnamed32(o.itemListElement);
+    checkUnnamed3559(o.itemListElement);
   }
   buildCounterSearchResponse--;
 }
 
-buildUnnamed33() {
+buildUnnamed3560() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed33(core.List<core.String> o) {
+checkUnnamed3560(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed34() {
+buildUnnamed3561() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed34(core.List<core.String> o) {
+checkUnnamed3561(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed35() {
+buildUnnamed3562() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed35(core.List<core.String> o) {
+checkUnnamed3562(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -171,12 +171,12 @@
       var mock = new HttpServerMock();
       api.EntitiesResourceApi res = new api.KgsearchApi(mock).entities;
       var arg_indent = true;
-      var arg_languages = buildUnnamed33();
-      var arg_ids = buildUnnamed34();
+      var arg_languages = buildUnnamed3560();
+      var arg_ids = buildUnnamed3561();
       var arg_limit = 42;
       var arg_prefix = true;
       var arg_query = "foo";
-      var arg_types = buildUnnamed35();
+      var arg_types = buildUnnamed3562();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -236,7 +236,7 @@
               query: arg_query,
               types: arg_types,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SearchResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSearchResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/language/v1_test.dart b/generated/googleapis/test/language/v1_test.dart
index 27d07a7..b6a8a3f 100644
--- a/generated/googleapis/test/language/v1_test.dart
+++ b/generated/googleapis/test/language/v1_test.dart
@@ -71,14 +71,14 @@
   buildCounterAnalyzeEntitiesRequest--;
 }
 
-buildUnnamed2813() {
+buildUnnamed864() {
   var o = new core.List<api.Entity>();
   o.add(buildEntity());
   o.add(buildEntity());
   return o;
 }
 
-checkUnnamed2813(core.List<api.Entity> o) {
+checkUnnamed864(core.List<api.Entity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntity(o[0]);
   checkEntity(o[1]);
@@ -89,7 +89,7 @@
   var o = new api.AnalyzeEntitiesResponse();
   buildCounterAnalyzeEntitiesResponse++;
   if (buildCounterAnalyzeEntitiesResponse < 3) {
-    o.entities = buildUnnamed2813();
+    o.entities = buildUnnamed864();
     o.language = "foo";
   }
   buildCounterAnalyzeEntitiesResponse--;
@@ -99,7 +99,7 @@
 checkAnalyzeEntitiesResponse(api.AnalyzeEntitiesResponse o) {
   buildCounterAnalyzeEntitiesResponse++;
   if (buildCounterAnalyzeEntitiesResponse < 3) {
-    checkUnnamed2813(o.entities);
+    checkUnnamed864(o.entities);
     unittest.expect(o.language, unittest.equals('foo'));
   }
   buildCounterAnalyzeEntitiesResponse--;
@@ -126,14 +126,14 @@
   buildCounterAnalyzeEntitySentimentRequest--;
 }
 
-buildUnnamed2814() {
+buildUnnamed865() {
   var o = new core.List<api.Entity>();
   o.add(buildEntity());
   o.add(buildEntity());
   return o;
 }
 
-checkUnnamed2814(core.List<api.Entity> o) {
+checkUnnamed865(core.List<api.Entity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntity(o[0]);
   checkEntity(o[1]);
@@ -144,7 +144,7 @@
   var o = new api.AnalyzeEntitySentimentResponse();
   buildCounterAnalyzeEntitySentimentResponse++;
   if (buildCounterAnalyzeEntitySentimentResponse < 3) {
-    o.entities = buildUnnamed2814();
+    o.entities = buildUnnamed865();
     o.language = "foo";
   }
   buildCounterAnalyzeEntitySentimentResponse--;
@@ -154,7 +154,7 @@
 checkAnalyzeEntitySentimentResponse(api.AnalyzeEntitySentimentResponse o) {
   buildCounterAnalyzeEntitySentimentResponse++;
   if (buildCounterAnalyzeEntitySentimentResponse < 3) {
-    checkUnnamed2814(o.entities);
+    checkUnnamed865(o.entities);
     unittest.expect(o.language, unittest.equals('foo'));
   }
   buildCounterAnalyzeEntitySentimentResponse--;
@@ -181,14 +181,14 @@
   buildCounterAnalyzeSentimentRequest--;
 }
 
-buildUnnamed2815() {
+buildUnnamed866() {
   var o = new core.List<api.Sentence>();
   o.add(buildSentence());
   o.add(buildSentence());
   return o;
 }
 
-checkUnnamed2815(core.List<api.Sentence> o) {
+checkUnnamed866(core.List<api.Sentence> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSentence(o[0]);
   checkSentence(o[1]);
@@ -201,7 +201,7 @@
   if (buildCounterAnalyzeSentimentResponse < 3) {
     o.documentSentiment = buildSentiment();
     o.language = "foo";
-    o.sentences = buildUnnamed2815();
+    o.sentences = buildUnnamed866();
   }
   buildCounterAnalyzeSentimentResponse--;
   return o;
@@ -212,7 +212,7 @@
   if (buildCounterAnalyzeSentimentResponse < 3) {
     checkSentiment(o.documentSentiment);
     unittest.expect(o.language, unittest.equals('foo'));
-    checkUnnamed2815(o.sentences);
+    checkUnnamed866(o.sentences);
   }
   buildCounterAnalyzeSentimentResponse--;
 }
@@ -238,27 +238,27 @@
   buildCounterAnalyzeSyntaxRequest--;
 }
 
-buildUnnamed2816() {
+buildUnnamed867() {
   var o = new core.List<api.Sentence>();
   o.add(buildSentence());
   o.add(buildSentence());
   return o;
 }
 
-checkUnnamed2816(core.List<api.Sentence> o) {
+checkUnnamed867(core.List<api.Sentence> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSentence(o[0]);
   checkSentence(o[1]);
 }
 
-buildUnnamed2817() {
+buildUnnamed868() {
   var o = new core.List<api.Token>();
   o.add(buildToken());
   o.add(buildToken());
   return o;
 }
 
-checkUnnamed2817(core.List<api.Token> o) {
+checkUnnamed868(core.List<api.Token> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkToken(o[0]);
   checkToken(o[1]);
@@ -270,8 +270,8 @@
   buildCounterAnalyzeSyntaxResponse++;
   if (buildCounterAnalyzeSyntaxResponse < 3) {
     o.language = "foo";
-    o.sentences = buildUnnamed2816();
-    o.tokens = buildUnnamed2817();
+    o.sentences = buildUnnamed867();
+    o.tokens = buildUnnamed868();
   }
   buildCounterAnalyzeSyntaxResponse--;
   return o;
@@ -281,8 +281,8 @@
   buildCounterAnalyzeSyntaxResponse++;
   if (buildCounterAnalyzeSyntaxResponse < 3) {
     unittest.expect(o.language, unittest.equals('foo'));
-    checkUnnamed2816(o.sentences);
-    checkUnnamed2817(o.tokens);
+    checkUnnamed867(o.sentences);
+    checkUnnamed868(o.tokens);
   }
   buildCounterAnalyzeSyntaxResponse--;
 }
@@ -310,53 +310,53 @@
   buildCounterAnnotateTextRequest--;
 }
 
-buildUnnamed2818() {
+buildUnnamed869() {
   var o = new core.List<api.ClassificationCategory>();
   o.add(buildClassificationCategory());
   o.add(buildClassificationCategory());
   return o;
 }
 
-checkUnnamed2818(core.List<api.ClassificationCategory> o) {
+checkUnnamed869(core.List<api.ClassificationCategory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClassificationCategory(o[0]);
   checkClassificationCategory(o[1]);
 }
 
-buildUnnamed2819() {
+buildUnnamed870() {
   var o = new core.List<api.Entity>();
   o.add(buildEntity());
   o.add(buildEntity());
   return o;
 }
 
-checkUnnamed2819(core.List<api.Entity> o) {
+checkUnnamed870(core.List<api.Entity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntity(o[0]);
   checkEntity(o[1]);
 }
 
-buildUnnamed2820() {
+buildUnnamed871() {
   var o = new core.List<api.Sentence>();
   o.add(buildSentence());
   o.add(buildSentence());
   return o;
 }
 
-checkUnnamed2820(core.List<api.Sentence> o) {
+checkUnnamed871(core.List<api.Sentence> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSentence(o[0]);
   checkSentence(o[1]);
 }
 
-buildUnnamed2821() {
+buildUnnamed872() {
   var o = new core.List<api.Token>();
   o.add(buildToken());
   o.add(buildToken());
   return o;
 }
 
-checkUnnamed2821(core.List<api.Token> o) {
+checkUnnamed872(core.List<api.Token> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkToken(o[0]);
   checkToken(o[1]);
@@ -367,12 +367,12 @@
   var o = new api.AnnotateTextResponse();
   buildCounterAnnotateTextResponse++;
   if (buildCounterAnnotateTextResponse < 3) {
-    o.categories = buildUnnamed2818();
+    o.categories = buildUnnamed869();
     o.documentSentiment = buildSentiment();
-    o.entities = buildUnnamed2819();
+    o.entities = buildUnnamed870();
     o.language = "foo";
-    o.sentences = buildUnnamed2820();
-    o.tokens = buildUnnamed2821();
+    o.sentences = buildUnnamed871();
+    o.tokens = buildUnnamed872();
   }
   buildCounterAnnotateTextResponse--;
   return o;
@@ -381,12 +381,12 @@
 checkAnnotateTextResponse(api.AnnotateTextResponse o) {
   buildCounterAnnotateTextResponse++;
   if (buildCounterAnnotateTextResponse < 3) {
-    checkUnnamed2818(o.categories);
+    checkUnnamed869(o.categories);
     checkSentiment(o.documentSentiment);
-    checkUnnamed2819(o.entities);
+    checkUnnamed870(o.entities);
     unittest.expect(o.language, unittest.equals('foo'));
-    checkUnnamed2820(o.sentences);
-    checkUnnamed2821(o.tokens);
+    checkUnnamed871(o.sentences);
+    checkUnnamed872(o.tokens);
   }
   buildCounterAnnotateTextResponse--;
 }
@@ -431,14 +431,14 @@
   buildCounterClassifyTextRequest--;
 }
 
-buildUnnamed2822() {
+buildUnnamed873() {
   var o = new core.List<api.ClassificationCategory>();
   o.add(buildClassificationCategory());
   o.add(buildClassificationCategory());
   return o;
 }
 
-checkUnnamed2822(core.List<api.ClassificationCategory> o) {
+checkUnnamed873(core.List<api.ClassificationCategory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClassificationCategory(o[0]);
   checkClassificationCategory(o[1]);
@@ -449,7 +449,7 @@
   var o = new api.ClassifyTextResponse();
   buildCounterClassifyTextResponse++;
   if (buildCounterClassifyTextResponse < 3) {
-    o.categories = buildUnnamed2822();
+    o.categories = buildUnnamed873();
   }
   buildCounterClassifyTextResponse--;
   return o;
@@ -458,7 +458,7 @@
 checkClassifyTextResponse(api.ClassifyTextResponse o) {
   buildCounterClassifyTextResponse++;
   if (buildCounterClassifyTextResponse < 3) {
-    checkUnnamed2822(o.categories);
+    checkUnnamed873(o.categories);
   }
   buildCounterClassifyTextResponse--;
 }
@@ -509,27 +509,27 @@
   buildCounterDocument--;
 }
 
-buildUnnamed2823() {
+buildUnnamed874() {
   var o = new core.List<api.EntityMention>();
   o.add(buildEntityMention());
   o.add(buildEntityMention());
   return o;
 }
 
-checkUnnamed2823(core.List<api.EntityMention> o) {
+checkUnnamed874(core.List<api.EntityMention> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityMention(o[0]);
   checkEntityMention(o[1]);
 }
 
-buildUnnamed2824() {
+buildUnnamed875() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2824(core.Map<core.String, core.String> o) {
+checkUnnamed875(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -540,8 +540,8 @@
   var o = new api.Entity();
   buildCounterEntity++;
   if (buildCounterEntity < 3) {
-    o.mentions = buildUnnamed2823();
-    o.metadata = buildUnnamed2824();
+    o.mentions = buildUnnamed874();
+    o.metadata = buildUnnamed875();
     o.name = "foo";
     o.salience = 42.0;
     o.sentiment = buildSentiment();
@@ -554,8 +554,8 @@
 checkEntity(api.Entity o) {
   buildCounterEntity++;
   if (buildCounterEntity < 3) {
-    checkUnnamed2823(o.mentions);
-    checkUnnamed2824(o.metadata);
+    checkUnnamed874(o.mentions);
+    checkUnnamed875(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.salience, unittest.equals(42.0));
     checkSentiment(o.sentiment);
@@ -697,7 +697,7 @@
   buildCounterSentiment--;
 }
 
-buildUnnamed2825() {
+buildUnnamed876() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -712,7 +712,7 @@
   return o;
 }
 
-checkUnnamed2825(core.Map<core.String, core.Object> o) {
+checkUnnamed876(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -726,17 +726,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2826() {
+buildUnnamed877() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2825());
-  o.add(buildUnnamed2825());
+  o.add(buildUnnamed876());
+  o.add(buildUnnamed876());
   return o;
 }
 
-checkUnnamed2826(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed877(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2825(o[0]);
-  checkUnnamed2825(o[1]);
+  checkUnnamed876(o[0]);
+  checkUnnamed876(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -745,7 +745,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed2826();
+    o.details = buildUnnamed877();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -756,7 +756,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed2826(o.details);
+    checkUnnamed877(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -1050,7 +1050,7 @@
       }), true);
       res
           .analyzeEntities(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnalyzeEntitiesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnalyzeEntitiesResponse(response);
       })));
     });
@@ -1101,8 +1101,9 @@
         var resp = convert.JSON.encode(buildAnalyzeEntitySentimentResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.analyzeEntitySentiment(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.AnalyzeEntitySentimentResponse response) {
+      res
+          .analyzeEntitySentiment(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkAnalyzeEntitySentimentResponse(response);
       })));
     });
@@ -1155,7 +1156,7 @@
       }), true);
       res
           .analyzeSentiment(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnalyzeSentimentResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnalyzeSentimentResponse(response);
       })));
     });
@@ -1208,7 +1209,7 @@
       }), true);
       res
           .analyzeSyntax(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnalyzeSyntaxResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnalyzeSyntaxResponse(response);
       })));
     });
@@ -1261,7 +1262,7 @@
       }), true);
       res
           .annotateText(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnnotateTextResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotateTextResponse(response);
       })));
     });
@@ -1314,7 +1315,7 @@
       }), true);
       res
           .classifyText(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ClassifyTextResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkClassifyTextResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/licensing/v1_test.dart b/generated/googleapis/test/licensing/v1_test.dart
index 0d8b710..1950aa9 100644
--- a/generated/googleapis/test/licensing/v1_test.dart
+++ b/generated/googleapis/test/licensing/v1_test.dart
@@ -102,14 +102,14 @@
   buildCounterLicenseAssignmentInsert--;
 }
 
-buildUnnamed2618() {
+buildUnnamed1910() {
   var o = new core.List<api.LicenseAssignment>();
   o.add(buildLicenseAssignment());
   o.add(buildLicenseAssignment());
   return o;
 }
 
-checkUnnamed2618(core.List<api.LicenseAssignment> o) {
+checkUnnamed1910(core.List<api.LicenseAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLicenseAssignment(o[0]);
   checkLicenseAssignment(o[1]);
@@ -121,7 +121,7 @@
   buildCounterLicenseAssignmentList++;
   if (buildCounterLicenseAssignmentList < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2618();
+    o.items = buildUnnamed1910();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -133,7 +133,7 @@
   buildCounterLicenseAssignmentList++;
   if (buildCounterLicenseAssignmentList < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2618(o.items);
+    checkUnnamed1910(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -259,7 +259,7 @@
       }), true);
       res
           .get(arg_productId, arg_skuId, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LicenseAssignment response) {
+          .then(unittest.expectAsync1(((response) {
         checkLicenseAssignment(response);
       })));
     });
@@ -312,7 +312,7 @@
       }), true);
       res
           .insert(arg_request, arg_productId, arg_skuId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LicenseAssignment response) {
+          .then(unittest.expectAsync1(((response) {
         checkLicenseAssignment(response);
       })));
     });
@@ -372,7 +372,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LicenseAssignmentList response) {
+          .then(unittest.expectAsync1(((response) {
         checkLicenseAssignmentList(response);
       })));
     });
@@ -433,7 +433,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LicenseAssignmentList response) {
+          .then(unittest.expectAsync1(((response) {
         checkLicenseAssignmentList(response);
       })));
     });
@@ -488,7 +488,7 @@
       res
           .patch(arg_request, arg_productId, arg_skuId, arg_userId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LicenseAssignment response) {
+          .then(unittest.expectAsync1(((response) {
         checkLicenseAssignment(response);
       })));
     });
@@ -543,7 +543,7 @@
       res
           .update(arg_request, arg_productId, arg_skuId, arg_userId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LicenseAssignment response) {
+          .then(unittest.expectAsync1(((response) {
         checkLicenseAssignment(response);
       })));
     });
diff --git a/generated/googleapis/test/logging/v2_test.dart b/generated/googleapis/test/logging/v2_test.dart
index 52572fd..ac6f253 100644
--- a/generated/googleapis/test/logging/v2_test.dart
+++ b/generated/googleapis/test/logging/v2_test.dart
@@ -88,14 +88,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed2339() {
+buildUnnamed328() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2339(core.List<core.double> o) {
+checkUnnamed328(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -106,7 +106,7 @@
   var o = new api.Explicit();
   buildCounterExplicit++;
   if (buildCounterExplicit < 3) {
-    o.bounds = buildUnnamed2339();
+    o.bounds = buildUnnamed328();
   }
   buildCounterExplicit--;
   return o;
@@ -115,7 +115,7 @@
 checkExplicit(api.Explicit o) {
   buildCounterExplicit++;
   if (buildCounterExplicit < 3) {
-    checkUnnamed2339(o.bounds);
+    checkUnnamed328(o.bounds);
   }
   buildCounterExplicit--;
 }
@@ -236,14 +236,14 @@
   buildCounterLinear--;
 }
 
-buildUnnamed2340() {
+buildUnnamed329() {
   var o = new core.List<api.LogExclusion>();
   o.add(buildLogExclusion());
   o.add(buildLogExclusion());
   return o;
 }
 
-checkUnnamed2340(core.List<api.LogExclusion> o) {
+checkUnnamed329(core.List<api.LogExclusion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogExclusion(o[0]);
   checkLogExclusion(o[1]);
@@ -254,7 +254,7 @@
   var o = new api.ListExclusionsResponse();
   buildCounterListExclusionsResponse++;
   if (buildCounterListExclusionsResponse < 3) {
-    o.exclusions = buildUnnamed2340();
+    o.exclusions = buildUnnamed329();
     o.nextPageToken = "foo";
   }
   buildCounterListExclusionsResponse--;
@@ -264,33 +264,33 @@
 checkListExclusionsResponse(api.ListExclusionsResponse o) {
   buildCounterListExclusionsResponse++;
   if (buildCounterListExclusionsResponse < 3) {
-    checkUnnamed2340(o.exclusions);
+    checkUnnamed329(o.exclusions);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListExclusionsResponse--;
 }
 
-buildUnnamed2341() {
+buildUnnamed330() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2341(core.List<core.String> o) {
+checkUnnamed330(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2342() {
+buildUnnamed331() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2342(core.List<core.String> o) {
+checkUnnamed331(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -305,8 +305,8 @@
     o.orderBy = "foo";
     o.pageSize = 42;
     o.pageToken = "foo";
-    o.projectIds = buildUnnamed2341();
-    o.resourceNames = buildUnnamed2342();
+    o.projectIds = buildUnnamed330();
+    o.resourceNames = buildUnnamed331();
   }
   buildCounterListLogEntriesRequest--;
   return o;
@@ -319,20 +319,20 @@
     unittest.expect(o.orderBy, unittest.equals('foo'));
     unittest.expect(o.pageSize, unittest.equals(42));
     unittest.expect(o.pageToken, unittest.equals('foo'));
-    checkUnnamed2341(o.projectIds);
-    checkUnnamed2342(o.resourceNames);
+    checkUnnamed330(o.projectIds);
+    checkUnnamed331(o.resourceNames);
   }
   buildCounterListLogEntriesRequest--;
 }
 
-buildUnnamed2343() {
+buildUnnamed332() {
   var o = new core.List<api.LogEntry>();
   o.add(buildLogEntry());
   o.add(buildLogEntry());
   return o;
 }
 
-checkUnnamed2343(core.List<api.LogEntry> o) {
+checkUnnamed332(core.List<api.LogEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogEntry(o[0]);
   checkLogEntry(o[1]);
@@ -343,7 +343,7 @@
   var o = new api.ListLogEntriesResponse();
   buildCounterListLogEntriesResponse++;
   if (buildCounterListLogEntriesResponse < 3) {
-    o.entries = buildUnnamed2343();
+    o.entries = buildUnnamed332();
     o.nextPageToken = "foo";
   }
   buildCounterListLogEntriesResponse--;
@@ -353,20 +353,20 @@
 checkListLogEntriesResponse(api.ListLogEntriesResponse o) {
   buildCounterListLogEntriesResponse++;
   if (buildCounterListLogEntriesResponse < 3) {
-    checkUnnamed2343(o.entries);
+    checkUnnamed332(o.entries);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLogEntriesResponse--;
 }
 
-buildUnnamed2344() {
+buildUnnamed333() {
   var o = new core.List<api.LogMetric>();
   o.add(buildLogMetric());
   o.add(buildLogMetric());
   return o;
 }
 
-checkUnnamed2344(core.List<api.LogMetric> o) {
+checkUnnamed333(core.List<api.LogMetric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogMetric(o[0]);
   checkLogMetric(o[1]);
@@ -377,7 +377,7 @@
   var o = new api.ListLogMetricsResponse();
   buildCounterListLogMetricsResponse++;
   if (buildCounterListLogMetricsResponse < 3) {
-    o.metrics = buildUnnamed2344();
+    o.metrics = buildUnnamed333();
     o.nextPageToken = "foo";
   }
   buildCounterListLogMetricsResponse--;
@@ -387,20 +387,20 @@
 checkListLogMetricsResponse(api.ListLogMetricsResponse o) {
   buildCounterListLogMetricsResponse++;
   if (buildCounterListLogMetricsResponse < 3) {
-    checkUnnamed2344(o.metrics);
+    checkUnnamed333(o.metrics);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLogMetricsResponse--;
 }
 
-buildUnnamed2345() {
+buildUnnamed334() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2345(core.List<core.String> o) {
+checkUnnamed334(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -411,7 +411,7 @@
   var o = new api.ListLogsResponse();
   buildCounterListLogsResponse++;
   if (buildCounterListLogsResponse < 3) {
-    o.logNames = buildUnnamed2345();
+    o.logNames = buildUnnamed334();
     o.nextPageToken = "foo";
   }
   buildCounterListLogsResponse--;
@@ -421,20 +421,20 @@
 checkListLogsResponse(api.ListLogsResponse o) {
   buildCounterListLogsResponse++;
   if (buildCounterListLogsResponse < 3) {
-    checkUnnamed2345(o.logNames);
+    checkUnnamed334(o.logNames);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLogsResponse--;
 }
 
-buildUnnamed2346() {
+buildUnnamed335() {
   var o = new core.List<api.MonitoredResourceDescriptor>();
   o.add(buildMonitoredResourceDescriptor());
   o.add(buildMonitoredResourceDescriptor());
   return o;
 }
 
-checkUnnamed2346(core.List<api.MonitoredResourceDescriptor> o) {
+checkUnnamed335(core.List<api.MonitoredResourceDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoredResourceDescriptor(o[0]);
   checkMonitoredResourceDescriptor(o[1]);
@@ -446,7 +446,7 @@
   buildCounterListMonitoredResourceDescriptorsResponse++;
   if (buildCounterListMonitoredResourceDescriptorsResponse < 3) {
     o.nextPageToken = "foo";
-    o.resourceDescriptors = buildUnnamed2346();
+    o.resourceDescriptors = buildUnnamed335();
   }
   buildCounterListMonitoredResourceDescriptorsResponse--;
   return o;
@@ -457,19 +457,19 @@
   buildCounterListMonitoredResourceDescriptorsResponse++;
   if (buildCounterListMonitoredResourceDescriptorsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2346(o.resourceDescriptors);
+    checkUnnamed335(o.resourceDescriptors);
   }
   buildCounterListMonitoredResourceDescriptorsResponse--;
 }
 
-buildUnnamed2347() {
+buildUnnamed336() {
   var o = new core.List<api.LogSink>();
   o.add(buildLogSink());
   o.add(buildLogSink());
   return o;
 }
 
-checkUnnamed2347(core.List<api.LogSink> o) {
+checkUnnamed336(core.List<api.LogSink> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogSink(o[0]);
   checkLogSink(o[1]);
@@ -481,7 +481,7 @@
   buildCounterListSinksResponse++;
   if (buildCounterListSinksResponse < 3) {
     o.nextPageToken = "foo";
-    o.sinks = buildUnnamed2347();
+    o.sinks = buildUnnamed336();
   }
   buildCounterListSinksResponse--;
   return o;
@@ -491,12 +491,12 @@
   buildCounterListSinksResponse++;
   if (buildCounterListSinksResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2347(o.sinks);
+    checkUnnamed336(o.sinks);
   }
   buildCounterListSinksResponse--;
 }
 
-buildUnnamed2348() {
+buildUnnamed337() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -511,7 +511,7 @@
   return o;
 }
 
-checkUnnamed2348(core.Map<core.String, core.Object> o) {
+checkUnnamed337(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -525,20 +525,20 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2349() {
+buildUnnamed338() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2349(core.Map<core.String, core.String> o) {
+checkUnnamed338(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed2350() {
+buildUnnamed339() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -553,7 +553,7 @@
   return o;
 }
 
-checkUnnamed2350(core.Map<core.String, core.Object> o) {
+checkUnnamed339(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -574,11 +574,11 @@
   if (buildCounterLogEntry < 3) {
     o.httpRequest = buildHttpRequest();
     o.insertId = "foo";
-    o.jsonPayload = buildUnnamed2348();
-    o.labels = buildUnnamed2349();
+    o.jsonPayload = buildUnnamed337();
+    o.labels = buildUnnamed338();
     o.logName = "foo";
     o.operation = buildLogEntryOperation();
-    o.protoPayload = buildUnnamed2350();
+    o.protoPayload = buildUnnamed339();
     o.receiveTimestamp = "foo";
     o.resource = buildMonitoredResource();
     o.severity = "foo";
@@ -597,11 +597,11 @@
   if (buildCounterLogEntry < 3) {
     checkHttpRequest(o.httpRequest);
     unittest.expect(o.insertId, unittest.equals('foo'));
-    checkUnnamed2348(o.jsonPayload);
-    checkUnnamed2349(o.labels);
+    checkUnnamed337(o.jsonPayload);
+    checkUnnamed338(o.labels);
     unittest.expect(o.logName, unittest.equals('foo'));
     checkLogEntryOperation(o.operation);
-    checkUnnamed2350(o.protoPayload);
+    checkUnnamed339(o.protoPayload);
     unittest.expect(o.receiveTimestamp, unittest.equals('foo'));
     checkMonitoredResource(o.resource);
     unittest.expect(o.severity, unittest.equals('foo'));
@@ -712,14 +712,14 @@
   buildCounterLogLine--;
 }
 
-buildUnnamed2351() {
+buildUnnamed340() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2351(core.Map<core.String, core.String> o) {
+checkUnnamed340(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -733,7 +733,7 @@
     o.bucketOptions = buildBucketOptions();
     o.description = "foo";
     o.filter = "foo";
-    o.labelExtractors = buildUnnamed2351();
+    o.labelExtractors = buildUnnamed340();
     o.metricDescriptor = buildMetricDescriptor();
     o.name = "foo";
     o.valueExtractor = "foo";
@@ -749,7 +749,7 @@
     checkBucketOptions(o.bucketOptions);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.filter, unittest.equals('foo'));
-    checkUnnamed2351(o.labelExtractors);
+    checkUnnamed340(o.labelExtractors);
     checkMetricDescriptor(o.metricDescriptor);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.valueExtractor, unittest.equals('foo'));
@@ -791,14 +791,14 @@
   buildCounterLogSink--;
 }
 
-buildUnnamed2352() {
+buildUnnamed341() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed2352(core.List<api.LabelDescriptor> o) {
+checkUnnamed341(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -811,7 +811,7 @@
   if (buildCounterMetricDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed2352();
+    o.labels = buildUnnamed341();
     o.metricKind = "foo";
     o.name = "foo";
     o.type = "foo";
@@ -827,7 +827,7 @@
   if (buildCounterMetricDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed2352(o.labels);
+    checkUnnamed341(o.labels);
     unittest.expect(o.metricKind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -837,14 +837,14 @@
   buildCounterMetricDescriptor--;
 }
 
-buildUnnamed2353() {
+buildUnnamed342() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2353(core.Map<core.String, core.String> o) {
+checkUnnamed342(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -855,7 +855,7 @@
   var o = new api.MonitoredResource();
   buildCounterMonitoredResource++;
   if (buildCounterMonitoredResource < 3) {
-    o.labels = buildUnnamed2353();
+    o.labels = buildUnnamed342();
     o.type = "foo";
   }
   buildCounterMonitoredResource--;
@@ -865,20 +865,20 @@
 checkMonitoredResource(api.MonitoredResource o) {
   buildCounterMonitoredResource++;
   if (buildCounterMonitoredResource < 3) {
-    checkUnnamed2353(o.labels);
+    checkUnnamed342(o.labels);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMonitoredResource--;
 }
 
-buildUnnamed2354() {
+buildUnnamed343() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed2354(core.List<api.LabelDescriptor> o) {
+checkUnnamed343(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -891,7 +891,7 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed2354();
+    o.labels = buildUnnamed343();
     o.name = "foo";
     o.type = "foo";
   }
@@ -904,34 +904,34 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed2354(o.labels);
+    checkUnnamed343(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMonitoredResourceDescriptor--;
 }
 
-buildUnnamed2355() {
+buildUnnamed344() {
   var o = new core.List<api.LogLine>();
   o.add(buildLogLine());
   o.add(buildLogLine());
   return o;
 }
 
-checkUnnamed2355(core.List<api.LogLine> o) {
+checkUnnamed344(core.List<api.LogLine> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogLine(o[0]);
   checkLogLine(o[1]);
 }
 
-buildUnnamed2356() {
+buildUnnamed345() {
   var o = new core.List<api.SourceReference>();
   o.add(buildSourceReference());
   o.add(buildSourceReference());
   return o;
 }
 
-checkUnnamed2356(core.List<api.SourceReference> o) {
+checkUnnamed345(core.List<api.SourceReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSourceReference(o[0]);
   checkSourceReference(o[1]);
@@ -954,7 +954,7 @@
     o.instanceIndex = 42;
     o.ip = "foo";
     o.latency = "foo";
-    o.line = buildUnnamed2355();
+    o.line = buildUnnamed344();
     o.megaCycles = "foo";
     o.method = "foo";
     o.moduleId = "foo";
@@ -964,7 +964,7 @@
     o.requestId = "foo";
     o.resource = "foo";
     o.responseSize = "foo";
-    o.sourceReference = buildUnnamed2356();
+    o.sourceReference = buildUnnamed345();
     o.startTime = "foo";
     o.status = 42;
     o.taskName = "foo";
@@ -994,7 +994,7 @@
     unittest.expect(o.instanceIndex, unittest.equals(42));
     unittest.expect(o.ip, unittest.equals('foo'));
     unittest.expect(o.latency, unittest.equals('foo'));
-    checkUnnamed2355(o.line);
+    checkUnnamed344(o.line);
     unittest.expect(o.megaCycles, unittest.equals('foo'));
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.moduleId, unittest.equals('foo'));
@@ -1004,7 +1004,7 @@
     unittest.expect(o.requestId, unittest.equals('foo'));
     unittest.expect(o.resource, unittest.equals('foo'));
     unittest.expect(o.responseSize, unittest.equals('foo'));
-    checkUnnamed2356(o.sourceReference);
+    checkUnnamed345(o.sourceReference);
     unittest.expect(o.startTime, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals(42));
     unittest.expect(o.taskName, unittest.equals('foo'));
@@ -1062,27 +1062,27 @@
   buildCounterSourceReference--;
 }
 
-buildUnnamed2357() {
+buildUnnamed346() {
   var o = new core.List<api.LogEntry>();
   o.add(buildLogEntry());
   o.add(buildLogEntry());
   return o;
 }
 
-checkUnnamed2357(core.List<api.LogEntry> o) {
+checkUnnamed346(core.List<api.LogEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogEntry(o[0]);
   checkLogEntry(o[1]);
 }
 
-buildUnnamed2358() {
+buildUnnamed347() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2358(core.Map<core.String, core.String> o) {
+checkUnnamed347(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1094,8 +1094,8 @@
   buildCounterWriteLogEntriesRequest++;
   if (buildCounterWriteLogEntriesRequest < 3) {
     o.dryRun = true;
-    o.entries = buildUnnamed2357();
-    o.labels = buildUnnamed2358();
+    o.entries = buildUnnamed346();
+    o.labels = buildUnnamed347();
     o.logName = "foo";
     o.partialSuccess = true;
     o.resource = buildMonitoredResource();
@@ -1108,8 +1108,8 @@
   buildCounterWriteLogEntriesRequest++;
   if (buildCounterWriteLogEntriesRequest < 3) {
     unittest.expect(o.dryRun, unittest.isTrue);
-    checkUnnamed2357(o.entries);
-    checkUnnamed2358(o.labels);
+    checkUnnamed346(o.entries);
+    checkUnnamed347(o.labels);
     unittest.expect(o.logName, unittest.equals('foo'));
     unittest.expect(o.partialSuccess, unittest.isTrue);
     checkMonitoredResource(o.resource);
@@ -1418,7 +1418,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -1470,7 +1470,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1522,7 +1522,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -1583,7 +1583,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListExclusionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListExclusionsResponse(response);
       })));
     });
@@ -1643,7 +1643,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -1697,7 +1697,7 @@
       }), true);
       res
           .delete(arg_logName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1758,7 +1758,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLogsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLogsResponse(response);
       })));
     });
@@ -1821,7 +1821,7 @@
           .create(arg_request, arg_parent,
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -1873,7 +1873,7 @@
       }), true);
       res
           .delete(arg_sinkName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1925,7 +1925,7 @@
       }), true);
       res
           .get(arg_sinkName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -1986,7 +1986,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListSinksResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSinksResponse(response);
       })));
     });
@@ -2051,7 +2051,7 @@
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -2116,7 +2116,7 @@
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -2171,7 +2171,7 @@
       }), true);
       res
           .list(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLogEntriesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLogEntriesResponse(response);
       })));
     });
@@ -2224,7 +2224,7 @@
       }), true);
       res
           .write(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WriteLogEntriesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkWriteLogEntriesResponse(response);
       })));
     });
@@ -2281,7 +2281,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -2332,7 +2332,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2383,7 +2383,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -2443,7 +2443,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListExclusionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListExclusionsResponse(response);
       })));
     });
@@ -2502,7 +2502,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -2560,7 +2560,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -2612,7 +2612,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2664,7 +2664,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -2725,7 +2725,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListExclusionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListExclusionsResponse(response);
       })));
     });
@@ -2785,7 +2785,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -2838,7 +2838,7 @@
       }), true);
       res
           .delete(arg_logName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2898,7 +2898,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLogsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLogsResponse(response);
       })));
     });
@@ -2960,7 +2960,7 @@
           .create(arg_request, arg_parent,
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -3011,7 +3011,7 @@
       }), true);
       res
           .delete(arg_sinkName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3062,7 +3062,7 @@
       }), true);
       res
           .get(arg_sinkName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -3122,7 +3122,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListSinksResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSinksResponse(response);
       })));
     });
@@ -3186,7 +3186,7 @@
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -3250,7 +3250,7 @@
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -3303,7 +3303,7 @@
       }), true);
       res
           .delete(arg_logName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3363,7 +3363,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLogsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLogsResponse(response);
       })));
     });
@@ -3425,8 +3425,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ListMonitoredResourceDescriptorsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListMonitoredResourceDescriptorsResponse(response);
       })));
     });
@@ -3484,7 +3483,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -3536,7 +3535,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3588,7 +3587,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -3649,7 +3648,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListExclusionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListExclusionsResponse(response);
       })));
     });
@@ -3709,7 +3708,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -3763,7 +3762,7 @@
       }), true);
       res
           .delete(arg_logName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3824,7 +3823,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLogsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLogsResponse(response);
       })));
     });
@@ -3887,7 +3886,7 @@
           .create(arg_request, arg_parent,
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -3939,7 +3938,7 @@
       }), true);
       res
           .delete(arg_sinkName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3991,7 +3990,7 @@
       }), true);
       res
           .get(arg_sinkName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -4052,7 +4051,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListSinksResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSinksResponse(response);
       })));
     });
@@ -4117,7 +4116,7 @@
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -4182,7 +4181,7 @@
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -4240,7 +4239,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -4292,7 +4291,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4344,7 +4343,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -4405,7 +4404,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListExclusionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListExclusionsResponse(response);
       })));
     });
@@ -4465,7 +4464,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogExclusion response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogExclusion(response);
       })));
     });
@@ -4518,7 +4517,7 @@
       }), true);
       res
           .delete(arg_logName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4578,7 +4577,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLogsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLogsResponse(response);
       })));
     });
@@ -4636,7 +4635,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogMetric response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogMetric(response);
       })));
     });
@@ -4688,7 +4687,7 @@
       }), true);
       res
           .delete(arg_metricName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4740,7 +4739,7 @@
       }), true);
       res
           .get(arg_metricName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogMetric response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogMetric(response);
       })));
     });
@@ -4801,7 +4800,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLogMetricsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLogMetricsResponse(response);
       })));
     });
@@ -4857,7 +4856,7 @@
       }), true);
       res
           .update(arg_request, arg_metricName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogMetric response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogMetric(response);
       })));
     });
@@ -4920,7 +4919,7 @@
           .create(arg_request, arg_parent,
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -4972,7 +4971,7 @@
       }), true);
       res
           .delete(arg_sinkName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -5024,7 +5023,7 @@
       }), true);
       res
           .get(arg_sinkName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -5085,7 +5084,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListSinksResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSinksResponse(response);
       })));
     });
@@ -5150,7 +5149,7 @@
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -5215,7 +5214,7 @@
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -5277,7 +5276,7 @@
           .create(arg_request, arg_parent,
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -5328,7 +5327,7 @@
       }), true);
       res
           .delete(arg_sinkName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -5379,7 +5378,7 @@
       }), true);
       res
           .get(arg_sinkName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -5439,7 +5438,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListSinksResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSinksResponse(response);
       })));
     });
@@ -5503,7 +5502,7 @@
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
diff --git a/generated/googleapis/test/manufacturers/v1_test.dart b/generated/googleapis/test/manufacturers/v1_test.dart
index 917ce5b..fff5e61 100644
--- a/generated/googleapis/test/manufacturers/v1_test.dart
+++ b/generated/googleapis/test/manufacturers/v1_test.dart
@@ -50,79 +50,79 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3585() {
+buildUnnamed2456() {
   var o = new core.List<api.Image>();
   o.add(buildImage());
   o.add(buildImage());
   return o;
 }
 
-checkUnnamed3585(core.List<api.Image> o) {
+checkUnnamed2456(core.List<api.Image> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImage(o[0]);
   checkImage(o[1]);
 }
 
-buildUnnamed3586() {
+buildUnnamed2457() {
   var o = new core.List<api.FeatureDescription>();
   o.add(buildFeatureDescription());
   o.add(buildFeatureDescription());
   return o;
 }
 
-checkUnnamed3586(core.List<api.FeatureDescription> o) {
+checkUnnamed2457(core.List<api.FeatureDescription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFeatureDescription(o[0]);
   checkFeatureDescription(o[1]);
 }
 
-buildUnnamed3587() {
+buildUnnamed2458() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3587(core.List<core.String> o) {
+checkUnnamed2458(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3588() {
+buildUnnamed2459() {
   var o = new core.List<api.ProductDetail>();
   o.add(buildProductDetail());
   o.add(buildProductDetail());
   return o;
 }
 
-checkUnnamed3588(core.List<api.ProductDetail> o) {
+checkUnnamed2459(core.List<api.ProductDetail> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProductDetail(o[0]);
   checkProductDetail(o[1]);
 }
 
-buildUnnamed3589() {
+buildUnnamed2460() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3589(core.List<core.String> o) {
+checkUnnamed2460(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3590() {
+buildUnnamed2461() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3590(core.List<core.String> o) {
+checkUnnamed2461(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -133,7 +133,7 @@
   var o = new api.Attributes();
   buildCounterAttributes++;
   if (buildCounterAttributes < 3) {
-    o.additionalImageLink = buildUnnamed3585();
+    o.additionalImageLink = buildUnnamed2456();
     o.ageGroup = "foo";
     o.brand = "foo";
     o.capacity = buildCapacity();
@@ -141,21 +141,21 @@
     o.count = buildCount();
     o.description = "foo";
     o.disclosureDate = "foo";
-    o.featureDescription = buildUnnamed3586();
+    o.featureDescription = buildUnnamed2457();
     o.flavor = "foo";
     o.format = "foo";
     o.gender = "foo";
-    o.gtin = buildUnnamed3587();
+    o.gtin = buildUnnamed2458();
     o.imageLink = buildImage();
     o.itemGroupId = "foo";
     o.material = "foo";
     o.mpn = "foo";
     o.pattern = "foo";
-    o.productDetail = buildUnnamed3588();
+    o.productDetail = buildUnnamed2459();
     o.productLine = "foo";
     o.productName = "foo";
     o.productPageUrl = "foo";
-    o.productType = buildUnnamed3589();
+    o.productType = buildUnnamed2460();
     o.releaseDate = "foo";
     o.scent = "foo";
     o.size = "foo";
@@ -165,7 +165,7 @@
     o.targetClientId = "foo";
     o.theme = "foo";
     o.title = "foo";
-    o.videoLink = buildUnnamed3590();
+    o.videoLink = buildUnnamed2461();
   }
   buildCounterAttributes--;
   return o;
@@ -174,7 +174,7 @@
 checkAttributes(api.Attributes o) {
   buildCounterAttributes++;
   if (buildCounterAttributes < 3) {
-    checkUnnamed3585(o.additionalImageLink);
+    checkUnnamed2456(o.additionalImageLink);
     unittest.expect(o.ageGroup, unittest.equals('foo'));
     unittest.expect(o.brand, unittest.equals('foo'));
     checkCapacity(o.capacity);
@@ -182,21 +182,21 @@
     checkCount(o.count);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.disclosureDate, unittest.equals('foo'));
-    checkUnnamed3586(o.featureDescription);
+    checkUnnamed2457(o.featureDescription);
     unittest.expect(o.flavor, unittest.equals('foo'));
     unittest.expect(o.format, unittest.equals('foo'));
     unittest.expect(o.gender, unittest.equals('foo'));
-    checkUnnamed3587(o.gtin);
+    checkUnnamed2458(o.gtin);
     checkImage(o.imageLink);
     unittest.expect(o.itemGroupId, unittest.equals('foo'));
     unittest.expect(o.material, unittest.equals('foo'));
     unittest.expect(o.mpn, unittest.equals('foo'));
     unittest.expect(o.pattern, unittest.equals('foo'));
-    checkUnnamed3588(o.productDetail);
+    checkUnnamed2459(o.productDetail);
     unittest.expect(o.productLine, unittest.equals('foo'));
     unittest.expect(o.productName, unittest.equals('foo'));
     unittest.expect(o.productPageUrl, unittest.equals('foo'));
-    checkUnnamed3589(o.productType);
+    checkUnnamed2460(o.productType);
     unittest.expect(o.releaseDate, unittest.equals('foo'));
     unittest.expect(o.scent, unittest.equals('foo'));
     unittest.expect(o.size, unittest.equals('foo'));
@@ -206,7 +206,7 @@
     unittest.expect(o.targetClientId, unittest.equals('foo'));
     unittest.expect(o.theme, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
-    checkUnnamed3590(o.videoLink);
+    checkUnnamed2461(o.videoLink);
   }
   buildCounterAttributes--;
 }
@@ -341,14 +341,14 @@
   buildCounterIssue--;
 }
 
-buildUnnamed3591() {
+buildUnnamed2462() {
   var o = new core.List<api.Product>();
   o.add(buildProduct());
   o.add(buildProduct());
   return o;
 }
 
-checkUnnamed3591(core.List<api.Product> o) {
+checkUnnamed2462(core.List<api.Product> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProduct(o[0]);
   checkProduct(o[1]);
@@ -360,7 +360,7 @@
   buildCounterListProductsResponse++;
   if (buildCounterListProductsResponse < 3) {
     o.nextPageToken = "foo";
-    o.products = buildUnnamed3591();
+    o.products = buildUnnamed2462();
   }
   buildCounterListProductsResponse--;
   return o;
@@ -370,7 +370,7 @@
   buildCounterListProductsResponse++;
   if (buildCounterListProductsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3591(o.products);
+    checkUnnamed2462(o.products);
   }
   buildCounterListProductsResponse--;
 }
@@ -396,27 +396,27 @@
   buildCounterPrice--;
 }
 
-buildUnnamed3592() {
+buildUnnamed2463() {
   var o = new core.List<api.Issue>();
   o.add(buildIssue());
   o.add(buildIssue());
   return o;
 }
 
-checkUnnamed3592(core.List<api.Issue> o) {
+checkUnnamed2463(core.List<api.Issue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkIssue(o[0]);
   checkIssue(o[1]);
 }
 
-buildUnnamed3593() {
+buildUnnamed2464() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3593(core.List<core.String> o) {
+checkUnnamed2464(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -429,8 +429,8 @@
   if (buildCounterProduct < 3) {
     o.contentLanguage = "foo";
     o.finalAttributes = buildAttributes();
-    o.issues = buildUnnamed3592();
-    o.manuallyDeletedAttributes = buildUnnamed3593();
+    o.issues = buildUnnamed2463();
+    o.manuallyDeletedAttributes = buildUnnamed2464();
     o.manuallyProvidedAttributes = buildAttributes();
     o.name = "foo";
     o.parent = "foo";
@@ -447,8 +447,8 @@
   if (buildCounterProduct < 3) {
     unittest.expect(o.contentLanguage, unittest.equals('foo'));
     checkAttributes(o.finalAttributes);
-    checkUnnamed3592(o.issues);
-    checkUnnamed3593(o.manuallyDeletedAttributes);
+    checkUnnamed2463(o.issues);
+    checkUnnamed2464(o.manuallyDeletedAttributes);
     checkAttributes(o.manuallyProvidedAttributes);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.parent, unittest.equals('foo'));
@@ -620,7 +620,7 @@
       }), true);
       res
           .delete(arg_parent, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -673,7 +673,7 @@
       }), true);
       res
           .get(arg_parent, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Product response) {
+          .then(unittest.expectAsync1(((response) {
         checkProduct(response);
       })));
     });
@@ -734,7 +734,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListProductsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListProductsResponse(response);
       })));
     });
@@ -792,7 +792,7 @@
       res
           .uploadProduct(arg_request, arg_parent, arg_name,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
diff --git a/generated/googleapis/test/mirror/v1_test.dart b/generated/googleapis/test/mirror/v1_test.dart
index 82090fc..9986119 100644
--- a/generated/googleapis/test/mirror/v1_test.dart
+++ b/generated/googleapis/test/mirror/v1_test.dart
@@ -50,40 +50,40 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed1521() {
+buildUnnamed2876() {
   var o = new core.List<api.AuthToken>();
   o.add(buildAuthToken());
   o.add(buildAuthToken());
   return o;
 }
 
-checkUnnamed1521(core.List<api.AuthToken> o) {
+checkUnnamed2876(core.List<api.AuthToken> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthToken(o[0]);
   checkAuthToken(o[1]);
 }
 
-buildUnnamed1522() {
+buildUnnamed2877() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1522(core.List<core.String> o) {
+checkUnnamed2877(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1523() {
+buildUnnamed2878() {
   var o = new core.List<api.UserData>();
   o.add(buildUserData());
   o.add(buildUserData());
   return o;
 }
 
-checkUnnamed1523(core.List<api.UserData> o) {
+checkUnnamed2878(core.List<api.UserData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserData(o[0]);
   checkUserData(o[1]);
@@ -94,10 +94,10 @@
   var o = new api.Account();
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    o.authTokens = buildUnnamed1521();
-    o.features = buildUnnamed1522();
+    o.authTokens = buildUnnamed2876();
+    o.features = buildUnnamed2877();
     o.password = "foo";
-    o.userData = buildUnnamed1523();
+    o.userData = buildUnnamed2878();
   }
   buildCounterAccount--;
   return o;
@@ -106,10 +106,10 @@
 checkAccount(api.Account o) {
   buildCounterAccount++;
   if (buildCounterAccount < 3) {
-    checkUnnamed1521(o.authTokens);
-    checkUnnamed1522(o.features);
+    checkUnnamed2876(o.authTokens);
+    checkUnnamed2877(o.features);
     unittest.expect(o.password, unittest.equals('foo'));
-    checkUnnamed1523(o.userData);
+    checkUnnamed2878(o.userData);
   }
   buildCounterAccount--;
 }
@@ -139,14 +139,14 @@
   buildCounterAttachment--;
 }
 
-buildUnnamed1524() {
+buildUnnamed2879() {
   var o = new core.List<api.Attachment>();
   o.add(buildAttachment());
   o.add(buildAttachment());
   return o;
 }
 
-checkUnnamed1524(core.List<api.Attachment> o) {
+checkUnnamed2879(core.List<api.Attachment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAttachment(o[0]);
   checkAttachment(o[1]);
@@ -157,7 +157,7 @@
   var o = new api.AttachmentsListResponse();
   buildCounterAttachmentsListResponse++;
   if (buildCounterAttachmentsListResponse < 3) {
-    o.items = buildUnnamed1524();
+    o.items = buildUnnamed2879();
     o.kind = "foo";
   }
   buildCounterAttachmentsListResponse--;
@@ -167,7 +167,7 @@
 checkAttachmentsListResponse(api.AttachmentsListResponse o) {
   buildCounterAttachmentsListResponse++;
   if (buildCounterAttachmentsListResponse < 3) {
-    checkUnnamed1524(o.items);
+    checkUnnamed2879(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAttachmentsListResponse--;
@@ -213,53 +213,53 @@
   buildCounterCommand--;
 }
 
-buildUnnamed1525() {
+buildUnnamed2880() {
   var o = new core.List<api.Command>();
   o.add(buildCommand());
   o.add(buildCommand());
   return o;
 }
 
-checkUnnamed1525(core.List<api.Command> o) {
+checkUnnamed2880(core.List<api.Command> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommand(o[0]);
   checkCommand(o[1]);
 }
 
-buildUnnamed1526() {
+buildUnnamed2881() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1526(core.List<core.String> o) {
+checkUnnamed2881(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1527() {
+buildUnnamed2882() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1527(core.List<core.String> o) {
+checkUnnamed2882(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1528() {
+buildUnnamed2883() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1528(core.List<core.String> o) {
+checkUnnamed2883(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -270,15 +270,15 @@
   var o = new api.Contact();
   buildCounterContact++;
   if (buildCounterContact < 3) {
-    o.acceptCommands = buildUnnamed1525();
-    o.acceptTypes = buildUnnamed1526();
+    o.acceptCommands = buildUnnamed2880();
+    o.acceptTypes = buildUnnamed2881();
     o.displayName = "foo";
     o.id = "foo";
-    o.imageUrls = buildUnnamed1527();
+    o.imageUrls = buildUnnamed2882();
     o.kind = "foo";
     o.phoneNumber = "foo";
     o.priority = 42;
-    o.sharingFeatures = buildUnnamed1528();
+    o.sharingFeatures = buildUnnamed2883();
     o.source = "foo";
     o.speakableName = "foo";
     o.type = "foo";
@@ -290,15 +290,15 @@
 checkContact(api.Contact o) {
   buildCounterContact++;
   if (buildCounterContact < 3) {
-    checkUnnamed1525(o.acceptCommands);
-    checkUnnamed1526(o.acceptTypes);
+    checkUnnamed2880(o.acceptCommands);
+    checkUnnamed2881(o.acceptTypes);
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1527(o.imageUrls);
+    checkUnnamed2882(o.imageUrls);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.phoneNumber, unittest.equals('foo'));
     unittest.expect(o.priority, unittest.equals(42));
-    checkUnnamed1528(o.sharingFeatures);
+    checkUnnamed2883(o.sharingFeatures);
     unittest.expect(o.source, unittest.equals('foo'));
     unittest.expect(o.speakableName, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -306,14 +306,14 @@
   buildCounterContact--;
 }
 
-buildUnnamed1529() {
+buildUnnamed2884() {
   var o = new core.List<api.Contact>();
   o.add(buildContact());
   o.add(buildContact());
   return o;
 }
 
-checkUnnamed1529(core.List<api.Contact> o) {
+checkUnnamed2884(core.List<api.Contact> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContact(o[0]);
   checkContact(o[1]);
@@ -324,7 +324,7 @@
   var o = new api.ContactsListResponse();
   buildCounterContactsListResponse++;
   if (buildCounterContactsListResponse < 3) {
-    o.items = buildUnnamed1529();
+    o.items = buildUnnamed2884();
     o.kind = "foo";
   }
   buildCounterContactsListResponse--;
@@ -334,7 +334,7 @@
 checkContactsListResponse(api.ContactsListResponse o) {
   buildCounterContactsListResponse++;
   if (buildCounterContactsListResponse < 3) {
-    checkUnnamed1529(o.items);
+    checkUnnamed2884(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterContactsListResponse--;
@@ -374,14 +374,14 @@
   buildCounterLocation--;
 }
 
-buildUnnamed1530() {
+buildUnnamed2885() {
   var o = new core.List<api.Location>();
   o.add(buildLocation());
   o.add(buildLocation());
   return o;
 }
 
-checkUnnamed1530(core.List<api.Location> o) {
+checkUnnamed2885(core.List<api.Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocation(o[0]);
   checkLocation(o[1]);
@@ -392,7 +392,7 @@
   var o = new api.LocationsListResponse();
   buildCounterLocationsListResponse++;
   if (buildCounterLocationsListResponse < 3) {
-    o.items = buildUnnamed1530();
+    o.items = buildUnnamed2885();
     o.kind = "foo";
   }
   buildCounterLocationsListResponse--;
@@ -402,20 +402,20 @@
 checkLocationsListResponse(api.LocationsListResponse o) {
   buildCounterLocationsListResponse++;
   if (buildCounterLocationsListResponse < 3) {
-    checkUnnamed1530(o.items);
+    checkUnnamed2885(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterLocationsListResponse--;
 }
 
-buildUnnamed1531() {
+buildUnnamed2886() {
   var o = new core.List<api.MenuValue>();
   o.add(buildMenuValue());
   o.add(buildMenuValue());
   return o;
 }
 
-checkUnnamed1531(core.List<api.MenuValue> o) {
+checkUnnamed2886(core.List<api.MenuValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMenuValue(o[0]);
   checkMenuValue(o[1]);
@@ -431,7 +431,7 @@
     o.id = "foo";
     o.payload = "foo";
     o.removeWhenSelected = true;
-    o.values = buildUnnamed1531();
+    o.values = buildUnnamed2886();
   }
   buildCounterMenuItem--;
   return o;
@@ -445,7 +445,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.payload, unittest.equals('foo'));
     unittest.expect(o.removeWhenSelected, unittest.isTrue);
-    checkUnnamed1531(o.values);
+    checkUnnamed2886(o.values);
   }
   buildCounterMenuItem--;
 }
@@ -473,14 +473,14 @@
   buildCounterMenuValue--;
 }
 
-buildUnnamed1532() {
+buildUnnamed2887() {
   var o = new core.List<api.UserAction>();
   o.add(buildUserAction());
   o.add(buildUserAction());
   return o;
 }
 
-checkUnnamed1532(core.List<api.UserAction> o) {
+checkUnnamed2887(core.List<api.UserAction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserAction(o[0]);
   checkUserAction(o[1]);
@@ -494,7 +494,7 @@
     o.collection = "foo";
     o.itemId = "foo";
     o.operation = "foo";
-    o.userActions = buildUnnamed1532();
+    o.userActions = buildUnnamed2887();
     o.userToken = "foo";
     o.verifyToken = "foo";
   }
@@ -508,7 +508,7 @@
     unittest.expect(o.collection, unittest.equals('foo'));
     unittest.expect(o.itemId, unittest.equals('foo'));
     unittest.expect(o.operation, unittest.equals('foo'));
-    checkUnnamed1532(o.userActions);
+    checkUnnamed2887(o.userActions);
     unittest.expect(o.userToken, unittest.equals('foo'));
     unittest.expect(o.verifyToken, unittest.equals('foo'));
   }
@@ -560,14 +560,14 @@
   buildCounterSetting--;
 }
 
-buildUnnamed1533() {
+buildUnnamed2888() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1533(core.List<core.String> o) {
+checkUnnamed2888(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -583,7 +583,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.notification = buildNotification();
-    o.operation = buildUnnamed1533();
+    o.operation = buildUnnamed2888();
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
     o.userToken = "foo";
     o.verifyToken = "foo";
@@ -600,7 +600,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkNotification(o.notification);
-    checkUnnamed1533(o.operation);
+    checkUnnamed2888(o.operation);
     unittest.expect(
         o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.userToken, unittest.equals('foo'));
@@ -609,14 +609,14 @@
   buildCounterSubscription--;
 }
 
-buildUnnamed1534() {
+buildUnnamed2889() {
   var o = new core.List<api.Subscription>();
   o.add(buildSubscription());
   o.add(buildSubscription());
   return o;
 }
 
-checkUnnamed1534(core.List<api.Subscription> o) {
+checkUnnamed2889(core.List<api.Subscription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubscription(o[0]);
   checkSubscription(o[1]);
@@ -627,7 +627,7 @@
   var o = new api.SubscriptionsListResponse();
   buildCounterSubscriptionsListResponse++;
   if (buildCounterSubscriptionsListResponse < 3) {
-    o.items = buildUnnamed1534();
+    o.items = buildUnnamed2889();
     o.kind = "foo";
   }
   buildCounterSubscriptionsListResponse--;
@@ -637,46 +637,46 @@
 checkSubscriptionsListResponse(api.SubscriptionsListResponse o) {
   buildCounterSubscriptionsListResponse++;
   if (buildCounterSubscriptionsListResponse < 3) {
-    checkUnnamed1534(o.items);
+    checkUnnamed2889(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterSubscriptionsListResponse--;
 }
 
-buildUnnamed1535() {
+buildUnnamed2890() {
   var o = new core.List<api.Attachment>();
   o.add(buildAttachment());
   o.add(buildAttachment());
   return o;
 }
 
-checkUnnamed1535(core.List<api.Attachment> o) {
+checkUnnamed2890(core.List<api.Attachment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAttachment(o[0]);
   checkAttachment(o[1]);
 }
 
-buildUnnamed1536() {
+buildUnnamed2891() {
   var o = new core.List<api.MenuItem>();
   o.add(buildMenuItem());
   o.add(buildMenuItem());
   return o;
 }
 
-checkUnnamed1536(core.List<api.MenuItem> o) {
+checkUnnamed2891(core.List<api.MenuItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMenuItem(o[0]);
   checkMenuItem(o[1]);
 }
 
-buildUnnamed1537() {
+buildUnnamed2892() {
   var o = new core.List<api.Contact>();
   o.add(buildContact());
   o.add(buildContact());
   return o;
 }
 
-checkUnnamed1537(core.List<api.Contact> o) {
+checkUnnamed2892(core.List<api.Contact> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContact(o[0]);
   checkContact(o[1]);
@@ -687,7 +687,7 @@
   var o = new api.TimelineItem();
   buildCounterTimelineItem++;
   if (buildCounterTimelineItem < 3) {
-    o.attachments = buildUnnamed1535();
+    o.attachments = buildUnnamed2890();
     o.bundleId = "foo";
     o.canonicalUrl = "foo";
     o.created = core.DateTime.parse("2002-02-27T14:01:02");
@@ -702,10 +702,10 @@
     o.isPinned = true;
     o.kind = "foo";
     o.location = buildLocation();
-    o.menuItems = buildUnnamed1536();
+    o.menuItems = buildUnnamed2891();
     o.notification = buildNotificationConfig();
     o.pinScore = 42;
-    o.recipients = buildUnnamed1537();
+    o.recipients = buildUnnamed2892();
     o.selfLink = "foo";
     o.sourceItemId = "foo";
     o.speakableText = "foo";
@@ -721,7 +721,7 @@
 checkTimelineItem(api.TimelineItem o) {
   buildCounterTimelineItem++;
   if (buildCounterTimelineItem < 3) {
-    checkUnnamed1535(o.attachments);
+    checkUnnamed2890(o.attachments);
     unittest.expect(o.bundleId, unittest.equals('foo'));
     unittest.expect(o.canonicalUrl, unittest.equals('foo'));
     unittest.expect(
@@ -738,10 +738,10 @@
     unittest.expect(o.isPinned, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkLocation(o.location);
-    checkUnnamed1536(o.menuItems);
+    checkUnnamed2891(o.menuItems);
     checkNotificationConfig(o.notification);
     unittest.expect(o.pinScore, unittest.equals(42));
-    checkUnnamed1537(o.recipients);
+    checkUnnamed2892(o.recipients);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.sourceItemId, unittest.equals('foo'));
     unittest.expect(o.speakableText, unittest.equals('foo'));
@@ -754,14 +754,14 @@
   buildCounterTimelineItem--;
 }
 
-buildUnnamed1538() {
+buildUnnamed2893() {
   var o = new core.List<api.TimelineItem>();
   o.add(buildTimelineItem());
   o.add(buildTimelineItem());
   return o;
 }
 
-checkUnnamed1538(core.List<api.TimelineItem> o) {
+checkUnnamed2893(core.List<api.TimelineItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTimelineItem(o[0]);
   checkTimelineItem(o[1]);
@@ -772,7 +772,7 @@
   var o = new api.TimelineListResponse();
   buildCounterTimelineListResponse++;
   if (buildCounterTimelineListResponse < 3) {
-    o.items = buildUnnamed1538();
+    o.items = buildUnnamed2893();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -783,7 +783,7 @@
 checkTimelineListResponse(api.TimelineListResponse o) {
   buildCounterTimelineListResponse++;
   if (buildCounterTimelineListResponse < 3) {
-    checkUnnamed1538(o.items);
+    checkUnnamed2893(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1070,7 +1070,7 @@
       res
           .insert(arg_request, arg_userToken, arg_accountType, arg_accountName,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -1182,7 +1182,7 @@
       }), true);
       res
           .get(arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Contact response) {
+          .then(unittest.expectAsync1(((response) {
         checkContact(response);
       })));
     });
@@ -1238,7 +1238,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Contact response) {
+          .then(unittest.expectAsync1(((response) {
         checkContact(response);
       })));
     });
@@ -1288,9 +1288,7 @@
         var resp = convert.JSON.encode(buildContactsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContactsListResponse response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkContactsListResponse(response);
       })));
     });
@@ -1350,7 +1348,7 @@
       }), true);
       res
           .patch(arg_request, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Contact response) {
+          .then(unittest.expectAsync1(((response) {
         checkContact(response);
       })));
     });
@@ -1410,7 +1408,7 @@
       }), true);
       res
           .update(arg_request, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Contact response) {
+          .then(unittest.expectAsync1(((response) {
         checkContact(response);
       })));
     });
@@ -1468,7 +1466,7 @@
       }), true);
       res
           .get(arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Location response) {
+          .then(unittest.expectAsync1(((response) {
         checkLocation(response);
       })));
     });
@@ -1518,9 +1516,7 @@
         var resp = convert.JSON.encode(buildLocationsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LocationsListResponse response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkLocationsListResponse(response);
       })));
     });
@@ -1578,7 +1574,7 @@
       }), true);
       res
           .get(arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Setting response) {
+          .then(unittest.expectAsync1(((response) {
         checkSetting(response);
       })));
     });
@@ -1690,7 +1686,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -1740,8 +1736,7 @@
         var resp = convert.JSON.encode(buildSubscriptionsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list($fields: arg_$fields).then(
-          unittest.expectAsync1(((api.SubscriptionsListResponse response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkSubscriptionsListResponse(response);
       })));
     });
@@ -1801,7 +1796,7 @@
       }), true);
       res
           .update(arg_request, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -1913,7 +1908,7 @@
       }), true);
       res
           .get(arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TimelineItem response) {
+          .then(unittest.expectAsync1(((response) {
         checkTimelineItem(response);
       })));
     });
@@ -1972,7 +1967,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TimelineItem response) {
+          .then(unittest.expectAsync1(((response) {
         checkTimelineItem(response);
       })));
     });
@@ -2053,7 +2048,7 @@
               pinnedOnly: arg_pinnedOnly,
               sourceItemId: arg_sourceItemId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TimelineListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTimelineListResponse(response);
       })));
     });
@@ -2113,7 +2108,7 @@
       }), true);
       res
           .patch(arg_request, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TimelineItem response) {
+          .then(unittest.expectAsync1(((response) {
         checkTimelineItem(response);
       })));
     });
@@ -2176,7 +2171,7 @@
       }), true);
       res
           .update(arg_request, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TimelineItem response) {
+          .then(unittest.expectAsync1(((response) {
         checkTimelineItem(response);
       })));
     });
@@ -2313,7 +2308,7 @@
       }), true);
       res
           .get(arg_itemId, arg_attachmentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Attachment response) {
+          .then(unittest.expectAsync1(((response) {
         checkAttachment(response);
       })));
     });
@@ -2379,7 +2374,7 @@
       }), true);
       res
           .insert(arg_itemId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Attachment response) {
+          .then(unittest.expectAsync1(((response) {
         checkAttachment(response);
       })));
     });
@@ -2442,7 +2437,7 @@
       }), true);
       res
           .list(arg_itemId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AttachmentsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAttachmentsListResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/ml/v1_test.dart b/generated/googleapis/test/ml/v1_test.dart
index 7daea93..e917c81 100644
--- a/generated/googleapis/test/ml/v1_test.dart
+++ b/generated/googleapis/test/ml/v1_test.dart
@@ -50,7 +50,7 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2786() {
+buildUnnamed1734() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -65,7 +65,7 @@
   return o;
 }
 
-checkUnnamed2786(core.Map<core.String, core.Object> o) {
+checkUnnamed1734(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -79,17 +79,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2787() {
+buildUnnamed1735() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2786());
-  o.add(buildUnnamed2786());
+  o.add(buildUnnamed1734());
+  o.add(buildUnnamed1734());
   return o;
 }
 
-checkUnnamed2787(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1735(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2786(o[0]);
-  checkUnnamed2786(o[1]);
+  checkUnnamed1734(o[0]);
+  checkUnnamed1734(o[1]);
 }
 
 core.int buildCounterGoogleApiHttpBody = 0;
@@ -99,7 +99,7 @@
   if (buildCounterGoogleApiHttpBody < 3) {
     o.contentType = "foo";
     o.data = "foo";
-    o.extensions = buildUnnamed2787();
+    o.extensions = buildUnnamed1735();
   }
   buildCounterGoogleApiHttpBody--;
   return o;
@@ -110,7 +110,7 @@
   if (buildCounterGoogleApiHttpBody < 3) {
     unittest.expect(o.contentType, unittest.equals('foo'));
     unittest.expect(o.data, unittest.equals('foo'));
-    checkUnnamed2787(o.extensions);
+    checkUnnamed1735(o.extensions);
   }
   buildCounterGoogleApiHttpBody--;
 }
@@ -172,14 +172,14 @@
   buildCounterGoogleCloudMlV1CancelJobRequest--;
 }
 
-buildUnnamed2788() {
+buildUnnamed1736() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2788(core.List<core.String> o) {
+checkUnnamed1736(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -190,7 +190,7 @@
   var o = new api.GoogleCloudMlV1Capability();
   buildCounterGoogleCloudMlV1Capability++;
   if (buildCounterGoogleCloudMlV1Capability < 3) {
-    o.availableAccelerators = buildUnnamed2788();
+    o.availableAccelerators = buildUnnamed1736();
     o.type = "foo";
   }
   buildCounterGoogleCloudMlV1Capability--;
@@ -200,7 +200,7 @@
 checkGoogleCloudMlV1Capability(api.GoogleCloudMlV1Capability o) {
   buildCounterGoogleCloudMlV1Capability++;
   if (buildCounterGoogleCloudMlV1Capability < 3) {
-    checkUnnamed2788(o.availableAccelerators);
+    checkUnnamed1736(o.availableAccelerators);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterGoogleCloudMlV1Capability--;
@@ -227,7 +227,7 @@
   buildCounterGoogleCloudMlV1GetConfigResponse--;
 }
 
-buildUnnamed2789() {
+buildUnnamed1737() {
   var o = new core
       .List<api.GoogleCloudMlV1HyperparameterOutputHyperparameterMetric>();
   o.add(buildGoogleCloudMlV1HyperparameterOutputHyperparameterMetric());
@@ -235,21 +235,21 @@
   return o;
 }
 
-checkUnnamed2789(
+checkUnnamed1737(
     core.List<api.GoogleCloudMlV1HyperparameterOutputHyperparameterMetric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudMlV1HyperparameterOutputHyperparameterMetric(o[0]);
   checkGoogleCloudMlV1HyperparameterOutputHyperparameterMetric(o[1]);
 }
 
-buildUnnamed2790() {
+buildUnnamed1738() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2790(core.Map<core.String, core.String> o) {
+checkUnnamed1738(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -260,10 +260,10 @@
   var o = new api.GoogleCloudMlV1HyperparameterOutput();
   buildCounterGoogleCloudMlV1HyperparameterOutput++;
   if (buildCounterGoogleCloudMlV1HyperparameterOutput < 3) {
-    o.allMetrics = buildUnnamed2789();
+    o.allMetrics = buildUnnamed1737();
     o.finalMetric =
         buildGoogleCloudMlV1HyperparameterOutputHyperparameterMetric();
-    o.hyperparameters = buildUnnamed2790();
+    o.hyperparameters = buildUnnamed1738();
     o.isTrialStoppedEarly = true;
     o.trialId = "foo";
   }
@@ -275,23 +275,23 @@
     api.GoogleCloudMlV1HyperparameterOutput o) {
   buildCounterGoogleCloudMlV1HyperparameterOutput++;
   if (buildCounterGoogleCloudMlV1HyperparameterOutput < 3) {
-    checkUnnamed2789(o.allMetrics);
+    checkUnnamed1737(o.allMetrics);
     checkGoogleCloudMlV1HyperparameterOutputHyperparameterMetric(o.finalMetric);
-    checkUnnamed2790(o.hyperparameters);
+    checkUnnamed1738(o.hyperparameters);
     unittest.expect(o.isTrialStoppedEarly, unittest.isTrue);
     unittest.expect(o.trialId, unittest.equals('foo'));
   }
   buildCounterGoogleCloudMlV1HyperparameterOutput--;
 }
 
-buildUnnamed2791() {
+buildUnnamed1739() {
   var o = new core.List<api.GoogleCloudMlV1ParameterSpec>();
   o.add(buildGoogleCloudMlV1ParameterSpec());
   o.add(buildGoogleCloudMlV1ParameterSpec());
   return o;
 }
 
-checkUnnamed2791(core.List<api.GoogleCloudMlV1ParameterSpec> o) {
+checkUnnamed1739(core.List<api.GoogleCloudMlV1ParameterSpec> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudMlV1ParameterSpec(o[0]);
   checkGoogleCloudMlV1ParameterSpec(o[1]);
@@ -307,7 +307,7 @@
     o.hyperparameterMetricTag = "foo";
     o.maxParallelTrials = 42;
     o.maxTrials = 42;
-    o.params = buildUnnamed2791();
+    o.params = buildUnnamed1739();
     o.resumePreviousJobId = "foo";
   }
   buildCounterGoogleCloudMlV1HyperparameterSpec--;
@@ -323,7 +323,7 @@
     unittest.expect(o.hyperparameterMetricTag, unittest.equals('foo'));
     unittest.expect(o.maxParallelTrials, unittest.equals(42));
     unittest.expect(o.maxTrials, unittest.equals(42));
-    checkUnnamed2791(o.params);
+    checkUnnamed1739(o.params);
     unittest.expect(o.resumePreviousJobId, unittest.equals('foo'));
   }
   buildCounterGoogleCloudMlV1HyperparameterSpec--;
@@ -366,14 +366,14 @@
   buildCounterGoogleCloudMlV1Job--;
 }
 
-buildUnnamed2792() {
+buildUnnamed1740() {
   var o = new core.List<api.GoogleCloudMlV1Job>();
   o.add(buildGoogleCloudMlV1Job());
   o.add(buildGoogleCloudMlV1Job());
   return o;
 }
 
-checkUnnamed2792(core.List<api.GoogleCloudMlV1Job> o) {
+checkUnnamed1740(core.List<api.GoogleCloudMlV1Job> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudMlV1Job(o[0]);
   checkGoogleCloudMlV1Job(o[1]);
@@ -384,7 +384,7 @@
   var o = new api.GoogleCloudMlV1ListJobsResponse();
   buildCounterGoogleCloudMlV1ListJobsResponse++;
   if (buildCounterGoogleCloudMlV1ListJobsResponse < 3) {
-    o.jobs = buildUnnamed2792();
+    o.jobs = buildUnnamed1740();
     o.nextPageToken = "foo";
   }
   buildCounterGoogleCloudMlV1ListJobsResponse--;
@@ -394,20 +394,20 @@
 checkGoogleCloudMlV1ListJobsResponse(api.GoogleCloudMlV1ListJobsResponse o) {
   buildCounterGoogleCloudMlV1ListJobsResponse++;
   if (buildCounterGoogleCloudMlV1ListJobsResponse < 3) {
-    checkUnnamed2792(o.jobs);
+    checkUnnamed1740(o.jobs);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterGoogleCloudMlV1ListJobsResponse--;
 }
 
-buildUnnamed2793() {
+buildUnnamed1741() {
   var o = new core.List<api.GoogleCloudMlV1Location>();
   o.add(buildGoogleCloudMlV1Location());
   o.add(buildGoogleCloudMlV1Location());
   return o;
 }
 
-checkUnnamed2793(core.List<api.GoogleCloudMlV1Location> o) {
+checkUnnamed1741(core.List<api.GoogleCloudMlV1Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudMlV1Location(o[0]);
   checkGoogleCloudMlV1Location(o[1]);
@@ -418,7 +418,7 @@
   var o = new api.GoogleCloudMlV1ListLocationsResponse();
   buildCounterGoogleCloudMlV1ListLocationsResponse++;
   if (buildCounterGoogleCloudMlV1ListLocationsResponse < 3) {
-    o.locations = buildUnnamed2793();
+    o.locations = buildUnnamed1741();
     o.nextPageToken = "foo";
   }
   buildCounterGoogleCloudMlV1ListLocationsResponse--;
@@ -429,20 +429,20 @@
     api.GoogleCloudMlV1ListLocationsResponse o) {
   buildCounterGoogleCloudMlV1ListLocationsResponse++;
   if (buildCounterGoogleCloudMlV1ListLocationsResponse < 3) {
-    checkUnnamed2793(o.locations);
+    checkUnnamed1741(o.locations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterGoogleCloudMlV1ListLocationsResponse--;
 }
 
-buildUnnamed2794() {
+buildUnnamed1742() {
   var o = new core.List<api.GoogleCloudMlV1Model>();
   o.add(buildGoogleCloudMlV1Model());
   o.add(buildGoogleCloudMlV1Model());
   return o;
 }
 
-checkUnnamed2794(core.List<api.GoogleCloudMlV1Model> o) {
+checkUnnamed1742(core.List<api.GoogleCloudMlV1Model> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudMlV1Model(o[0]);
   checkGoogleCloudMlV1Model(o[1]);
@@ -453,7 +453,7 @@
   var o = new api.GoogleCloudMlV1ListModelsResponse();
   buildCounterGoogleCloudMlV1ListModelsResponse++;
   if (buildCounterGoogleCloudMlV1ListModelsResponse < 3) {
-    o.models = buildUnnamed2794();
+    o.models = buildUnnamed1742();
     o.nextPageToken = "foo";
   }
   buildCounterGoogleCloudMlV1ListModelsResponse--;
@@ -464,20 +464,20 @@
     api.GoogleCloudMlV1ListModelsResponse o) {
   buildCounterGoogleCloudMlV1ListModelsResponse++;
   if (buildCounterGoogleCloudMlV1ListModelsResponse < 3) {
-    checkUnnamed2794(o.models);
+    checkUnnamed1742(o.models);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterGoogleCloudMlV1ListModelsResponse--;
 }
 
-buildUnnamed2795() {
+buildUnnamed1743() {
   var o = new core.List<api.GoogleCloudMlV1Version>();
   o.add(buildGoogleCloudMlV1Version());
   o.add(buildGoogleCloudMlV1Version());
   return o;
 }
 
-checkUnnamed2795(core.List<api.GoogleCloudMlV1Version> o) {
+checkUnnamed1743(core.List<api.GoogleCloudMlV1Version> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudMlV1Version(o[0]);
   checkGoogleCloudMlV1Version(o[1]);
@@ -489,7 +489,7 @@
   buildCounterGoogleCloudMlV1ListVersionsResponse++;
   if (buildCounterGoogleCloudMlV1ListVersionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.versions = buildUnnamed2795();
+    o.versions = buildUnnamed1743();
   }
   buildCounterGoogleCloudMlV1ListVersionsResponse--;
   return o;
@@ -500,19 +500,19 @@
   buildCounterGoogleCloudMlV1ListVersionsResponse++;
   if (buildCounterGoogleCloudMlV1ListVersionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2795(o.versions);
+    checkUnnamed1743(o.versions);
   }
   buildCounterGoogleCloudMlV1ListVersionsResponse--;
 }
 
-buildUnnamed2796() {
+buildUnnamed1744() {
   var o = new core.List<api.GoogleCloudMlV1Capability>();
   o.add(buildGoogleCloudMlV1Capability());
   o.add(buildGoogleCloudMlV1Capability());
   return o;
 }
 
-checkUnnamed2796(core.List<api.GoogleCloudMlV1Capability> o) {
+checkUnnamed1744(core.List<api.GoogleCloudMlV1Capability> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudMlV1Capability(o[0]);
   checkGoogleCloudMlV1Capability(o[1]);
@@ -523,7 +523,7 @@
   var o = new api.GoogleCloudMlV1Location();
   buildCounterGoogleCloudMlV1Location++;
   if (buildCounterGoogleCloudMlV1Location < 3) {
-    o.capabilities = buildUnnamed2796();
+    o.capabilities = buildUnnamed1744();
     o.name = "foo";
   }
   buildCounterGoogleCloudMlV1Location--;
@@ -533,7 +533,7 @@
 checkGoogleCloudMlV1Location(api.GoogleCloudMlV1Location o) {
   buildCounterGoogleCloudMlV1Location++;
   if (buildCounterGoogleCloudMlV1Location < 3) {
-    checkUnnamed2796(o.capabilities);
+    checkUnnamed1744(o.capabilities);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterGoogleCloudMlV1Location--;
@@ -558,14 +558,14 @@
   buildCounterGoogleCloudMlV1ManualScaling--;
 }
 
-buildUnnamed2797() {
+buildUnnamed1745() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2797(core.List<core.String> o) {
+checkUnnamed1745(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -580,7 +580,7 @@
     o.description = "foo";
     o.name = "foo";
     o.onlinePredictionLogging = true;
-    o.regions = buildUnnamed2797();
+    o.regions = buildUnnamed1745();
   }
   buildCounterGoogleCloudMlV1Model--;
   return o;
@@ -593,7 +593,7 @@
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.onlinePredictionLogging, unittest.isTrue);
-    checkUnnamed2797(o.regions);
+    checkUnnamed1745(o.regions);
   }
   buildCounterGoogleCloudMlV1Model--;
 }
@@ -631,27 +631,27 @@
   buildCounterGoogleCloudMlV1OperationMetadata--;
 }
 
-buildUnnamed2798() {
+buildUnnamed1746() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2798(core.List<core.String> o) {
+checkUnnamed1746(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2799() {
+buildUnnamed1747() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed2799(core.List<core.double> o) {
+checkUnnamed1747(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -662,8 +662,8 @@
   var o = new api.GoogleCloudMlV1ParameterSpec();
   buildCounterGoogleCloudMlV1ParameterSpec++;
   if (buildCounterGoogleCloudMlV1ParameterSpec < 3) {
-    o.categoricalValues = buildUnnamed2798();
-    o.discreteValues = buildUnnamed2799();
+    o.categoricalValues = buildUnnamed1746();
+    o.discreteValues = buildUnnamed1747();
     o.maxValue = 42.0;
     o.minValue = 42.0;
     o.parameterName = "foo";
@@ -677,8 +677,8 @@
 checkGoogleCloudMlV1ParameterSpec(api.GoogleCloudMlV1ParameterSpec o) {
   buildCounterGoogleCloudMlV1ParameterSpec++;
   if (buildCounterGoogleCloudMlV1ParameterSpec < 3) {
-    checkUnnamed2798(o.categoricalValues);
-    checkUnnamed2799(o.discreteValues);
+    checkUnnamed1746(o.categoricalValues);
+    checkUnnamed1747(o.discreteValues);
     unittest.expect(o.maxValue, unittest.equals(42.0));
     unittest.expect(o.minValue, unittest.equals(42.0));
     unittest.expect(o.parameterName, unittest.equals('foo'));
@@ -707,14 +707,14 @@
   buildCounterGoogleCloudMlV1PredictRequest--;
 }
 
-buildUnnamed2800() {
+buildUnnamed1748() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2800(core.List<core.String> o) {
+checkUnnamed1748(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -727,7 +727,7 @@
   if (buildCounterGoogleCloudMlV1PredictionInput < 3) {
     o.batchSize = "foo";
     o.dataFormat = "foo";
-    o.inputPaths = buildUnnamed2800();
+    o.inputPaths = buildUnnamed1748();
     o.maxWorkerCount = "foo";
     o.modelName = "foo";
     o.outputPath = "foo";
@@ -746,7 +746,7 @@
   if (buildCounterGoogleCloudMlV1PredictionInput < 3) {
     unittest.expect(o.batchSize, unittest.equals('foo'));
     unittest.expect(o.dataFormat, unittest.equals('foo'));
-    checkUnnamed2800(o.inputPaths);
+    checkUnnamed1748(o.inputPaths);
     unittest.expect(o.maxWorkerCount, unittest.equals('foo'));
     unittest.expect(o.modelName, unittest.equals('foo'));
     unittest.expect(o.outputPath, unittest.equals('foo'));
@@ -800,27 +800,27 @@
   buildCounterGoogleCloudMlV1SetDefaultVersionRequest--;
 }
 
-buildUnnamed2801() {
+buildUnnamed1749() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2801(core.List<core.String> o) {
+checkUnnamed1749(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2802() {
+buildUnnamed1750() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2802(core.List<core.String> o) {
+checkUnnamed1750(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -831,11 +831,11 @@
   var o = new api.GoogleCloudMlV1TrainingInput();
   buildCounterGoogleCloudMlV1TrainingInput++;
   if (buildCounterGoogleCloudMlV1TrainingInput < 3) {
-    o.args = buildUnnamed2801();
+    o.args = buildUnnamed1749();
     o.hyperparameters = buildGoogleCloudMlV1HyperparameterSpec();
     o.jobDir = "foo";
     o.masterType = "foo";
-    o.packageUris = buildUnnamed2802();
+    o.packageUris = buildUnnamed1750();
     o.parameterServerCount = "foo";
     o.parameterServerType = "foo";
     o.pythonModule = "foo";
@@ -853,11 +853,11 @@
 checkGoogleCloudMlV1TrainingInput(api.GoogleCloudMlV1TrainingInput o) {
   buildCounterGoogleCloudMlV1TrainingInput++;
   if (buildCounterGoogleCloudMlV1TrainingInput < 3) {
-    checkUnnamed2801(o.args);
+    checkUnnamed1749(o.args);
     checkGoogleCloudMlV1HyperparameterSpec(o.hyperparameters);
     unittest.expect(o.jobDir, unittest.equals('foo'));
     unittest.expect(o.masterType, unittest.equals('foo'));
-    checkUnnamed2802(o.packageUris);
+    checkUnnamed1750(o.packageUris);
     unittest.expect(o.parameterServerCount, unittest.equals('foo'));
     unittest.expect(o.parameterServerType, unittest.equals('foo'));
     unittest.expect(o.pythonModule, unittest.equals('foo'));
@@ -871,14 +871,14 @@
   buildCounterGoogleCloudMlV1TrainingInput--;
 }
 
-buildUnnamed2803() {
+buildUnnamed1751() {
   var o = new core.List<api.GoogleCloudMlV1HyperparameterOutput>();
   o.add(buildGoogleCloudMlV1HyperparameterOutput());
   o.add(buildGoogleCloudMlV1HyperparameterOutput());
   return o;
 }
 
-checkUnnamed2803(core.List<api.GoogleCloudMlV1HyperparameterOutput> o) {
+checkUnnamed1751(core.List<api.GoogleCloudMlV1HyperparameterOutput> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudMlV1HyperparameterOutput(o[0]);
   checkGoogleCloudMlV1HyperparameterOutput(o[1]);
@@ -892,7 +892,7 @@
     o.completedTrialCount = "foo";
     o.consumedMLUnits = 42.0;
     o.isHyperparameterTuningJob = true;
-    o.trials = buildUnnamed2803();
+    o.trials = buildUnnamed1751();
   }
   buildCounterGoogleCloudMlV1TrainingOutput--;
   return o;
@@ -904,7 +904,7 @@
     unittest.expect(o.completedTrialCount, unittest.equals('foo'));
     unittest.expect(o.consumedMLUnits, unittest.equals(42.0));
     unittest.expect(o.isHyperparameterTuningJob, unittest.isTrue);
-    checkUnnamed2803(o.trials);
+    checkUnnamed1751(o.trials);
   }
   buildCounterGoogleCloudMlV1TrainingOutput--;
 }
@@ -948,14 +948,14 @@
   buildCounterGoogleCloudMlV1Version--;
 }
 
-buildUnnamed2804() {
+buildUnnamed1752() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2804(core.List<core.String> o) {
+checkUnnamed1752(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -966,7 +966,7 @@
   var o = new api.GoogleIamV1Binding();
   buildCounterGoogleIamV1Binding++;
   if (buildCounterGoogleIamV1Binding < 3) {
-    o.members = buildUnnamed2804();
+    o.members = buildUnnamed1752();
     o.role = "foo";
   }
   buildCounterGoogleIamV1Binding--;
@@ -976,20 +976,20 @@
 checkGoogleIamV1Binding(api.GoogleIamV1Binding o) {
   buildCounterGoogleIamV1Binding++;
   if (buildCounterGoogleIamV1Binding < 3) {
-    checkUnnamed2804(o.members);
+    checkUnnamed1752(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterGoogleIamV1Binding--;
 }
 
-buildUnnamed2805() {
+buildUnnamed1753() {
   var o = new core.List<api.GoogleIamV1Binding>();
   o.add(buildGoogleIamV1Binding());
   o.add(buildGoogleIamV1Binding());
   return o;
 }
 
-checkUnnamed2805(core.List<api.GoogleIamV1Binding> o) {
+checkUnnamed1753(core.List<api.GoogleIamV1Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleIamV1Binding(o[0]);
   checkGoogleIamV1Binding(o[1]);
@@ -1000,7 +1000,7 @@
   var o = new api.GoogleIamV1Policy();
   buildCounterGoogleIamV1Policy++;
   if (buildCounterGoogleIamV1Policy < 3) {
-    o.bindings = buildUnnamed2805();
+    o.bindings = buildUnnamed1753();
     o.etag = "foo";
     o.version = 42;
   }
@@ -1011,7 +1011,7 @@
 checkGoogleIamV1Policy(api.GoogleIamV1Policy o) {
   buildCounterGoogleIamV1Policy++;
   if (buildCounterGoogleIamV1Policy < 3) {
-    checkUnnamed2805(o.bindings);
+    checkUnnamed1753(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
@@ -1037,14 +1037,14 @@
   buildCounterGoogleIamV1SetIamPolicyRequest--;
 }
 
-buildUnnamed2806() {
+buildUnnamed1754() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2806(core.List<core.String> o) {
+checkUnnamed1754(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1055,7 +1055,7 @@
   var o = new api.GoogleIamV1TestIamPermissionsRequest();
   buildCounterGoogleIamV1TestIamPermissionsRequest++;
   if (buildCounterGoogleIamV1TestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed2806();
+    o.permissions = buildUnnamed1754();
   }
   buildCounterGoogleIamV1TestIamPermissionsRequest--;
   return o;
@@ -1065,19 +1065,19 @@
     api.GoogleIamV1TestIamPermissionsRequest o) {
   buildCounterGoogleIamV1TestIamPermissionsRequest++;
   if (buildCounterGoogleIamV1TestIamPermissionsRequest < 3) {
-    checkUnnamed2806(o.permissions);
+    checkUnnamed1754(o.permissions);
   }
   buildCounterGoogleIamV1TestIamPermissionsRequest--;
 }
 
-buildUnnamed2807() {
+buildUnnamed1755() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2807(core.List<core.String> o) {
+checkUnnamed1755(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1088,7 +1088,7 @@
   var o = new api.GoogleIamV1TestIamPermissionsResponse();
   buildCounterGoogleIamV1TestIamPermissionsResponse++;
   if (buildCounterGoogleIamV1TestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed2807();
+    o.permissions = buildUnnamed1755();
   }
   buildCounterGoogleIamV1TestIamPermissionsResponse--;
   return o;
@@ -1098,19 +1098,19 @@
     api.GoogleIamV1TestIamPermissionsResponse o) {
   buildCounterGoogleIamV1TestIamPermissionsResponse++;
   if (buildCounterGoogleIamV1TestIamPermissionsResponse < 3) {
-    checkUnnamed2807(o.permissions);
+    checkUnnamed1755(o.permissions);
   }
   buildCounterGoogleIamV1TestIamPermissionsResponse--;
 }
 
-buildUnnamed2808() {
+buildUnnamed1756() {
   var o = new core.List<api.GoogleLongrunningOperation>();
   o.add(buildGoogleLongrunningOperation());
   o.add(buildGoogleLongrunningOperation());
   return o;
 }
 
-checkUnnamed2808(core.List<api.GoogleLongrunningOperation> o) {
+checkUnnamed1756(core.List<api.GoogleLongrunningOperation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleLongrunningOperation(o[0]);
   checkGoogleLongrunningOperation(o[1]);
@@ -1122,7 +1122,7 @@
   buildCounterGoogleLongrunningListOperationsResponse++;
   if (buildCounterGoogleLongrunningListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed2808();
+    o.operations = buildUnnamed1756();
   }
   buildCounterGoogleLongrunningListOperationsResponse--;
   return o;
@@ -1133,12 +1133,12 @@
   buildCounterGoogleLongrunningListOperationsResponse++;
   if (buildCounterGoogleLongrunningListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2808(o.operations);
+    checkUnnamed1756(o.operations);
   }
   buildCounterGoogleLongrunningListOperationsResponse--;
 }
 
-buildUnnamed2809() {
+buildUnnamed1757() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1153,7 +1153,7 @@
   return o;
 }
 
-checkUnnamed2809(core.Map<core.String, core.Object> o) {
+checkUnnamed1757(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -1167,7 +1167,7 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2810() {
+buildUnnamed1758() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1182,7 +1182,7 @@
   return o;
 }
 
-checkUnnamed2810(core.Map<core.String, core.Object> o) {
+checkUnnamed1758(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1203,9 +1203,9 @@
   if (buildCounterGoogleLongrunningOperation < 3) {
     o.done = true;
     o.error = buildGoogleRpcStatus();
-    o.metadata = buildUnnamed2809();
+    o.metadata = buildUnnamed1757();
     o.name = "foo";
-    o.response = buildUnnamed2810();
+    o.response = buildUnnamed1758();
   }
   buildCounterGoogleLongrunningOperation--;
   return o;
@@ -1216,9 +1216,9 @@
   if (buildCounterGoogleLongrunningOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkGoogleRpcStatus(o.error);
-    checkUnnamed2809(o.metadata);
+    checkUnnamed1757(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2810(o.response);
+    checkUnnamed1758(o.response);
   }
   buildCounterGoogleLongrunningOperation--;
 }
@@ -1238,7 +1238,7 @@
   buildCounterGoogleProtobufEmpty--;
 }
 
-buildUnnamed2811() {
+buildUnnamed1759() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1253,7 +1253,7 @@
   return o;
 }
 
-checkUnnamed2811(core.Map<core.String, core.Object> o) {
+checkUnnamed1759(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -1267,17 +1267,17 @@
   unittest.expect(casted8["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2812() {
+buildUnnamed1760() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2811());
-  o.add(buildUnnamed2811());
+  o.add(buildUnnamed1759());
+  o.add(buildUnnamed1759());
   return o;
 }
 
-checkUnnamed2812(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1760(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2811(o[0]);
-  checkUnnamed2811(o[1]);
+  checkUnnamed1759(o[0]);
+  checkUnnamed1759(o[1]);
 }
 
 core.int buildCounterGoogleRpcStatus = 0;
@@ -1286,7 +1286,7 @@
   buildCounterGoogleRpcStatus++;
   if (buildCounterGoogleRpcStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed2812();
+    o.details = buildUnnamed1760();
     o.message = "foo";
   }
   buildCounterGoogleRpcStatus--;
@@ -1297,7 +1297,7 @@
   buildCounterGoogleRpcStatus++;
   if (buildCounterGoogleRpcStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed2812(o.details);
+    checkUnnamed1760(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterGoogleRpcStatus--;
@@ -1629,8 +1629,9 @@
         var resp = convert.JSON.encode(buildGoogleCloudMlV1GetConfigResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getConfig(arg_name, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GoogleCloudMlV1GetConfigResponse response) {
+      res
+          .getConfig(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudMlV1GetConfigResponse(response);
       })));
     });
@@ -1685,7 +1686,7 @@
       }), true);
       res
           .predict(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleApiHttpBody response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleApiHttpBody(response);
       })));
     });
@@ -1742,7 +1743,7 @@
       }), true);
       res
           .cancel(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -1797,7 +1798,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleCloudMlV1Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudMlV1Job(response);
       })));
     });
@@ -1848,7 +1849,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleCloudMlV1Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudMlV1Job(response);
       })));
     });
@@ -1899,7 +1900,7 @@
       }), true);
       res
           .getIamPolicy(arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleIamV1Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleIamV1Policy(response);
       })));
     });
@@ -1962,8 +1963,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.GoogleCloudMlV1ListJobsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudMlV1ListJobsResponse(response);
       })));
     });
@@ -2018,7 +2018,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleIamV1Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleIamV1Policy(response);
       })));
     });
@@ -2074,8 +2074,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleIamV1TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleIamV1TestIamPermissionsResponse(response);
       })));
     });
@@ -2129,7 +2128,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleCloudMlV1Location response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudMlV1Location(response);
       })));
     });
@@ -2191,8 +2190,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleCloudMlV1ListLocationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudMlV1ListLocationsResponse(response);
       })));
     });
@@ -2249,7 +2247,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleCloudMlV1Model response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudMlV1Model(response);
       })));
     });
@@ -2298,8 +2296,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.delete(arg_name, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .delete(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -2350,7 +2349,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleCloudMlV1Model response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudMlV1Model(response);
       })));
     });
@@ -2401,7 +2400,7 @@
       }), true);
       res
           .getIamPolicy(arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleIamV1Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleIamV1Policy(response);
       })));
     });
@@ -2465,8 +2464,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.GoogleCloudMlV1ListModelsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudMlV1ListModelsResponse(response);
       })));
     });
@@ -2525,8 +2523,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -2581,7 +2578,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleIamV1Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleIamV1Policy(response);
       })));
     });
@@ -2637,8 +2634,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleIamV1TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleIamV1TestIamPermissionsResponse(response);
       })));
     });
@@ -2694,8 +2690,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .create(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -2745,8 +2742,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.delete(arg_name, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .delete(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -2798,7 +2796,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleCloudMlV1Version response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudMlV1Version(response);
       })));
     });
@@ -2863,8 +2861,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleCloudMlV1ListVersionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudMlV1ListVersionsResponse(response);
       })));
     });
@@ -2924,8 +2921,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -2982,7 +2978,7 @@
       }), true);
       res
           .setDefault(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleCloudMlV1Version response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudMlV1Version(response);
       })));
     });
@@ -3036,7 +3032,7 @@
       }), true);
       res
           .cancel(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -3088,7 +3084,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -3138,8 +3134,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -3204,8 +3201,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleLongrunningListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningListOperationsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/monitoring/v3_test.dart b/generated/googleapis/test/monitoring/v3_test.dart
index be8c172..00110e4 100644
--- a/generated/googleapis/test/monitoring/v3_test.dart
+++ b/generated/googleapis/test/monitoring/v3_test.dart
@@ -94,27 +94,27 @@
   buildCounterBucketOptions--;
 }
 
-buildUnnamed3128() {
+buildUnnamed1292() {
   var o = new core.Map<core.String, api.TypedValue>();
   o["x"] = buildTypedValue();
   o["y"] = buildTypedValue();
   return o;
 }
 
-checkUnnamed3128(core.Map<core.String, api.TypedValue> o) {
+checkUnnamed1292(core.Map<core.String, api.TypedValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTypedValue(o["x"]);
   checkTypedValue(o["y"]);
 }
 
-buildUnnamed3129() {
+buildUnnamed1293() {
   var o = new core.List<api.CollectdValue>();
   o.add(buildCollectdValue());
   o.add(buildCollectdValue());
   return o;
 }
 
-checkUnnamed3129(core.List<api.CollectdValue> o) {
+checkUnnamed1293(core.List<api.CollectdValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCollectdValue(o[0]);
   checkCollectdValue(o[1]);
@@ -126,13 +126,13 @@
   buildCounterCollectdPayload++;
   if (buildCounterCollectdPayload < 3) {
     o.endTime = "foo";
-    o.metadata = buildUnnamed3128();
+    o.metadata = buildUnnamed1292();
     o.plugin = "foo";
     o.pluginInstance = "foo";
     o.startTime = "foo";
     o.type = "foo";
     o.typeInstance = "foo";
-    o.values = buildUnnamed3129();
+    o.values = buildUnnamed1293();
   }
   buildCounterCollectdPayload--;
   return o;
@@ -142,25 +142,25 @@
   buildCounterCollectdPayload++;
   if (buildCounterCollectdPayload < 3) {
     unittest.expect(o.endTime, unittest.equals('foo'));
-    checkUnnamed3128(o.metadata);
+    checkUnnamed1292(o.metadata);
     unittest.expect(o.plugin, unittest.equals('foo'));
     unittest.expect(o.pluginInstance, unittest.equals('foo'));
     unittest.expect(o.startTime, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.typeInstance, unittest.equals('foo'));
-    checkUnnamed3129(o.values);
+    checkUnnamed1293(o.values);
   }
   buildCounterCollectdPayload--;
 }
 
-buildUnnamed3130() {
+buildUnnamed1294() {
   var o = new core.List<api.CollectdValueError>();
   o.add(buildCollectdValueError());
   o.add(buildCollectdValueError());
   return o;
 }
 
-checkUnnamed3130(core.List<api.CollectdValueError> o) {
+checkUnnamed1294(core.List<api.CollectdValueError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCollectdValueError(o[0]);
   checkCollectdValueError(o[1]);
@@ -173,7 +173,7 @@
   if (buildCounterCollectdPayloadError < 3) {
     o.error = buildStatus();
     o.index = 42;
-    o.valueErrors = buildUnnamed3130();
+    o.valueErrors = buildUnnamed1294();
   }
   buildCounterCollectdPayloadError--;
   return o;
@@ -184,7 +184,7 @@
   if (buildCounterCollectdPayloadError < 3) {
     checkStatus(o.error);
     unittest.expect(o.index, unittest.equals(42));
-    checkUnnamed3130(o.valueErrors);
+    checkUnnamed1294(o.valueErrors);
   }
   buildCounterCollectdPayloadError--;
 }
@@ -252,14 +252,14 @@
   buildCounterContentMatcher--;
 }
 
-buildUnnamed3131() {
+buildUnnamed1295() {
   var o = new core.List<api.CollectdPayload>();
   o.add(buildCollectdPayload());
   o.add(buildCollectdPayload());
   return o;
 }
 
-checkUnnamed3131(core.List<api.CollectdPayload> o) {
+checkUnnamed1295(core.List<api.CollectdPayload> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCollectdPayload(o[0]);
   checkCollectdPayload(o[1]);
@@ -270,7 +270,7 @@
   var o = new api.CreateCollectdTimeSeriesRequest();
   buildCounterCreateCollectdTimeSeriesRequest++;
   if (buildCounterCreateCollectdTimeSeriesRequest < 3) {
-    o.collectdPayloads = buildUnnamed3131();
+    o.collectdPayloads = buildUnnamed1295();
     o.collectdVersion = "foo";
     o.resource = buildMonitoredResource();
   }
@@ -281,21 +281,21 @@
 checkCreateCollectdTimeSeriesRequest(api.CreateCollectdTimeSeriesRequest o) {
   buildCounterCreateCollectdTimeSeriesRequest++;
   if (buildCounterCreateCollectdTimeSeriesRequest < 3) {
-    checkUnnamed3131(o.collectdPayloads);
+    checkUnnamed1295(o.collectdPayloads);
     unittest.expect(o.collectdVersion, unittest.equals('foo'));
     checkMonitoredResource(o.resource);
   }
   buildCounterCreateCollectdTimeSeriesRequest--;
 }
 
-buildUnnamed3132() {
+buildUnnamed1296() {
   var o = new core.List<api.CollectdPayloadError>();
   o.add(buildCollectdPayloadError());
   o.add(buildCollectdPayloadError());
   return o;
 }
 
-checkUnnamed3132(core.List<api.CollectdPayloadError> o) {
+checkUnnamed1296(core.List<api.CollectdPayloadError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCollectdPayloadError(o[0]);
   checkCollectdPayloadError(o[1]);
@@ -306,7 +306,7 @@
   var o = new api.CreateCollectdTimeSeriesResponse();
   buildCounterCreateCollectdTimeSeriesResponse++;
   if (buildCounterCreateCollectdTimeSeriesResponse < 3) {
-    o.payloadErrors = buildUnnamed3132();
+    o.payloadErrors = buildUnnamed1296();
   }
   buildCounterCreateCollectdTimeSeriesResponse--;
   return o;
@@ -315,19 +315,19 @@
 checkCreateCollectdTimeSeriesResponse(api.CreateCollectdTimeSeriesResponse o) {
   buildCounterCreateCollectdTimeSeriesResponse++;
   if (buildCounterCreateCollectdTimeSeriesResponse < 3) {
-    checkUnnamed3132(o.payloadErrors);
+    checkUnnamed1296(o.payloadErrors);
   }
   buildCounterCreateCollectdTimeSeriesResponse--;
 }
 
-buildUnnamed3133() {
+buildUnnamed1297() {
   var o = new core.List<api.TimeSeries>();
   o.add(buildTimeSeries());
   o.add(buildTimeSeries());
   return o;
 }
 
-checkUnnamed3133(core.List<api.TimeSeries> o) {
+checkUnnamed1297(core.List<api.TimeSeries> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTimeSeries(o[0]);
   checkTimeSeries(o[1]);
@@ -338,7 +338,7 @@
   var o = new api.CreateTimeSeriesRequest();
   buildCounterCreateTimeSeriesRequest++;
   if (buildCounterCreateTimeSeriesRequest < 3) {
-    o.timeSeries = buildUnnamed3133();
+    o.timeSeries = buildUnnamed1297();
   }
   buildCounterCreateTimeSeriesRequest--;
   return o;
@@ -347,19 +347,19 @@
 checkCreateTimeSeriesRequest(api.CreateTimeSeriesRequest o) {
   buildCounterCreateTimeSeriesRequest++;
   if (buildCounterCreateTimeSeriesRequest < 3) {
-    checkUnnamed3133(o.timeSeries);
+    checkUnnamed1297(o.timeSeries);
   }
   buildCounterCreateTimeSeriesRequest--;
 }
 
-buildUnnamed3134() {
+buildUnnamed1298() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3134(core.List<core.String> o) {
+checkUnnamed1298(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -370,7 +370,7 @@
   var o = new api.Distribution();
   buildCounterDistribution++;
   if (buildCounterDistribution < 3) {
-    o.bucketCounts = buildUnnamed3134();
+    o.bucketCounts = buildUnnamed1298();
     o.bucketOptions = buildBucketOptions();
     o.count = "foo";
     o.mean = 42.0;
@@ -384,7 +384,7 @@
 checkDistribution(api.Distribution o) {
   buildCounterDistribution++;
   if (buildCounterDistribution < 3) {
-    checkUnnamed3134(o.bucketCounts);
+    checkUnnamed1298(o.bucketCounts);
     checkBucketOptions(o.bucketOptions);
     unittest.expect(o.count, unittest.equals('foo'));
     unittest.expect(o.mean, unittest.equals(42.0));
@@ -409,14 +409,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed3135() {
+buildUnnamed1299() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed3135(core.List<core.double> o) {
+checkUnnamed1299(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -427,7 +427,7 @@
   var o = new api.Explicit();
   buildCounterExplicit++;
   if (buildCounterExplicit < 3) {
-    o.bounds = buildUnnamed3135();
+    o.bounds = buildUnnamed1299();
   }
   buildCounterExplicit--;
   return o;
@@ -436,7 +436,7 @@
 checkExplicit(api.Explicit o) {
   buildCounterExplicit++;
   if (buildCounterExplicit < 3) {
-    checkUnnamed3135(o.bounds);
+    checkUnnamed1299(o.bounds);
   }
   buildCounterExplicit--;
 }
@@ -464,14 +464,14 @@
   buildCounterExponential--;
 }
 
-buildUnnamed3136() {
+buildUnnamed1300() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3136(core.List<api.Option> o) {
+checkUnnamed1300(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -489,7 +489,7 @@
     o.name = "foo";
     o.number = 42;
     o.oneofIndex = 42;
-    o.options = buildUnnamed3136();
+    o.options = buildUnnamed1300();
     o.packed = true;
     o.typeUrl = "foo";
   }
@@ -507,7 +507,7 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.number, unittest.equals(42));
     unittest.expect(o.oneofIndex, unittest.equals(42));
-    checkUnnamed3136(o.options);
+    checkUnnamed1300(o.options);
     unittest.expect(o.packed, unittest.isTrue);
     unittest.expect(o.typeUrl, unittest.equals('foo'));
   }
@@ -541,14 +541,14 @@
   buildCounterGroup--;
 }
 
-buildUnnamed3137() {
+buildUnnamed1301() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3137(core.Map<core.String, core.String> o) {
+checkUnnamed1301(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -560,7 +560,7 @@
   buildCounterHttpCheck++;
   if (buildCounterHttpCheck < 3) {
     o.authInfo = buildBasicAuthentication();
-    o.headers = buildUnnamed3137();
+    o.headers = buildUnnamed1301();
     o.maskHeaders = true;
     o.path = "foo";
     o.port = 42;
@@ -574,7 +574,7 @@
   buildCounterHttpCheck++;
   if (buildCounterHttpCheck < 3) {
     checkBasicAuthentication(o.authInfo);
-    checkUnnamed3137(o.headers);
+    checkUnnamed1301(o.headers);
     unittest.expect(o.maskHeaders, unittest.isTrue);
     unittest.expect(o.path, unittest.equals('foo'));
     unittest.expect(o.port, unittest.equals(42));
@@ -656,14 +656,14 @@
   buildCounterLinear--;
 }
 
-buildUnnamed3138() {
+buildUnnamed1302() {
   var o = new core.List<api.MonitoredResource>();
   o.add(buildMonitoredResource());
   o.add(buildMonitoredResource());
   return o;
 }
 
-checkUnnamed3138(core.List<api.MonitoredResource> o) {
+checkUnnamed1302(core.List<api.MonitoredResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoredResource(o[0]);
   checkMonitoredResource(o[1]);
@@ -674,7 +674,7 @@
   var o = new api.ListGroupMembersResponse();
   buildCounterListGroupMembersResponse++;
   if (buildCounterListGroupMembersResponse < 3) {
-    o.members = buildUnnamed3138();
+    o.members = buildUnnamed1302();
     o.nextPageToken = "foo";
     o.totalSize = 42;
   }
@@ -685,21 +685,21 @@
 checkListGroupMembersResponse(api.ListGroupMembersResponse o) {
   buildCounterListGroupMembersResponse++;
   if (buildCounterListGroupMembersResponse < 3) {
-    checkUnnamed3138(o.members);
+    checkUnnamed1302(o.members);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalSize, unittest.equals(42));
   }
   buildCounterListGroupMembersResponse--;
 }
 
-buildUnnamed3139() {
+buildUnnamed1303() {
   var o = new core.List<api.Group>();
   o.add(buildGroup());
   o.add(buildGroup());
   return o;
 }
 
-checkUnnamed3139(core.List<api.Group> o) {
+checkUnnamed1303(core.List<api.Group> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGroup(o[0]);
   checkGroup(o[1]);
@@ -710,7 +710,7 @@
   var o = new api.ListGroupsResponse();
   buildCounterListGroupsResponse++;
   if (buildCounterListGroupsResponse < 3) {
-    o.group = buildUnnamed3139();
+    o.group = buildUnnamed1303();
     o.nextPageToken = "foo";
   }
   buildCounterListGroupsResponse--;
@@ -720,20 +720,20 @@
 checkListGroupsResponse(api.ListGroupsResponse o) {
   buildCounterListGroupsResponse++;
   if (buildCounterListGroupsResponse < 3) {
-    checkUnnamed3139(o.group);
+    checkUnnamed1303(o.group);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListGroupsResponse--;
 }
 
-buildUnnamed3140() {
+buildUnnamed1304() {
   var o = new core.List<api.MetricDescriptor>();
   o.add(buildMetricDescriptor());
   o.add(buildMetricDescriptor());
   return o;
 }
 
-checkUnnamed3140(core.List<api.MetricDescriptor> o) {
+checkUnnamed1304(core.List<api.MetricDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricDescriptor(o[0]);
   checkMetricDescriptor(o[1]);
@@ -744,7 +744,7 @@
   var o = new api.ListMetricDescriptorsResponse();
   buildCounterListMetricDescriptorsResponse++;
   if (buildCounterListMetricDescriptorsResponse < 3) {
-    o.metricDescriptors = buildUnnamed3140();
+    o.metricDescriptors = buildUnnamed1304();
     o.nextPageToken = "foo";
   }
   buildCounterListMetricDescriptorsResponse--;
@@ -754,20 +754,20 @@
 checkListMetricDescriptorsResponse(api.ListMetricDescriptorsResponse o) {
   buildCounterListMetricDescriptorsResponse++;
   if (buildCounterListMetricDescriptorsResponse < 3) {
-    checkUnnamed3140(o.metricDescriptors);
+    checkUnnamed1304(o.metricDescriptors);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListMetricDescriptorsResponse--;
 }
 
-buildUnnamed3141() {
+buildUnnamed1305() {
   var o = new core.List<api.MonitoredResourceDescriptor>();
   o.add(buildMonitoredResourceDescriptor());
   o.add(buildMonitoredResourceDescriptor());
   return o;
 }
 
-checkUnnamed3141(core.List<api.MonitoredResourceDescriptor> o) {
+checkUnnamed1305(core.List<api.MonitoredResourceDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoredResourceDescriptor(o[0]);
   checkMonitoredResourceDescriptor(o[1]);
@@ -779,7 +779,7 @@
   buildCounterListMonitoredResourceDescriptorsResponse++;
   if (buildCounterListMonitoredResourceDescriptorsResponse < 3) {
     o.nextPageToken = "foo";
-    o.resourceDescriptors = buildUnnamed3141();
+    o.resourceDescriptors = buildUnnamed1305();
   }
   buildCounterListMonitoredResourceDescriptorsResponse--;
   return o;
@@ -790,19 +790,19 @@
   buildCounterListMonitoredResourceDescriptorsResponse++;
   if (buildCounterListMonitoredResourceDescriptorsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3141(o.resourceDescriptors);
+    checkUnnamed1305(o.resourceDescriptors);
   }
   buildCounterListMonitoredResourceDescriptorsResponse--;
 }
 
-buildUnnamed3142() {
+buildUnnamed1306() {
   var o = new core.List<api.TimeSeries>();
   o.add(buildTimeSeries());
   o.add(buildTimeSeries());
   return o;
 }
 
-checkUnnamed3142(core.List<api.TimeSeries> o) {
+checkUnnamed1306(core.List<api.TimeSeries> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTimeSeries(o[0]);
   checkTimeSeries(o[1]);
@@ -814,7 +814,7 @@
   buildCounterListTimeSeriesResponse++;
   if (buildCounterListTimeSeriesResponse < 3) {
     o.nextPageToken = "foo";
-    o.timeSeries = buildUnnamed3142();
+    o.timeSeries = buildUnnamed1306();
   }
   buildCounterListTimeSeriesResponse--;
   return o;
@@ -824,19 +824,19 @@
   buildCounterListTimeSeriesResponse++;
   if (buildCounterListTimeSeriesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3142(o.timeSeries);
+    checkUnnamed1306(o.timeSeries);
   }
   buildCounterListTimeSeriesResponse--;
 }
 
-buildUnnamed3143() {
+buildUnnamed1307() {
   var o = new core.List<api.UptimeCheckConfig>();
   o.add(buildUptimeCheckConfig());
   o.add(buildUptimeCheckConfig());
   return o;
 }
 
-checkUnnamed3143(core.List<api.UptimeCheckConfig> o) {
+checkUnnamed1307(core.List<api.UptimeCheckConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUptimeCheckConfig(o[0]);
   checkUptimeCheckConfig(o[1]);
@@ -849,7 +849,7 @@
   if (buildCounterListUptimeCheckConfigsResponse < 3) {
     o.nextPageToken = "foo";
     o.totalSize = 42;
-    o.uptimeCheckConfigs = buildUnnamed3143();
+    o.uptimeCheckConfigs = buildUnnamed1307();
   }
   buildCounterListUptimeCheckConfigsResponse--;
   return o;
@@ -860,19 +860,19 @@
   if (buildCounterListUptimeCheckConfigsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalSize, unittest.equals(42));
-    checkUnnamed3143(o.uptimeCheckConfigs);
+    checkUnnamed1307(o.uptimeCheckConfigs);
   }
   buildCounterListUptimeCheckConfigsResponse--;
 }
 
-buildUnnamed3144() {
+buildUnnamed1308() {
   var o = new core.List<api.UptimeCheckIp>();
   o.add(buildUptimeCheckIp());
   o.add(buildUptimeCheckIp());
   return o;
 }
 
-checkUnnamed3144(core.List<api.UptimeCheckIp> o) {
+checkUnnamed1308(core.List<api.UptimeCheckIp> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUptimeCheckIp(o[0]);
   checkUptimeCheckIp(o[1]);
@@ -884,7 +884,7 @@
   buildCounterListUptimeCheckIpsResponse++;
   if (buildCounterListUptimeCheckIpsResponse < 3) {
     o.nextPageToken = "foo";
-    o.uptimeCheckIps = buildUnnamed3144();
+    o.uptimeCheckIps = buildUnnamed1308();
   }
   buildCounterListUptimeCheckIpsResponse--;
   return o;
@@ -894,19 +894,19 @@
   buildCounterListUptimeCheckIpsResponse++;
   if (buildCounterListUptimeCheckIpsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3144(o.uptimeCheckIps);
+    checkUnnamed1308(o.uptimeCheckIps);
   }
   buildCounterListUptimeCheckIpsResponse--;
 }
 
-buildUnnamed3145() {
+buildUnnamed1309() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3145(core.Map<core.String, core.String> o) {
+checkUnnamed1309(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -917,7 +917,7 @@
   var o = new api.Metric();
   buildCounterMetric++;
   if (buildCounterMetric < 3) {
-    o.labels = buildUnnamed3145();
+    o.labels = buildUnnamed1309();
     o.type = "foo";
   }
   buildCounterMetric--;
@@ -927,20 +927,20 @@
 checkMetric(api.Metric o) {
   buildCounterMetric++;
   if (buildCounterMetric < 3) {
-    checkUnnamed3145(o.labels);
+    checkUnnamed1309(o.labels);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMetric--;
 }
 
-buildUnnamed3146() {
+buildUnnamed1310() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed3146(core.List<api.LabelDescriptor> o) {
+checkUnnamed1310(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -953,7 +953,7 @@
   if (buildCounterMetricDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed3146();
+    o.labels = buildUnnamed1310();
     o.metricKind = "foo";
     o.name = "foo";
     o.type = "foo";
@@ -969,7 +969,7 @@
   if (buildCounterMetricDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed3146(o.labels);
+    checkUnnamed1310(o.labels);
     unittest.expect(o.metricKind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -979,14 +979,14 @@
   buildCounterMetricDescriptor--;
 }
 
-buildUnnamed3147() {
+buildUnnamed1311() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3147(core.Map<core.String, core.String> o) {
+checkUnnamed1311(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -997,7 +997,7 @@
   var o = new api.MonitoredResource();
   buildCounterMonitoredResource++;
   if (buildCounterMonitoredResource < 3) {
-    o.labels = buildUnnamed3147();
+    o.labels = buildUnnamed1311();
     o.type = "foo";
   }
   buildCounterMonitoredResource--;
@@ -1007,20 +1007,20 @@
 checkMonitoredResource(api.MonitoredResource o) {
   buildCounterMonitoredResource++;
   if (buildCounterMonitoredResource < 3) {
-    checkUnnamed3147(o.labels);
+    checkUnnamed1311(o.labels);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMonitoredResource--;
 }
 
-buildUnnamed3148() {
+buildUnnamed1312() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed3148(core.List<api.LabelDescriptor> o) {
+checkUnnamed1312(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -1033,7 +1033,7 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed3148();
+    o.labels = buildUnnamed1312();
     o.name = "foo";
     o.type = "foo";
   }
@@ -1046,14 +1046,14 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed3148(o.labels);
+    checkUnnamed1312(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMonitoredResourceDescriptor--;
 }
 
-buildUnnamed3149() {
+buildUnnamed1313() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1068,7 +1068,7 @@
   return o;
 }
 
-checkUnnamed3149(core.Map<core.String, core.Object> o) {
+checkUnnamed1313(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1082,14 +1082,14 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3150() {
+buildUnnamed1314() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3150(core.Map<core.String, core.String> o) {
+checkUnnamed1314(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1100,8 +1100,8 @@
   var o = new api.MonitoredResourceMetadata();
   buildCounterMonitoredResourceMetadata++;
   if (buildCounterMonitoredResourceMetadata < 3) {
-    o.systemLabels = buildUnnamed3149();
-    o.userLabels = buildUnnamed3150();
+    o.systemLabels = buildUnnamed1313();
+    o.userLabels = buildUnnamed1314();
   }
   buildCounterMonitoredResourceMetadata--;
   return o;
@@ -1110,13 +1110,13 @@
 checkMonitoredResourceMetadata(api.MonitoredResourceMetadata o) {
   buildCounterMonitoredResourceMetadata++;
   if (buildCounterMonitoredResourceMetadata < 3) {
-    checkUnnamed3149(o.systemLabels);
-    checkUnnamed3150(o.userLabels);
+    checkUnnamed1313(o.systemLabels);
+    checkUnnamed1314(o.userLabels);
   }
   buildCounterMonitoredResourceMetadata--;
 }
 
-buildUnnamed3151() {
+buildUnnamed1315() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1131,7 +1131,7 @@
   return o;
 }
 
-checkUnnamed3151(core.Map<core.String, core.Object> o) {
+checkUnnamed1315(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -1151,7 +1151,7 @@
   buildCounterOption++;
   if (buildCounterOption < 3) {
     o.name = "foo";
-    o.value = buildUnnamed3151();
+    o.value = buildUnnamed1315();
   }
   buildCounterOption--;
   return o;
@@ -1161,7 +1161,7 @@
   buildCounterOption++;
   if (buildCounterOption < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3151(o.value);
+    checkUnnamed1315(o.value);
   }
   buildCounterOption--;
 }
@@ -1248,7 +1248,7 @@
   buildCounterSourceContext--;
 }
 
-buildUnnamed3152() {
+buildUnnamed1316() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1263,7 +1263,7 @@
   return o;
 }
 
-checkUnnamed3152(core.Map<core.String, core.Object> o) {
+checkUnnamed1316(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1277,17 +1277,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3153() {
+buildUnnamed1317() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3152());
-  o.add(buildUnnamed3152());
+  o.add(buildUnnamed1316());
+  o.add(buildUnnamed1316());
   return o;
 }
 
-checkUnnamed3153(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1317(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3152(o[0]);
-  checkUnnamed3152(o[1]);
+  checkUnnamed1316(o[0]);
+  checkUnnamed1316(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1296,7 +1296,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed3153();
+    o.details = buildUnnamed1317();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1307,7 +1307,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed3153(o.details);
+    checkUnnamed1317(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -1353,14 +1353,14 @@
   buildCounterTimeInterval--;
 }
 
-buildUnnamed3154() {
+buildUnnamed1318() {
   var o = new core.List<api.Point>();
   o.add(buildPoint());
   o.add(buildPoint());
   return o;
 }
 
-checkUnnamed3154(core.List<api.Point> o) {
+checkUnnamed1318(core.List<api.Point> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPoint(o[0]);
   checkPoint(o[1]);
@@ -1374,7 +1374,7 @@
     o.metadata = buildMonitoredResourceMetadata();
     o.metric = buildMetric();
     o.metricKind = "foo";
-    o.points = buildUnnamed3154();
+    o.points = buildUnnamed1318();
     o.resource = buildMonitoredResource();
     o.valueType = "foo";
   }
@@ -1388,47 +1388,47 @@
     checkMonitoredResourceMetadata(o.metadata);
     checkMetric(o.metric);
     unittest.expect(o.metricKind, unittest.equals('foo'));
-    checkUnnamed3154(o.points);
+    checkUnnamed1318(o.points);
     checkMonitoredResource(o.resource);
     unittest.expect(o.valueType, unittest.equals('foo'));
   }
   buildCounterTimeSeries--;
 }
 
-buildUnnamed3155() {
+buildUnnamed1319() {
   var o = new core.List<api.Field>();
   o.add(buildField());
   o.add(buildField());
   return o;
 }
 
-checkUnnamed3155(core.List<api.Field> o) {
+checkUnnamed1319(core.List<api.Field> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkField(o[0]);
   checkField(o[1]);
 }
 
-buildUnnamed3156() {
+buildUnnamed1320() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3156(core.List<core.String> o) {
+checkUnnamed1320(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3157() {
+buildUnnamed1321() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3157(core.List<api.Option> o) {
+checkUnnamed1321(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -1439,10 +1439,10 @@
   var o = new api.Type();
   buildCounterType++;
   if (buildCounterType < 3) {
-    o.fields = buildUnnamed3155();
+    o.fields = buildUnnamed1319();
     o.name = "foo";
-    o.oneofs = buildUnnamed3156();
-    o.options = buildUnnamed3157();
+    o.oneofs = buildUnnamed1320();
+    o.options = buildUnnamed1321();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
   }
@@ -1453,10 +1453,10 @@
 checkType(api.Type o) {
   buildCounterType++;
   if (buildCounterType < 3) {
-    checkUnnamed3155(o.fields);
+    checkUnnamed1319(o.fields);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3156(o.oneofs);
-    checkUnnamed3157(o.options);
+    checkUnnamed1320(o.oneofs);
+    checkUnnamed1321(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
   }
@@ -1490,40 +1490,40 @@
   buildCounterTypedValue--;
 }
 
-buildUnnamed3158() {
+buildUnnamed1322() {
   var o = new core.List<api.ContentMatcher>();
   o.add(buildContentMatcher());
   o.add(buildContentMatcher());
   return o;
 }
 
-checkUnnamed3158(core.List<api.ContentMatcher> o) {
+checkUnnamed1322(core.List<api.ContentMatcher> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContentMatcher(o[0]);
   checkContentMatcher(o[1]);
 }
 
-buildUnnamed3159() {
+buildUnnamed1323() {
   var o = new core.List<api.InternalChecker>();
   o.add(buildInternalChecker());
   o.add(buildInternalChecker());
   return o;
 }
 
-checkUnnamed3159(core.List<api.InternalChecker> o) {
+checkUnnamed1323(core.List<api.InternalChecker> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInternalChecker(o[0]);
   checkInternalChecker(o[1]);
 }
 
-buildUnnamed3160() {
+buildUnnamed1324() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3160(core.List<core.String> o) {
+checkUnnamed1324(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1534,16 +1534,16 @@
   var o = new api.UptimeCheckConfig();
   buildCounterUptimeCheckConfig++;
   if (buildCounterUptimeCheckConfig < 3) {
-    o.contentMatchers = buildUnnamed3158();
+    o.contentMatchers = buildUnnamed1322();
     o.displayName = "foo";
     o.httpCheck = buildHttpCheck();
-    o.internalCheckers = buildUnnamed3159();
+    o.internalCheckers = buildUnnamed1323();
     o.isInternal = true;
     o.monitoredResource = buildMonitoredResource();
     o.name = "foo";
     o.period = "foo";
     o.resourceGroup = buildResourceGroup();
-    o.selectedRegions = buildUnnamed3160();
+    o.selectedRegions = buildUnnamed1324();
     o.tcpCheck = buildTcpCheck();
     o.timeout = "foo";
   }
@@ -1554,16 +1554,16 @@
 checkUptimeCheckConfig(api.UptimeCheckConfig o) {
   buildCounterUptimeCheckConfig++;
   if (buildCounterUptimeCheckConfig < 3) {
-    checkUnnamed3158(o.contentMatchers);
+    checkUnnamed1322(o.contentMatchers);
     unittest.expect(o.displayName, unittest.equals('foo'));
     checkHttpCheck(o.httpCheck);
-    checkUnnamed3159(o.internalCheckers);
+    checkUnnamed1323(o.internalCheckers);
     unittest.expect(o.isInternal, unittest.isTrue);
     checkMonitoredResource(o.monitoredResource);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.period, unittest.equals('foo'));
     checkResourceGroup(o.resourceGroup);
-    checkUnnamed3160(o.selectedRegions);
+    checkUnnamed1324(o.selectedRegions);
     checkTcpCheck(o.tcpCheck);
     unittest.expect(o.timeout, unittest.equals('foo'));
   }
@@ -1593,14 +1593,14 @@
   buildCounterUptimeCheckIp--;
 }
 
-buildUnnamed3161() {
+buildUnnamed1325() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3161(core.List<core.String> o) {
+checkUnnamed1325(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2018,8 +2018,9 @@
         var resp = convert.JSON.encode(buildCreateCollectdTimeSeriesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, arg_name, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.CreateCollectdTimeSeriesResponse response) {
+      res
+          .create(arg_request, arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkCreateCollectdTimeSeriesResponse(response);
       })));
     });
@@ -2081,7 +2082,7 @@
       res
           .create(arg_request, arg_name,
               validateOnly: arg_validateOnly, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Group response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroup(response);
       })));
     });
@@ -2133,7 +2134,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2185,7 +2186,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Group response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroup(response);
       })));
     });
@@ -2258,7 +2259,7 @@
               childrenOfGroup: arg_childrenOfGroup,
               descendantsOfGroup: arg_descendantsOfGroup,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListGroupsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListGroupsResponse(response);
       })));
     });
@@ -2318,7 +2319,7 @@
       res
           .update(arg_request, arg_name,
               validateOnly: arg_validateOnly, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Group response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroup(response);
       })));
     });
@@ -2392,7 +2393,7 @@
               interval_startTime: arg_interval_startTime,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListGroupMembersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListGroupMembersResponse(response);
       })));
     });
@@ -2450,7 +2451,7 @@
       }), true);
       res
           .create(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MetricDescriptor response) {
+          .then(unittest.expectAsync1(((response) {
         checkMetricDescriptor(response);
       })));
     });
@@ -2502,7 +2503,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2554,7 +2555,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MetricDescriptor response) {
+          .then(unittest.expectAsync1(((response) {
         checkMetricDescriptor(response);
       })));
     });
@@ -2618,8 +2619,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListMetricDescriptorsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListMetricDescriptorsResponse(response);
       })));
     });
@@ -2672,8 +2672,9 @@
         var resp = convert.JSON.encode(buildMonitoredResourceDescriptor());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.MonitoredResourceDescriptor response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkMonitoredResourceDescriptor(response);
       })));
     });
@@ -2738,8 +2739,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ListMonitoredResourceDescriptorsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListMonitoredResourceDescriptorsResponse(response);
       })));
     });
@@ -2797,7 +2797,7 @@
       }), true);
       res
           .create(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2807,7 +2807,7 @@
       api.ProjectsTimeSeriesResourceApi res =
           new api.MonitoringApi(mock).projects.timeSeries;
       var arg_name = "foo";
-      var arg_aggregation_groupByFields = buildUnnamed3161();
+      var arg_aggregation_groupByFields = buildUnnamed1325();
       var arg_interval_endTime = "foo";
       var arg_aggregation_alignmentPeriod = "foo";
       var arg_pageSize = 42;
@@ -2893,7 +2893,7 @@
               interval_startTime: arg_interval_startTime,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTimeSeriesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTimeSeriesResponse(response);
       })));
     });
@@ -2951,7 +2951,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UptimeCheckConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkUptimeCheckConfig(response);
       })));
     });
@@ -3003,7 +3003,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3055,7 +3055,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UptimeCheckConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkUptimeCheckConfig(response);
       })));
     });
@@ -3116,8 +3116,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListUptimeCheckConfigsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListUptimeCheckConfigsResponse(response);
       })));
     });
@@ -3177,7 +3176,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UptimeCheckConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkUptimeCheckConfig(response);
       })));
     });
@@ -3238,8 +3237,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListUptimeCheckIpsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListUptimeCheckIpsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/oauth2/v2_test.dart b/generated/googleapis/test/oauth2/v2_test.dart
index 7a204ec..331728e 100644
--- a/generated/googleapis/test/oauth2/v2_test.dart
+++ b/generated/googleapis/test/oauth2/v2_test.dart
@@ -79,14 +79,14 @@
   buildCounterJwkKeys--;
 }
 
-buildUnnamed1924() {
+buildUnnamed3563() {
   var o = new core.List<api.JwkKeys>();
   o.add(buildJwkKeys());
   o.add(buildJwkKeys());
   return o;
 }
 
-checkUnnamed1924(core.List<api.JwkKeys> o) {
+checkUnnamed3563(core.List<api.JwkKeys> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJwkKeys(o[0]);
   checkJwkKeys(o[1]);
@@ -97,7 +97,7 @@
   var o = new api.Jwk();
   buildCounterJwk++;
   if (buildCounterJwk < 3) {
-    o.keys = buildUnnamed1924();
+    o.keys = buildUnnamed3563();
   }
   buildCounterJwk--;
   return o;
@@ -106,7 +106,7 @@
 checkJwk(api.Jwk o) {
   buildCounterJwk++;
   if (buildCounterJwk < 3) {
-    checkUnnamed1924(o.keys);
+    checkUnnamed3563(o.keys);
   }
   buildCounterJwk--;
 }
@@ -263,7 +263,7 @@
       }), true);
       res
           .getCertForOpenIdConnect($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Jwk response) {
+          .then(unittest.expectAsync1(((response) {
         checkJwk(response);
       })));
     });
@@ -325,7 +325,7 @@
               idToken: arg_idToken,
               tokenHandle: arg_tokenHandle,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Tokeninfo response) {
+          .then(unittest.expectAsync1(((response) {
         checkTokeninfo(response);
       })));
     });
@@ -374,9 +374,7 @@
         var resp = convert.JSON.encode(buildUserinfoplus());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .get($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Userinfoplus response) {
+      res.get($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkUserinfoplus(response);
       })));
     });
@@ -425,9 +423,7 @@
         var resp = convert.JSON.encode(buildUserinfoplus());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .get($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Userinfoplus response) {
+      res.get($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkUserinfoplus(response);
       })));
     });
diff --git a/generated/googleapis/test/oslogin/v1_test.dart b/generated/googleapis/test/oslogin/v1_test.dart
index ed73950..e4797d1 100644
--- a/generated/googleapis/test/oslogin/v1_test.dart
+++ b/generated/googleapis/test/oslogin/v1_test.dart
@@ -84,27 +84,27 @@
   buildCounterImportSshPublicKeyResponse--;
 }
 
-buildUnnamed30() {
+buildUnnamed1435() {
   var o = new core.List<api.PosixAccount>();
   o.add(buildPosixAccount());
   o.add(buildPosixAccount());
   return o;
 }
 
-checkUnnamed30(core.List<api.PosixAccount> o) {
+checkUnnamed1435(core.List<api.PosixAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPosixAccount(o[0]);
   checkPosixAccount(o[1]);
 }
 
-buildUnnamed31() {
+buildUnnamed1436() {
   var o = new core.Map<core.String, api.SshPublicKey>();
   o["x"] = buildSshPublicKey();
   o["y"] = buildSshPublicKey();
   return o;
 }
 
-checkUnnamed31(core.Map<core.String, api.SshPublicKey> o) {
+checkUnnamed1436(core.Map<core.String, api.SshPublicKey> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSshPublicKey(o["x"]);
   checkSshPublicKey(o["y"]);
@@ -116,8 +116,8 @@
   buildCounterLoginProfile++;
   if (buildCounterLoginProfile < 3) {
     o.name = "foo";
-    o.posixAccounts = buildUnnamed30();
-    o.sshPublicKeys = buildUnnamed31();
+    o.posixAccounts = buildUnnamed1435();
+    o.sshPublicKeys = buildUnnamed1436();
   }
   buildCounterLoginProfile--;
   return o;
@@ -127,8 +127,8 @@
   buildCounterLoginProfile++;
   if (buildCounterLoginProfile < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed30(o.posixAccounts);
-    checkUnnamed31(o.sshPublicKeys);
+    checkUnnamed1435(o.posixAccounts);
+    checkUnnamed1436(o.sshPublicKeys);
   }
   buildCounterLoginProfile--;
 }
@@ -279,7 +279,7 @@
       }), true);
       res
           .getLoginProfile(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LoginProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkLoginProfile(response);
       })));
     });
@@ -338,8 +338,7 @@
       res
           .importSshPublicKey(arg_request, arg_parent,
               projectId: arg_projectId, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ImportSshPublicKeyResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkImportSshPublicKeyResponse(response);
       })));
     });
@@ -393,7 +392,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -447,7 +446,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -499,7 +498,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SshPublicKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkSshPublicKey(response);
       })));
     });
@@ -559,7 +558,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SshPublicKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkSshPublicKey(response);
       })));
     });
diff --git a/generated/googleapis/test/pagespeedonline/v1_test.dart b/generated/googleapis/test/pagespeedonline/v1_test.dart
index 67e93fa..ac73577 100644
--- a/generated/googleapis/test/pagespeedonline/v1_test.dart
+++ b/generated/googleapis/test/pagespeedonline/v1_test.dart
@@ -75,7 +75,7 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs--;
 }
 
-buildUnnamed2609() {
+buildUnnamed1680() {
   var o = new core
       .List<api.ResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs());
@@ -83,7 +83,7 @@
   return o;
 }
 
-checkUnnamed2609(
+checkUnnamed1680(
     core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksHeaderArgs>
         o) {
   unittest.expect(o, unittest.hasLength(2));
@@ -96,7 +96,7 @@
   var o = new api.ResultFormattedResultsRuleResultsValueUrlBlocksHeader();
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeader++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeader < 3) {
-    o.args = buildUnnamed2609();
+    o.args = buildUnnamed1680();
     o.format = "foo";
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeader--;
@@ -107,7 +107,7 @@
     api.ResultFormattedResultsRuleResultsValueUrlBlocksHeader o) {
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeader++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeader < 3) {
-    checkUnnamed2609(o.args);
+    checkUnnamed1680(o.args);
     unittest.expect(o.format, unittest.equals('foo'));
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksHeader--;
@@ -140,7 +140,7 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs--;
 }
 
-buildUnnamed2610() {
+buildUnnamed1681() {
   var o = new core.List<
       api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs());
@@ -148,7 +148,7 @@
   return o;
 }
 
-checkUnnamed2610(
+checkUnnamed1681(
     core.List<
             api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetailsArgs>
         o) {
@@ -164,7 +164,7 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails <
       3) {
-    o.args = buildUnnamed2610();
+    o.args = buildUnnamed1681();
     o.format = "foo";
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails--;
@@ -176,13 +176,13 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails <
       3) {
-    checkUnnamed2610(o.args);
+    checkUnnamed1681(o.args);
     unittest.expect(o.format, unittest.equals('foo'));
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails--;
 }
 
-buildUnnamed2611() {
+buildUnnamed1682() {
   var o = new core
       .List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails());
@@ -190,7 +190,7 @@
   return o;
 }
 
-checkUnnamed2611(
+checkUnnamed1682(
     core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsDetails>
         o) {
   unittest.expect(o, unittest.hasLength(2));
@@ -225,7 +225,7 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs--;
 }
 
-buildUnnamed2612() {
+buildUnnamed1683() {
   var o = new core.List<
       api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs());
@@ -233,7 +233,7 @@
   return o;
 }
 
-checkUnnamed2612(
+checkUnnamed1683(
     core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrlsResultArgs>
         o) {
   unittest.expect(o, unittest.hasLength(2));
@@ -248,7 +248,7 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult <
       3) {
-    o.args = buildUnnamed2612();
+    o.args = buildUnnamed1683();
     o.format = "foo";
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult--;
@@ -260,7 +260,7 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult <
       3) {
-    checkUnnamed2612(o.args);
+    checkUnnamed1683(o.args);
     unittest.expect(o.format, unittest.equals('foo'));
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult--;
@@ -271,7 +271,7 @@
   var o = new api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls();
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls < 3) {
-    o.details = buildUnnamed2611();
+    o.details = buildUnnamed1682();
     o.result = buildResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult();
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls--;
@@ -282,13 +282,13 @@
     api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls o) {
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls < 3) {
-    checkUnnamed2611(o.details);
+    checkUnnamed1682(o.details);
     checkResultFormattedResultsRuleResultsValueUrlBlocksUrlsResult(o.result);
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls--;
 }
 
-buildUnnamed2613() {
+buildUnnamed1684() {
   var o =
       new core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrls());
@@ -296,7 +296,7 @@
   return o;
 }
 
-checkUnnamed2613(
+checkUnnamed1684(
     core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValueUrlBlocksUrls(o[0]);
@@ -309,7 +309,7 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocks < 3) {
     o.header = buildResultFormattedResultsRuleResultsValueUrlBlocksHeader();
-    o.urls = buildUnnamed2613();
+    o.urls = buildUnnamed1684();
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks--;
   return o;
@@ -320,19 +320,19 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocks < 3) {
     checkResultFormattedResultsRuleResultsValueUrlBlocksHeader(o.header);
-    checkUnnamed2613(o.urls);
+    checkUnnamed1684(o.urls);
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks--;
 }
 
-buildUnnamed2614() {
+buildUnnamed1685() {
   var o = new core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocks>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocks());
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocks());
   return o;
 }
 
-checkUnnamed2614(
+checkUnnamed1685(
     core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocks> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValueUrlBlocks(o[0]);
@@ -346,7 +346,7 @@
   if (buildCounterResultFormattedResultsRuleResultsValue < 3) {
     o.localizedRuleName = "foo";
     o.ruleImpact = 42.0;
-    o.urlBlocks = buildUnnamed2614();
+    o.urlBlocks = buildUnnamed1685();
   }
   buildCounterResultFormattedResultsRuleResultsValue--;
   return o;
@@ -358,12 +358,12 @@
   if (buildCounterResultFormattedResultsRuleResultsValue < 3) {
     unittest.expect(o.localizedRuleName, unittest.equals('foo'));
     unittest.expect(o.ruleImpact, unittest.equals(42.0));
-    checkUnnamed2614(o.urlBlocks);
+    checkUnnamed1685(o.urlBlocks);
   }
   buildCounterResultFormattedResultsRuleResultsValue--;
 }
 
-buildUnnamed2615() {
+buildUnnamed1686() {
   var o =
       new core.Map<core.String, api.ResultFormattedResultsRuleResultsValue>();
   o["x"] = buildResultFormattedResultsRuleResultsValue();
@@ -371,7 +371,7 @@
   return o;
 }
 
-checkUnnamed2615(
+checkUnnamed1686(
     core.Map<core.String, api.ResultFormattedResultsRuleResultsValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValue(o["x"]);
@@ -384,7 +384,7 @@
   buildCounterResultFormattedResults++;
   if (buildCounterResultFormattedResults < 3) {
     o.locale = "foo";
-    o.ruleResults = buildUnnamed2615();
+    o.ruleResults = buildUnnamed1686();
   }
   buildCounterResultFormattedResults--;
   return o;
@@ -394,19 +394,19 @@
   buildCounterResultFormattedResults++;
   if (buildCounterResultFormattedResults < 3) {
     unittest.expect(o.locale, unittest.equals('foo'));
-    checkUnnamed2615(o.ruleResults);
+    checkUnnamed1686(o.ruleResults);
   }
   buildCounterResultFormattedResults--;
 }
 
-buildUnnamed2616() {
+buildUnnamed1687() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2616(core.List<core.String> o) {
+checkUnnamed1687(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -509,7 +509,7 @@
     o.captchaResult = "foo";
     o.formattedResults = buildResultFormattedResults();
     o.id = "foo";
-    o.invalidRules = buildUnnamed2616();
+    o.invalidRules = buildUnnamed1687();
     o.kind = "foo";
     o.pageStats = buildResultPageStats();
     o.responseCode = 42;
@@ -528,7 +528,7 @@
     unittest.expect(o.captchaResult, unittest.equals('foo'));
     checkResultFormattedResults(o.formattedResults);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2616(o.invalidRules);
+    checkUnnamed1687(o.invalidRules);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkResultPageStats(o.pageStats);
     unittest.expect(o.responseCode, unittest.equals(42));
@@ -540,14 +540,14 @@
   buildCounterResult--;
 }
 
-buildUnnamed2617() {
+buildUnnamed1688() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2617(core.List<core.String> o) {
+checkUnnamed1688(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -705,7 +705,7 @@
       var arg_url = "foo";
       var arg_filterThirdPartyResources = true;
       var arg_locale = "foo";
-      var arg_rule = buildUnnamed2617();
+      var arg_rule = buildUnnamed1688();
       var arg_screenshot = true;
       var arg_strategy = "foo";
       var arg_$fields = "foo";
@@ -767,7 +767,7 @@
               screenshot: arg_screenshot,
               strategy: arg_strategy,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Result response) {
+          .then(unittest.expectAsync1(((response) {
         checkResult(response);
       })));
     });
diff --git a/generated/googleapis/test/pagespeedonline/v2_test.dart b/generated/googleapis/test/pagespeedonline/v2_test.dart
index b988412..df609f9 100644
--- a/generated/googleapis/test/pagespeedonline/v2_test.dart
+++ b/generated/googleapis/test/pagespeedonline/v2_test.dart
@@ -76,14 +76,14 @@
   buildCounterPagespeedApiFormatStringV2ArgsRects--;
 }
 
-buildUnnamed3012() {
+buildUnnamed188() {
   var o = new core.List<api.PagespeedApiFormatStringV2ArgsRects>();
   o.add(buildPagespeedApiFormatStringV2ArgsRects());
   o.add(buildPagespeedApiFormatStringV2ArgsRects());
   return o;
 }
 
-checkUnnamed3012(core.List<api.PagespeedApiFormatStringV2ArgsRects> o) {
+checkUnnamed188(core.List<api.PagespeedApiFormatStringV2ArgsRects> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPagespeedApiFormatStringV2ArgsRects(o[0]);
   checkPagespeedApiFormatStringV2ArgsRects(o[1]);
@@ -115,15 +115,14 @@
   buildCounterPagespeedApiFormatStringV2ArgsSecondaryRects--;
 }
 
-buildUnnamed3013() {
+buildUnnamed189() {
   var o = new core.List<api.PagespeedApiFormatStringV2ArgsSecondaryRects>();
   o.add(buildPagespeedApiFormatStringV2ArgsSecondaryRects());
   o.add(buildPagespeedApiFormatStringV2ArgsSecondaryRects());
   return o;
 }
 
-checkUnnamed3013(
-    core.List<api.PagespeedApiFormatStringV2ArgsSecondaryRects> o) {
+checkUnnamed189(core.List<api.PagespeedApiFormatStringV2ArgsSecondaryRects> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPagespeedApiFormatStringV2ArgsSecondaryRects(o[0]);
   checkPagespeedApiFormatStringV2ArgsSecondaryRects(o[1]);
@@ -135,8 +134,8 @@
   buildCounterPagespeedApiFormatStringV2Args++;
   if (buildCounterPagespeedApiFormatStringV2Args < 3) {
     o.key = "foo";
-    o.rects = buildUnnamed3012();
-    o.secondaryRects = buildUnnamed3013();
+    o.rects = buildUnnamed188();
+    o.secondaryRects = buildUnnamed189();
     o.type = "foo";
     o.value = "foo";
   }
@@ -148,22 +147,22 @@
   buildCounterPagespeedApiFormatStringV2Args++;
   if (buildCounterPagespeedApiFormatStringV2Args < 3) {
     unittest.expect(o.key, unittest.equals('foo'));
-    checkUnnamed3012(o.rects);
-    checkUnnamed3013(o.secondaryRects);
+    checkUnnamed188(o.rects);
+    checkUnnamed189(o.secondaryRects);
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterPagespeedApiFormatStringV2Args--;
 }
 
-buildUnnamed3014() {
+buildUnnamed190() {
   var o = new core.List<api.PagespeedApiFormatStringV2Args>();
   o.add(buildPagespeedApiFormatStringV2Args());
   o.add(buildPagespeedApiFormatStringV2Args());
   return o;
 }
 
-checkUnnamed3014(core.List<api.PagespeedApiFormatStringV2Args> o) {
+checkUnnamed190(core.List<api.PagespeedApiFormatStringV2Args> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPagespeedApiFormatStringV2Args(o[0]);
   checkPagespeedApiFormatStringV2Args(o[1]);
@@ -174,7 +173,7 @@
   var o = new api.PagespeedApiFormatStringV2();
   buildCounterPagespeedApiFormatStringV2++;
   if (buildCounterPagespeedApiFormatStringV2 < 3) {
-    o.args = buildUnnamed3014();
+    o.args = buildUnnamed190();
     o.format = "foo";
   }
   buildCounterPagespeedApiFormatStringV2--;
@@ -184,7 +183,7 @@
 checkPagespeedApiFormatStringV2(api.PagespeedApiFormatStringV2 o) {
   buildCounterPagespeedApiFormatStringV2++;
   if (buildCounterPagespeedApiFormatStringV2 < 3) {
-    checkUnnamed3014(o.args);
+    checkUnnamed190(o.args);
     unittest.expect(o.format, unittest.equals('foo'));
   }
   buildCounterPagespeedApiFormatStringV2--;
@@ -244,27 +243,27 @@
   buildCounterPagespeedApiImageV2--;
 }
 
-buildUnnamed3015() {
+buildUnnamed191() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3015(core.List<core.String> o) {
+checkUnnamed191(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3016() {
+buildUnnamed192() {
   var o = new core.List<api.PagespeedApiFormatStringV2>();
   o.add(buildPagespeedApiFormatStringV2());
   o.add(buildPagespeedApiFormatStringV2());
   return o;
 }
 
-checkUnnamed3016(core.List<api.PagespeedApiFormatStringV2> o) {
+checkUnnamed192(core.List<api.PagespeedApiFormatStringV2> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPagespeedApiFormatStringV2(o[0]);
   checkPagespeedApiFormatStringV2(o[1]);
@@ -275,7 +274,7 @@
   var o = new api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls();
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls < 3) {
-    o.details = buildUnnamed3016();
+    o.details = buildUnnamed192();
     o.result = buildPagespeedApiFormatStringV2();
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls--;
@@ -286,13 +285,13 @@
     api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls o) {
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls < 3) {
-    checkUnnamed3016(o.details);
+    checkUnnamed192(o.details);
     checkPagespeedApiFormatStringV2(o.result);
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocksUrls--;
 }
 
-buildUnnamed3017() {
+buildUnnamed193() {
   var o =
       new core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocksUrls());
@@ -300,7 +299,7 @@
   return o;
 }
 
-checkUnnamed3017(
+checkUnnamed193(
     core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocksUrls> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValueUrlBlocksUrls(o[0]);
@@ -313,7 +312,7 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocks < 3) {
     o.header = buildPagespeedApiFormatStringV2();
-    o.urls = buildUnnamed3017();
+    o.urls = buildUnnamed193();
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks--;
   return o;
@@ -324,19 +323,19 @@
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks++;
   if (buildCounterResultFormattedResultsRuleResultsValueUrlBlocks < 3) {
     checkPagespeedApiFormatStringV2(o.header);
-    checkUnnamed3017(o.urls);
+    checkUnnamed193(o.urls);
   }
   buildCounterResultFormattedResultsRuleResultsValueUrlBlocks--;
 }
 
-buildUnnamed3018() {
+buildUnnamed194() {
   var o = new core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocks>();
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocks());
   o.add(buildResultFormattedResultsRuleResultsValueUrlBlocks());
   return o;
 }
 
-checkUnnamed3018(
+checkUnnamed194(
     core.List<api.ResultFormattedResultsRuleResultsValueUrlBlocks> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValueUrlBlocks(o[0]);
@@ -348,11 +347,11 @@
   var o = new api.ResultFormattedResultsRuleResultsValue();
   buildCounterResultFormattedResultsRuleResultsValue++;
   if (buildCounterResultFormattedResultsRuleResultsValue < 3) {
-    o.groups = buildUnnamed3015();
+    o.groups = buildUnnamed191();
     o.localizedRuleName = "foo";
     o.ruleImpact = 42.0;
     o.summary = buildPagespeedApiFormatStringV2();
-    o.urlBlocks = buildUnnamed3018();
+    o.urlBlocks = buildUnnamed194();
   }
   buildCounterResultFormattedResultsRuleResultsValue--;
   return o;
@@ -362,16 +361,16 @@
     api.ResultFormattedResultsRuleResultsValue o) {
   buildCounterResultFormattedResultsRuleResultsValue++;
   if (buildCounterResultFormattedResultsRuleResultsValue < 3) {
-    checkUnnamed3015(o.groups);
+    checkUnnamed191(o.groups);
     unittest.expect(o.localizedRuleName, unittest.equals('foo'));
     unittest.expect(o.ruleImpact, unittest.equals(42.0));
     checkPagespeedApiFormatStringV2(o.summary);
-    checkUnnamed3018(o.urlBlocks);
+    checkUnnamed194(o.urlBlocks);
   }
   buildCounterResultFormattedResultsRuleResultsValue--;
 }
 
-buildUnnamed3019() {
+buildUnnamed195() {
   var o =
       new core.Map<core.String, api.ResultFormattedResultsRuleResultsValue>();
   o["x"] = buildResultFormattedResultsRuleResultsValue();
@@ -379,7 +378,7 @@
   return o;
 }
 
-checkUnnamed3019(
+checkUnnamed195(
     core.Map<core.String, api.ResultFormattedResultsRuleResultsValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultFormattedResultsRuleResultsValue(o["x"]);
@@ -392,7 +391,7 @@
   buildCounterResultFormattedResults++;
   if (buildCounterResultFormattedResults < 3) {
     o.locale = "foo";
-    o.ruleResults = buildUnnamed3019();
+    o.ruleResults = buildUnnamed195();
   }
   buildCounterResultFormattedResults--;
   return o;
@@ -402,19 +401,19 @@
   buildCounterResultFormattedResults++;
   if (buildCounterResultFormattedResults < 3) {
     unittest.expect(o.locale, unittest.equals('foo'));
-    checkUnnamed3019(o.ruleResults);
+    checkUnnamed195(o.ruleResults);
   }
   buildCounterResultFormattedResults--;
 }
 
-buildUnnamed3020() {
+buildUnnamed196() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3020(core.List<core.String> o) {
+checkUnnamed196(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -482,14 +481,14 @@
   buildCounterResultRuleGroupsValue--;
 }
 
-buildUnnamed3021() {
+buildUnnamed197() {
   var o = new core.Map<core.String, api.ResultRuleGroupsValue>();
   o["x"] = buildResultRuleGroupsValue();
   o["y"] = buildResultRuleGroupsValue();
   return o;
 }
 
-checkUnnamed3021(core.Map<core.String, api.ResultRuleGroupsValue> o) {
+checkUnnamed197(core.Map<core.String, api.ResultRuleGroupsValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultRuleGroupsValue(o["x"]);
   checkResultRuleGroupsValue(o["y"]);
@@ -524,11 +523,11 @@
     o.captchaResult = "foo";
     o.formattedResults = buildResultFormattedResults();
     o.id = "foo";
-    o.invalidRules = buildUnnamed3020();
+    o.invalidRules = buildUnnamed196();
     o.kind = "foo";
     o.pageStats = buildResultPageStats();
     o.responseCode = 42;
-    o.ruleGroups = buildUnnamed3021();
+    o.ruleGroups = buildUnnamed197();
     o.screenshot = buildPagespeedApiImageV2();
     o.title = "foo";
     o.version = buildResultVersion();
@@ -543,11 +542,11 @@
     unittest.expect(o.captchaResult, unittest.equals('foo'));
     checkResultFormattedResults(o.formattedResults);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed3020(o.invalidRules);
+    checkUnnamed196(o.invalidRules);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkResultPageStats(o.pageStats);
     unittest.expect(o.responseCode, unittest.equals(42));
-    checkUnnamed3021(o.ruleGroups);
+    checkUnnamed197(o.ruleGroups);
     checkPagespeedApiImageV2(o.screenshot);
     unittest.expect(o.title, unittest.equals('foo'));
     checkResultVersion(o.version);
@@ -555,14 +554,14 @@
   buildCounterResult--;
 }
 
-buildUnnamed3022() {
+buildUnnamed198() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3022(core.List<core.String> o) {
+checkUnnamed198(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -696,7 +695,7 @@
       var arg_url = "foo";
       var arg_filterThirdPartyResources = true;
       var arg_locale = "foo";
-      var arg_rule = buildUnnamed3022();
+      var arg_rule = buildUnnamed198();
       var arg_screenshot = true;
       var arg_strategy = "foo";
       var arg_$fields = "foo";
@@ -758,7 +757,7 @@
               screenshot: arg_screenshot,
               strategy: arg_strategy,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Result response) {
+          .then(unittest.expectAsync1(((response) {
         checkResult(response);
       })));
     });
diff --git a/generated/googleapis/test/partners/v2_test.dart b/generated/googleapis/test/partners/v2_test.dart
index c90feb6..9dc100a 100644
--- a/generated/googleapis/test/partners/v2_test.dart
+++ b/generated/googleapis/test/partners/v2_test.dart
@@ -96,14 +96,14 @@
   buildCounterAnalytics--;
 }
 
-buildUnnamed1431() {
+buildUnnamed126() {
   var o = new core.List<api.LatLng>();
   o.add(buildLatLng());
   o.add(buildLatLng());
   return o;
 }
 
-checkUnnamed1431(core.List<api.LatLng> o) {
+checkUnnamed126(core.List<api.LatLng> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLatLng(o[0]);
   checkLatLng(o[1]);
@@ -115,7 +115,7 @@
   buildCounterAnalyticsDataPoint++;
   if (buildCounterAnalyticsDataPoint < 3) {
     o.eventCount = 42;
-    o.eventLocations = buildUnnamed1431();
+    o.eventLocations = buildUnnamed126();
   }
   buildCounterAnalyticsDataPoint--;
   return o;
@@ -125,7 +125,7 @@
   buildCounterAnalyticsDataPoint++;
   if (buildCounterAnalyticsDataPoint < 3) {
     unittest.expect(o.eventCount, unittest.equals(42));
-    checkUnnamed1431(o.eventLocations);
+    checkUnnamed126(o.eventLocations);
   }
   buildCounterAnalyticsDataPoint--;
 }
@@ -153,27 +153,27 @@
   buildCounterAnalyticsSummary--;
 }
 
-buildUnnamed1432() {
+buildUnnamed127() {
   var o = new core.List<api.CountryOfferInfo>();
   o.add(buildCountryOfferInfo());
   o.add(buildCountryOfferInfo());
   return o;
 }
 
-checkUnnamed1432(core.List<api.CountryOfferInfo> o) {
+checkUnnamed127(core.List<api.CountryOfferInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCountryOfferInfo(o[0]);
   checkCountryOfferInfo(o[1]);
 }
 
-buildUnnamed1433() {
+buildUnnamed128() {
   var o = new core.List<api.OfferCustomer>();
   o.add(buildOfferCustomer());
   o.add(buildOfferCustomer());
   return o;
 }
 
-checkUnnamed1433(core.List<api.OfferCustomer> o) {
+checkUnnamed128(core.List<api.OfferCustomer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOfferCustomer(o[0]);
   checkOfferCustomer(o[1]);
@@ -185,14 +185,14 @@
   buildCounterAvailableOffer++;
   if (buildCounterAvailableOffer < 3) {
     o.available = 42;
-    o.countryOfferInfos = buildUnnamed1432();
+    o.countryOfferInfos = buildUnnamed127();
     o.description = "foo";
     o.id = "foo";
     o.maxAccountAge = 42;
     o.name = "foo";
     o.offerLevel = "foo";
     o.offerType = "foo";
-    o.qualifiedCustomer = buildUnnamed1433();
+    o.qualifiedCustomer = buildUnnamed128();
     o.qualifiedCustomersComplete = true;
     o.showSpecialOfferCopy = true;
     o.terms = "foo";
@@ -205,14 +205,14 @@
   buildCounterAvailableOffer++;
   if (buildCounterAvailableOffer < 3) {
     unittest.expect(o.available, unittest.equals(42));
-    checkUnnamed1432(o.countryOfferInfos);
+    checkUnnamed127(o.countryOfferInfos);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.maxAccountAge, unittest.equals(42));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.offerLevel, unittest.equals('foo'));
     unittest.expect(o.offerType, unittest.equals('foo'));
-    checkUnnamed1433(o.qualifiedCustomer);
+    checkUnnamed128(o.qualifiedCustomer);
     unittest.expect(o.qualifiedCustomersComplete, unittest.isTrue);
     unittest.expect(o.showSpecialOfferCopy, unittest.isTrue);
     unittest.expect(o.terms, unittest.equals('foo'));
@@ -268,14 +268,14 @@
   buildCounterCertificationExamStatus--;
 }
 
-buildUnnamed1434() {
+buildUnnamed129() {
   var o = new core.List<api.CertificationExamStatus>();
   o.add(buildCertificationExamStatus());
   o.add(buildCertificationExamStatus());
   return o;
 }
 
-checkUnnamed1434(core.List<api.CertificationExamStatus> o) {
+checkUnnamed129(core.List<api.CertificationExamStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCertificationExamStatus(o[0]);
   checkCertificationExamStatus(o[1]);
@@ -286,7 +286,7 @@
   var o = new api.CertificationStatus();
   buildCounterCertificationStatus++;
   if (buildCounterCertificationStatus < 3) {
-    o.examStatuses = buildUnnamed1434();
+    o.examStatuses = buildUnnamed129();
     o.isCertified = true;
     o.type = "foo";
     o.userCount = 42;
@@ -298,7 +298,7 @@
 checkCertificationStatus(api.CertificationStatus o) {
   buildCounterCertificationStatus++;
   if (buildCounterCertificationStatus < 3) {
-    checkUnnamed1434(o.examStatuses);
+    checkUnnamed129(o.examStatuses);
     unittest.expect(o.isCertified, unittest.isTrue);
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.userCount, unittest.equals(42));
@@ -306,131 +306,131 @@
   buildCounterCertificationStatus--;
 }
 
-buildUnnamed1435() {
+buildUnnamed130() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1435(core.List<core.String> o) {
+checkUnnamed130(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1436() {
+buildUnnamed131() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1436(core.List<core.String> o) {
+checkUnnamed131(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1437() {
+buildUnnamed132() {
   var o = new core.List<api.CertificationStatus>();
   o.add(buildCertificationStatus());
   o.add(buildCertificationStatus());
   return o;
 }
 
-checkUnnamed1437(core.List<api.CertificationStatus> o) {
+checkUnnamed132(core.List<api.CertificationStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCertificationStatus(o[0]);
   checkCertificationStatus(o[1]);
 }
 
-buildUnnamed1438() {
+buildUnnamed133() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1438(core.List<core.String> o) {
+checkUnnamed133(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1439() {
+buildUnnamed134() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1439(core.List<core.String> o) {
+checkUnnamed134(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1440() {
+buildUnnamed135() {
   var o = new core.List<api.LocalizedCompanyInfo>();
   o.add(buildLocalizedCompanyInfo());
   o.add(buildLocalizedCompanyInfo());
   return o;
 }
 
-checkUnnamed1440(core.List<api.LocalizedCompanyInfo> o) {
+checkUnnamed135(core.List<api.LocalizedCompanyInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocalizedCompanyInfo(o[0]);
   checkLocalizedCompanyInfo(o[1]);
 }
 
-buildUnnamed1441() {
+buildUnnamed136() {
   var o = new core.List<api.Location>();
   o.add(buildLocation());
   o.add(buildLocation());
   return o;
 }
 
-checkUnnamed1441(core.List<api.Location> o) {
+checkUnnamed136(core.List<api.Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocation(o[0]);
   checkLocation(o[1]);
 }
 
-buildUnnamed1442() {
+buildUnnamed137() {
   var o = new core.List<api.Rank>();
   o.add(buildRank());
   o.add(buildRank());
   return o;
 }
 
-checkUnnamed1442(core.List<api.Rank> o) {
+checkUnnamed137(core.List<api.Rank> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRank(o[0]);
   checkRank(o[1]);
 }
 
-buildUnnamed1443() {
+buildUnnamed138() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1443(core.List<core.String> o) {
+checkUnnamed138(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1444() {
+buildUnnamed139() {
   var o = new core.List<api.SpecializationStatus>();
   o.add(buildSpecializationStatus());
   o.add(buildSpecializationStatus());
   return o;
 }
 
-checkUnnamed1444(core.List<api.SpecializationStatus> o) {
+checkUnnamed139(core.List<api.SpecializationStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSpecializationStatus(o[0]);
   checkSpecializationStatus(o[1]);
@@ -441,16 +441,16 @@
   var o = new api.Company();
   buildCounterCompany++;
   if (buildCounterCompany < 3) {
-    o.additionalWebsites = buildUnnamed1435();
-    o.autoApprovalEmailDomains = buildUnnamed1436();
+    o.additionalWebsites = buildUnnamed130();
+    o.autoApprovalEmailDomains = buildUnnamed131();
     o.badgeTier = "foo";
-    o.certificationStatuses = buildUnnamed1437();
-    o.companyTypes = buildUnnamed1438();
+    o.certificationStatuses = buildUnnamed132();
+    o.companyTypes = buildUnnamed133();
     o.convertedMinMonthlyBudget = buildMoney();
     o.id = "foo";
-    o.industries = buildUnnamed1439();
-    o.localizedInfos = buildUnnamed1440();
-    o.locations = buildUnnamed1441();
+    o.industries = buildUnnamed134();
+    o.localizedInfos = buildUnnamed135();
+    o.locations = buildUnnamed136();
     o.name = "foo";
     o.originalMinMonthlyBudget = buildMoney();
     o.primaryAdwordsManagerAccountId = "foo";
@@ -458,9 +458,9 @@
     o.primaryLocation = buildLocation();
     o.profileStatus = "foo";
     o.publicProfile = buildPublicProfile();
-    o.ranks = buildUnnamed1442();
-    o.services = buildUnnamed1443();
-    o.specializationStatus = buildUnnamed1444();
+    o.ranks = buildUnnamed137();
+    o.services = buildUnnamed138();
+    o.specializationStatus = buildUnnamed139();
     o.websiteUrl = "foo";
   }
   buildCounterCompany--;
@@ -470,16 +470,16 @@
 checkCompany(api.Company o) {
   buildCounterCompany++;
   if (buildCounterCompany < 3) {
-    checkUnnamed1435(o.additionalWebsites);
-    checkUnnamed1436(o.autoApprovalEmailDomains);
+    checkUnnamed130(o.additionalWebsites);
+    checkUnnamed131(o.autoApprovalEmailDomains);
     unittest.expect(o.badgeTier, unittest.equals('foo'));
-    checkUnnamed1437(o.certificationStatuses);
-    checkUnnamed1438(o.companyTypes);
+    checkUnnamed132(o.certificationStatuses);
+    checkUnnamed133(o.companyTypes);
     checkMoney(o.convertedMinMonthlyBudget);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1439(o.industries);
-    checkUnnamed1440(o.localizedInfos);
-    checkUnnamed1441(o.locations);
+    checkUnnamed134(o.industries);
+    checkUnnamed135(o.localizedInfos);
+    checkUnnamed136(o.locations);
     unittest.expect(o.name, unittest.equals('foo'));
     checkMoney(o.originalMinMonthlyBudget);
     unittest.expect(o.primaryAdwordsManagerAccountId, unittest.equals('foo'));
@@ -487,35 +487,35 @@
     checkLocation(o.primaryLocation);
     unittest.expect(o.profileStatus, unittest.equals('foo'));
     checkPublicProfile(o.publicProfile);
-    checkUnnamed1442(o.ranks);
-    checkUnnamed1443(o.services);
-    checkUnnamed1444(o.specializationStatus);
+    checkUnnamed137(o.ranks);
+    checkUnnamed138(o.services);
+    checkUnnamed139(o.specializationStatus);
     unittest.expect(o.websiteUrl, unittest.equals('foo'));
   }
   buildCounterCompany--;
 }
 
-buildUnnamed1445() {
+buildUnnamed140() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1445(core.List<core.String> o) {
+checkUnnamed140(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1446() {
+buildUnnamed141() {
   var o = new core.List<api.SpecializationStatus>();
   o.add(buildSpecializationStatus());
   o.add(buildSpecializationStatus());
   return o;
 }
 
-checkUnnamed1446(core.List<api.SpecializationStatus> o) {
+checkUnnamed141(core.List<api.SpecializationStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSpecializationStatus(o[0]);
   checkSpecializationStatus(o[1]);
@@ -541,8 +541,8 @@
     o.primaryCountryCode = "foo";
     o.primaryLanguageCode = "foo";
     o.resolvedTimestamp = "foo";
-    o.segment = buildUnnamed1445();
-    o.specializationStatus = buildUnnamed1446();
+    o.segment = buildUnnamed140();
+    o.specializationStatus = buildUnnamed141();
     o.state = "foo";
     o.website = "foo";
   }
@@ -568,8 +568,8 @@
     unittest.expect(o.primaryCountryCode, unittest.equals('foo'));
     unittest.expect(o.primaryLanguageCode, unittest.equals('foo'));
     unittest.expect(o.resolvedTimestamp, unittest.equals('foo'));
-    checkUnnamed1445(o.segment);
-    checkUnnamed1446(o.specializationStatus);
+    checkUnnamed140(o.segment);
+    checkUnnamed141(o.specializationStatus);
     unittest.expect(o.state, unittest.equals('foo'));
     unittest.expect(o.website, unittest.equals('foo'));
   }
@@ -708,14 +708,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed1447() {
+buildUnnamed142() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1447(core.List<core.String> o) {
+checkUnnamed142(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -727,7 +727,7 @@
   buildCounterEventData++;
   if (buildCounterEventData < 3) {
     o.key = "foo";
-    o.values = buildUnnamed1447();
+    o.values = buildUnnamed142();
   }
   buildCounterEventData--;
   return o;
@@ -737,7 +737,7 @@
   buildCounterEventData++;
   if (buildCounterEventData < 3) {
     unittest.expect(o.key, unittest.equals('foo'));
-    checkUnnamed1447(o.values);
+    checkUnnamed142(o.values);
   }
   buildCounterEventData--;
 }
@@ -873,14 +873,14 @@
   buildCounterLatLng--;
 }
 
-buildUnnamed1448() {
+buildUnnamed143() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1448(core.List<core.String> o) {
+checkUnnamed143(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -897,7 +897,7 @@
     o.email = "foo";
     o.familyName = "foo";
     o.givenName = "foo";
-    o.gpsMotivations = buildUnnamed1448();
+    o.gpsMotivations = buildUnnamed143();
     o.id = "foo";
     o.languageCode = "foo";
     o.marketingOptIn = true;
@@ -920,7 +920,7 @@
     unittest.expect(o.email, unittest.equals('foo'));
     unittest.expect(o.familyName, unittest.equals('foo'));
     unittest.expect(o.givenName, unittest.equals('foo'));
-    checkUnnamed1448(o.gpsMotivations);
+    checkUnnamed143(o.gpsMotivations);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.languageCode, unittest.equals('foo'));
     unittest.expect(o.marketingOptIn, unittest.isTrue);
@@ -933,14 +933,14 @@
   buildCounterLead--;
 }
 
-buildUnnamed1449() {
+buildUnnamed144() {
   var o = new core.List<api.Analytics>();
   o.add(buildAnalytics());
   o.add(buildAnalytics());
   return o;
 }
 
-checkUnnamed1449(core.List<api.Analytics> o) {
+checkUnnamed144(core.List<api.Analytics> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnalytics(o[0]);
   checkAnalytics(o[1]);
@@ -951,7 +951,7 @@
   var o = new api.ListAnalyticsResponse();
   buildCounterListAnalyticsResponse++;
   if (buildCounterListAnalyticsResponse < 3) {
-    o.analytics = buildUnnamed1449();
+    o.analytics = buildUnnamed144();
     o.analyticsSummary = buildAnalyticsSummary();
     o.nextPageToken = "foo";
     o.responseMetadata = buildResponseMetadata();
@@ -963,7 +963,7 @@
 checkListAnalyticsResponse(api.ListAnalyticsResponse o) {
   buildCounterListAnalyticsResponse++;
   if (buildCounterListAnalyticsResponse < 3) {
-    checkUnnamed1449(o.analytics);
+    checkUnnamed144(o.analytics);
     checkAnalyticsSummary(o.analyticsSummary);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkResponseMetadata(o.responseMetadata);
@@ -971,14 +971,14 @@
   buildCounterListAnalyticsResponse--;
 }
 
-buildUnnamed1450() {
+buildUnnamed145() {
   var o = new core.List<api.Company>();
   o.add(buildCompany());
   o.add(buildCompany());
   return o;
 }
 
-checkUnnamed1450(core.List<api.Company> o) {
+checkUnnamed145(core.List<api.Company> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCompany(o[0]);
   checkCompany(o[1]);
@@ -989,7 +989,7 @@
   var o = new api.ListCompaniesResponse();
   buildCounterListCompaniesResponse++;
   if (buildCounterListCompaniesResponse < 3) {
-    o.companies = buildUnnamed1450();
+    o.companies = buildUnnamed145();
     o.nextPageToken = "foo";
     o.responseMetadata = buildResponseMetadata();
   }
@@ -1000,21 +1000,21 @@
 checkListCompaniesResponse(api.ListCompaniesResponse o) {
   buildCounterListCompaniesResponse++;
   if (buildCounterListCompaniesResponse < 3) {
-    checkUnnamed1450(o.companies);
+    checkUnnamed145(o.companies);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkResponseMetadata(o.responseMetadata);
   }
   buildCounterListCompaniesResponse--;
 }
 
-buildUnnamed1451() {
+buildUnnamed146() {
   var o = new core.List<api.Lead>();
   o.add(buildLead());
   o.add(buildLead());
   return o;
 }
 
-checkUnnamed1451(core.List<api.Lead> o) {
+checkUnnamed146(core.List<api.Lead> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLead(o[0]);
   checkLead(o[1]);
@@ -1025,7 +1025,7 @@
   var o = new api.ListLeadsResponse();
   buildCounterListLeadsResponse++;
   if (buildCounterListLeadsResponse < 3) {
-    o.leads = buildUnnamed1451();
+    o.leads = buildUnnamed146();
     o.nextPageToken = "foo";
     o.responseMetadata = buildResponseMetadata();
     o.totalSize = 42;
@@ -1037,7 +1037,7 @@
 checkListLeadsResponse(api.ListLeadsResponse o) {
   buildCounterListLeadsResponse++;
   if (buildCounterListLeadsResponse < 3) {
-    checkUnnamed1451(o.leads);
+    checkUnnamed146(o.leads);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkResponseMetadata(o.responseMetadata);
     unittest.expect(o.totalSize, unittest.equals(42));
@@ -1045,14 +1045,14 @@
   buildCounterListLeadsResponse--;
 }
 
-buildUnnamed1452() {
+buildUnnamed147() {
   var o = new core.List<api.HistoricalOffer>();
   o.add(buildHistoricalOffer());
   o.add(buildHistoricalOffer());
   return o;
 }
 
-checkUnnamed1452(core.List<api.HistoricalOffer> o) {
+checkUnnamed147(core.List<api.HistoricalOffer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistoricalOffer(o[0]);
   checkHistoricalOffer(o[1]);
@@ -1065,7 +1065,7 @@
   if (buildCounterListOffersHistoryResponse < 3) {
     o.canShowEntireCompany = true;
     o.nextPageToken = "foo";
-    o.offers = buildUnnamed1452();
+    o.offers = buildUnnamed147();
     o.responseMetadata = buildResponseMetadata();
     o.showingEntireCompany = true;
     o.totalResults = 42;
@@ -1079,7 +1079,7 @@
   if (buildCounterListOffersHistoryResponse < 3) {
     unittest.expect(o.canShowEntireCompany, unittest.isTrue);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1452(o.offers);
+    checkUnnamed147(o.offers);
     checkResponseMetadata(o.responseMetadata);
     unittest.expect(o.showingEntireCompany, unittest.isTrue);
     unittest.expect(o.totalResults, unittest.equals(42));
@@ -1087,14 +1087,14 @@
   buildCounterListOffersHistoryResponse--;
 }
 
-buildUnnamed1453() {
+buildUnnamed148() {
   var o = new core.List<api.AvailableOffer>();
   o.add(buildAvailableOffer());
   o.add(buildAvailableOffer());
   return o;
 }
 
-checkUnnamed1453(core.List<api.AvailableOffer> o) {
+checkUnnamed148(core.List<api.AvailableOffer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAvailableOffer(o[0]);
   checkAvailableOffer(o[1]);
@@ -1105,7 +1105,7 @@
   var o = new api.ListOffersResponse();
   buildCounterListOffersResponse++;
   if (buildCounterListOffersResponse < 3) {
-    o.availableOffers = buildUnnamed1453();
+    o.availableOffers = buildUnnamed148();
     o.noOfferReason = "foo";
     o.responseMetadata = buildResponseMetadata();
   }
@@ -1116,21 +1116,21 @@
 checkListOffersResponse(api.ListOffersResponse o) {
   buildCounterListOffersResponse++;
   if (buildCounterListOffersResponse < 3) {
-    checkUnnamed1453(o.availableOffers);
+    checkUnnamed148(o.availableOffers);
     unittest.expect(o.noOfferReason, unittest.equals('foo'));
     checkResponseMetadata(o.responseMetadata);
   }
   buildCounterListOffersResponse--;
 }
 
-buildUnnamed1454() {
+buildUnnamed149() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1454(core.List<core.String> o) {
+checkUnnamed149(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1142,7 +1142,7 @@
   buildCounterListUserStatesResponse++;
   if (buildCounterListUserStatesResponse < 3) {
     o.responseMetadata = buildResponseMetadata();
-    o.userStates = buildUnnamed1454();
+    o.userStates = buildUnnamed149();
   }
   buildCounterListUserStatesResponse--;
   return o;
@@ -1152,19 +1152,19 @@
   buildCounterListUserStatesResponse++;
   if (buildCounterListUserStatesResponse < 3) {
     checkResponseMetadata(o.responseMetadata);
-    checkUnnamed1454(o.userStates);
+    checkUnnamed149(o.userStates);
   }
   buildCounterListUserStatesResponse--;
 }
 
-buildUnnamed1455() {
+buildUnnamed150() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1455(core.List<core.String> o) {
+checkUnnamed150(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1175,7 +1175,7 @@
   var o = new api.LocalizedCompanyInfo();
   buildCounterLocalizedCompanyInfo++;
   if (buildCounterLocalizedCompanyInfo < 3) {
-    o.countryCodes = buildUnnamed1455();
+    o.countryCodes = buildUnnamed150();
     o.displayName = "foo";
     o.languageCode = "foo";
     o.overview = "foo";
@@ -1187,7 +1187,7 @@
 checkLocalizedCompanyInfo(api.LocalizedCompanyInfo o) {
   buildCounterLocalizedCompanyInfo++;
   if (buildCounterLocalizedCompanyInfo < 3) {
-    checkUnnamed1455(o.countryCodes);
+    checkUnnamed150(o.countryCodes);
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.languageCode, unittest.equals('foo'));
     unittest.expect(o.overview, unittest.equals('foo'));
@@ -1195,14 +1195,14 @@
   buildCounterLocalizedCompanyInfo--;
 }
 
-buildUnnamed1456() {
+buildUnnamed151() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1456(core.List<core.String> o) {
+checkUnnamed151(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1214,7 +1214,7 @@
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
     o.address = "foo";
-    o.addressLine = buildUnnamed1456();
+    o.addressLine = buildUnnamed151();
     o.administrativeArea = "foo";
     o.dependentLocality = "foo";
     o.languageCode = "foo";
@@ -1232,7 +1232,7 @@
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
     unittest.expect(o.address, unittest.equals('foo'));
-    checkUnnamed1456(o.addressLine);
+    checkUnnamed151(o.addressLine);
     unittest.expect(o.administrativeArea, unittest.equals('foo'));
     unittest.expect(o.dependentLocality, unittest.equals('foo'));
     unittest.expect(o.languageCode, unittest.equals('foo'));
@@ -1245,14 +1245,14 @@
   buildCounterLocation--;
 }
 
-buildUnnamed1457() {
+buildUnnamed152() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1457(core.Map<core.String, core.String> o) {
+checkUnnamed152(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1263,7 +1263,7 @@
   var o = new api.LogMessageRequest();
   buildCounterLogMessageRequest++;
   if (buildCounterLogMessageRequest < 3) {
-    o.clientInfo = buildUnnamed1457();
+    o.clientInfo = buildUnnamed152();
     o.details = "foo";
     o.level = "foo";
     o.requestMetadata = buildRequestMetadata();
@@ -1275,7 +1275,7 @@
 checkLogMessageRequest(api.LogMessageRequest o) {
   buildCounterLogMessageRequest++;
   if (buildCounterLogMessageRequest < 3) {
-    checkUnnamed1457(o.clientInfo);
+    checkUnnamed152(o.clientInfo);
     unittest.expect(o.details, unittest.equals('foo'));
     unittest.expect(o.level, unittest.equals('foo'));
     checkRequestMetadata(o.requestMetadata);
@@ -1302,14 +1302,14 @@
   buildCounterLogMessageResponse--;
 }
 
-buildUnnamed1458() {
+buildUnnamed153() {
   var o = new core.List<api.EventData>();
   o.add(buildEventData());
   o.add(buildEventData());
   return o;
 }
 
-checkUnnamed1458(core.List<api.EventData> o) {
+checkUnnamed153(core.List<api.EventData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEventData(o[0]);
   checkEventData(o[1]);
@@ -1322,7 +1322,7 @@
   if (buildCounterLogUserEventRequest < 3) {
     o.eventAction = "foo";
     o.eventCategory = "foo";
-    o.eventDatas = buildUnnamed1458();
+    o.eventDatas = buildUnnamed153();
     o.eventScope = "foo";
     o.lead = buildLead();
     o.requestMetadata = buildRequestMetadata();
@@ -1337,7 +1337,7 @@
   if (buildCounterLogUserEventRequest < 3) {
     unittest.expect(o.eventAction, unittest.equals('foo'));
     unittest.expect(o.eventCategory, unittest.equals('foo'));
-    checkUnnamed1458(o.eventDatas);
+    checkUnnamed153(o.eventDatas);
     unittest.expect(o.eventScope, unittest.equals('foo'));
     checkLead(o.lead);
     checkRequestMetadata(o.requestMetadata);
@@ -1519,14 +1519,14 @@
   buildCounterRecaptchaChallenge--;
 }
 
-buildUnnamed1459() {
+buildUnnamed154() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1459(core.List<core.String> o) {
+checkUnnamed154(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1537,7 +1537,7 @@
   var o = new api.RequestMetadata();
   buildCounterRequestMetadata++;
   if (buildCounterRequestMetadata < 3) {
-    o.experimentIds = buildUnnamed1459();
+    o.experimentIds = buildUnnamed154();
     o.locale = "foo";
     o.partnersSessionId = "foo";
     o.trafficSource = buildTrafficSource();
@@ -1550,7 +1550,7 @@
 checkRequestMetadata(api.RequestMetadata o) {
   buildCounterRequestMetadata++;
   if (buildCounterRequestMetadata < 3) {
-    checkUnnamed1459(o.experimentIds);
+    checkUnnamed154(o.experimentIds);
     unittest.expect(o.locale, unittest.equals('foo'));
     unittest.expect(o.partnersSessionId, unittest.equals('foo'));
     checkTrafficSource(o.trafficSource);
@@ -1620,53 +1620,53 @@
   buildCounterTrafficSource--;
 }
 
-buildUnnamed1460() {
+buildUnnamed155() {
   var o = new core.List<api.AdWordsManagerAccountInfo>();
   o.add(buildAdWordsManagerAccountInfo());
   o.add(buildAdWordsManagerAccountInfo());
   return o;
 }
 
-checkUnnamed1460(core.List<api.AdWordsManagerAccountInfo> o) {
+checkUnnamed155(core.List<api.AdWordsManagerAccountInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdWordsManagerAccountInfo(o[0]);
   checkAdWordsManagerAccountInfo(o[1]);
 }
 
-buildUnnamed1461() {
+buildUnnamed156() {
   var o = new core.List<api.Certification>();
   o.add(buildCertification());
   o.add(buildCertification());
   return o;
 }
 
-checkUnnamed1461(core.List<api.Certification> o) {
+checkUnnamed156(core.List<api.Certification> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCertification(o[0]);
   checkCertification(o[1]);
 }
 
-buildUnnamed1462() {
+buildUnnamed157() {
   var o = new core.List<api.ExamStatus>();
   o.add(buildExamStatus());
   o.add(buildExamStatus());
   return o;
 }
 
-checkUnnamed1462(core.List<api.ExamStatus> o) {
+checkUnnamed157(core.List<api.ExamStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExamStatus(o[0]);
   checkExamStatus(o[1]);
 }
 
-buildUnnamed1463() {
+buildUnnamed158() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1463(core.List<core.String> o) {
+checkUnnamed158(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1677,15 +1677,15 @@
   var o = new api.User();
   buildCounterUser++;
   if (buildCounterUser < 3) {
-    o.availableAdwordsManagerAccounts = buildUnnamed1460();
-    o.certificationStatus = buildUnnamed1461();
+    o.availableAdwordsManagerAccounts = buildUnnamed155();
+    o.certificationStatus = buildUnnamed156();
     o.company = buildCompanyRelation();
     o.companyVerificationEmail = "foo";
-    o.examStatus = buildUnnamed1462();
+    o.examStatus = buildUnnamed157();
     o.id = "foo";
     o.internalId = "foo";
     o.lastAccessTime = "foo";
-    o.primaryEmails = buildUnnamed1463();
+    o.primaryEmails = buildUnnamed158();
     o.profile = buildUserProfile();
     o.publicProfile = buildPublicProfile();
   }
@@ -1696,15 +1696,15 @@
 checkUser(api.User o) {
   buildCounterUser++;
   if (buildCounterUser < 3) {
-    checkUnnamed1460(o.availableAdwordsManagerAccounts);
-    checkUnnamed1461(o.certificationStatus);
+    checkUnnamed155(o.availableAdwordsManagerAccounts);
+    checkUnnamed156(o.certificationStatus);
     checkCompanyRelation(o.company);
     unittest.expect(o.companyVerificationEmail, unittest.equals('foo'));
-    checkUnnamed1462(o.examStatus);
+    checkUnnamed157(o.examStatus);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.internalId, unittest.equals('foo'));
     unittest.expect(o.lastAccessTime, unittest.equals('foo'));
-    checkUnnamed1463(o.primaryEmails);
+    checkUnnamed158(o.primaryEmails);
     checkUserProfile(o.profile);
     checkPublicProfile(o.publicProfile);
   }
@@ -1732,66 +1732,66 @@
   buildCounterUserOverrides--;
 }
 
-buildUnnamed1464() {
+buildUnnamed159() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1464(core.List<core.String> o) {
+checkUnnamed159(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1465() {
+buildUnnamed160() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1465(core.List<core.String> o) {
+checkUnnamed160(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1466() {
+buildUnnamed161() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1466(core.List<core.String> o) {
+checkUnnamed161(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1467() {
+buildUnnamed162() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1467(core.List<core.String> o) {
+checkUnnamed162(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1468() {
+buildUnnamed163() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1468(core.List<core.String> o) {
+checkUnnamed163(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1804,15 +1804,15 @@
   if (buildCounterUserProfile < 3) {
     o.address = buildLocation();
     o.adwordsManagerAccount = "foo";
-    o.channels = buildUnnamed1464();
+    o.channels = buildUnnamed159();
     o.emailAddress = "foo";
     o.emailOptIns = buildOptIns();
     o.familyName = "foo";
     o.givenName = "foo";
-    o.industries = buildUnnamed1465();
-    o.jobFunctions = buildUnnamed1466();
-    o.languages = buildUnnamed1467();
-    o.markets = buildUnnamed1468();
+    o.industries = buildUnnamed160();
+    o.jobFunctions = buildUnnamed161();
+    o.languages = buildUnnamed162();
+    o.markets = buildUnnamed163();
     o.migrateToAfa = true;
     o.phoneNumber = "foo";
     o.primaryCountryCode = "foo";
@@ -1827,15 +1827,15 @@
   if (buildCounterUserProfile < 3) {
     checkLocation(o.address);
     unittest.expect(o.adwordsManagerAccount, unittest.equals('foo'));
-    checkUnnamed1464(o.channels);
+    checkUnnamed159(o.channels);
     unittest.expect(o.emailAddress, unittest.equals('foo'));
     checkOptIns(o.emailOptIns);
     unittest.expect(o.familyName, unittest.equals('foo'));
     unittest.expect(o.givenName, unittest.equals('foo'));
-    checkUnnamed1465(o.industries);
-    checkUnnamed1466(o.jobFunctions);
-    checkUnnamed1467(o.languages);
-    checkUnnamed1468(o.markets);
+    checkUnnamed160(o.industries);
+    checkUnnamed161(o.jobFunctions);
+    checkUnnamed162(o.languages);
+    checkUnnamed163(o.markets);
     unittest.expect(o.migrateToAfa, unittest.isTrue);
     unittest.expect(o.phoneNumber, unittest.equals('foo'));
     unittest.expect(o.primaryCountryCode, unittest.equals('foo'));
@@ -1844,248 +1844,248 @@
   buildCounterUserProfile--;
 }
 
-buildUnnamed1469() {
+buildUnnamed164() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1469(core.List<core.String> o) {
+checkUnnamed164(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1470() {
+buildUnnamed165() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1470(core.List<core.String> o) {
+checkUnnamed165(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1471() {
+buildUnnamed166() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1471(core.List<core.String> o) {
+checkUnnamed166(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1472() {
+buildUnnamed167() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1472(core.List<core.String> o) {
+checkUnnamed167(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1473() {
+buildUnnamed168() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1473(core.List<core.String> o) {
+checkUnnamed168(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1474() {
+buildUnnamed169() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1474(core.List<core.String> o) {
+checkUnnamed169(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1475() {
+buildUnnamed170() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1475(core.List<core.String> o) {
+checkUnnamed170(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1476() {
+buildUnnamed171() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1476(core.List<core.String> o) {
+checkUnnamed171(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1477() {
+buildUnnamed172() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1477(core.List<core.String> o) {
+checkUnnamed172(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1478() {
+buildUnnamed173() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1478(core.List<core.String> o) {
+checkUnnamed173(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1479() {
+buildUnnamed174() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1479(core.List<core.String> o) {
+checkUnnamed174(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1480() {
+buildUnnamed175() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1480(core.List<core.String> o) {
+checkUnnamed175(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1481() {
+buildUnnamed176() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1481(core.List<core.String> o) {
+checkUnnamed176(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1482() {
+buildUnnamed177() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1482(core.List<core.String> o) {
+checkUnnamed177(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1483() {
+buildUnnamed178() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1483(core.List<core.String> o) {
+checkUnnamed178(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1484() {
+buildUnnamed179() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1484(core.List<core.String> o) {
+checkUnnamed179(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1485() {
+buildUnnamed180() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1485(core.List<core.String> o) {
+checkUnnamed180(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1486() {
+buildUnnamed181() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1486(core.List<core.String> o) {
+checkUnnamed181(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1487() {
+buildUnnamed182() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1487(core.List<core.String> o) {
+checkUnnamed182(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2487,7 +2487,7 @@
       var arg_requestMetadata_trafficSource_trafficSourceId = "foo";
       var arg_requestMetadata_locale = "foo";
       var arg_requestMetadata_userOverrides_ipAddress = "foo";
-      var arg_requestMetadata_experimentIds = buildUnnamed1469();
+      var arg_requestMetadata_experimentIds = buildUnnamed164();
       var arg_requestMetadata_trafficSource_trafficSubId = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -2566,7 +2566,7 @@
               requestMetadata_trafficSource_trafficSubId:
                   arg_requestMetadata_trafficSource_trafficSubId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListAnalyticsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListAnalyticsResponse(response);
       })));
     });
@@ -2622,7 +2622,7 @@
       }), true);
       res
           .log(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogMessageResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogMessageResponse(response);
       })));
     });
@@ -2636,7 +2636,7 @@
       var arg_requestMetadata_trafficSource_trafficSourceId = "foo";
       var arg_requestMetadata_userOverrides_ipAddress = "foo";
       var arg_currencyCode = "foo";
-      var arg_requestMetadata_experimentIds = buildUnnamed1470();
+      var arg_requestMetadata_experimentIds = buildUnnamed165();
       var arg_requestMetadata_trafficSource_trafficSubId = "foo";
       var arg_orderBy = "foo";
       var arg_requestMetadata_partnersSessionId = "foo";
@@ -2729,7 +2729,7 @@
               requestMetadata_locale: arg_requestMetadata_locale,
               address: arg_address,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetCompanyResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetCompanyResponse(response);
       })));
     });
@@ -2740,15 +2740,15 @@
       var arg_requestMetadata_partnersSessionId = "foo";
       var arg_companyName = "foo";
       var arg_pageToken = "foo";
-      var arg_industries = buildUnnamed1471();
+      var arg_industries = buildUnnamed166();
       var arg_websiteUrl = "foo";
-      var arg_gpsMotivations = buildUnnamed1472();
-      var arg_languageCodes = buildUnnamed1473();
+      var arg_gpsMotivations = buildUnnamed167();
+      var arg_languageCodes = buildUnnamed168();
       var arg_pageSize = 42;
       var arg_requestMetadata_userOverrides_ipAddress = "foo";
-      var arg_requestMetadata_experimentIds = buildUnnamed1474();
+      var arg_requestMetadata_experimentIds = buildUnnamed169();
       var arg_orderBy = "foo";
-      var arg_specializations = buildUnnamed1475();
+      var arg_specializations = buildUnnamed170();
       var arg_maxMonthlyBudget_currencyCode = "foo";
       var arg_requestMetadata_userOverrides_userId = "foo";
       var arg_minMonthlyBudget_currencyCode = "foo";
@@ -2757,7 +2757,7 @@
       var arg_address = "foo";
       var arg_minMonthlyBudget_units = "foo";
       var arg_maxMonthlyBudget_nanos = 42;
-      var arg_services = buildUnnamed1476();
+      var arg_services = buildUnnamed171();
       var arg_requestMetadata_trafficSource_trafficSourceId = "foo";
       var arg_maxMonthlyBudget_units = "foo";
       var arg_minMonthlyBudget_nanos = 42;
@@ -2887,7 +2887,7 @@
               requestMetadata_trafficSource_trafficSubId:
                   arg_requestMetadata_trafficSource_trafficSubId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListCompaniesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCompaniesResponse(response);
       })));
     });
@@ -2953,7 +2953,7 @@
       }), true);
       res
           .create(arg_request, arg_companyId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CreateLeadResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreateLeadResponse(response);
       })));
     });
@@ -2970,7 +2970,7 @@
       var arg_requestMetadata_trafficSource_trafficSourceId = "foo";
       var arg_requestMetadata_locale = "foo";
       var arg_requestMetadata_userOverrides_ipAddress = "foo";
-      var arg_requestMetadata_experimentIds = buildUnnamed1477();
+      var arg_requestMetadata_experimentIds = buildUnnamed172();
       var arg_requestMetadata_trafficSource_trafficSubId = "foo";
       var arg_orderBy = "foo";
       var arg_$fields = "foo";
@@ -3053,7 +3053,7 @@
                   arg_requestMetadata_trafficSource_trafficSubId,
               orderBy: arg_orderBy,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLeadsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLeadsResponse(response);
       })));
     });
@@ -3068,7 +3068,7 @@
       var arg_requestMetadata_trafficSource_trafficSourceId = "foo";
       var arg_requestMetadata_locale = "foo";
       var arg_requestMetadata_userOverrides_ipAddress = "foo";
-      var arg_requestMetadata_experimentIds = buildUnnamed1478();
+      var arg_requestMetadata_experimentIds = buildUnnamed173();
       var arg_requestMetadata_trafficSource_trafficSubId = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -3141,7 +3141,7 @@
               requestMetadata_trafficSource_trafficSubId:
                   arg_requestMetadata_trafficSource_trafficSubId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOffersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOffersResponse(response);
       })));
     });
@@ -3160,7 +3160,7 @@
       var arg_requestMetadata_locale = "foo";
       var arg_requestMetadata_userOverrides_ipAddress = "foo";
       var arg_entireCompany = true;
-      var arg_requestMetadata_experimentIds = buildUnnamed1479();
+      var arg_requestMetadata_experimentIds = buildUnnamed174();
       var arg_orderBy = "foo";
       var arg_requestMetadata_trafficSource_trafficSubId = "foo";
       var arg_$fields = "foo";
@@ -3246,8 +3246,7 @@
               requestMetadata_trafficSource_trafficSubId:
                   arg_requestMetadata_trafficSource_trafficSubId,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListOffersHistoryResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOffersHistoryResponse(response);
       })));
     });
@@ -3302,7 +3301,7 @@
       }), true);
       res
           .log(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogUserEventResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogUserEventResponse(response);
       })));
     });
@@ -3314,7 +3313,7 @@
       api.UserStatesResourceApi res = new api.PartnersApi(mock).userStates;
       var arg_requestMetadata_locale = "foo";
       var arg_requestMetadata_userOverrides_ipAddress = "foo";
-      var arg_requestMetadata_experimentIds = buildUnnamed1480();
+      var arg_requestMetadata_experimentIds = buildUnnamed175();
       var arg_requestMetadata_trafficSource_trafficSubId = "foo";
       var arg_requestMetadata_userOverrides_userId = "foo";
       var arg_requestMetadata_partnersSessionId = "foo";
@@ -3390,7 +3389,7 @@
               requestMetadata_trafficSource_trafficSourceId:
                   arg_requestMetadata_trafficSource_trafficSourceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListUserStatesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListUserStatesResponse(response);
       })));
     });
@@ -3402,7 +3401,7 @@
       api.UsersResourceApi res = new api.PartnersApi(mock).users;
       var arg_request = buildCompanyRelation();
       var arg_userId = "foo";
-      var arg_requestMetadata_experimentIds = buildUnnamed1481();
+      var arg_requestMetadata_experimentIds = buildUnnamed176();
       var arg_requestMetadata_trafficSource_trafficSubId = "foo";
       var arg_requestMetadata_userOverrides_userId = "foo";
       var arg_requestMetadata_partnersSessionId = "foo";
@@ -3492,7 +3491,7 @@
               requestMetadata_userOverrides_ipAddress:
                   arg_requestMetadata_userOverrides_ipAddress,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CompanyRelation response) {
+          .then(unittest.expectAsync1(((response) {
         checkCompanyRelation(response);
       })));
     });
@@ -3503,7 +3502,7 @@
       var arg_userId = "foo";
       var arg_requestMetadata_locale = "foo";
       var arg_requestMetadata_userOverrides_ipAddress = "foo";
-      var arg_requestMetadata_experimentIds = buildUnnamed1482();
+      var arg_requestMetadata_experimentIds = buildUnnamed177();
       var arg_requestMetadata_trafficSource_trafficSubId = "foo";
       var arg_requestMetadata_userOverrides_userId = "foo";
       var arg_requestMetadata_partnersSessionId = "foo";
@@ -3588,7 +3587,7 @@
               requestMetadata_trafficSource_trafficSourceId:
                   arg_requestMetadata_trafficSource_trafficSourceId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3604,7 +3603,7 @@
       var arg_requestMetadata_trafficSource_trafficSourceId = "foo";
       var arg_requestMetadata_locale = "foo";
       var arg_requestMetadata_userOverrides_ipAddress = "foo";
-      var arg_requestMetadata_experimentIds = buildUnnamed1483();
+      var arg_requestMetadata_experimentIds = buildUnnamed178();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3682,7 +3681,7 @@
                   arg_requestMetadata_userOverrides_ipAddress,
               requestMetadata_experimentIds: arg_requestMetadata_experimentIds,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.User response) {
+          .then(unittest.expectAsync1(((response) {
         checkUser(response);
       })));
     });
@@ -3696,7 +3695,7 @@
       var arg_requestMetadata_trafficSource_trafficSourceId = "foo";
       var arg_requestMetadata_locale = "foo";
       var arg_requestMetadata_userOverrides_ipAddress = "foo";
-      var arg_requestMetadata_experimentIds = buildUnnamed1484();
+      var arg_requestMetadata_experimentIds = buildUnnamed179();
       var arg_requestMetadata_trafficSource_trafficSubId = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -3772,7 +3771,7 @@
               requestMetadata_trafficSource_trafficSubId:
                   arg_requestMetadata_trafficSource_trafficSubId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserProfile(response);
       })));
     });
@@ -3782,7 +3781,7 @@
     unittest.test("method--getPartnersstatus", () {
       var mock = new HttpServerMock();
       api.V2ResourceApi res = new api.PartnersApi(mock).v2;
-      var arg_requestMetadata_experimentIds = buildUnnamed1485();
+      var arg_requestMetadata_experimentIds = buildUnnamed180();
       var arg_requestMetadata_trafficSource_trafficSubId = "foo";
       var arg_requestMetadata_userOverrides_userId = "foo";
       var arg_requestMetadata_partnersSessionId = "foo";
@@ -3860,8 +3859,7 @@
               requestMetadata_userOverrides_ipAddress:
                   arg_requestMetadata_userOverrides_ipAddress,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.GetPartnersStatusResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetPartnersStatusResponse(response);
       })));
     });
@@ -3876,7 +3874,7 @@
       var arg_requestMetadata_locale = "foo";
       var arg_requestMetadata_userOverrides_ipAddress = "foo";
       var arg_updateMask = "foo";
-      var arg_requestMetadata_experimentIds = buildUnnamed1486();
+      var arg_requestMetadata_experimentIds = buildUnnamed181();
       var arg_requestMetadata_trafficSource_trafficSubId = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -3955,7 +3953,7 @@
               requestMetadata_trafficSource_trafficSubId:
                   arg_requestMetadata_trafficSource_trafficSubId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Company response) {
+          .then(unittest.expectAsync1(((response) {
         checkCompany(response);
       })));
     });
@@ -3970,7 +3968,7 @@
       var arg_requestMetadata_locale = "foo";
       var arg_requestMetadata_userOverrides_ipAddress = "foo";
       var arg_updateMask = "foo";
-      var arg_requestMetadata_experimentIds = buildUnnamed1487();
+      var arg_requestMetadata_experimentIds = buildUnnamed182();
       var arg_requestMetadata_trafficSource_trafficSubId = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -4049,7 +4047,7 @@
               requestMetadata_trafficSource_trafficSubId:
                   arg_requestMetadata_trafficSource_trafficSubId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Lead response) {
+          .then(unittest.expectAsync1(((response) {
         checkLead(response);
       })));
     });
diff --git a/generated/googleapis/test/people/v1_test.dart b/generated/googleapis/test/people/v1_test.dart
index 53e635d..858920f 100644
--- a/generated/googleapis/test/people/v1_test.dart
+++ b/generated/googleapis/test/people/v1_test.dart
@@ -112,14 +112,14 @@
   buildCounterAgeRangeType--;
 }
 
-buildUnnamed3023() {
+buildUnnamed3091() {
   var o = new core.List<api.ContactGroupResponse>();
   o.add(buildContactGroupResponse());
   o.add(buildContactGroupResponse());
   return o;
 }
 
-checkUnnamed3023(core.List<api.ContactGroupResponse> o) {
+checkUnnamed3091(core.List<api.ContactGroupResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContactGroupResponse(o[0]);
   checkContactGroupResponse(o[1]);
@@ -130,7 +130,7 @@
   var o = new api.BatchGetContactGroupsResponse();
   buildCounterBatchGetContactGroupsResponse++;
   if (buildCounterBatchGetContactGroupsResponse < 3) {
-    o.responses = buildUnnamed3023();
+    o.responses = buildUnnamed3091();
   }
   buildCounterBatchGetContactGroupsResponse--;
   return o;
@@ -139,7 +139,7 @@
 checkBatchGetContactGroupsResponse(api.BatchGetContactGroupsResponse o) {
   buildCounterBatchGetContactGroupsResponse++;
   if (buildCounterBatchGetContactGroupsResponse < 3) {
-    checkUnnamed3023(o.responses);
+    checkUnnamed3091(o.responses);
   }
   buildCounterBatchGetContactGroupsResponse--;
 }
@@ -211,14 +211,14 @@
   buildCounterBraggingRights--;
 }
 
-buildUnnamed3024() {
+buildUnnamed3092() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3024(core.List<core.String> o) {
+checkUnnamed3092(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -233,7 +233,7 @@
     o.formattedName = "foo";
     o.groupType = "foo";
     o.memberCount = 42;
-    o.memberResourceNames = buildUnnamed3024();
+    o.memberResourceNames = buildUnnamed3092();
     o.metadata = buildContactGroupMetadata();
     o.name = "foo";
     o.resourceName = "foo";
@@ -249,7 +249,7 @@
     unittest.expect(o.formattedName, unittest.equals('foo'));
     unittest.expect(o.groupType, unittest.equals('foo'));
     unittest.expect(o.memberCount, unittest.equals(42));
-    checkUnnamed3024(o.memberResourceNames);
+    checkUnnamed3092(o.memberResourceNames);
     checkContactGroupMetadata(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.resourceName, unittest.equals('foo'));
@@ -517,14 +517,14 @@
   buildCounterGender--;
 }
 
-buildUnnamed3025() {
+buildUnnamed3093() {
   var o = new core.List<api.PersonResponse>();
   o.add(buildPersonResponse());
   o.add(buildPersonResponse());
   return o;
 }
 
-checkUnnamed3025(core.List<api.PersonResponse> o) {
+checkUnnamed3093(core.List<api.PersonResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonResponse(o[0]);
   checkPersonResponse(o[1]);
@@ -535,7 +535,7 @@
   var o = new api.GetPeopleResponse();
   buildCounterGetPeopleResponse++;
   if (buildCounterGetPeopleResponse < 3) {
-    o.responses = buildUnnamed3025();
+    o.responses = buildUnnamed3093();
   }
   buildCounterGetPeopleResponse--;
   return o;
@@ -544,7 +544,7 @@
 checkGetPeopleResponse(api.GetPeopleResponse o) {
   buildCounterGetPeopleResponse++;
   if (buildCounterGetPeopleResponse < 3) {
-    checkUnnamed3025(o.responses);
+    checkUnnamed3093(o.responses);
   }
   buildCounterGetPeopleResponse--;
 }
@@ -599,14 +599,14 @@
   buildCounterInterest--;
 }
 
-buildUnnamed3026() {
+buildUnnamed3094() {
   var o = new core.List<api.Person>();
   o.add(buildPerson());
   o.add(buildPerson());
   return o;
 }
 
-checkUnnamed3026(core.List<api.Person> o) {
+checkUnnamed3094(core.List<api.Person> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerson(o[0]);
   checkPerson(o[1]);
@@ -617,7 +617,7 @@
   var o = new api.ListConnectionsResponse();
   buildCounterListConnectionsResponse++;
   if (buildCounterListConnectionsResponse < 3) {
-    o.connections = buildUnnamed3026();
+    o.connections = buildUnnamed3094();
     o.nextPageToken = "foo";
     o.nextSyncToken = "foo";
     o.totalItems = 42;
@@ -630,7 +630,7 @@
 checkListConnectionsResponse(api.ListConnectionsResponse o) {
   buildCounterListConnectionsResponse++;
   if (buildCounterListConnectionsResponse < 3) {
-    checkUnnamed3026(o.connections);
+    checkUnnamed3094(o.connections);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.nextSyncToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -639,14 +639,14 @@
   buildCounterListConnectionsResponse--;
 }
 
-buildUnnamed3027() {
+buildUnnamed3095() {
   var o = new core.List<api.ContactGroup>();
   o.add(buildContactGroup());
   o.add(buildContactGroup());
   return o;
 }
 
-checkUnnamed3027(core.List<api.ContactGroup> o) {
+checkUnnamed3095(core.List<api.ContactGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContactGroup(o[0]);
   checkContactGroup(o[1]);
@@ -657,7 +657,7 @@
   var o = new api.ListContactGroupsResponse();
   buildCounterListContactGroupsResponse++;
   if (buildCounterListContactGroupsResponse < 3) {
-    o.contactGroups = buildUnnamed3027();
+    o.contactGroups = buildUnnamed3095();
     o.nextPageToken = "foo";
     o.nextSyncToken = "foo";
     o.totalItems = 42;
@@ -669,7 +669,7 @@
 checkListContactGroupsResponse(api.ListContactGroupsResponse o) {
   buildCounterListContactGroupsResponse++;
   if (buildCounterListContactGroupsResponse < 3) {
-    checkUnnamed3027(o.contactGroups);
+    checkUnnamed3095(o.contactGroups);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.nextSyncToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -721,27 +721,27 @@
   buildCounterMembership--;
 }
 
-buildUnnamed3028() {
+buildUnnamed3096() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3028(core.List<core.String> o) {
+checkUnnamed3096(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3029() {
+buildUnnamed3097() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3029(core.List<core.String> o) {
+checkUnnamed3097(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -752,8 +752,8 @@
   var o = new api.ModifyContactGroupMembersRequest();
   buildCounterModifyContactGroupMembersRequest++;
   if (buildCounterModifyContactGroupMembersRequest < 3) {
-    o.resourceNamesToAdd = buildUnnamed3028();
-    o.resourceNamesToRemove = buildUnnamed3029();
+    o.resourceNamesToAdd = buildUnnamed3096();
+    o.resourceNamesToRemove = buildUnnamed3097();
   }
   buildCounterModifyContactGroupMembersRequest--;
   return o;
@@ -762,20 +762,20 @@
 checkModifyContactGroupMembersRequest(api.ModifyContactGroupMembersRequest o) {
   buildCounterModifyContactGroupMembersRequest++;
   if (buildCounterModifyContactGroupMembersRequest < 3) {
-    checkUnnamed3028(o.resourceNamesToAdd);
-    checkUnnamed3029(o.resourceNamesToRemove);
+    checkUnnamed3096(o.resourceNamesToAdd);
+    checkUnnamed3097(o.resourceNamesToRemove);
   }
   buildCounterModifyContactGroupMembersRequest--;
 }
 
-buildUnnamed3030() {
+buildUnnamed3098() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3030(core.List<core.String> o) {
+checkUnnamed3098(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -786,7 +786,7 @@
   var o = new api.ModifyContactGroupMembersResponse();
   buildCounterModifyContactGroupMembersResponse++;
   if (buildCounterModifyContactGroupMembersResponse < 3) {
-    o.notFoundResourceNames = buildUnnamed3030();
+    o.notFoundResourceNames = buildUnnamed3098();
   }
   buildCounterModifyContactGroupMembersResponse--;
   return o;
@@ -796,7 +796,7 @@
     api.ModifyContactGroupMembersResponse o) {
   buildCounterModifyContactGroupMembersResponse++;
   if (buildCounterModifyContactGroupMembersResponse < 3) {
-    checkUnnamed3030(o.notFoundResourceNames);
+    checkUnnamed3098(o.notFoundResourceNames);
   }
   buildCounterModifyContactGroupMembersResponse--;
 }
@@ -935,352 +935,352 @@
   buildCounterOrganization--;
 }
 
-buildUnnamed3031() {
+buildUnnamed3099() {
   var o = new core.List<api.Address>();
   o.add(buildAddress());
   o.add(buildAddress());
   return o;
 }
 
-checkUnnamed3031(core.List<api.Address> o) {
+checkUnnamed3099(core.List<api.Address> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAddress(o[0]);
   checkAddress(o[1]);
 }
 
-buildUnnamed3032() {
+buildUnnamed3100() {
   var o = new core.List<api.AgeRangeType>();
   o.add(buildAgeRangeType());
   o.add(buildAgeRangeType());
   return o;
 }
 
-checkUnnamed3032(core.List<api.AgeRangeType> o) {
+checkUnnamed3100(core.List<api.AgeRangeType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAgeRangeType(o[0]);
   checkAgeRangeType(o[1]);
 }
 
-buildUnnamed3033() {
+buildUnnamed3101() {
   var o = new core.List<api.Biography>();
   o.add(buildBiography());
   o.add(buildBiography());
   return o;
 }
 
-checkUnnamed3033(core.List<api.Biography> o) {
+checkUnnamed3101(core.List<api.Biography> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBiography(o[0]);
   checkBiography(o[1]);
 }
 
-buildUnnamed3034() {
+buildUnnamed3102() {
   var o = new core.List<api.Birthday>();
   o.add(buildBirthday());
   o.add(buildBirthday());
   return o;
 }
 
-checkUnnamed3034(core.List<api.Birthday> o) {
+checkUnnamed3102(core.List<api.Birthday> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBirthday(o[0]);
   checkBirthday(o[1]);
 }
 
-buildUnnamed3035() {
+buildUnnamed3103() {
   var o = new core.List<api.BraggingRights>();
   o.add(buildBraggingRights());
   o.add(buildBraggingRights());
   return o;
 }
 
-checkUnnamed3035(core.List<api.BraggingRights> o) {
+checkUnnamed3103(core.List<api.BraggingRights> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBraggingRights(o[0]);
   checkBraggingRights(o[1]);
 }
 
-buildUnnamed3036() {
+buildUnnamed3104() {
   var o = new core.List<api.CoverPhoto>();
   o.add(buildCoverPhoto());
   o.add(buildCoverPhoto());
   return o;
 }
 
-checkUnnamed3036(core.List<api.CoverPhoto> o) {
+checkUnnamed3104(core.List<api.CoverPhoto> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCoverPhoto(o[0]);
   checkCoverPhoto(o[1]);
 }
 
-buildUnnamed3037() {
+buildUnnamed3105() {
   var o = new core.List<api.EmailAddress>();
   o.add(buildEmailAddress());
   o.add(buildEmailAddress());
   return o;
 }
 
-checkUnnamed3037(core.List<api.EmailAddress> o) {
+checkUnnamed3105(core.List<api.EmailAddress> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEmailAddress(o[0]);
   checkEmailAddress(o[1]);
 }
 
-buildUnnamed3038() {
+buildUnnamed3106() {
   var o = new core.List<api.Event>();
   o.add(buildEvent());
   o.add(buildEvent());
   return o;
 }
 
-checkUnnamed3038(core.List<api.Event> o) {
+checkUnnamed3106(core.List<api.Event> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEvent(o[0]);
   checkEvent(o[1]);
 }
 
-buildUnnamed3039() {
+buildUnnamed3107() {
   var o = new core.List<api.Gender>();
   o.add(buildGender());
   o.add(buildGender());
   return o;
 }
 
-checkUnnamed3039(core.List<api.Gender> o) {
+checkUnnamed3107(core.List<api.Gender> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGender(o[0]);
   checkGender(o[1]);
 }
 
-buildUnnamed3040() {
+buildUnnamed3108() {
   var o = new core.List<api.ImClient>();
   o.add(buildImClient());
   o.add(buildImClient());
   return o;
 }
 
-checkUnnamed3040(core.List<api.ImClient> o) {
+checkUnnamed3108(core.List<api.ImClient> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImClient(o[0]);
   checkImClient(o[1]);
 }
 
-buildUnnamed3041() {
+buildUnnamed3109() {
   var o = new core.List<api.Interest>();
   o.add(buildInterest());
   o.add(buildInterest());
   return o;
 }
 
-checkUnnamed3041(core.List<api.Interest> o) {
+checkUnnamed3109(core.List<api.Interest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInterest(o[0]);
   checkInterest(o[1]);
 }
 
-buildUnnamed3042() {
+buildUnnamed3110() {
   var o = new core.List<api.Locale>();
   o.add(buildLocale());
   o.add(buildLocale());
   return o;
 }
 
-checkUnnamed3042(core.List<api.Locale> o) {
+checkUnnamed3110(core.List<api.Locale> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocale(o[0]);
   checkLocale(o[1]);
 }
 
-buildUnnamed3043() {
+buildUnnamed3111() {
   var o = new core.List<api.Membership>();
   o.add(buildMembership());
   o.add(buildMembership());
   return o;
 }
 
-checkUnnamed3043(core.List<api.Membership> o) {
+checkUnnamed3111(core.List<api.Membership> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMembership(o[0]);
   checkMembership(o[1]);
 }
 
-buildUnnamed3044() {
+buildUnnamed3112() {
   var o = new core.List<api.Name>();
   o.add(buildName());
   o.add(buildName());
   return o;
 }
 
-checkUnnamed3044(core.List<api.Name> o) {
+checkUnnamed3112(core.List<api.Name> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkName(o[0]);
   checkName(o[1]);
 }
 
-buildUnnamed3045() {
+buildUnnamed3113() {
   var o = new core.List<api.Nickname>();
   o.add(buildNickname());
   o.add(buildNickname());
   return o;
 }
 
-checkUnnamed3045(core.List<api.Nickname> o) {
+checkUnnamed3113(core.List<api.Nickname> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNickname(o[0]);
   checkNickname(o[1]);
 }
 
-buildUnnamed3046() {
+buildUnnamed3114() {
   var o = new core.List<api.Occupation>();
   o.add(buildOccupation());
   o.add(buildOccupation());
   return o;
 }
 
-checkUnnamed3046(core.List<api.Occupation> o) {
+checkUnnamed3114(core.List<api.Occupation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOccupation(o[0]);
   checkOccupation(o[1]);
 }
 
-buildUnnamed3047() {
+buildUnnamed3115() {
   var o = new core.List<api.Organization>();
   o.add(buildOrganization());
   o.add(buildOrganization());
   return o;
 }
 
-checkUnnamed3047(core.List<api.Organization> o) {
+checkUnnamed3115(core.List<api.Organization> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrganization(o[0]);
   checkOrganization(o[1]);
 }
 
-buildUnnamed3048() {
+buildUnnamed3116() {
   var o = new core.List<api.PhoneNumber>();
   o.add(buildPhoneNumber());
   o.add(buildPhoneNumber());
   return o;
 }
 
-checkUnnamed3048(core.List<api.PhoneNumber> o) {
+checkUnnamed3116(core.List<api.PhoneNumber> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPhoneNumber(o[0]);
   checkPhoneNumber(o[1]);
 }
 
-buildUnnamed3049() {
+buildUnnamed3117() {
   var o = new core.List<api.Photo>();
   o.add(buildPhoto());
   o.add(buildPhoto());
   return o;
 }
 
-checkUnnamed3049(core.List<api.Photo> o) {
+checkUnnamed3117(core.List<api.Photo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPhoto(o[0]);
   checkPhoto(o[1]);
 }
 
-buildUnnamed3050() {
+buildUnnamed3118() {
   var o = new core.List<api.Relation>();
   o.add(buildRelation());
   o.add(buildRelation());
   return o;
 }
 
-checkUnnamed3050(core.List<api.Relation> o) {
+checkUnnamed3118(core.List<api.Relation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRelation(o[0]);
   checkRelation(o[1]);
 }
 
-buildUnnamed3051() {
+buildUnnamed3119() {
   var o = new core.List<api.RelationshipInterest>();
   o.add(buildRelationshipInterest());
   o.add(buildRelationshipInterest());
   return o;
 }
 
-checkUnnamed3051(core.List<api.RelationshipInterest> o) {
+checkUnnamed3119(core.List<api.RelationshipInterest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRelationshipInterest(o[0]);
   checkRelationshipInterest(o[1]);
 }
 
-buildUnnamed3052() {
+buildUnnamed3120() {
   var o = new core.List<api.RelationshipStatus>();
   o.add(buildRelationshipStatus());
   o.add(buildRelationshipStatus());
   return o;
 }
 
-checkUnnamed3052(core.List<api.RelationshipStatus> o) {
+checkUnnamed3120(core.List<api.RelationshipStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRelationshipStatus(o[0]);
   checkRelationshipStatus(o[1]);
 }
 
-buildUnnamed3053() {
+buildUnnamed3121() {
   var o = new core.List<api.Residence>();
   o.add(buildResidence());
   o.add(buildResidence());
   return o;
 }
 
-checkUnnamed3053(core.List<api.Residence> o) {
+checkUnnamed3121(core.List<api.Residence> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResidence(o[0]);
   checkResidence(o[1]);
 }
 
-buildUnnamed3054() {
+buildUnnamed3122() {
   var o = new core.List<api.Skill>();
   o.add(buildSkill());
   o.add(buildSkill());
   return o;
 }
 
-checkUnnamed3054(core.List<api.Skill> o) {
+checkUnnamed3122(core.List<api.Skill> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSkill(o[0]);
   checkSkill(o[1]);
 }
 
-buildUnnamed3055() {
+buildUnnamed3123() {
   var o = new core.List<api.Tagline>();
   o.add(buildTagline());
   o.add(buildTagline());
   return o;
 }
 
-checkUnnamed3055(core.List<api.Tagline> o) {
+checkUnnamed3123(core.List<api.Tagline> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTagline(o[0]);
   checkTagline(o[1]);
 }
 
-buildUnnamed3056() {
+buildUnnamed3124() {
   var o = new core.List<api.Url>();
   o.add(buildUrl());
   o.add(buildUrl());
   return o;
 }
 
-checkUnnamed3056(core.List<api.Url> o) {
+checkUnnamed3124(core.List<api.Url> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrl(o[0]);
   checkUrl(o[1]);
 }
 
-buildUnnamed3057() {
+buildUnnamed3125() {
   var o = new core.List<api.UserDefined>();
   o.add(buildUserDefined());
   o.add(buildUserDefined());
   return o;
 }
 
-checkUnnamed3057(core.List<api.UserDefined> o) {
+checkUnnamed3125(core.List<api.UserDefined> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserDefined(o[0]);
   checkUserDefined(o[1]);
@@ -1291,37 +1291,37 @@
   var o = new api.Person();
   buildCounterPerson++;
   if (buildCounterPerson < 3) {
-    o.addresses = buildUnnamed3031();
+    o.addresses = buildUnnamed3099();
     o.ageRange = "foo";
-    o.ageRanges = buildUnnamed3032();
-    o.biographies = buildUnnamed3033();
-    o.birthdays = buildUnnamed3034();
-    o.braggingRights = buildUnnamed3035();
-    o.coverPhotos = buildUnnamed3036();
-    o.emailAddresses = buildUnnamed3037();
+    o.ageRanges = buildUnnamed3100();
+    o.biographies = buildUnnamed3101();
+    o.birthdays = buildUnnamed3102();
+    o.braggingRights = buildUnnamed3103();
+    o.coverPhotos = buildUnnamed3104();
+    o.emailAddresses = buildUnnamed3105();
     o.etag = "foo";
-    o.events = buildUnnamed3038();
-    o.genders = buildUnnamed3039();
-    o.imClients = buildUnnamed3040();
-    o.interests = buildUnnamed3041();
-    o.locales = buildUnnamed3042();
-    o.memberships = buildUnnamed3043();
+    o.events = buildUnnamed3106();
+    o.genders = buildUnnamed3107();
+    o.imClients = buildUnnamed3108();
+    o.interests = buildUnnamed3109();
+    o.locales = buildUnnamed3110();
+    o.memberships = buildUnnamed3111();
     o.metadata = buildPersonMetadata();
-    o.names = buildUnnamed3044();
-    o.nicknames = buildUnnamed3045();
-    o.occupations = buildUnnamed3046();
-    o.organizations = buildUnnamed3047();
-    o.phoneNumbers = buildUnnamed3048();
-    o.photos = buildUnnamed3049();
-    o.relations = buildUnnamed3050();
-    o.relationshipInterests = buildUnnamed3051();
-    o.relationshipStatuses = buildUnnamed3052();
-    o.residences = buildUnnamed3053();
+    o.names = buildUnnamed3112();
+    o.nicknames = buildUnnamed3113();
+    o.occupations = buildUnnamed3114();
+    o.organizations = buildUnnamed3115();
+    o.phoneNumbers = buildUnnamed3116();
+    o.photos = buildUnnamed3117();
+    o.relations = buildUnnamed3118();
+    o.relationshipInterests = buildUnnamed3119();
+    o.relationshipStatuses = buildUnnamed3120();
+    o.residences = buildUnnamed3121();
     o.resourceName = "foo";
-    o.skills = buildUnnamed3054();
-    o.taglines = buildUnnamed3055();
-    o.urls = buildUnnamed3056();
-    o.userDefined = buildUnnamed3057();
+    o.skills = buildUnnamed3122();
+    o.taglines = buildUnnamed3123();
+    o.urls = buildUnnamed3124();
+    o.userDefined = buildUnnamed3125();
   }
   buildCounterPerson--;
   return o;
@@ -1330,75 +1330,75 @@
 checkPerson(api.Person o) {
   buildCounterPerson++;
   if (buildCounterPerson < 3) {
-    checkUnnamed3031(o.addresses);
+    checkUnnamed3099(o.addresses);
     unittest.expect(o.ageRange, unittest.equals('foo'));
-    checkUnnamed3032(o.ageRanges);
-    checkUnnamed3033(o.biographies);
-    checkUnnamed3034(o.birthdays);
-    checkUnnamed3035(o.braggingRights);
-    checkUnnamed3036(o.coverPhotos);
-    checkUnnamed3037(o.emailAddresses);
+    checkUnnamed3100(o.ageRanges);
+    checkUnnamed3101(o.biographies);
+    checkUnnamed3102(o.birthdays);
+    checkUnnamed3103(o.braggingRights);
+    checkUnnamed3104(o.coverPhotos);
+    checkUnnamed3105(o.emailAddresses);
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3038(o.events);
-    checkUnnamed3039(o.genders);
-    checkUnnamed3040(o.imClients);
-    checkUnnamed3041(o.interests);
-    checkUnnamed3042(o.locales);
-    checkUnnamed3043(o.memberships);
+    checkUnnamed3106(o.events);
+    checkUnnamed3107(o.genders);
+    checkUnnamed3108(o.imClients);
+    checkUnnamed3109(o.interests);
+    checkUnnamed3110(o.locales);
+    checkUnnamed3111(o.memberships);
     checkPersonMetadata(o.metadata);
-    checkUnnamed3044(o.names);
-    checkUnnamed3045(o.nicknames);
-    checkUnnamed3046(o.occupations);
-    checkUnnamed3047(o.organizations);
-    checkUnnamed3048(o.phoneNumbers);
-    checkUnnamed3049(o.photos);
-    checkUnnamed3050(o.relations);
-    checkUnnamed3051(o.relationshipInterests);
-    checkUnnamed3052(o.relationshipStatuses);
-    checkUnnamed3053(o.residences);
+    checkUnnamed3112(o.names);
+    checkUnnamed3113(o.nicknames);
+    checkUnnamed3114(o.occupations);
+    checkUnnamed3115(o.organizations);
+    checkUnnamed3116(o.phoneNumbers);
+    checkUnnamed3117(o.photos);
+    checkUnnamed3118(o.relations);
+    checkUnnamed3119(o.relationshipInterests);
+    checkUnnamed3120(o.relationshipStatuses);
+    checkUnnamed3121(o.residences);
     unittest.expect(o.resourceName, unittest.equals('foo'));
-    checkUnnamed3054(o.skills);
-    checkUnnamed3055(o.taglines);
-    checkUnnamed3056(o.urls);
-    checkUnnamed3057(o.userDefined);
+    checkUnnamed3122(o.skills);
+    checkUnnamed3123(o.taglines);
+    checkUnnamed3124(o.urls);
+    checkUnnamed3125(o.userDefined);
   }
   buildCounterPerson--;
 }
 
-buildUnnamed3058() {
+buildUnnamed3126() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3058(core.List<core.String> o) {
+checkUnnamed3126(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3059() {
+buildUnnamed3127() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3059(core.List<core.String> o) {
+checkUnnamed3127(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3060() {
+buildUnnamed3128() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed3060(core.List<api.Source> o) {
+checkUnnamed3128(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -1410,10 +1410,10 @@
   buildCounterPersonMetadata++;
   if (buildCounterPersonMetadata < 3) {
     o.deleted = true;
-    o.linkedPeopleResourceNames = buildUnnamed3058();
+    o.linkedPeopleResourceNames = buildUnnamed3126();
     o.objectType = "foo";
-    o.previousResourceNames = buildUnnamed3059();
-    o.sources = buildUnnamed3060();
+    o.previousResourceNames = buildUnnamed3127();
+    o.sources = buildUnnamed3128();
   }
   buildCounterPersonMetadata--;
   return o;
@@ -1423,10 +1423,10 @@
   buildCounterPersonMetadata++;
   if (buildCounterPersonMetadata < 3) {
     unittest.expect(o.deleted, unittest.isTrue);
-    checkUnnamed3058(o.linkedPeopleResourceNames);
+    checkUnnamed3126(o.linkedPeopleResourceNames);
     unittest.expect(o.objectType, unittest.equals('foo'));
-    checkUnnamed3059(o.previousResourceNames);
-    checkUnnamed3060(o.sources);
+    checkUnnamed3127(o.previousResourceNames);
+    checkUnnamed3128(o.sources);
   }
   buildCounterPersonMetadata--;
 }
@@ -1506,14 +1506,14 @@
   buildCounterPhoto--;
 }
 
-buildUnnamed3061() {
+buildUnnamed3129() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3061(core.List<core.String> o) {
+checkUnnamed3129(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1525,7 +1525,7 @@
   buildCounterProfileMetadata++;
   if (buildCounterProfileMetadata < 3) {
     o.objectType = "foo";
-    o.userTypes = buildUnnamed3061();
+    o.userTypes = buildUnnamed3129();
   }
   buildCounterProfileMetadata--;
   return o;
@@ -1535,7 +1535,7 @@
   buildCounterProfileMetadata++;
   if (buildCounterProfileMetadata < 3) {
     unittest.expect(o.objectType, unittest.equals('foo'));
-    checkUnnamed3061(o.userTypes);
+    checkUnnamed3129(o.userTypes);
   }
   buildCounterProfileMetadata--;
 }
@@ -1682,7 +1682,7 @@
   buildCounterSource--;
 }
 
-buildUnnamed3062() {
+buildUnnamed3130() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1697,7 +1697,7 @@
   return o;
 }
 
-checkUnnamed3062(core.Map<core.String, core.Object> o) {
+checkUnnamed3130(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1711,17 +1711,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3063() {
+buildUnnamed3131() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3062());
-  o.add(buildUnnamed3062());
+  o.add(buildUnnamed3130());
+  o.add(buildUnnamed3130());
   return o;
 }
 
-checkUnnamed3063(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed3131(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3062(o[0]);
-  checkUnnamed3062(o[1]);
+  checkUnnamed3130(o[0]);
+  checkUnnamed3130(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1730,7 +1730,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed3063();
+    o.details = buildUnnamed3131();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1741,7 +1741,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed3063(o.details);
+    checkUnnamed3131(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -1835,27 +1835,27 @@
   buildCounterUserDefined--;
 }
 
-buildUnnamed3064() {
+buildUnnamed3132() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3064(core.List<core.String> o) {
+checkUnnamed3132(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3065() {
+buildUnnamed3133() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3065(core.List<core.String> o) {
+checkUnnamed3133(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2258,7 +2258,7 @@
     unittest.test("method--batchGet", () {
       var mock = new HttpServerMock();
       api.ContactGroupsResourceApi res = new api.PeopleApi(mock).contactGroups;
-      var arg_resourceNames = buildUnnamed3064();
+      var arg_resourceNames = buildUnnamed3132();
       var arg_maxMembers = 42;
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -2308,8 +2308,7 @@
               resourceNames: arg_resourceNames,
               maxMembers: arg_maxMembers,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.BatchGetContactGroupsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBatchGetContactGroupsResponse(response);
       })));
     });
@@ -2362,7 +2361,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContactGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkContactGroup(response);
       })));
     });
@@ -2417,7 +2416,7 @@
       res
           .delete(arg_resourceName,
               deleteContacts: arg_deleteContacts, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2472,7 +2471,7 @@
       res
           .get(arg_resourceName,
               maxMembers: arg_maxMembers, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContactGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkContactGroup(response);
       })));
     });
@@ -2534,8 +2533,7 @@
               pageSize: arg_pageSize,
               syncToken: arg_syncToken,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListContactGroupsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListContactGroupsResponse(response);
       })));
     });
@@ -2590,7 +2588,7 @@
       }), true);
       res
           .update(arg_request, arg_resourceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContactGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkContactGroup(response);
       })));
     });
@@ -2647,9 +2645,9 @@
             convert.JSON.encode(buildModifyContactGroupMembersResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.modify(arg_request, arg_resourceName, $fields: arg_$fields).then(
-          unittest
-              .expectAsync1(((api.ModifyContactGroupMembersResponse response) {
+      res
+          .modify(arg_request, arg_resourceName, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkModifyContactGroupMembersResponse(response);
       })));
     });
@@ -2706,7 +2704,7 @@
       }), true);
       res
           .createContact(arg_request, parent: arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Person response) {
+          .then(unittest.expectAsync1(((response) {
         checkPerson(response);
       })));
     });
@@ -2757,7 +2755,7 @@
       }), true);
       res
           .deleteContact(arg_resourceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2817,7 +2815,7 @@
               personFields: arg_personFields,
               requestMask_includeField: arg_requestMask_includeField,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Person response) {
+          .then(unittest.expectAsync1(((response) {
         checkPerson(response);
       })));
     });
@@ -2827,7 +2825,7 @@
       api.PeopleResourceApi res = new api.PeopleApi(mock).people;
       var arg_personFields = "foo";
       var arg_requestMask_includeField = "foo";
-      var arg_resourceNames = buildUnnamed3065();
+      var arg_resourceNames = buildUnnamed3133();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2879,7 +2877,7 @@
               requestMask_includeField: arg_requestMask_includeField,
               resourceNames: arg_resourceNames,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetPeopleResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetPeopleResponse(response);
       })));
     });
@@ -2938,7 +2936,7 @@
       res
           .updateContact(arg_request, arg_resourceName,
               updatePersonFields: arg_updatePersonFields, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Person response) {
+          .then(unittest.expectAsync1(((response) {
         checkPerson(response);
       })));
     });
@@ -3021,7 +3019,7 @@
               syncToken: arg_syncToken,
               personFields: arg_personFields,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListConnectionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListConnectionsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/playcustomapp/v1_test.dart b/generated/googleapis/test/playcustomapp/v1_test.dart
index 49baa15..edd8efc 100644
--- a/generated/googleapis/test/playcustomapp/v1_test.dart
+++ b/generated/googleapis/test/playcustomapp/v1_test.dart
@@ -131,7 +131,7 @@
       }), true);
       res
           .create(arg_request, arg_account, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CustomApp response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomApp(response);
       })));
     });
diff --git a/generated/googleapis/test/plus/v1_test.dart b/generated/googleapis/test/plus/v1_test.dart
index 8f03162..e6687f7 100644
--- a/generated/googleapis/test/plus/v1_test.dart
+++ b/generated/googleapis/test/plus/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3277() {
+buildUnnamed3442() {
   var o = new core.List<api.PlusAclentryResource>();
   o.add(buildPlusAclentryResource());
   o.add(buildPlusAclentryResource());
   return o;
 }
 
-checkUnnamed3277(core.List<api.PlusAclentryResource> o) {
+checkUnnamed3442(core.List<api.PlusAclentryResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlusAclentryResource(o[0]);
   checkPlusAclentryResource(o[1]);
@@ -69,7 +69,7 @@
   buildCounterAcl++;
   if (buildCounterAcl < 3) {
     o.description = "foo";
-    o.items = buildUnnamed3277();
+    o.items = buildUnnamed3442();
     o.kind = "foo";
   }
   buildCounterAcl--;
@@ -80,7 +80,7 @@
   buildCounterAcl++;
   if (buildCounterAcl < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed3277(o.items);
+    checkUnnamed3442(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAcl--;
@@ -453,14 +453,14 @@
   buildCounterActivityObjectAttachmentsThumbnails--;
 }
 
-buildUnnamed3278() {
+buildUnnamed3443() {
   var o = new core.List<api.ActivityObjectAttachmentsThumbnails>();
   o.add(buildActivityObjectAttachmentsThumbnails());
   o.add(buildActivityObjectAttachmentsThumbnails());
   return o;
 }
 
-checkUnnamed3278(core.List<api.ActivityObjectAttachmentsThumbnails> o) {
+checkUnnamed3443(core.List<api.ActivityObjectAttachmentsThumbnails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachmentsThumbnails(o[0]);
   checkActivityObjectAttachmentsThumbnails(o[1]);
@@ -478,7 +478,7 @@
     o.id = "foo";
     o.image = buildActivityObjectAttachmentsImage();
     o.objectType = "foo";
-    o.thumbnails = buildUnnamed3278();
+    o.thumbnails = buildUnnamed3443();
     o.url = "foo";
   }
   buildCounterActivityObjectAttachments--;
@@ -495,20 +495,20 @@
     unittest.expect(o.id, unittest.equals('foo'));
     checkActivityObjectAttachmentsImage(o.image);
     unittest.expect(o.objectType, unittest.equals('foo'));
-    checkUnnamed3278(o.thumbnails);
+    checkUnnamed3443(o.thumbnails);
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterActivityObjectAttachments--;
 }
 
-buildUnnamed3279() {
+buildUnnamed3444() {
   var o = new core.List<api.ActivityObjectAttachments>();
   o.add(buildActivityObjectAttachments());
   o.add(buildActivityObjectAttachments());
   return o;
 }
 
-checkUnnamed3279(core.List<api.ActivityObjectAttachments> o) {
+checkUnnamed3444(core.List<api.ActivityObjectAttachments> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachments(o[0]);
   checkActivityObjectAttachments(o[1]);
@@ -583,7 +583,7 @@
   buildCounterActivityObject++;
   if (buildCounterActivityObject < 3) {
     o.actor = buildActivityObjectActor();
-    o.attachments = buildUnnamed3279();
+    o.attachments = buildUnnamed3444();
     o.content = "foo";
     o.id = "foo";
     o.objectType = "foo";
@@ -601,7 +601,7 @@
   buildCounterActivityObject++;
   if (buildCounterActivityObject < 3) {
     checkActivityObjectActor(o.actor);
-    checkUnnamed3279(o.attachments);
+    checkUnnamed3444(o.attachments);
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
@@ -692,14 +692,14 @@
   buildCounterActivity--;
 }
 
-buildUnnamed3280() {
+buildUnnamed3445() {
   var o = new core.List<api.Activity>();
   o.add(buildActivity());
   o.add(buildActivity());
   return o;
 }
 
-checkUnnamed3280(core.List<api.Activity> o) {
+checkUnnamed3445(core.List<api.Activity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivity(o[0]);
   checkActivity(o[1]);
@@ -712,7 +712,7 @@
   if (buildCounterActivityFeed < 3) {
     o.etag = "foo";
     o.id = "foo";
-    o.items = buildUnnamed3280();
+    o.items = buildUnnamed3445();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -729,7 +729,7 @@
   if (buildCounterActivityFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed3280(o.items);
+    checkUnnamed3445(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -871,14 +871,14 @@
   buildCounterCommentInReplyTo--;
 }
 
-buildUnnamed3281() {
+buildUnnamed3446() {
   var o = new core.List<api.CommentInReplyTo>();
   o.add(buildCommentInReplyTo());
   o.add(buildCommentInReplyTo());
   return o;
 }
 
-checkUnnamed3281(core.List<api.CommentInReplyTo> o) {
+checkUnnamed3446(core.List<api.CommentInReplyTo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommentInReplyTo(o[0]);
   checkCommentInReplyTo(o[1]);
@@ -934,7 +934,7 @@
     o.actor = buildCommentActor();
     o.etag = "foo";
     o.id = "foo";
-    o.inReplyTo = buildUnnamed3281();
+    o.inReplyTo = buildUnnamed3446();
     o.kind = "foo";
     o.object = buildCommentObject();
     o.plusoners = buildCommentPlusoners();
@@ -953,7 +953,7 @@
     checkCommentActor(o.actor);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed3281(o.inReplyTo);
+    checkUnnamed3446(o.inReplyTo);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkCommentObject(o.object);
     checkCommentPlusoners(o.plusoners);
@@ -967,14 +967,14 @@
   buildCounterComment--;
 }
 
-buildUnnamed3282() {
+buildUnnamed3447() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed3282(core.List<api.Comment> o) {
+checkUnnamed3447(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -987,7 +987,7 @@
   if (buildCounterCommentFeed < 3) {
     o.etag = "foo";
     o.id = "foo";
-    o.items = buildUnnamed3282();
+    o.items = buildUnnamed3447();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -1003,7 +1003,7 @@
   if (buildCounterCommentFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed3282(o.items);
+    checkUnnamed3447(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -1014,14 +1014,14 @@
   buildCounterCommentFeed--;
 }
 
-buildUnnamed3283() {
+buildUnnamed3448() {
   var o = new core.List<api.Person>();
   o.add(buildPerson());
   o.add(buildPerson());
   return o;
 }
 
-checkUnnamed3283(core.List<api.Person> o) {
+checkUnnamed3448(core.List<api.Person> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerson(o[0]);
   checkPerson(o[1]);
@@ -1033,7 +1033,7 @@
   buildCounterPeopleFeed++;
   if (buildCounterPeopleFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3283();
+    o.items = buildUnnamed3448();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1048,7 +1048,7 @@
   buildCounterPeopleFeed++;
   if (buildCounterPeopleFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3283(o.items);
+    checkUnnamed3448(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1167,14 +1167,14 @@
   buildCounterPersonEmails--;
 }
 
-buildUnnamed3284() {
+buildUnnamed3449() {
   var o = new core.List<api.PersonEmails>();
   o.add(buildPersonEmails());
   o.add(buildPersonEmails());
   return o;
 }
 
-checkUnnamed3284(core.List<api.PersonEmails> o) {
+checkUnnamed3449(core.List<api.PersonEmails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonEmails(o[0]);
   checkPersonEmails(o[1]);
@@ -1265,14 +1265,14 @@
   buildCounterPersonOrganizations--;
 }
 
-buildUnnamed3285() {
+buildUnnamed3450() {
   var o = new core.List<api.PersonOrganizations>();
   o.add(buildPersonOrganizations());
   o.add(buildPersonOrganizations());
   return o;
 }
 
-checkUnnamed3285(core.List<api.PersonOrganizations> o) {
+checkUnnamed3450(core.List<api.PersonOrganizations> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonOrganizations(o[0]);
   checkPersonOrganizations(o[1]);
@@ -1299,14 +1299,14 @@
   buildCounterPersonPlacesLived--;
 }
 
-buildUnnamed3286() {
+buildUnnamed3451() {
   var o = new core.List<api.PersonPlacesLived>();
   o.add(buildPersonPlacesLived());
   o.add(buildPersonPlacesLived());
   return o;
 }
 
-checkUnnamed3286(core.List<api.PersonPlacesLived> o) {
+checkUnnamed3451(core.List<api.PersonPlacesLived> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonPlacesLived(o[0]);
   checkPersonPlacesLived(o[1]);
@@ -1335,14 +1335,14 @@
   buildCounterPersonUrls--;
 }
 
-buildUnnamed3287() {
+buildUnnamed3452() {
   var o = new core.List<api.PersonUrls>();
   o.add(buildPersonUrls());
   o.add(buildPersonUrls());
   return o;
 }
 
-checkUnnamed3287(core.List<api.PersonUrls> o) {
+checkUnnamed3452(core.List<api.PersonUrls> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonUrls(o[0]);
   checkPersonUrls(o[1]);
@@ -1362,7 +1362,7 @@
     o.currentLocation = "foo";
     o.displayName = "foo";
     o.domain = "foo";
-    o.emails = buildUnnamed3284();
+    o.emails = buildUnnamed3449();
     o.etag = "foo";
     o.gender = "foo";
     o.id = "foo";
@@ -1374,14 +1374,14 @@
     o.nickname = "foo";
     o.objectType = "foo";
     o.occupation = "foo";
-    o.organizations = buildUnnamed3285();
-    o.placesLived = buildUnnamed3286();
+    o.organizations = buildUnnamed3450();
+    o.placesLived = buildUnnamed3451();
     o.plusOneCount = 42;
     o.relationshipStatus = "foo";
     o.skills = "foo";
     o.tagline = "foo";
     o.url = "foo";
-    o.urls = buildUnnamed3287();
+    o.urls = buildUnnamed3452();
     o.verified = true;
   }
   buildCounterPerson--;
@@ -1400,7 +1400,7 @@
     unittest.expect(o.currentLocation, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.domain, unittest.equals('foo'));
-    checkUnnamed3284(o.emails);
+    checkUnnamed3449(o.emails);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.gender, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
@@ -1412,14 +1412,14 @@
     unittest.expect(o.nickname, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
     unittest.expect(o.occupation, unittest.equals('foo'));
-    checkUnnamed3285(o.organizations);
-    checkUnnamed3286(o.placesLived);
+    checkUnnamed3450(o.organizations);
+    checkUnnamed3451(o.placesLived);
     unittest.expect(o.plusOneCount, unittest.equals(42));
     unittest.expect(o.relationshipStatus, unittest.equals('foo'));
     unittest.expect(o.skills, unittest.equals('foo'));
     unittest.expect(o.tagline, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
-    checkUnnamed3287(o.urls);
+    checkUnnamed3452(o.urls);
     unittest.expect(o.verified, unittest.isTrue);
   }
   buildCounterPerson--;
@@ -1989,7 +1989,7 @@
       }), true);
       res
           .get(arg_activityId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Activity response) {
+          .then(unittest.expectAsync1(((response) {
         checkActivity(response);
       })));
     });
@@ -2064,7 +2064,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ActivityFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkActivityFeed(response);
       })));
     });
@@ -2135,7 +2135,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ActivityFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkActivityFeed(response);
       })));
     });
@@ -2193,7 +2193,7 @@
       }), true);
       res
           .get(arg_commentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -2268,7 +2268,7 @@
               pageToken: arg_pageToken,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentFeed(response);
       })));
     });
@@ -2326,7 +2326,7 @@
       }), true);
       res
           .get(arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Person response) {
+          .then(unittest.expectAsync1(((response) {
         checkPerson(response);
       })));
     });
@@ -2405,7 +2405,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PeopleFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkPeopleFeed(response);
       })));
     });
@@ -2480,7 +2480,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PeopleFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkPeopleFeed(response);
       })));
     });
@@ -2547,7 +2547,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PeopleFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkPeopleFeed(response);
       })));
     });
diff --git a/generated/googleapis/test/plusdomains/v1_test.dart b/generated/googleapis/test/plusdomains/v1_test.dart
index c89754d..b4f29ca 100644
--- a/generated/googleapis/test/plusdomains/v1_test.dart
+++ b/generated/googleapis/test/plusdomains/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2623() {
+buildUnnamed504() {
   var o = new core.List<api.PlusDomainsAclentryResource>();
   o.add(buildPlusDomainsAclentryResource());
   o.add(buildPlusDomainsAclentryResource());
   return o;
 }
 
-checkUnnamed2623(core.List<api.PlusDomainsAclentryResource> o) {
+checkUnnamed504(core.List<api.PlusDomainsAclentryResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlusDomainsAclentryResource(o[0]);
   checkPlusDomainsAclentryResource(o[1]);
@@ -70,7 +70,7 @@
   if (buildCounterAcl < 3) {
     o.description = "foo";
     o.domainRestricted = true;
-    o.items = buildUnnamed2623();
+    o.items = buildUnnamed504();
     o.kind = "foo";
   }
   buildCounterAcl--;
@@ -82,7 +82,7 @@
   if (buildCounterAcl < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.domainRestricted, unittest.isTrue);
-    checkUnnamed2623(o.items);
+    checkUnnamed504(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterAcl--;
@@ -425,14 +425,14 @@
   buildCounterActivityObjectAttachmentsPreviewThumbnails--;
 }
 
-buildUnnamed2624() {
+buildUnnamed505() {
   var o = new core.List<api.ActivityObjectAttachmentsPreviewThumbnails>();
   o.add(buildActivityObjectAttachmentsPreviewThumbnails());
   o.add(buildActivityObjectAttachmentsPreviewThumbnails());
   return o;
 }
 
-checkUnnamed2624(core.List<api.ActivityObjectAttachmentsPreviewThumbnails> o) {
+checkUnnamed505(core.List<api.ActivityObjectAttachmentsPreviewThumbnails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachmentsPreviewThumbnails(o[0]);
   checkActivityObjectAttachmentsPreviewThumbnails(o[1]);
@@ -488,14 +488,14 @@
   buildCounterActivityObjectAttachmentsThumbnails--;
 }
 
-buildUnnamed2625() {
+buildUnnamed506() {
   var o = new core.List<api.ActivityObjectAttachmentsThumbnails>();
   o.add(buildActivityObjectAttachmentsThumbnails());
   o.add(buildActivityObjectAttachmentsThumbnails());
   return o;
 }
 
-checkUnnamed2625(core.List<api.ActivityObjectAttachmentsThumbnails> o) {
+checkUnnamed506(core.List<api.ActivityObjectAttachmentsThumbnails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachmentsThumbnails(o[0]);
   checkActivityObjectAttachmentsThumbnails(o[1]);
@@ -513,8 +513,8 @@
     o.id = "foo";
     o.image = buildActivityObjectAttachmentsImage();
     o.objectType = "foo";
-    o.previewThumbnails = buildUnnamed2624();
-    o.thumbnails = buildUnnamed2625();
+    o.previewThumbnails = buildUnnamed505();
+    o.thumbnails = buildUnnamed506();
     o.url = "foo";
   }
   buildCounterActivityObjectAttachments--;
@@ -531,21 +531,21 @@
     unittest.expect(o.id, unittest.equals('foo'));
     checkActivityObjectAttachmentsImage(o.image);
     unittest.expect(o.objectType, unittest.equals('foo'));
-    checkUnnamed2624(o.previewThumbnails);
-    checkUnnamed2625(o.thumbnails);
+    checkUnnamed505(o.previewThumbnails);
+    checkUnnamed506(o.thumbnails);
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterActivityObjectAttachments--;
 }
 
-buildUnnamed2626() {
+buildUnnamed507() {
   var o = new core.List<api.ActivityObjectAttachments>();
   o.add(buildActivityObjectAttachments());
   o.add(buildActivityObjectAttachments());
   return o;
 }
 
-checkUnnamed2626(core.List<api.ActivityObjectAttachments> o) {
+checkUnnamed507(core.List<api.ActivityObjectAttachments> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivityObjectAttachments(o[0]);
   checkActivityObjectAttachments(o[1]);
@@ -647,7 +647,7 @@
   buildCounterActivityObject++;
   if (buildCounterActivityObject < 3) {
     o.actor = buildActivityObjectActor();
-    o.attachments = buildUnnamed2626();
+    o.attachments = buildUnnamed507();
     o.content = "foo";
     o.id = "foo";
     o.objectType = "foo";
@@ -666,7 +666,7 @@
   buildCounterActivityObject++;
   if (buildCounterActivityObject < 3) {
     checkActivityObjectActor(o.actor);
-    checkUnnamed2626(o.attachments);
+    checkUnnamed507(o.attachments);
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
@@ -758,14 +758,14 @@
   buildCounterActivity--;
 }
 
-buildUnnamed2627() {
+buildUnnamed508() {
   var o = new core.List<api.Activity>();
   o.add(buildActivity());
   o.add(buildActivity());
   return o;
 }
 
-checkUnnamed2627(core.List<api.Activity> o) {
+checkUnnamed508(core.List<api.Activity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivity(o[0]);
   checkActivity(o[1]);
@@ -778,7 +778,7 @@
   if (buildCounterActivityFeed < 3) {
     o.etag = "foo";
     o.id = "foo";
-    o.items = buildUnnamed2627();
+    o.items = buildUnnamed508();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -795,7 +795,7 @@
   if (buildCounterActivityFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2627(o.items);
+    checkUnnamed508(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -834,14 +834,14 @@
   buildCounterAudience--;
 }
 
-buildUnnamed2628() {
+buildUnnamed509() {
   var o = new core.List<api.Audience>();
   o.add(buildAudience());
   o.add(buildAudience());
   return o;
 }
 
-checkUnnamed2628(core.List<api.Audience> o) {
+checkUnnamed509(core.List<api.Audience> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAudience(o[0]);
   checkAudience(o[1]);
@@ -853,7 +853,7 @@
   buildCounterAudiencesFeed++;
   if (buildCounterAudiencesFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2628();
+    o.items = buildUnnamed509();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.totalItems = 42;
@@ -866,7 +866,7 @@
   buildCounterAudiencesFeed++;
   if (buildCounterAudiencesFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2628(o.items);
+    checkUnnamed509(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalItems, unittest.equals(42));
@@ -924,14 +924,14 @@
   buildCounterCircle--;
 }
 
-buildUnnamed2629() {
+buildUnnamed510() {
   var o = new core.List<api.Circle>();
   o.add(buildCircle());
   o.add(buildCircle());
   return o;
 }
 
-checkUnnamed2629(core.List<api.Circle> o) {
+checkUnnamed510(core.List<api.Circle> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCircle(o[0]);
   checkCircle(o[1]);
@@ -943,7 +943,7 @@
   buildCounterCircleFeed++;
   if (buildCounterCircleFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2629();
+    o.items = buildUnnamed510();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -959,7 +959,7 @@
   buildCounterCircleFeed++;
   if (buildCounterCircleFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2629(o.items);
+    checkUnnamed510(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -1100,14 +1100,14 @@
   buildCounterCommentInReplyTo--;
 }
 
-buildUnnamed2630() {
+buildUnnamed511() {
   var o = new core.List<api.CommentInReplyTo>();
   o.add(buildCommentInReplyTo());
   o.add(buildCommentInReplyTo());
   return o;
 }
 
-checkUnnamed2630(core.List<api.CommentInReplyTo> o) {
+checkUnnamed511(core.List<api.CommentInReplyTo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommentInReplyTo(o[0]);
   checkCommentInReplyTo(o[1]);
@@ -1163,7 +1163,7 @@
     o.actor = buildCommentActor();
     o.etag = "foo";
     o.id = "foo";
-    o.inReplyTo = buildUnnamed2630();
+    o.inReplyTo = buildUnnamed511();
     o.kind = "foo";
     o.object = buildCommentObject();
     o.plusoners = buildCommentPlusoners();
@@ -1182,7 +1182,7 @@
     checkCommentActor(o.actor);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2630(o.inReplyTo);
+    checkUnnamed511(o.inReplyTo);
     unittest.expect(o.kind, unittest.equals('foo'));
     checkCommentObject(o.object);
     checkCommentPlusoners(o.plusoners);
@@ -1196,14 +1196,14 @@
   buildCounterComment--;
 }
 
-buildUnnamed2631() {
+buildUnnamed512() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed2631(core.List<api.Comment> o) {
+checkUnnamed512(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -1216,7 +1216,7 @@
   if (buildCounterCommentFeed < 3) {
     o.etag = "foo";
     o.id = "foo";
-    o.items = buildUnnamed2631();
+    o.items = buildUnnamed512();
     o.kind = "foo";
     o.nextLink = "foo";
     o.nextPageToken = "foo";
@@ -1232,7 +1232,7 @@
   if (buildCounterCommentFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2631(o.items);
+    checkUnnamed512(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextLink, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -1307,14 +1307,14 @@
   buildCounterMediaExif--;
 }
 
-buildUnnamed2632() {
+buildUnnamed513() {
   var o = new core.List<api.Videostream>();
   o.add(buildVideostream());
   o.add(buildVideostream());
   return o;
 }
 
-checkUnnamed2632(core.List<api.Videostream> o) {
+checkUnnamed513(core.List<api.Videostream> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideostream(o[0]);
   checkVideostream(o[1]);
@@ -1336,7 +1336,7 @@
     o.mediaUrl = "foo";
     o.published = core.DateTime.parse("2002-02-27T14:01:02");
     o.sizeBytes = "foo";
-    o.streams = buildUnnamed2632();
+    o.streams = buildUnnamed513();
     o.summary = "foo";
     o.updated = core.DateTime.parse("2002-02-27T14:01:02");
     o.url = "foo";
@@ -1364,7 +1364,7 @@
     unittest.expect(o.published,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.sizeBytes, unittest.equals('foo'));
-    checkUnnamed2632(o.streams);
+    checkUnnamed513(o.streams);
     unittest.expect(o.summary, unittest.equals('foo'));
     unittest.expect(
         o.updated, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
@@ -1376,14 +1376,14 @@
   buildCounterMedia--;
 }
 
-buildUnnamed2633() {
+buildUnnamed514() {
   var o = new core.List<api.Person>();
   o.add(buildPerson());
   o.add(buildPerson());
   return o;
 }
 
-checkUnnamed2633(core.List<api.Person> o) {
+checkUnnamed514(core.List<api.Person> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerson(o[0]);
   checkPerson(o[1]);
@@ -1395,7 +1395,7 @@
   buildCounterPeopleFeed++;
   if (buildCounterPeopleFeed < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2633();
+    o.items = buildUnnamed514();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -1410,7 +1410,7 @@
   buildCounterPeopleFeed++;
   if (buildCounterPeopleFeed < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2633(o.items);
+    checkUnnamed514(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -1508,14 +1508,14 @@
   buildCounterPersonEmails--;
 }
 
-buildUnnamed2634() {
+buildUnnamed515() {
   var o = new core.List<api.PersonEmails>();
   o.add(buildPersonEmails());
   o.add(buildPersonEmails());
   return o;
 }
 
-checkUnnamed2634(core.List<api.PersonEmails> o) {
+checkUnnamed515(core.List<api.PersonEmails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonEmails(o[0]);
   checkPersonEmails(o[1]);
@@ -1606,14 +1606,14 @@
   buildCounterPersonOrganizations--;
 }
 
-buildUnnamed2635() {
+buildUnnamed516() {
   var o = new core.List<api.PersonOrganizations>();
   o.add(buildPersonOrganizations());
   o.add(buildPersonOrganizations());
   return o;
 }
 
-checkUnnamed2635(core.List<api.PersonOrganizations> o) {
+checkUnnamed516(core.List<api.PersonOrganizations> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonOrganizations(o[0]);
   checkPersonOrganizations(o[1]);
@@ -1640,14 +1640,14 @@
   buildCounterPersonPlacesLived--;
 }
 
-buildUnnamed2636() {
+buildUnnamed517() {
   var o = new core.List<api.PersonPlacesLived>();
   o.add(buildPersonPlacesLived());
   o.add(buildPersonPlacesLived());
   return o;
 }
 
-checkUnnamed2636(core.List<api.PersonPlacesLived> o) {
+checkUnnamed517(core.List<api.PersonPlacesLived> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonPlacesLived(o[0]);
   checkPersonPlacesLived(o[1]);
@@ -1676,14 +1676,14 @@
   buildCounterPersonUrls--;
 }
 
-buildUnnamed2637() {
+buildUnnamed518() {
   var o = new core.List<api.PersonUrls>();
   o.add(buildPersonUrls());
   o.add(buildPersonUrls());
   return o;
 }
 
-checkUnnamed2637(core.List<api.PersonUrls> o) {
+checkUnnamed518(core.List<api.PersonUrls> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPersonUrls(o[0]);
   checkPersonUrls(o[1]);
@@ -1702,7 +1702,7 @@
     o.currentLocation = "foo";
     o.displayName = "foo";
     o.domain = "foo";
-    o.emails = buildUnnamed2634();
+    o.emails = buildUnnamed515();
     o.etag = "foo";
     o.gender = "foo";
     o.id = "foo";
@@ -1713,14 +1713,14 @@
     o.nickname = "foo";
     o.objectType = "foo";
     o.occupation = "foo";
-    o.organizations = buildUnnamed2635();
-    o.placesLived = buildUnnamed2636();
+    o.organizations = buildUnnamed516();
+    o.placesLived = buildUnnamed517();
     o.plusOneCount = 42;
     o.relationshipStatus = "foo";
     o.skills = "foo";
     o.tagline = "foo";
     o.url = "foo";
-    o.urls = buildUnnamed2637();
+    o.urls = buildUnnamed518();
     o.verified = true;
   }
   buildCounterPerson--;
@@ -1738,7 +1738,7 @@
     unittest.expect(o.currentLocation, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.domain, unittest.equals('foo'));
-    checkUnnamed2634(o.emails);
+    checkUnnamed515(o.emails);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.gender, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
@@ -1749,14 +1749,14 @@
     unittest.expect(o.nickname, unittest.equals('foo'));
     unittest.expect(o.objectType, unittest.equals('foo'));
     unittest.expect(o.occupation, unittest.equals('foo'));
-    checkUnnamed2635(o.organizations);
-    checkUnnamed2636(o.placesLived);
+    checkUnnamed516(o.organizations);
+    checkUnnamed517(o.placesLived);
     unittest.expect(o.plusOneCount, unittest.equals(42));
     unittest.expect(o.relationshipStatus, unittest.equals('foo'));
     unittest.expect(o.skills, unittest.equals('foo'));
     unittest.expect(o.tagline, unittest.equals('foo'));
     unittest.expect(o.url, unittest.equals('foo'));
-    checkUnnamed2637(o.urls);
+    checkUnnamed518(o.urls);
     unittest.expect(o.verified, unittest.isTrue);
   }
   buildCounterPerson--;
@@ -1877,53 +1877,53 @@
   buildCounterVideostream--;
 }
 
-buildUnnamed2638() {
+buildUnnamed519() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2638(core.List<core.String> o) {
+checkUnnamed519(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2639() {
+buildUnnamed520() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2639(core.List<core.String> o) {
+checkUnnamed520(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2640() {
+buildUnnamed521() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2640(core.List<core.String> o) {
+checkUnnamed521(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2641() {
+buildUnnamed522() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2641(core.List<core.String> o) {
+checkUnnamed522(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2492,7 +2492,7 @@
       }), true);
       res
           .get(arg_activityId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Activity response) {
+          .then(unittest.expectAsync1(((response) {
         checkActivity(response);
       })));
     });
@@ -2562,7 +2562,7 @@
       res
           .insert(arg_request, arg_userId,
               preview: arg_preview, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Activity response) {
+          .then(unittest.expectAsync1(((response) {
         checkActivity(response);
       })));
     });
@@ -2637,7 +2637,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ActivityFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkActivityFeed(response);
       })));
     });
@@ -2710,7 +2710,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AudiencesFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkAudiencesFeed(response);
       })));
     });
@@ -2721,8 +2721,8 @@
       var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_circleId = "foo";
-      var arg_email = buildUnnamed2638();
-      var arg_userId = buildUnnamed2639();
+      var arg_email = buildUnnamed519();
+      var arg_userId = buildUnnamed520();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -2779,7 +2779,7 @@
       res
           .addPeople(arg_circleId,
               email: arg_email, userId: arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Circle response) {
+          .then(unittest.expectAsync1(((response) {
         checkCircle(response);
       })));
     });
@@ -2835,7 +2835,7 @@
       }), true);
       res
           .get(arg_circleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Circle response) {
+          .then(unittest.expectAsync1(((response) {
         checkCircle(response);
       })));
     });
@@ -2901,7 +2901,7 @@
       }), true);
       res
           .insert(arg_request, arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Circle response) {
+          .then(unittest.expectAsync1(((response) {
         checkCircle(response);
       })));
     });
@@ -2972,7 +2972,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CircleFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkCircleFeed(response);
       })));
     });
@@ -3032,7 +3032,7 @@
       }), true);
       res
           .patch(arg_request, arg_circleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Circle response) {
+          .then(unittest.expectAsync1(((response) {
         checkCircle(response);
       })));
     });
@@ -3095,8 +3095,8 @@
       var mock = new HttpServerMock();
       api.CirclesResourceApi res = new api.PlusDomainsApi(mock).circles;
       var arg_circleId = "foo";
-      var arg_email = buildUnnamed2640();
-      var arg_userId = buildUnnamed2641();
+      var arg_email = buildUnnamed521();
+      var arg_userId = buildUnnamed522();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3211,7 +3211,7 @@
       }), true);
       res
           .update(arg_request, arg_circleId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Circle response) {
+          .then(unittest.expectAsync1(((response) {
         checkCircle(response);
       })));
     });
@@ -3269,7 +3269,7 @@
       }), true);
       res
           .get(arg_commentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -3335,7 +3335,7 @@
       }), true);
       res
           .insert(arg_request, arg_activityId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -3410,7 +3410,7 @@
               pageToken: arg_pageToken,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentFeed(response);
       })));
     });
@@ -3485,7 +3485,7 @@
       }), true);
       res
           .insert(arg_request, arg_userId, arg_collection, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Media response) {
+          .then(unittest.expectAsync1(((response) {
         checkMedia(response);
       })));
     });
@@ -3543,7 +3543,7 @@
       }), true);
       res
           .get(arg_userId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Person response) {
+          .then(unittest.expectAsync1(((response) {
         checkPerson(response);
       })));
     });
@@ -3622,7 +3622,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PeopleFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkPeopleFeed(response);
       })));
     });
@@ -3697,7 +3697,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PeopleFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkPeopleFeed(response);
       })));
     });
@@ -3768,7 +3768,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PeopleFeed response) {
+          .then(unittest.expectAsync1(((response) {
         checkPeopleFeed(response);
       })));
     });
diff --git a/generated/googleapis/test/poly/v1_test.dart b/generated/googleapis/test/poly/v1_test.dart
index 22a96fe..dbcefd8 100644
--- a/generated/googleapis/test/poly/v1_test.dart
+++ b/generated/googleapis/test/poly/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2604() {
+buildUnnamed183() {
   var o = new core.List<api.Format>();
   o.add(buildFormat());
   o.add(buildFormat());
   return o;
 }
 
-checkUnnamed2604(core.List<api.Format> o) {
+checkUnnamed183(core.List<api.Format> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFormat(o[0]);
   checkFormat(o[1]);
@@ -72,7 +72,7 @@
     o.createTime = "foo";
     o.description = "foo";
     o.displayName = "foo";
-    o.formats = buildUnnamed2604();
+    o.formats = buildUnnamed183();
     o.isCurated = true;
     o.license = "foo";
     o.metadata = "foo";
@@ -93,7 +93,7 @@
     unittest.expect(o.createTime, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed2604(o.formats);
+    checkUnnamed183(o.formats);
     unittest.expect(o.isCurated, unittest.isTrue);
     unittest.expect(o.license, unittest.equals('foo'));
     unittest.expect(o.metadata, unittest.equals('foo'));
@@ -129,14 +129,14 @@
   buildCounterFile--;
 }
 
-buildUnnamed2605() {
+buildUnnamed184() {
   var o = new core.List<api.File>();
   o.add(buildFile());
   o.add(buildFile());
   return o;
 }
 
-checkUnnamed2605(core.List<api.File> o) {
+checkUnnamed184(core.List<api.File> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFile(o[0]);
   checkFile(o[1]);
@@ -149,7 +149,7 @@
   if (buildCounterFormat < 3) {
     o.formatComplexity = buildFormatComplexity();
     o.formatType = "foo";
-    o.resources = buildUnnamed2605();
+    o.resources = buildUnnamed184();
     o.root = buildFile();
   }
   buildCounterFormat--;
@@ -161,7 +161,7 @@
   if (buildCounterFormat < 3) {
     checkFormatComplexity(o.formatComplexity);
     unittest.expect(o.formatType, unittest.equals('foo'));
-    checkUnnamed2605(o.resources);
+    checkUnnamed184(o.resources);
     checkFile(o.root);
   }
   buildCounterFormat--;
@@ -188,14 +188,14 @@
   buildCounterFormatComplexity--;
 }
 
-buildUnnamed2606() {
+buildUnnamed185() {
   var o = new core.List<api.Asset>();
   o.add(buildAsset());
   o.add(buildAsset());
   return o;
 }
 
-checkUnnamed2606(core.List<api.Asset> o) {
+checkUnnamed185(core.List<api.Asset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAsset(o[0]);
   checkAsset(o[1]);
@@ -206,7 +206,7 @@
   var o = new api.ListAssetsResponse();
   buildCounterListAssetsResponse++;
   if (buildCounterListAssetsResponse < 3) {
-    o.assets = buildUnnamed2606();
+    o.assets = buildUnnamed185();
     o.nextPageToken = "foo";
     o.totalSize = 42;
   }
@@ -217,21 +217,21 @@
 checkListAssetsResponse(api.ListAssetsResponse o) {
   buildCounterListAssetsResponse++;
   if (buildCounterListAssetsResponse < 3) {
-    checkUnnamed2606(o.assets);
+    checkUnnamed185(o.assets);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalSize, unittest.equals(42));
   }
   buildCounterListAssetsResponse--;
 }
 
-buildUnnamed2607() {
+buildUnnamed186() {
   var o = new core.List<api.Asset>();
   o.add(buildAsset());
   o.add(buildAsset());
   return o;
 }
 
-checkUnnamed2607(core.List<api.Asset> o) {
+checkUnnamed186(core.List<api.Asset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAsset(o[0]);
   checkAsset(o[1]);
@@ -242,7 +242,7 @@
   var o = new api.ListLikedAssetsResponse();
   buildCounterListLikedAssetsResponse++;
   if (buildCounterListLikedAssetsResponse < 3) {
-    o.assets = buildUnnamed2607();
+    o.assets = buildUnnamed186();
     o.nextPageToken = "foo";
     o.totalSize = 42;
   }
@@ -253,21 +253,21 @@
 checkListLikedAssetsResponse(api.ListLikedAssetsResponse o) {
   buildCounterListLikedAssetsResponse++;
   if (buildCounterListLikedAssetsResponse < 3) {
-    checkUnnamed2607(o.assets);
+    checkUnnamed186(o.assets);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalSize, unittest.equals(42));
   }
   buildCounterListLikedAssetsResponse--;
 }
 
-buildUnnamed2608() {
+buildUnnamed187() {
   var o = new core.List<api.UserAsset>();
   o.add(buildUserAsset());
   o.add(buildUserAsset());
   return o;
 }
 
-checkUnnamed2608(core.List<api.UserAsset> o) {
+checkUnnamed187(core.List<api.UserAsset> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserAsset(o[0]);
   checkUserAsset(o[1]);
@@ -280,7 +280,7 @@
   if (buildCounterListUserAssetsResponse < 3) {
     o.nextPageToken = "foo";
     o.totalSize = 42;
-    o.userAssets = buildUnnamed2608();
+    o.userAssets = buildUnnamed187();
   }
   buildCounterListUserAssetsResponse--;
   return o;
@@ -291,7 +291,7 @@
   if (buildCounterListUserAssetsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalSize, unittest.equals(42));
-    checkUnnamed2608(o.userAssets);
+    checkUnnamed187(o.userAssets);
   }
   buildCounterListUserAssetsResponse--;
 }
@@ -489,7 +489,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Asset response) {
+          .then(unittest.expectAsync1(((response) {
         checkAsset(response);
       })));
     });
@@ -570,7 +570,7 @@
               format: arg_format,
               curated: arg_curated,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListAssetsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListAssetsResponse(response);
       })));
     });
@@ -643,7 +643,7 @@
               pageSize: arg_pageSize,
               visibility: arg_visibility,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListUserAssetsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListUserAssetsResponse(response);
       })));
     });
@@ -713,7 +713,7 @@
               pageSize: arg_pageSize,
               format: arg_format,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLikedAssetsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLikedAssetsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/prediction/v1_6_test.dart b/generated/googleapis/test/prediction/v1_6_test.dart
index 48ca6f8..fb1cbbe 100644
--- a/generated/googleapis/test/prediction/v1_6_test.dart
+++ b/generated/googleapis/test/prediction/v1_6_test.dart
@@ -72,14 +72,14 @@
   buildCounterAnalyzeDataDescriptionFeaturesCategoricalValues--;
 }
 
-buildUnnamed3718() {
+buildUnnamed2815() {
   var o = new core.List<api.AnalyzeDataDescriptionFeaturesCategoricalValues>();
   o.add(buildAnalyzeDataDescriptionFeaturesCategoricalValues());
   o.add(buildAnalyzeDataDescriptionFeaturesCategoricalValues());
   return o;
 }
 
-checkUnnamed3718(
+checkUnnamed2815(
     core.List<api.AnalyzeDataDescriptionFeaturesCategoricalValues> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnalyzeDataDescriptionFeaturesCategoricalValues(o[0]);
@@ -92,7 +92,7 @@
   buildCounterAnalyzeDataDescriptionFeaturesCategorical++;
   if (buildCounterAnalyzeDataDescriptionFeaturesCategorical < 3) {
     o.count = "foo";
-    o.values = buildUnnamed3718();
+    o.values = buildUnnamed2815();
   }
   buildCounterAnalyzeDataDescriptionFeaturesCategorical--;
   return o;
@@ -103,7 +103,7 @@
   buildCounterAnalyzeDataDescriptionFeaturesCategorical++;
   if (buildCounterAnalyzeDataDescriptionFeaturesCategorical < 3) {
     unittest.expect(o.count, unittest.equals('foo'));
-    checkUnnamed3718(o.values);
+    checkUnnamed2815(o.values);
   }
   buildCounterAnalyzeDataDescriptionFeaturesCategorical--;
 }
@@ -177,14 +177,14 @@
   buildCounterAnalyzeDataDescriptionFeatures--;
 }
 
-buildUnnamed3719() {
+buildUnnamed2816() {
   var o = new core.List<api.AnalyzeDataDescriptionFeatures>();
   o.add(buildAnalyzeDataDescriptionFeatures());
   o.add(buildAnalyzeDataDescriptionFeatures());
   return o;
 }
 
-checkUnnamed3719(core.List<api.AnalyzeDataDescriptionFeatures> o) {
+checkUnnamed2816(core.List<api.AnalyzeDataDescriptionFeatures> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnalyzeDataDescriptionFeatures(o[0]);
   checkAnalyzeDataDescriptionFeatures(o[1]);
@@ -236,14 +236,14 @@
   buildCounterAnalyzeDataDescriptionOutputFeatureText--;
 }
 
-buildUnnamed3720() {
+buildUnnamed2817() {
   var o = new core.List<api.AnalyzeDataDescriptionOutputFeatureText>();
   o.add(buildAnalyzeDataDescriptionOutputFeatureText());
   o.add(buildAnalyzeDataDescriptionOutputFeatureText());
   return o;
 }
 
-checkUnnamed3720(core.List<api.AnalyzeDataDescriptionOutputFeatureText> o) {
+checkUnnamed2817(core.List<api.AnalyzeDataDescriptionOutputFeatureText> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnalyzeDataDescriptionOutputFeatureText(o[0]);
   checkAnalyzeDataDescriptionOutputFeatureText(o[1]);
@@ -255,7 +255,7 @@
   buildCounterAnalyzeDataDescriptionOutputFeature++;
   if (buildCounterAnalyzeDataDescriptionOutputFeature < 3) {
     o.numeric = buildAnalyzeDataDescriptionOutputFeatureNumeric();
-    o.text = buildUnnamed3720();
+    o.text = buildUnnamed2817();
   }
   buildCounterAnalyzeDataDescriptionOutputFeature--;
   return o;
@@ -266,7 +266,7 @@
   buildCounterAnalyzeDataDescriptionOutputFeature++;
   if (buildCounterAnalyzeDataDescriptionOutputFeature < 3) {
     checkAnalyzeDataDescriptionOutputFeatureNumeric(o.numeric);
-    checkUnnamed3720(o.text);
+    checkUnnamed2817(o.text);
   }
   buildCounterAnalyzeDataDescriptionOutputFeature--;
 }
@@ -276,7 +276,7 @@
   var o = new api.AnalyzeDataDescription();
   buildCounterAnalyzeDataDescription++;
   if (buildCounterAnalyzeDataDescription < 3) {
-    o.features = buildUnnamed3719();
+    o.features = buildUnnamed2816();
     o.outputFeature = buildAnalyzeDataDescriptionOutputFeature();
   }
   buildCounterAnalyzeDataDescription--;
@@ -286,72 +286,72 @@
 checkAnalyzeDataDescription(api.AnalyzeDataDescription o) {
   buildCounterAnalyzeDataDescription++;
   if (buildCounterAnalyzeDataDescription < 3) {
-    checkUnnamed3719(o.features);
+    checkUnnamed2816(o.features);
     checkAnalyzeDataDescriptionOutputFeature(o.outputFeature);
   }
   buildCounterAnalyzeDataDescription--;
 }
 
-buildUnnamed3721() {
+buildUnnamed2818() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3721(core.Map<core.String, core.String> o) {
+checkUnnamed2818(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed3722() {
+buildUnnamed2819() {
   var o = new core.List<core.Map<core.String, core.String>>();
-  o.add(buildUnnamed3721());
-  o.add(buildUnnamed3721());
+  o.add(buildUnnamed2818());
+  o.add(buildUnnamed2818());
   return o;
 }
 
-checkUnnamed3722(core.List<core.Map<core.String, core.String>> o) {
+checkUnnamed2819(core.List<core.Map<core.String, core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3721(o[0]);
-  checkUnnamed3721(o[1]);
+  checkUnnamed2818(o[0]);
+  checkUnnamed2818(o[1]);
 }
 
-buildUnnamed3723() {
+buildUnnamed2820() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3723(core.Map<core.String, core.String> o) {
+checkUnnamed2820(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed3724() {
+buildUnnamed2821() {
   var o = new core.Map<core.String, core.Map<core.String, core.String>>();
-  o["x"] = buildUnnamed3723();
-  o["y"] = buildUnnamed3723();
+  o["x"] = buildUnnamed2820();
+  o["y"] = buildUnnamed2820();
   return o;
 }
 
-checkUnnamed3724(core.Map<core.String, core.Map<core.String, core.String>> o) {
+checkUnnamed2821(core.Map<core.String, core.Map<core.String, core.String>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3723(o["x"]);
-  checkUnnamed3723(o["y"]);
+  checkUnnamed2820(o["x"]);
+  checkUnnamed2820(o["y"]);
 }
 
-buildUnnamed3725() {
+buildUnnamed2822() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3725(core.Map<core.String, core.String> o) {
+checkUnnamed2822(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -362,8 +362,8 @@
   var o = new api.AnalyzeModelDescription();
   buildCounterAnalyzeModelDescription++;
   if (buildCounterAnalyzeModelDescription < 3) {
-    o.confusionMatrix = buildUnnamed3724();
-    o.confusionMatrixRowTotals = buildUnnamed3725();
+    o.confusionMatrix = buildUnnamed2821();
+    o.confusionMatrixRowTotals = buildUnnamed2822();
     o.modelinfo = buildInsert2();
   }
   buildCounterAnalyzeModelDescription--;
@@ -373,8 +373,8 @@
 checkAnalyzeModelDescription(api.AnalyzeModelDescription o) {
   buildCounterAnalyzeModelDescription++;
   if (buildCounterAnalyzeModelDescription < 3) {
-    checkUnnamed3724(o.confusionMatrix);
-    checkUnnamed3725(o.confusionMatrixRowTotals);
+    checkUnnamed2821(o.confusionMatrix);
+    checkUnnamed2822(o.confusionMatrixRowTotals);
     checkInsert2(o.modelinfo);
   }
   buildCounterAnalyzeModelDescription--;
@@ -386,7 +386,7 @@
   buildCounterAnalyze++;
   if (buildCounterAnalyze < 3) {
     o.dataDescription = buildAnalyzeDataDescription();
-    o.errors = buildUnnamed3722();
+    o.errors = buildUnnamed2819();
     o.id = "foo";
     o.kind = "foo";
     o.modelDescription = buildAnalyzeModelDescription();
@@ -400,7 +400,7 @@
   buildCounterAnalyze++;
   if (buildCounterAnalyze < 3) {
     checkAnalyzeDataDescription(o.dataDescription);
-    checkUnnamed3722(o.errors);
+    checkUnnamed2819(o.errors);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkAnalyzeModelDescription(o.modelDescription);
@@ -409,7 +409,7 @@
   buildCounterAnalyze--;
 }
 
-buildUnnamed3726() {
+buildUnnamed2823() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -424,7 +424,7 @@
   return o;
 }
 
-checkUnnamed3726(core.List<core.Object> o) {
+checkUnnamed2823(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -443,7 +443,7 @@
   var o = new api.InputInput();
   buildCounterInputInput++;
   if (buildCounterInputInput < 3) {
-    o.csvInstance = buildUnnamed3726();
+    o.csvInstance = buildUnnamed2823();
   }
   buildCounterInputInput--;
   return o;
@@ -452,7 +452,7 @@
 checkInputInput(api.InputInput o) {
   buildCounterInputInput++;
   if (buildCounterInputInput < 3) {
-    checkUnnamed3726(o.csvInstance);
+    checkUnnamed2823(o.csvInstance);
   }
   buildCounterInputInput--;
 }
@@ -476,7 +476,7 @@
   buildCounterInput--;
 }
 
-buildUnnamed3727() {
+buildUnnamed2824() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -491,7 +491,7 @@
   return o;
 }
 
-checkUnnamed3727(core.List<core.Object> o) {
+checkUnnamed2824(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o[0]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -510,7 +510,7 @@
   var o = new api.InsertTrainingInstances();
   buildCounterInsertTrainingInstances++;
   if (buildCounterInsertTrainingInstances < 3) {
-    o.csvInstance = buildUnnamed3727();
+    o.csvInstance = buildUnnamed2824();
     o.output = "foo";
   }
   buildCounterInsertTrainingInstances--;
@@ -520,49 +520,49 @@
 checkInsertTrainingInstances(api.InsertTrainingInstances o) {
   buildCounterInsertTrainingInstances++;
   if (buildCounterInsertTrainingInstances < 3) {
-    checkUnnamed3727(o.csvInstance);
+    checkUnnamed2824(o.csvInstance);
     unittest.expect(o.output, unittest.equals('foo'));
   }
   buildCounterInsertTrainingInstances--;
 }
 
-buildUnnamed3728() {
+buildUnnamed2825() {
   var o = new core.List<api.InsertTrainingInstances>();
   o.add(buildInsertTrainingInstances());
   o.add(buildInsertTrainingInstances());
   return o;
 }
 
-checkUnnamed3728(core.List<api.InsertTrainingInstances> o) {
+checkUnnamed2825(core.List<api.InsertTrainingInstances> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInsertTrainingInstances(o[0]);
   checkInsertTrainingInstances(o[1]);
 }
 
-buildUnnamed3729() {
+buildUnnamed2826() {
   var o = new core.Map<core.String, core.double>();
   o["x"] = 42.0;
   o["y"] = 42.0;
   return o;
 }
 
-checkUnnamed3729(core.Map<core.String, core.double> o) {
+checkUnnamed2826(core.Map<core.String, core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals(42.0));
   unittest.expect(o["y"], unittest.equals(42.0));
 }
 
-buildUnnamed3730() {
+buildUnnamed2827() {
   var o = new core.List<core.Map<core.String, core.double>>();
-  o.add(buildUnnamed3729());
-  o.add(buildUnnamed3729());
+  o.add(buildUnnamed2826());
+  o.add(buildUnnamed2826());
   return o;
 }
 
-checkUnnamed3730(core.List<core.Map<core.String, core.double>> o) {
+checkUnnamed2827(core.List<core.Map<core.String, core.double>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3729(o[0]);
-  checkUnnamed3729(o[1]);
+  checkUnnamed2826(o[0]);
+  checkUnnamed2826(o[1]);
 }
 
 core.int buildCounterInsert = 0;
@@ -576,8 +576,8 @@
     o.storageDataLocation = "foo";
     o.storagePMMLLocation = "foo";
     o.storagePMMLModelLocation = "foo";
-    o.trainingInstances = buildUnnamed3728();
-    o.utility = buildUnnamed3730();
+    o.trainingInstances = buildUnnamed2825();
+    o.utility = buildUnnamed2827();
   }
   buildCounterInsert--;
   return o;
@@ -592,8 +592,8 @@
     unittest.expect(o.storageDataLocation, unittest.equals('foo'));
     unittest.expect(o.storagePMMLLocation, unittest.equals('foo'));
     unittest.expect(o.storagePMMLModelLocation, unittest.equals('foo'));
-    checkUnnamed3728(o.trainingInstances);
-    checkUnnamed3730(o.utility);
+    checkUnnamed2825(o.trainingInstances);
+    checkUnnamed2827(o.utility);
   }
   buildCounterInsert--;
 }
@@ -668,14 +668,14 @@
   buildCounterInsert2--;
 }
 
-buildUnnamed3731() {
+buildUnnamed2828() {
   var o = new core.List<api.Insert2>();
   o.add(buildInsert2());
   o.add(buildInsert2());
   return o;
 }
 
-checkUnnamed3731(core.List<api.Insert2> o) {
+checkUnnamed2828(core.List<api.Insert2> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInsert2(o[0]);
   checkInsert2(o[1]);
@@ -686,7 +686,7 @@
   var o = new api.List();
   buildCounterList++;
   if (buildCounterList < 3) {
-    o.items = buildUnnamed3731();
+    o.items = buildUnnamed2828();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -698,7 +698,7 @@
 checkList(api.List o) {
   buildCounterList++;
   if (buildCounterList < 3) {
-    checkUnnamed3731(o.items);
+    checkUnnamed2828(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -727,14 +727,14 @@
   buildCounterOutputOutputMulti--;
 }
 
-buildUnnamed3732() {
+buildUnnamed2829() {
   var o = new core.List<api.OutputOutputMulti>();
   o.add(buildOutputOutputMulti());
   o.add(buildOutputOutputMulti());
   return o;
 }
 
-checkUnnamed3732(core.List<api.OutputOutputMulti> o) {
+checkUnnamed2829(core.List<api.OutputOutputMulti> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOutputOutputMulti(o[0]);
   checkOutputOutputMulti(o[1]);
@@ -748,7 +748,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.outputLabel = "foo";
-    o.outputMulti = buildUnnamed3732();
+    o.outputMulti = buildUnnamed2829();
     o.outputValue = "foo";
     o.selfLink = "foo";
   }
@@ -762,14 +762,14 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.outputLabel, unittest.equals('foo'));
-    checkUnnamed3732(o.outputMulti);
+    checkUnnamed2829(o.outputMulti);
     unittest.expect(o.outputValue, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
   buildCounterOutput--;
 }
 
-buildUnnamed3733() {
+buildUnnamed2830() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -784,7 +784,7 @@
   return o;
 }
 
-checkUnnamed3733(core.List<core.Object> o) {
+checkUnnamed2830(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o[0]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -803,7 +803,7 @@
   var o = new api.Update();
   buildCounterUpdate++;
   if (buildCounterUpdate < 3) {
-    o.csvInstance = buildUnnamed3733();
+    o.csvInstance = buildUnnamed2830();
     o.output = "foo";
   }
   buildCounterUpdate--;
@@ -813,7 +813,7 @@
 checkUpdate(api.Update o) {
   buildCounterUpdate++;
   if (buildCounterUpdate < 3) {
-    checkUnnamed3733(o.csvInstance);
+    checkUnnamed2830(o.csvInstance);
     unittest.expect(o.output, unittest.equals('foo'));
   }
   buildCounterUpdate--;
@@ -1044,7 +1044,7 @@
       res
           .predict(arg_request, arg_project, arg_hostedModelName,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Output response) {
+          .then(unittest.expectAsync1(((response) {
         checkOutput(response);
       })));
     });
@@ -1095,7 +1095,7 @@
       }), true);
       res
           .analyze(arg_project, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Analyze response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnalyze(response);
       })));
     });
@@ -1191,7 +1191,7 @@
       }), true);
       res
           .get(arg_project, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Insert2 response) {
+          .then(unittest.expectAsync1(((response) {
         checkInsert2(response);
       })));
     });
@@ -1243,7 +1243,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Insert2 response) {
+          .then(unittest.expectAsync1(((response) {
         checkInsert2(response);
       })));
     });
@@ -1300,7 +1300,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.List response) {
+          .then(unittest.expectAsync1(((response) {
         checkList(response);
       })));
     });
@@ -1353,7 +1353,7 @@
       }), true);
       res
           .predict(arg_request, arg_project, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Output response) {
+          .then(unittest.expectAsync1(((response) {
         checkOutput(response);
       })));
     });
@@ -1406,7 +1406,7 @@
       }), true);
       res
           .update(arg_request, arg_project, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Insert2 response) {
+          .then(unittest.expectAsync1(((response) {
         checkInsert2(response);
       })));
     });
diff --git a/generated/googleapis/test/pubsub/v1_test.dart b/generated/googleapis/test/pubsub/v1_test.dart
index b0ebe07..ec90eb2 100644
--- a/generated/googleapis/test/pubsub/v1_test.dart
+++ b/generated/googleapis/test/pubsub/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed191() {
+buildUnnamed1326() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed191(core.List<core.String> o) {
+checkUnnamed1326(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -68,7 +68,7 @@
   var o = new api.AcknowledgeRequest();
   buildCounterAcknowledgeRequest++;
   if (buildCounterAcknowledgeRequest < 3) {
-    o.ackIds = buildUnnamed191();
+    o.ackIds = buildUnnamed1326();
   }
   buildCounterAcknowledgeRequest--;
   return o;
@@ -77,19 +77,19 @@
 checkAcknowledgeRequest(api.AcknowledgeRequest o) {
   buildCounterAcknowledgeRequest++;
   if (buildCounterAcknowledgeRequest < 3) {
-    checkUnnamed191(o.ackIds);
+    checkUnnamed1326(o.ackIds);
   }
   buildCounterAcknowledgeRequest--;
 }
 
-buildUnnamed192() {
+buildUnnamed1327() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed192(core.List<core.String> o) {
+checkUnnamed1327(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -100,7 +100,7 @@
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed192();
+    o.members = buildUnnamed1327();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -110,7 +110,7 @@
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed192(o.members);
+    checkUnnamed1327(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
@@ -150,14 +150,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed193() {
+buildUnnamed1328() {
   var o = new core.List<api.Snapshot>();
   o.add(buildSnapshot());
   o.add(buildSnapshot());
   return o;
 }
 
-checkUnnamed193(core.List<api.Snapshot> o) {
+checkUnnamed1328(core.List<api.Snapshot> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSnapshot(o[0]);
   checkSnapshot(o[1]);
@@ -169,7 +169,7 @@
   buildCounterListSnapshotsResponse++;
   if (buildCounterListSnapshotsResponse < 3) {
     o.nextPageToken = "foo";
-    o.snapshots = buildUnnamed193();
+    o.snapshots = buildUnnamed1328();
   }
   buildCounterListSnapshotsResponse--;
   return o;
@@ -179,19 +179,19 @@
   buildCounterListSnapshotsResponse++;
   if (buildCounterListSnapshotsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed193(o.snapshots);
+    checkUnnamed1328(o.snapshots);
   }
   buildCounterListSnapshotsResponse--;
 }
 
-buildUnnamed194() {
+buildUnnamed1329() {
   var o = new core.List<api.Subscription>();
   o.add(buildSubscription());
   o.add(buildSubscription());
   return o;
 }
 
-checkUnnamed194(core.List<api.Subscription> o) {
+checkUnnamed1329(core.List<api.Subscription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubscription(o[0]);
   checkSubscription(o[1]);
@@ -203,7 +203,7 @@
   buildCounterListSubscriptionsResponse++;
   if (buildCounterListSubscriptionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.subscriptions = buildUnnamed194();
+    o.subscriptions = buildUnnamed1329();
   }
   buildCounterListSubscriptionsResponse--;
   return o;
@@ -213,19 +213,19 @@
   buildCounterListSubscriptionsResponse++;
   if (buildCounterListSubscriptionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed194(o.subscriptions);
+    checkUnnamed1329(o.subscriptions);
   }
   buildCounterListSubscriptionsResponse--;
 }
 
-buildUnnamed195() {
+buildUnnamed1330() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed195(core.List<core.String> o) {
+checkUnnamed1330(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -237,7 +237,7 @@
   buildCounterListTopicSnapshotsResponse++;
   if (buildCounterListTopicSnapshotsResponse < 3) {
     o.nextPageToken = "foo";
-    o.snapshots = buildUnnamed195();
+    o.snapshots = buildUnnamed1330();
   }
   buildCounterListTopicSnapshotsResponse--;
   return o;
@@ -247,19 +247,19 @@
   buildCounterListTopicSnapshotsResponse++;
   if (buildCounterListTopicSnapshotsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed195(o.snapshots);
+    checkUnnamed1330(o.snapshots);
   }
   buildCounterListTopicSnapshotsResponse--;
 }
 
-buildUnnamed196() {
+buildUnnamed1331() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed196(core.List<core.String> o) {
+checkUnnamed1331(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -271,7 +271,7 @@
   buildCounterListTopicSubscriptionsResponse++;
   if (buildCounterListTopicSubscriptionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.subscriptions = buildUnnamed196();
+    o.subscriptions = buildUnnamed1331();
   }
   buildCounterListTopicSubscriptionsResponse--;
   return o;
@@ -281,19 +281,19 @@
   buildCounterListTopicSubscriptionsResponse++;
   if (buildCounterListTopicSubscriptionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed196(o.subscriptions);
+    checkUnnamed1331(o.subscriptions);
   }
   buildCounterListTopicSubscriptionsResponse--;
 }
 
-buildUnnamed197() {
+buildUnnamed1332() {
   var o = new core.List<api.Topic>();
   o.add(buildTopic());
   o.add(buildTopic());
   return o;
 }
 
-checkUnnamed197(core.List<api.Topic> o) {
+checkUnnamed1332(core.List<api.Topic> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTopic(o[0]);
   checkTopic(o[1]);
@@ -305,7 +305,7 @@
   buildCounterListTopicsResponse++;
   if (buildCounterListTopicsResponse < 3) {
     o.nextPageToken = "foo";
-    o.topics = buildUnnamed197();
+    o.topics = buildUnnamed1332();
   }
   buildCounterListTopicsResponse--;
   return o;
@@ -315,19 +315,19 @@
   buildCounterListTopicsResponse++;
   if (buildCounterListTopicsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed197(o.topics);
+    checkUnnamed1332(o.topics);
   }
   buildCounterListTopicsResponse--;
 }
 
-buildUnnamed198() {
+buildUnnamed1333() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed198(core.List<core.String> o) {
+checkUnnamed1333(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -339,7 +339,7 @@
   buildCounterModifyAckDeadlineRequest++;
   if (buildCounterModifyAckDeadlineRequest < 3) {
     o.ackDeadlineSeconds = 42;
-    o.ackIds = buildUnnamed198();
+    o.ackIds = buildUnnamed1333();
   }
   buildCounterModifyAckDeadlineRequest--;
   return o;
@@ -349,7 +349,7 @@
   buildCounterModifyAckDeadlineRequest++;
   if (buildCounterModifyAckDeadlineRequest < 3) {
     unittest.expect(o.ackDeadlineSeconds, unittest.equals(42));
-    checkUnnamed198(o.ackIds);
+    checkUnnamed1333(o.ackIds);
   }
   buildCounterModifyAckDeadlineRequest--;
 }
@@ -373,14 +373,14 @@
   buildCounterModifyPushConfigRequest--;
 }
 
-buildUnnamed199() {
+buildUnnamed1334() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed199(core.List<api.Binding> o) {
+checkUnnamed1334(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -391,7 +391,7 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.bindings = buildUnnamed199();
+    o.bindings = buildUnnamed1334();
     o.etag = "foo";
     o.version = 42;
   }
@@ -402,21 +402,21 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed199(o.bindings);
+    checkUnnamed1334(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
   buildCounterPolicy--;
 }
 
-buildUnnamed200() {
+buildUnnamed1335() {
   var o = new core.List<api.PubsubMessage>();
   o.add(buildPubsubMessage());
   o.add(buildPubsubMessage());
   return o;
 }
 
-checkUnnamed200(core.List<api.PubsubMessage> o) {
+checkUnnamed1335(core.List<api.PubsubMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPubsubMessage(o[0]);
   checkPubsubMessage(o[1]);
@@ -427,7 +427,7 @@
   var o = new api.PublishRequest();
   buildCounterPublishRequest++;
   if (buildCounterPublishRequest < 3) {
-    o.messages = buildUnnamed200();
+    o.messages = buildUnnamed1335();
   }
   buildCounterPublishRequest--;
   return o;
@@ -436,19 +436,19 @@
 checkPublishRequest(api.PublishRequest o) {
   buildCounterPublishRequest++;
   if (buildCounterPublishRequest < 3) {
-    checkUnnamed200(o.messages);
+    checkUnnamed1335(o.messages);
   }
   buildCounterPublishRequest--;
 }
 
-buildUnnamed201() {
+buildUnnamed1336() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed201(core.List<core.String> o) {
+checkUnnamed1336(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -459,7 +459,7 @@
   var o = new api.PublishResponse();
   buildCounterPublishResponse++;
   if (buildCounterPublishResponse < 3) {
-    o.messageIds = buildUnnamed201();
+    o.messageIds = buildUnnamed1336();
   }
   buildCounterPublishResponse--;
   return o;
@@ -468,19 +468,19 @@
 checkPublishResponse(api.PublishResponse o) {
   buildCounterPublishResponse++;
   if (buildCounterPublishResponse < 3) {
-    checkUnnamed201(o.messageIds);
+    checkUnnamed1336(o.messageIds);
   }
   buildCounterPublishResponse--;
 }
 
-buildUnnamed202() {
+buildUnnamed1337() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed202(core.Map<core.String, core.String> o) {
+checkUnnamed1337(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -491,7 +491,7 @@
   var o = new api.PubsubMessage();
   buildCounterPubsubMessage++;
   if (buildCounterPubsubMessage < 3) {
-    o.attributes = buildUnnamed202();
+    o.attributes = buildUnnamed1337();
     o.data = "foo";
     o.messageId = "foo";
     o.publishTime = "foo";
@@ -503,7 +503,7 @@
 checkPubsubMessage(api.PubsubMessage o) {
   buildCounterPubsubMessage++;
   if (buildCounterPubsubMessage < 3) {
-    checkUnnamed202(o.attributes);
+    checkUnnamed1337(o.attributes);
     unittest.expect(o.data, unittest.equals('foo'));
     unittest.expect(o.messageId, unittest.equals('foo'));
     unittest.expect(o.publishTime, unittest.equals('foo'));
@@ -532,14 +532,14 @@
   buildCounterPullRequest--;
 }
 
-buildUnnamed203() {
+buildUnnamed1338() {
   var o = new core.List<api.ReceivedMessage>();
   o.add(buildReceivedMessage());
   o.add(buildReceivedMessage());
   return o;
 }
 
-checkUnnamed203(core.List<api.ReceivedMessage> o) {
+checkUnnamed1338(core.List<api.ReceivedMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReceivedMessage(o[0]);
   checkReceivedMessage(o[1]);
@@ -550,7 +550,7 @@
   var o = new api.PullResponse();
   buildCounterPullResponse++;
   if (buildCounterPullResponse < 3) {
-    o.receivedMessages = buildUnnamed203();
+    o.receivedMessages = buildUnnamed1338();
   }
   buildCounterPullResponse--;
   return o;
@@ -559,19 +559,19 @@
 checkPullResponse(api.PullResponse o) {
   buildCounterPullResponse++;
   if (buildCounterPullResponse < 3) {
-    checkUnnamed203(o.receivedMessages);
+    checkUnnamed1338(o.receivedMessages);
   }
   buildCounterPullResponse--;
 }
 
-buildUnnamed204() {
+buildUnnamed1339() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed204(core.Map<core.String, core.String> o) {
+checkUnnamed1339(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -582,7 +582,7 @@
   var o = new api.PushConfig();
   buildCounterPushConfig++;
   if (buildCounterPushConfig < 3) {
-    o.attributes = buildUnnamed204();
+    o.attributes = buildUnnamed1339();
     o.pushEndpoint = "foo";
   }
   buildCounterPushConfig--;
@@ -592,7 +592,7 @@
 checkPushConfig(api.PushConfig o) {
   buildCounterPushConfig++;
   if (buildCounterPushConfig < 3) {
-    checkUnnamed204(o.attributes);
+    checkUnnamed1339(o.attributes);
     unittest.expect(o.pushEndpoint, unittest.equals('foo'));
   }
   buildCounterPushConfig--;
@@ -726,14 +726,14 @@
   buildCounterSubscription--;
 }
 
-buildUnnamed205() {
+buildUnnamed1340() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed205(core.List<core.String> o) {
+checkUnnamed1340(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -744,7 +744,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed205();
+    o.permissions = buildUnnamed1340();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -753,19 +753,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed205(o.permissions);
+    checkUnnamed1340(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed206() {
+buildUnnamed1341() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed206(core.List<core.String> o) {
+checkUnnamed1341(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -776,7 +776,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed206();
+    o.permissions = buildUnnamed1341();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -785,7 +785,7 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed206(o.permissions);
+    checkUnnamed1341(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
@@ -1136,7 +1136,7 @@
       }), true);
       res
           .create(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Snapshot response) {
+          .then(unittest.expectAsync1(((response) {
         checkSnapshot(response);
       })));
     });
@@ -1188,7 +1188,7 @@
       }), true);
       res
           .delete(arg_snapshot, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1240,7 +1240,7 @@
       }), true);
       res
           .get(arg_snapshot, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Snapshot response) {
+          .then(unittest.expectAsync1(((response) {
         checkSnapshot(response);
       })));
     });
@@ -1292,7 +1292,7 @@
       }), true);
       res
           .getIamPolicy(arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1353,7 +1353,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListSnapshotsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSnapshotsResponse(response);
       })));
     });
@@ -1409,7 +1409,7 @@
       }), true);
       res
           .patch(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Snapshot response) {
+          .then(unittest.expectAsync1(((response) {
         checkSnapshot(response);
       })));
     });
@@ -1465,7 +1465,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1521,8 +1521,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -1580,7 +1579,7 @@
       }), true);
       res
           .acknowledge(arg_request, arg_subscription, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1636,7 +1635,7 @@
       }), true);
       res
           .create(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -1688,7 +1687,7 @@
       }), true);
       res
           .delete(arg_subscription, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1740,7 +1739,7 @@
       }), true);
       res
           .get(arg_subscription, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -1792,7 +1791,7 @@
       }), true);
       res
           .getIamPolicy(arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1853,8 +1852,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListSubscriptionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSubscriptionsResponse(response);
       })));
     });
@@ -1911,7 +1909,7 @@
       res
           .modifyAckDeadline(arg_request, arg_subscription,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1967,7 +1965,7 @@
       }), true);
       res
           .modifyPushConfig(arg_request, arg_subscription, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2023,7 +2021,7 @@
       }), true);
       res
           .patch(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -2079,7 +2077,7 @@
       }), true);
       res
           .pull(arg_request, arg_subscription, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PullResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPullResponse(response);
       })));
     });
@@ -2135,7 +2133,7 @@
       }), true);
       res
           .seek(arg_request, arg_subscription, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SeekResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSeekResponse(response);
       })));
     });
@@ -2191,7 +2189,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -2247,8 +2245,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -2306,7 +2303,7 @@
       }), true);
       res
           .create(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Topic response) {
+          .then(unittest.expectAsync1(((response) {
         checkTopic(response);
       })));
     });
@@ -2358,7 +2355,7 @@
       }), true);
       res
           .delete(arg_topic, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2410,7 +2407,7 @@
       }), true);
       res
           .get(arg_topic, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Topic response) {
+          .then(unittest.expectAsync1(((response) {
         checkTopic(response);
       })));
     });
@@ -2462,7 +2459,7 @@
       }), true);
       res
           .getIamPolicy(arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -2523,7 +2520,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTopicsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTopicsResponse(response);
       })));
     });
@@ -2579,7 +2576,7 @@
       }), true);
       res
           .publish(arg_request, arg_topic, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PublishResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPublishResponse(response);
       })));
     });
@@ -2635,7 +2632,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -2691,8 +2688,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -2755,8 +2751,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListTopicSnapshotsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTopicSnapshotsResponse(response);
       })));
     });
@@ -2819,8 +2814,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListTopicSubscriptionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTopicSubscriptionsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/reseller/v1_test.dart b/generated/googleapis/test/reseller/v1_test.dart
index 4c3824a..2466d0b 100644
--- a/generated/googleapis/test/reseller/v1_test.dart
+++ b/generated/googleapis/test/reseller/v1_test.dart
@@ -168,14 +168,14 @@
   buildCounterRenewalSettings--;
 }
 
-buildUnnamed3229() {
+buildUnnamed1911() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3229(core.List<core.String> o) {
+checkUnnamed1911(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -186,7 +186,7 @@
   var o = new api.ResellernotifyGetwatchdetailsResponse();
   buildCounterResellernotifyGetwatchdetailsResponse++;
   if (buildCounterResellernotifyGetwatchdetailsResponse < 3) {
-    o.serviceAccountEmailAddresses = buildUnnamed3229();
+    o.serviceAccountEmailAddresses = buildUnnamed1911();
     o.topicName = "foo";
   }
   buildCounterResellernotifyGetwatchdetailsResponse--;
@@ -197,7 +197,7 @@
     api.ResellernotifyGetwatchdetailsResponse o) {
   buildCounterResellernotifyGetwatchdetailsResponse++;
   if (buildCounterResellernotifyGetwatchdetailsResponse < 3) {
-    checkUnnamed3229(o.serviceAccountEmailAddresses);
+    checkUnnamed1911(o.serviceAccountEmailAddresses);
     unittest.expect(o.topicName, unittest.equals('foo'));
   }
   buildCounterResellernotifyGetwatchdetailsResponse--;
@@ -292,14 +292,14 @@
   buildCounterSubscriptionPlan--;
 }
 
-buildUnnamed3230() {
+buildUnnamed1912() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3230(core.List<core.String> o) {
+checkUnnamed1912(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -367,7 +367,7 @@
     o.skuName = "foo";
     o.status = "foo";
     o.subscriptionId = "foo";
-    o.suspensionReasons = buildUnnamed3230();
+    o.suspensionReasons = buildUnnamed1912();
     o.transferInfo = buildSubscriptionTransferInfo();
     o.trialSettings = buildSubscriptionTrialSettings();
   }
@@ -393,21 +393,21 @@
     unittest.expect(o.skuName, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
     unittest.expect(o.subscriptionId, unittest.equals('foo'));
-    checkUnnamed3230(o.suspensionReasons);
+    checkUnnamed1912(o.suspensionReasons);
     checkSubscriptionTransferInfo(o.transferInfo);
     checkSubscriptionTrialSettings(o.trialSettings);
   }
   buildCounterSubscription--;
 }
 
-buildUnnamed3231() {
+buildUnnamed1913() {
   var o = new core.List<api.Subscription>();
   o.add(buildSubscription());
   o.add(buildSubscription());
   return o;
 }
 
-checkUnnamed3231(core.List<api.Subscription> o) {
+checkUnnamed1913(core.List<api.Subscription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubscription(o[0]);
   checkSubscription(o[1]);
@@ -420,7 +420,7 @@
   if (buildCounterSubscriptions < 3) {
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.subscriptions = buildUnnamed3231();
+    o.subscriptions = buildUnnamed1913();
   }
   buildCounterSubscriptions--;
   return o;
@@ -431,7 +431,7 @@
   if (buildCounterSubscriptions < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3231(o.subscriptions);
+    checkUnnamed1913(o.subscriptions);
   }
   buildCounterSubscriptions--;
 }
@@ -594,7 +594,7 @@
       }), true);
       res
           .get(arg_customerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Customer response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomer(response);
       })));
     });
@@ -654,7 +654,7 @@
       res
           .insert(arg_request,
               customerAuthToken: arg_customerAuthToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Customer response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomer(response);
       })));
     });
@@ -714,7 +714,7 @@
       }), true);
       res
           .patch(arg_request, arg_customerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Customer response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomer(response);
       })));
     });
@@ -774,7 +774,7 @@
       }), true);
       res
           .update(arg_request, arg_customerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Customer response) {
+          .then(unittest.expectAsync1(((response) {
         checkCustomer(response);
       })));
     });
@@ -828,8 +828,9 @@
             convert.JSON.encode(buildResellernotifyGetwatchdetailsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getwatchdetails($fields: arg_$fields).then(unittest
-          .expectAsync1(((api.ResellernotifyGetwatchdetailsResponse response) {
+      res
+          .getwatchdetails($fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkResellernotifyGetwatchdetailsResponse(response);
       })));
     });
@@ -887,7 +888,7 @@
           .register(
               serviceAccountEmailAddress: arg_serviceAccountEmailAddress,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ResellernotifyResource response) {
+          .then(unittest.expectAsync1(((response) {
         checkResellernotifyResource(response);
       })));
     });
@@ -945,7 +946,7 @@
           .unregister(
               serviceAccountEmailAddress: arg_serviceAccountEmailAddress,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ResellernotifyResource response) {
+          .then(unittest.expectAsync1(((response) {
         checkResellernotifyResource(response);
       })));
     });
@@ -1020,7 +1021,7 @@
       }), true);
       res
           .activate(arg_customerId, arg_subscriptionId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -1098,7 +1099,7 @@
       res
           .changePlan(arg_request, arg_customerId, arg_subscriptionId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -1177,7 +1178,7 @@
           .changeRenewalSettings(
               arg_request, arg_customerId, arg_subscriptionId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -1255,7 +1256,7 @@
       res
           .changeSeats(arg_request, arg_customerId, arg_subscriptionId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -1391,7 +1392,7 @@
       }), true);
       res
           .get(arg_customerId, arg_subscriptionId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -1462,7 +1463,7 @@
       res
           .insert(arg_request, arg_customerId,
               customerAuthToken: arg_customerAuthToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -1536,7 +1537,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscriptions response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscriptions(response);
       })));
     });
@@ -1610,7 +1611,7 @@
       res
           .startPaidService(arg_customerId, arg_subscriptionId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -1683,7 +1684,7 @@
       }), true);
       res
           .suspend(arg_customerId, arg_subscriptionId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
diff --git a/generated/googleapis/test/runtimeconfig/v1_test.dart b/generated/googleapis/test/runtimeconfig/v1_test.dart
index 4186879..bf6e499 100644
--- a/generated/googleapis/test/runtimeconfig/v1_test.dart
+++ b/generated/googleapis/test/runtimeconfig/v1_test.dart
@@ -80,14 +80,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed2283() {
+buildUnnamed3734() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed2283(core.List<api.Operation> o) {
+checkUnnamed3734(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -99,7 +99,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed2283();
+    o.operations = buildUnnamed3734();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -109,12 +109,12 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2283(o.operations);
+    checkUnnamed3734(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed2284() {
+buildUnnamed3735() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -129,7 +129,7 @@
   return o;
 }
 
-checkUnnamed2284(core.Map<core.String, core.Object> o) {
+checkUnnamed3735(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -143,7 +143,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2285() {
+buildUnnamed3736() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -158,7 +158,7 @@
   return o;
 }
 
-checkUnnamed2285(core.Map<core.String, core.Object> o) {
+checkUnnamed3736(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -179,9 +179,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed2284();
+    o.metadata = buildUnnamed3735();
     o.name = "foo";
-    o.response = buildUnnamed2285();
+    o.response = buildUnnamed3736();
   }
   buildCounterOperation--;
   return o;
@@ -192,14 +192,14 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed2284(o.metadata);
+    checkUnnamed3735(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2285(o.response);
+    checkUnnamed3736(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed2286() {
+buildUnnamed3737() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -214,7 +214,7 @@
   return o;
 }
 
-checkUnnamed2286(core.Map<core.String, core.Object> o) {
+checkUnnamed3737(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -228,17 +228,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2287() {
+buildUnnamed3738() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2286());
-  o.add(buildUnnamed2286());
+  o.add(buildUnnamed3737());
+  o.add(buildUnnamed3737());
   return o;
 }
 
-checkUnnamed2287(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed3738(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2286(o[0]);
-  checkUnnamed2286(o[1]);
+  checkUnnamed3737(o[0]);
+  checkUnnamed3737(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -247,7 +247,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed2287();
+    o.details = buildUnnamed3738();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -258,7 +258,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed2287(o.details);
+    checkUnnamed3738(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -356,7 +356,7 @@
       }), true);
       res
           .cancel(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -407,7 +407,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -470,7 +470,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/safebrowsing/v4_test.dart b/generated/googleapis/test/safebrowsing/v4_test.dart
index 8ee9c15..9774a53 100644
--- a/generated/googleapis/test/safebrowsing/v4_test.dart
+++ b/generated/googleapis/test/safebrowsing/v4_test.dart
@@ -90,14 +90,14 @@
   buildCounterClientInfo--;
 }
 
-buildUnnamed3300() {
+buildUnnamed2564() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3300(core.List<core.String> o) {
+checkUnnamed2564(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -113,7 +113,7 @@
     o.maxDatabaseEntries = 42;
     o.maxUpdateEntries = 42;
     o.region = "foo";
-    o.supportedCompressions = buildUnnamed3300();
+    o.supportedCompressions = buildUnnamed2564();
   }
   buildCounterConstraints--;
   return o;
@@ -127,7 +127,7 @@
     unittest.expect(o.maxDatabaseEntries, unittest.equals(42));
     unittest.expect(o.maxUpdateEntries, unittest.equals(42));
     unittest.expect(o.region, unittest.equals('foo'));
-    checkUnnamed3300(o.supportedCompressions);
+    checkUnnamed2564(o.supportedCompressions);
   }
   buildCounterConstraints--;
 }
@@ -147,14 +147,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed3301() {
+buildUnnamed2565() {
   var o = new core.List<api.ListUpdateRequest>();
   o.add(buildListUpdateRequest());
   o.add(buildListUpdateRequest());
   return o;
 }
 
-checkUnnamed3301(core.List<api.ListUpdateRequest> o) {
+checkUnnamed2565(core.List<api.ListUpdateRequest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkListUpdateRequest(o[0]);
   checkListUpdateRequest(o[1]);
@@ -166,7 +166,7 @@
   buildCounterFetchThreatListUpdatesRequest++;
   if (buildCounterFetchThreatListUpdatesRequest < 3) {
     o.client = buildClientInfo();
-    o.listUpdateRequests = buildUnnamed3301();
+    o.listUpdateRequests = buildUnnamed2565();
   }
   buildCounterFetchThreatListUpdatesRequest--;
   return o;
@@ -176,19 +176,19 @@
   buildCounterFetchThreatListUpdatesRequest++;
   if (buildCounterFetchThreatListUpdatesRequest < 3) {
     checkClientInfo(o.client);
-    checkUnnamed3301(o.listUpdateRequests);
+    checkUnnamed2565(o.listUpdateRequests);
   }
   buildCounterFetchThreatListUpdatesRequest--;
 }
 
-buildUnnamed3302() {
+buildUnnamed2566() {
   var o = new core.List<api.ListUpdateResponse>();
   o.add(buildListUpdateResponse());
   o.add(buildListUpdateResponse());
   return o;
 }
 
-checkUnnamed3302(core.List<api.ListUpdateResponse> o) {
+checkUnnamed2566(core.List<api.ListUpdateResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkListUpdateResponse(o[0]);
   checkListUpdateResponse(o[1]);
@@ -199,7 +199,7 @@
   var o = new api.FetchThreatListUpdatesResponse();
   buildCounterFetchThreatListUpdatesResponse++;
   if (buildCounterFetchThreatListUpdatesResponse < 3) {
-    o.listUpdateResponses = buildUnnamed3302();
+    o.listUpdateResponses = buildUnnamed2566();
     o.minimumWaitDuration = "foo";
   }
   buildCounterFetchThreatListUpdatesResponse--;
@@ -209,20 +209,20 @@
 checkFetchThreatListUpdatesResponse(api.FetchThreatListUpdatesResponse o) {
   buildCounterFetchThreatListUpdatesResponse++;
   if (buildCounterFetchThreatListUpdatesResponse < 3) {
-    checkUnnamed3302(o.listUpdateResponses);
+    checkUnnamed2566(o.listUpdateResponses);
     unittest.expect(o.minimumWaitDuration, unittest.equals('foo'));
   }
   buildCounterFetchThreatListUpdatesResponse--;
 }
 
-buildUnnamed3303() {
+buildUnnamed2567() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3303(core.List<core.String> o) {
+checkUnnamed2567(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -235,7 +235,7 @@
   if (buildCounterFindFullHashesRequest < 3) {
     o.apiClient = buildClientInfo();
     o.client = buildClientInfo();
-    o.clientStates = buildUnnamed3303();
+    o.clientStates = buildUnnamed2567();
     o.threatInfo = buildThreatInfo();
   }
   buildCounterFindFullHashesRequest--;
@@ -247,20 +247,20 @@
   if (buildCounterFindFullHashesRequest < 3) {
     checkClientInfo(o.apiClient);
     checkClientInfo(o.client);
-    checkUnnamed3303(o.clientStates);
+    checkUnnamed2567(o.clientStates);
     checkThreatInfo(o.threatInfo);
   }
   buildCounterFindFullHashesRequest--;
 }
 
-buildUnnamed3304() {
+buildUnnamed2568() {
   var o = new core.List<api.ThreatMatch>();
   o.add(buildThreatMatch());
   o.add(buildThreatMatch());
   return o;
 }
 
-checkUnnamed3304(core.List<api.ThreatMatch> o) {
+checkUnnamed2568(core.List<api.ThreatMatch> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatMatch(o[0]);
   checkThreatMatch(o[1]);
@@ -271,7 +271,7 @@
   var o = new api.FindFullHashesResponse();
   buildCounterFindFullHashesResponse++;
   if (buildCounterFindFullHashesResponse < 3) {
-    o.matches = buildUnnamed3304();
+    o.matches = buildUnnamed2568();
     o.minimumWaitDuration = "foo";
     o.negativeCacheDuration = "foo";
   }
@@ -282,7 +282,7 @@
 checkFindFullHashesResponse(api.FindFullHashesResponse o) {
   buildCounterFindFullHashesResponse++;
   if (buildCounterFindFullHashesResponse < 3) {
-    checkUnnamed3304(o.matches);
+    checkUnnamed2568(o.matches);
     unittest.expect(o.minimumWaitDuration, unittest.equals('foo'));
     unittest.expect(o.negativeCacheDuration, unittest.equals('foo'));
   }
@@ -310,14 +310,14 @@
   buildCounterFindThreatMatchesRequest--;
 }
 
-buildUnnamed3305() {
+buildUnnamed2569() {
   var o = new core.List<api.ThreatMatch>();
   o.add(buildThreatMatch());
   o.add(buildThreatMatch());
   return o;
 }
 
-checkUnnamed3305(core.List<api.ThreatMatch> o) {
+checkUnnamed2569(core.List<api.ThreatMatch> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatMatch(o[0]);
   checkThreatMatch(o[1]);
@@ -328,7 +328,7 @@
   var o = new api.FindThreatMatchesResponse();
   buildCounterFindThreatMatchesResponse++;
   if (buildCounterFindThreatMatchesResponse < 3) {
-    o.matches = buildUnnamed3305();
+    o.matches = buildUnnamed2569();
   }
   buildCounterFindThreatMatchesResponse--;
   return o;
@@ -337,19 +337,19 @@
 checkFindThreatMatchesResponse(api.FindThreatMatchesResponse o) {
   buildCounterFindThreatMatchesResponse++;
   if (buildCounterFindThreatMatchesResponse < 3) {
-    checkUnnamed3305(o.matches);
+    checkUnnamed2569(o.matches);
   }
   buildCounterFindThreatMatchesResponse--;
 }
 
-buildUnnamed3306() {
+buildUnnamed2570() {
   var o = new core.List<api.ThreatListDescriptor>();
   o.add(buildThreatListDescriptor());
   o.add(buildThreatListDescriptor());
   return o;
 }
 
-checkUnnamed3306(core.List<api.ThreatListDescriptor> o) {
+checkUnnamed2570(core.List<api.ThreatListDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatListDescriptor(o[0]);
   checkThreatListDescriptor(o[1]);
@@ -360,7 +360,7 @@
   var o = new api.ListThreatListsResponse();
   buildCounterListThreatListsResponse++;
   if (buildCounterListThreatListsResponse < 3) {
-    o.threatLists = buildUnnamed3306();
+    o.threatLists = buildUnnamed2570();
   }
   buildCounterListThreatListsResponse--;
   return o;
@@ -369,7 +369,7 @@
 checkListThreatListsResponse(api.ListThreatListsResponse o) {
   buildCounterListThreatListsResponse++;
   if (buildCounterListThreatListsResponse < 3) {
-    checkUnnamed3306(o.threatLists);
+    checkUnnamed2570(o.threatLists);
   }
   buildCounterListThreatListsResponse--;
 }
@@ -401,27 +401,27 @@
   buildCounterListUpdateRequest--;
 }
 
-buildUnnamed3307() {
+buildUnnamed2571() {
   var o = new core.List<api.ThreatEntrySet>();
   o.add(buildThreatEntrySet());
   o.add(buildThreatEntrySet());
   return o;
 }
 
-checkUnnamed3307(core.List<api.ThreatEntrySet> o) {
+checkUnnamed2571(core.List<api.ThreatEntrySet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatEntrySet(o[0]);
   checkThreatEntrySet(o[1]);
 }
 
-buildUnnamed3308() {
+buildUnnamed2572() {
   var o = new core.List<api.ThreatEntrySet>();
   o.add(buildThreatEntrySet());
   o.add(buildThreatEntrySet());
   return o;
 }
 
-checkUnnamed3308(core.List<api.ThreatEntrySet> o) {
+checkUnnamed2572(core.List<api.ThreatEntrySet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatEntrySet(o[0]);
   checkThreatEntrySet(o[1]);
@@ -432,11 +432,11 @@
   var o = new api.ListUpdateResponse();
   buildCounterListUpdateResponse++;
   if (buildCounterListUpdateResponse < 3) {
-    o.additions = buildUnnamed3307();
+    o.additions = buildUnnamed2571();
     o.checksum = buildChecksum();
     o.newClientState = "foo";
     o.platformType = "foo";
-    o.removals = buildUnnamed3308();
+    o.removals = buildUnnamed2572();
     o.responseType = "foo";
     o.threatEntryType = "foo";
     o.threatType = "foo";
@@ -448,11 +448,11 @@
 checkListUpdateResponse(api.ListUpdateResponse o) {
   buildCounterListUpdateResponse++;
   if (buildCounterListUpdateResponse < 3) {
-    checkUnnamed3307(o.additions);
+    checkUnnamed2571(o.additions);
     checkChecksum(o.checksum);
     unittest.expect(o.newClientState, unittest.equals('foo'));
     unittest.expect(o.platformType, unittest.equals('foo'));
-    checkUnnamed3308(o.removals);
+    checkUnnamed2572(o.removals);
     unittest.expect(o.responseType, unittest.equals('foo'));
     unittest.expect(o.threatEntryType, unittest.equals('foo'));
     unittest.expect(o.threatType, unittest.equals('foo'));
@@ -502,14 +502,14 @@
   buildCounterRawHashes--;
 }
 
-buildUnnamed3309() {
+buildUnnamed2573() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed3309(core.List<core.int> o) {
+checkUnnamed2573(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -520,7 +520,7 @@
   var o = new api.RawIndices();
   buildCounterRawIndices++;
   if (buildCounterRawIndices < 3) {
-    o.indices = buildUnnamed3309();
+    o.indices = buildUnnamed2573();
   }
   buildCounterRawIndices--;
   return o;
@@ -529,7 +529,7 @@
 checkRawIndices(api.RawIndices o) {
   buildCounterRawIndices++;
   if (buildCounterRawIndices < 3) {
-    checkUnnamed3309(o.indices);
+    checkUnnamed2573(o.indices);
   }
   buildCounterRawIndices--;
 }
@@ -582,14 +582,14 @@
   buildCounterThreatEntry--;
 }
 
-buildUnnamed3310() {
+buildUnnamed2574() {
   var o = new core.List<api.MetadataEntry>();
   o.add(buildMetadataEntry());
   o.add(buildMetadataEntry());
   return o;
 }
 
-checkUnnamed3310(core.List<api.MetadataEntry> o) {
+checkUnnamed2574(core.List<api.MetadataEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetadataEntry(o[0]);
   checkMetadataEntry(o[1]);
@@ -600,7 +600,7 @@
   var o = new api.ThreatEntryMetadata();
   buildCounterThreatEntryMetadata++;
   if (buildCounterThreatEntryMetadata < 3) {
-    o.entries = buildUnnamed3310();
+    o.entries = buildUnnamed2574();
   }
   buildCounterThreatEntryMetadata--;
   return o;
@@ -609,7 +609,7 @@
 checkThreatEntryMetadata(api.ThreatEntryMetadata o) {
   buildCounterThreatEntryMetadata++;
   if (buildCounterThreatEntryMetadata < 3) {
-    checkUnnamed3310(o.entries);
+    checkUnnamed2574(o.entries);
   }
   buildCounterThreatEntryMetadata--;
 }
@@ -641,14 +641,14 @@
   buildCounterThreatEntrySet--;
 }
 
-buildUnnamed3311() {
+buildUnnamed2575() {
   var o = new core.List<api.ThreatSource>();
   o.add(buildThreatSource());
   o.add(buildThreatSource());
   return o;
 }
 
-checkUnnamed3311(core.List<api.ThreatSource> o) {
+checkUnnamed2575(core.List<api.ThreatSource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatSource(o[0]);
   checkThreatSource(o[1]);
@@ -662,7 +662,7 @@
     o.clientInfo = buildClientInfo();
     o.entry = buildThreatEntry();
     o.platformType = "foo";
-    o.resources = buildUnnamed3311();
+    o.resources = buildUnnamed2575();
     o.threatType = "foo";
     o.userInfo = buildUserInfo();
   }
@@ -676,60 +676,60 @@
     checkClientInfo(o.clientInfo);
     checkThreatEntry(o.entry);
     unittest.expect(o.platformType, unittest.equals('foo'));
-    checkUnnamed3311(o.resources);
+    checkUnnamed2575(o.resources);
     unittest.expect(o.threatType, unittest.equals('foo'));
     checkUserInfo(o.userInfo);
   }
   buildCounterThreatHit--;
 }
 
-buildUnnamed3312() {
+buildUnnamed2576() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3312(core.List<core.String> o) {
+checkUnnamed2576(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3313() {
+buildUnnamed2577() {
   var o = new core.List<api.ThreatEntry>();
   o.add(buildThreatEntry());
   o.add(buildThreatEntry());
   return o;
 }
 
-checkUnnamed3313(core.List<api.ThreatEntry> o) {
+checkUnnamed2577(core.List<api.ThreatEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThreatEntry(o[0]);
   checkThreatEntry(o[1]);
 }
 
-buildUnnamed3314() {
+buildUnnamed2578() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3314(core.List<core.String> o) {
+checkUnnamed2578(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3315() {
+buildUnnamed2579() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3315(core.List<core.String> o) {
+checkUnnamed2579(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -740,10 +740,10 @@
   var o = new api.ThreatInfo();
   buildCounterThreatInfo++;
   if (buildCounterThreatInfo < 3) {
-    o.platformTypes = buildUnnamed3312();
-    o.threatEntries = buildUnnamed3313();
-    o.threatEntryTypes = buildUnnamed3314();
-    o.threatTypes = buildUnnamed3315();
+    o.platformTypes = buildUnnamed2576();
+    o.threatEntries = buildUnnamed2577();
+    o.threatEntryTypes = buildUnnamed2578();
+    o.threatTypes = buildUnnamed2579();
   }
   buildCounterThreatInfo--;
   return o;
@@ -752,10 +752,10 @@
 checkThreatInfo(api.ThreatInfo o) {
   buildCounterThreatInfo++;
   if (buildCounterThreatInfo < 3) {
-    checkUnnamed3312(o.platformTypes);
-    checkUnnamed3313(o.threatEntries);
-    checkUnnamed3314(o.threatEntryTypes);
-    checkUnnamed3315(o.threatTypes);
+    checkUnnamed2576(o.platformTypes);
+    checkUnnamed2577(o.threatEntries);
+    checkUnnamed2578(o.threatEntryTypes);
+    checkUnnamed2579(o.threatTypes);
   }
   buildCounterThreatInfo--;
 }
@@ -1126,7 +1126,7 @@
               clientId: arg_clientId,
               clientVersion: arg_clientVersion,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FindFullHashesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFindFullHashesResponse(response);
       })));
     });
@@ -1191,8 +1191,7 @@
               clientId: arg_clientId,
               clientVersion: arg_clientVersion,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.FetchThreatListUpdatesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFetchThreatListUpdatesResponse(response);
       })));
     });
@@ -1247,7 +1246,7 @@
       }), true);
       res
           .find(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FindFullHashesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFindFullHashesResponse(response);
       })));
     });
@@ -1302,7 +1301,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1356,8 +1355,9 @@
         var resp = convert.JSON.encode(buildFetchThreatListUpdatesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.fetch(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.FetchThreatListUpdatesResponse response) {
+      res
+          .fetch(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkFetchThreatListUpdatesResponse(response);
       })));
     });
@@ -1407,9 +1407,7 @@
         var resp = convert.JSON.encode(buildListThreatListsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListThreatListsResponse response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkListThreatListsResponse(response);
       })));
     });
@@ -1463,8 +1461,9 @@
         var resp = convert.JSON.encode(buildFindThreatMatchesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.find(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.FindThreatMatchesResponse response) {
+      res
+          .find(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkFindThreatMatchesResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/script/v1_test.dart b/generated/googleapis/test/script/v1_test.dart
index b83d3d0..98db729 100644
--- a/generated/googleapis/test/script/v1_test.dart
+++ b/generated/googleapis/test/script/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2764() {
+buildUnnamed1145() {
   var o = new core.List<api.File>();
   o.add(buildFile());
   o.add(buildFile());
   return o;
 }
 
-checkUnnamed2764(core.List<api.File> o) {
+checkUnnamed1145(core.List<api.File> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFile(o[0]);
   checkFile(o[1]);
@@ -68,7 +68,7 @@
   var o = new api.Content();
   buildCounterContent++;
   if (buildCounterContent < 3) {
-    o.files = buildUnnamed2764();
+    o.files = buildUnnamed1145();
     o.scriptId = "foo";
   }
   buildCounterContent--;
@@ -78,7 +78,7 @@
 checkContent(api.Content o) {
   buildCounterContent++;
   if (buildCounterContent < 3) {
-    checkUnnamed2764(o.files);
+    checkUnnamed1145(o.files);
     unittest.expect(o.scriptId, unittest.equals('foo'));
   }
   buildCounterContent--;
@@ -105,14 +105,14 @@
   buildCounterCreateProjectRequest--;
 }
 
-buildUnnamed2765() {
+buildUnnamed1146() {
   var o = new core.List<api.EntryPoint>();
   o.add(buildEntryPoint());
   o.add(buildEntryPoint());
   return o;
 }
 
-checkUnnamed2765(core.List<api.EntryPoint> o) {
+checkUnnamed1146(core.List<api.EntryPoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntryPoint(o[0]);
   checkEntryPoint(o[1]);
@@ -125,7 +125,7 @@
   if (buildCounterDeployment < 3) {
     o.deploymentConfig = buildDeploymentConfig();
     o.deploymentId = "foo";
-    o.entryPoints = buildUnnamed2765();
+    o.entryPoints = buildUnnamed1146();
     o.functionSet = buildGoogleAppsScriptTypeFunctionSet();
     o.scopeSet = buildGoogleAppsScriptTypeScopeSet();
     o.updateTime = "foo";
@@ -139,7 +139,7 @@
   if (buildCounterDeployment < 3) {
     checkDeploymentConfig(o.deploymentConfig);
     unittest.expect(o.deploymentId, unittest.equals('foo'));
-    checkUnnamed2765(o.entryPoints);
+    checkUnnamed1146(o.entryPoints);
     checkGoogleAppsScriptTypeFunctionSet(o.functionSet);
     checkGoogleAppsScriptTypeScopeSet(o.scopeSet);
     unittest.expect(o.updateTime, unittest.equals('foo'));
@@ -212,14 +212,14 @@
   buildCounterEntryPoint--;
 }
 
-buildUnnamed2766() {
+buildUnnamed1147() {
   var o = new core.List<api.ScriptStackTraceElement>();
   o.add(buildScriptStackTraceElement());
   o.add(buildScriptStackTraceElement());
   return o;
 }
 
-checkUnnamed2766(core.List<api.ScriptStackTraceElement> o) {
+checkUnnamed1147(core.List<api.ScriptStackTraceElement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkScriptStackTraceElement(o[0]);
   checkScriptStackTraceElement(o[1]);
@@ -232,7 +232,7 @@
   if (buildCounterExecutionError < 3) {
     o.errorMessage = "foo";
     o.errorType = "foo";
-    o.scriptStackTraceElements = buildUnnamed2766();
+    o.scriptStackTraceElements = buildUnnamed1147();
   }
   buildCounterExecutionError--;
   return o;
@@ -243,12 +243,12 @@
   if (buildCounterExecutionError < 3) {
     unittest.expect(o.errorMessage, unittest.equals('foo'));
     unittest.expect(o.errorType, unittest.equals('foo'));
-    checkUnnamed2766(o.scriptStackTraceElements);
+    checkUnnamed1147(o.scriptStackTraceElements);
   }
   buildCounterExecutionError--;
 }
 
-buildUnnamed2767() {
+buildUnnamed1148() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -263,7 +263,7 @@
   return o;
 }
 
-checkUnnamed2767(core.List<core.Object> o) {
+checkUnnamed1148(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -284,7 +284,7 @@
   if (buildCounterExecutionRequest < 3) {
     o.devMode = true;
     o.function = "foo";
-    o.parameters = buildUnnamed2767();
+    o.parameters = buildUnnamed1148();
     o.sessionState = "foo";
   }
   buildCounterExecutionRequest--;
@@ -296,7 +296,7 @@
   if (buildCounterExecutionRequest < 3) {
     unittest.expect(o.devMode, unittest.isTrue);
     unittest.expect(o.function, unittest.equals('foo'));
-    checkUnnamed2767(o.parameters);
+    checkUnnamed1148(o.parameters);
     unittest.expect(o.sessionState, unittest.equals('foo'));
   }
   buildCounterExecutionRequest--;
@@ -449,14 +449,14 @@
   buildCounterGoogleAppsScriptTypeFunction--;
 }
 
-buildUnnamed2768() {
+buildUnnamed1149() {
   var o = new core.List<api.GoogleAppsScriptTypeFunction>();
   o.add(buildGoogleAppsScriptTypeFunction());
   o.add(buildGoogleAppsScriptTypeFunction());
   return o;
 }
 
-checkUnnamed2768(core.List<api.GoogleAppsScriptTypeFunction> o) {
+checkUnnamed1149(core.List<api.GoogleAppsScriptTypeFunction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleAppsScriptTypeFunction(o[0]);
   checkGoogleAppsScriptTypeFunction(o[1]);
@@ -467,7 +467,7 @@
   var o = new api.GoogleAppsScriptTypeFunctionSet();
   buildCounterGoogleAppsScriptTypeFunctionSet++;
   if (buildCounterGoogleAppsScriptTypeFunctionSet < 3) {
-    o.values = buildUnnamed2768();
+    o.values = buildUnnamed1149();
   }
   buildCounterGoogleAppsScriptTypeFunctionSet--;
   return o;
@@ -476,7 +476,7 @@
 checkGoogleAppsScriptTypeFunctionSet(api.GoogleAppsScriptTypeFunctionSet o) {
   buildCounterGoogleAppsScriptTypeFunctionSet++;
   if (buildCounterGoogleAppsScriptTypeFunctionSet < 3) {
-    checkUnnamed2768(o.values);
+    checkUnnamed1149(o.values);
   }
   buildCounterGoogleAppsScriptTypeFunctionSet--;
 }
@@ -535,14 +535,14 @@
   buildCounterGoogleAppsScriptTypeScope--;
 }
 
-buildUnnamed2769() {
+buildUnnamed1150() {
   var o = new core.List<api.GoogleAppsScriptTypeScope>();
   o.add(buildGoogleAppsScriptTypeScope());
   o.add(buildGoogleAppsScriptTypeScope());
   return o;
 }
 
-checkUnnamed2769(core.List<api.GoogleAppsScriptTypeScope> o) {
+checkUnnamed1150(core.List<api.GoogleAppsScriptTypeScope> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleAppsScriptTypeScope(o[0]);
   checkGoogleAppsScriptTypeScope(o[1]);
@@ -553,7 +553,7 @@
   var o = new api.GoogleAppsScriptTypeScopeSet();
   buildCounterGoogleAppsScriptTypeScopeSet++;
   if (buildCounterGoogleAppsScriptTypeScopeSet < 3) {
-    o.values = buildUnnamed2769();
+    o.values = buildUnnamed1150();
   }
   buildCounterGoogleAppsScriptTypeScopeSet--;
   return o;
@@ -562,7 +562,7 @@
 checkGoogleAppsScriptTypeScopeSet(api.GoogleAppsScriptTypeScopeSet o) {
   buildCounterGoogleAppsScriptTypeScopeSet++;
   if (buildCounterGoogleAppsScriptTypeScopeSet < 3) {
-    checkUnnamed2769(o.values);
+    checkUnnamed1150(o.values);
   }
   buildCounterGoogleAppsScriptTypeScopeSet--;
 }
@@ -635,14 +635,14 @@
   buildCounterGoogleAppsScriptTypeWebAppEntryPoint--;
 }
 
-buildUnnamed2770() {
+buildUnnamed1151() {
   var o = new core.List<api.Deployment>();
   o.add(buildDeployment());
   o.add(buildDeployment());
   return o;
 }
 
-checkUnnamed2770(core.List<api.Deployment> o) {
+checkUnnamed1151(core.List<api.Deployment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeployment(o[0]);
   checkDeployment(o[1]);
@@ -653,7 +653,7 @@
   var o = new api.ListDeploymentsResponse();
   buildCounterListDeploymentsResponse++;
   if (buildCounterListDeploymentsResponse < 3) {
-    o.deployments = buildUnnamed2770();
+    o.deployments = buildUnnamed1151();
     o.nextPageToken = "foo";
   }
   buildCounterListDeploymentsResponse--;
@@ -663,20 +663,20 @@
 checkListDeploymentsResponse(api.ListDeploymentsResponse o) {
   buildCounterListDeploymentsResponse++;
   if (buildCounterListDeploymentsResponse < 3) {
-    checkUnnamed2770(o.deployments);
+    checkUnnamed1151(o.deployments);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDeploymentsResponse--;
 }
 
-buildUnnamed2771() {
+buildUnnamed1152() {
   var o = new core.List<api.GoogleAppsScriptTypeProcess>();
   o.add(buildGoogleAppsScriptTypeProcess());
   o.add(buildGoogleAppsScriptTypeProcess());
   return o;
 }
 
-checkUnnamed2771(core.List<api.GoogleAppsScriptTypeProcess> o) {
+checkUnnamed1152(core.List<api.GoogleAppsScriptTypeProcess> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleAppsScriptTypeProcess(o[0]);
   checkGoogleAppsScriptTypeProcess(o[1]);
@@ -688,7 +688,7 @@
   buildCounterListScriptProcessesResponse++;
   if (buildCounterListScriptProcessesResponse < 3) {
     o.nextPageToken = "foo";
-    o.processes = buildUnnamed2771();
+    o.processes = buildUnnamed1152();
   }
   buildCounterListScriptProcessesResponse--;
   return o;
@@ -698,19 +698,19 @@
   buildCounterListScriptProcessesResponse++;
   if (buildCounterListScriptProcessesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2771(o.processes);
+    checkUnnamed1152(o.processes);
   }
   buildCounterListScriptProcessesResponse--;
 }
 
-buildUnnamed2772() {
+buildUnnamed1153() {
   var o = new core.List<api.GoogleAppsScriptTypeProcess>();
   o.add(buildGoogleAppsScriptTypeProcess());
   o.add(buildGoogleAppsScriptTypeProcess());
   return o;
 }
 
-checkUnnamed2772(core.List<api.GoogleAppsScriptTypeProcess> o) {
+checkUnnamed1153(core.List<api.GoogleAppsScriptTypeProcess> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleAppsScriptTypeProcess(o[0]);
   checkGoogleAppsScriptTypeProcess(o[1]);
@@ -722,7 +722,7 @@
   buildCounterListUserProcessesResponse++;
   if (buildCounterListUserProcessesResponse < 3) {
     o.nextPageToken = "foo";
-    o.processes = buildUnnamed2772();
+    o.processes = buildUnnamed1153();
   }
   buildCounterListUserProcessesResponse--;
   return o;
@@ -732,19 +732,19 @@
   buildCounterListUserProcessesResponse++;
   if (buildCounterListUserProcessesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2772(o.processes);
+    checkUnnamed1153(o.processes);
   }
   buildCounterListUserProcessesResponse--;
 }
 
-buildUnnamed2773() {
+buildUnnamed1154() {
   var o = new core.List<api.Version>();
   o.add(buildVersion());
   o.add(buildVersion());
   return o;
 }
 
-checkUnnamed2773(core.List<api.Version> o) {
+checkUnnamed1154(core.List<api.Version> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVersion(o[0]);
   checkVersion(o[1]);
@@ -756,7 +756,7 @@
   buildCounterListVersionsResponse++;
   if (buildCounterListVersionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.versions = buildUnnamed2773();
+    o.versions = buildUnnamed1154();
   }
   buildCounterListVersionsResponse--;
   return o;
@@ -766,45 +766,45 @@
   buildCounterListVersionsResponse++;
   if (buildCounterListVersionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2773(o.versions);
+    checkUnnamed1154(o.versions);
   }
   buildCounterListVersionsResponse--;
 }
 
-buildUnnamed2774() {
+buildUnnamed1155() {
   var o = new core.List<api.MetricsValue>();
   o.add(buildMetricsValue());
   o.add(buildMetricsValue());
   return o;
 }
 
-checkUnnamed2774(core.List<api.MetricsValue> o) {
+checkUnnamed1155(core.List<api.MetricsValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricsValue(o[0]);
   checkMetricsValue(o[1]);
 }
 
-buildUnnamed2775() {
+buildUnnamed1156() {
   var o = new core.List<api.MetricsValue>();
   o.add(buildMetricsValue());
   o.add(buildMetricsValue());
   return o;
 }
 
-checkUnnamed2775(core.List<api.MetricsValue> o) {
+checkUnnamed1156(core.List<api.MetricsValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricsValue(o[0]);
   checkMetricsValue(o[1]);
 }
 
-buildUnnamed2776() {
+buildUnnamed1157() {
   var o = new core.List<api.MetricsValue>();
   o.add(buildMetricsValue());
   o.add(buildMetricsValue());
   return o;
 }
 
-checkUnnamed2776(core.List<api.MetricsValue> o) {
+checkUnnamed1157(core.List<api.MetricsValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricsValue(o[0]);
   checkMetricsValue(o[1]);
@@ -815,9 +815,9 @@
   var o = new api.Metrics();
   buildCounterMetrics++;
   if (buildCounterMetrics < 3) {
-    o.activeUsers = buildUnnamed2774();
-    o.failedExecutions = buildUnnamed2775();
-    o.totalExecutions = buildUnnamed2776();
+    o.activeUsers = buildUnnamed1155();
+    o.failedExecutions = buildUnnamed1156();
+    o.totalExecutions = buildUnnamed1157();
   }
   buildCounterMetrics--;
   return o;
@@ -826,9 +826,9 @@
 checkMetrics(api.Metrics o) {
   buildCounterMetrics++;
   if (buildCounterMetrics < 3) {
-    checkUnnamed2774(o.activeUsers);
-    checkUnnamed2775(o.failedExecutions);
-    checkUnnamed2776(o.totalExecutions);
+    checkUnnamed1155(o.activeUsers);
+    checkUnnamed1156(o.failedExecutions);
+    checkUnnamed1157(o.totalExecutions);
   }
   buildCounterMetrics--;
 }
@@ -856,7 +856,7 @@
   buildCounterMetricsValue--;
 }
 
-buildUnnamed2777() {
+buildUnnamed1158() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -871,7 +871,7 @@
   return o;
 }
 
-checkUnnamed2777(core.Map<core.String, core.Object> o) {
+checkUnnamed1158(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted4 = (o["x"]) as core.Map;
   unittest.expect(casted4, unittest.hasLength(3));
@@ -892,7 +892,7 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.response = buildUnnamed2777();
+    o.response = buildUnnamed1158();
   }
   buildCounterOperation--;
   return o;
@@ -903,7 +903,7 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed2777(o.response);
+    checkUnnamed1158(o.response);
   }
   buildCounterOperation--;
 }
@@ -960,7 +960,7 @@
   buildCounterScriptStackTraceElement--;
 }
 
-buildUnnamed2778() {
+buildUnnamed1159() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -975,7 +975,7 @@
   return o;
 }
 
-checkUnnamed2778(core.Map<core.String, core.Object> o) {
+checkUnnamed1159(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted6 = (o["x"]) as core.Map;
   unittest.expect(casted6, unittest.hasLength(3));
@@ -989,17 +989,17 @@
   unittest.expect(casted7["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2779() {
+buildUnnamed1160() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2778());
-  o.add(buildUnnamed2778());
+  o.add(buildUnnamed1159());
+  o.add(buildUnnamed1159());
   return o;
 }
 
-checkUnnamed2779(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1160(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2778(o[0]);
-  checkUnnamed2778(o[1]);
+  checkUnnamed1159(o[0]);
+  checkUnnamed1159(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1008,7 +1008,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed2779();
+    o.details = buildUnnamed1160();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1019,7 +1019,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed2779(o.details);
+    checkUnnamed1160(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -1069,79 +1069,79 @@
   buildCounterVersion--;
 }
 
-buildUnnamed2780() {
+buildUnnamed1161() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2780(core.List<core.String> o) {
+checkUnnamed1161(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2781() {
+buildUnnamed1162() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2781(core.List<core.String> o) {
+checkUnnamed1162(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2782() {
+buildUnnamed1163() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2782(core.List<core.String> o) {
+checkUnnamed1163(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2783() {
+buildUnnamed1164() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2783(core.List<core.String> o) {
+checkUnnamed1164(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2784() {
+buildUnnamed1165() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2784(core.List<core.String> o) {
+checkUnnamed1165(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2785() {
+buildUnnamed1166() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2785(core.List<core.String> o) {
+checkUnnamed1166(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1422,11 +1422,11 @@
       var arg_pageSize = 42;
       var arg_userProcessFilter_startTime = "foo";
       var arg_userProcessFilter_projectName = "foo";
-      var arg_userProcessFilter_userAccessLevels = buildUnnamed2780();
+      var arg_userProcessFilter_userAccessLevels = buildUnnamed1161();
       var arg_userProcessFilter_functionName = "foo";
       var arg_userProcessFilter_scriptId = "foo";
-      var arg_userProcessFilter_statuses = buildUnnamed2781();
-      var arg_userProcessFilter_types = buildUnnamed2782();
+      var arg_userProcessFilter_statuses = buildUnnamed1162();
+      var arg_userProcessFilter_types = buildUnnamed1163();
       var arg_userProcessFilter_deploymentId = "foo";
       var arg_userProcessFilter_endTime = "foo";
       var arg_pageToken = "foo";
@@ -1508,8 +1508,7 @@
               userProcessFilter_endTime: arg_userProcessFilter_endTime,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListUserProcessesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListUserProcessesResponse(response);
       })));
     });
@@ -1519,11 +1518,11 @@
       api.ProcessesResourceApi res = new api.ScriptApi(mock).processes;
       var arg_pageSize = 42;
       var arg_scriptProcessFilter_endTime = "foo";
-      var arg_scriptProcessFilter_userAccessLevels = buildUnnamed2783();
-      var arg_scriptProcessFilter_statuses = buildUnnamed2784();
+      var arg_scriptProcessFilter_userAccessLevels = buildUnnamed1164();
+      var arg_scriptProcessFilter_statuses = buildUnnamed1165();
       var arg_scriptProcessFilter_startTime = "foo";
       var arg_scriptProcessFilter_functionName = "foo";
-      var arg_scriptProcessFilter_types = buildUnnamed2785();
+      var arg_scriptProcessFilter_types = buildUnnamed1166();
       var arg_scriptId = "foo";
       var arg_scriptProcessFilter_deploymentId = "foo";
       var arg_pageToken = "foo";
@@ -1602,8 +1601,7 @@
                   arg_scriptProcessFilter_deploymentId,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListScriptProcessesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListScriptProcessesResponse(response);
       })));
     });
@@ -1658,7 +1656,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
@@ -1711,7 +1709,7 @@
       }), true);
       res
           .get(arg_scriptId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
@@ -1774,7 +1772,7 @@
       res
           .getContent(arg_scriptId,
               versionNumber: arg_versionNumber, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Content response) {
+          .then(unittest.expectAsync1(((response) {
         checkContent(response);
       })));
     });
@@ -1842,7 +1840,7 @@
               metricsGranularity: arg_metricsGranularity,
               metricsFilter_deploymentId: arg_metricsFilter_deploymentId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Metrics response) {
+          .then(unittest.expectAsync1(((response) {
         checkMetrics(response);
       })));
     });
@@ -1905,7 +1903,7 @@
       }), true);
       res
           .updateContent(arg_request, arg_scriptId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Content response) {
+          .then(unittest.expectAsync1(((response) {
         checkContent(response);
       })));
     });
@@ -1971,7 +1969,7 @@
       }), true);
       res
           .create(arg_request, arg_scriptId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Deployment response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeployment(response);
       })));
     });
@@ -2035,7 +2033,7 @@
       }), true);
       res
           .delete(arg_scriptId, arg_deploymentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2099,7 +2097,7 @@
       }), true);
       res
           .get(arg_scriptId, arg_deploymentId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Deployment response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeployment(response);
       })));
     });
@@ -2168,7 +2166,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDeploymentsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDeploymentsResponse(response);
       })));
     });
@@ -2237,7 +2235,7 @@
       res
           .update(arg_request, arg_scriptId, arg_deploymentId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Deployment response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeployment(response);
       })));
     });
@@ -2303,7 +2301,7 @@
       }), true);
       res
           .create(arg_request, arg_scriptId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Version response) {
+          .then(unittest.expectAsync1(((response) {
         checkVersion(response);
       })));
     });
@@ -2367,7 +2365,7 @@
       }), true);
       res
           .get(arg_scriptId, arg_versionNumber, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Version response) {
+          .then(unittest.expectAsync1(((response) {
         checkVersion(response);
       })));
     });
@@ -2436,7 +2434,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListVersionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListVersionsResponse(response);
       })));
     });
@@ -2501,7 +2499,7 @@
       }), true);
       res
           .run(arg_request, arg_scriptId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
diff --git a/generated/googleapis/test/searchconsole/v1_test.dart b/generated/googleapis/test/searchconsole/v1_test.dart
index 8bd3630..812da50 100644
--- a/generated/googleapis/test/searchconsole/v1_test.dart
+++ b/generated/googleapis/test/searchconsole/v1_test.dart
@@ -149,27 +149,27 @@
   buildCounterRunMobileFriendlyTestRequest--;
 }
 
-buildUnnamed2337() {
+buildUnnamed2646() {
   var o = new core.List<api.MobileFriendlyIssue>();
   o.add(buildMobileFriendlyIssue());
   o.add(buildMobileFriendlyIssue());
   return o;
 }
 
-checkUnnamed2337(core.List<api.MobileFriendlyIssue> o) {
+checkUnnamed2646(core.List<api.MobileFriendlyIssue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMobileFriendlyIssue(o[0]);
   checkMobileFriendlyIssue(o[1]);
 }
 
-buildUnnamed2338() {
+buildUnnamed2647() {
   var o = new core.List<api.ResourceIssue>();
   o.add(buildResourceIssue());
   o.add(buildResourceIssue());
   return o;
 }
 
-checkUnnamed2338(core.List<api.ResourceIssue> o) {
+checkUnnamed2647(core.List<api.ResourceIssue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceIssue(o[0]);
   checkResourceIssue(o[1]);
@@ -181,8 +181,8 @@
   buildCounterRunMobileFriendlyTestResponse++;
   if (buildCounterRunMobileFriendlyTestResponse < 3) {
     o.mobileFriendliness = "foo";
-    o.mobileFriendlyIssues = buildUnnamed2337();
-    o.resourceIssues = buildUnnamed2338();
+    o.mobileFriendlyIssues = buildUnnamed2646();
+    o.resourceIssues = buildUnnamed2647();
     o.screenshot = buildImage();
     o.testStatus = buildTestStatus();
   }
@@ -194,8 +194,8 @@
   buildCounterRunMobileFriendlyTestResponse++;
   if (buildCounterRunMobileFriendlyTestResponse < 3) {
     unittest.expect(o.mobileFriendliness, unittest.equals('foo'));
-    checkUnnamed2337(o.mobileFriendlyIssues);
-    checkUnnamed2338(o.resourceIssues);
+    checkUnnamed2646(o.mobileFriendlyIssues);
+    checkUnnamed2647(o.resourceIssues);
     checkImage(o.screenshot);
     checkTestStatus(o.testStatus);
   }
@@ -328,8 +328,9 @@
         var resp = convert.JSON.encode(buildRunMobileFriendlyTestResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.run(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.RunMobileFriendlyTestResponse response) {
+      res
+          .run(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkRunMobileFriendlyTestResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/serviceconsumermanagement/v1_test.dart b/generated/googleapis/test/serviceconsumermanagement/v1_test.dart
index 8349224..28e9996 100644
--- a/generated/googleapis/test/serviceconsumermanagement/v1_test.dart
+++ b/generated/googleapis/test/serviceconsumermanagement/v1_test.dart
@@ -71,40 +71,40 @@
   buildCounterAddTenantProjectRequest--;
 }
 
-buildUnnamed2078() {
+buildUnnamed3564() {
   var o = new core.List<api.Method>();
   o.add(buildMethod());
   o.add(buildMethod());
   return o;
 }
 
-checkUnnamed2078(core.List<api.Method> o) {
+checkUnnamed3564(core.List<api.Method> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMethod(o[0]);
   checkMethod(o[1]);
 }
 
-buildUnnamed2079() {
+buildUnnamed3565() {
   var o = new core.List<api.Mixin>();
   o.add(buildMixin());
   o.add(buildMixin());
   return o;
 }
 
-checkUnnamed2079(core.List<api.Mixin> o) {
+checkUnnamed3565(core.List<api.Mixin> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMixin(o[0]);
   checkMixin(o[1]);
 }
 
-buildUnnamed2080() {
+buildUnnamed3566() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed2080(core.List<api.Option> o) {
+checkUnnamed3566(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -115,10 +115,10 @@
   var o = new api.Api();
   buildCounterApi++;
   if (buildCounterApi < 3) {
-    o.methods = buildUnnamed2078();
-    o.mixins = buildUnnamed2079();
+    o.methods = buildUnnamed3564();
+    o.mixins = buildUnnamed3565();
     o.name = "foo";
-    o.options = buildUnnamed2080();
+    o.options = buildUnnamed3566();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
     o.version = "foo";
@@ -130,10 +130,10 @@
 checkApi(api.Api o) {
   buildCounterApi++;
   if (buildCounterApi < 3) {
-    checkUnnamed2078(o.methods);
-    checkUnnamed2079(o.mixins);
+    checkUnnamed3564(o.methods);
+    checkUnnamed3565(o.mixins);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2080(o.options);
+    checkUnnamed3566(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals('foo'));
@@ -189,27 +189,27 @@
   buildCounterAuthRequirement--;
 }
 
-buildUnnamed2081() {
+buildUnnamed3567() {
   var o = new core.List<api.AuthProvider>();
   o.add(buildAuthProvider());
   o.add(buildAuthProvider());
   return o;
 }
 
-checkUnnamed2081(core.List<api.AuthProvider> o) {
+checkUnnamed3567(core.List<api.AuthProvider> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthProvider(o[0]);
   checkAuthProvider(o[1]);
 }
 
-buildUnnamed2082() {
+buildUnnamed3568() {
   var o = new core.List<api.AuthenticationRule>();
   o.add(buildAuthenticationRule());
   o.add(buildAuthenticationRule());
   return o;
 }
 
-checkUnnamed2082(core.List<api.AuthenticationRule> o) {
+checkUnnamed3568(core.List<api.AuthenticationRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthenticationRule(o[0]);
   checkAuthenticationRule(o[1]);
@@ -220,8 +220,8 @@
   var o = new api.Authentication();
   buildCounterAuthentication++;
   if (buildCounterAuthentication < 3) {
-    o.providers = buildUnnamed2081();
-    o.rules = buildUnnamed2082();
+    o.providers = buildUnnamed3567();
+    o.rules = buildUnnamed3568();
   }
   buildCounterAuthentication--;
   return o;
@@ -230,20 +230,20 @@
 checkAuthentication(api.Authentication o) {
   buildCounterAuthentication++;
   if (buildCounterAuthentication < 3) {
-    checkUnnamed2081(o.providers);
-    checkUnnamed2082(o.rules);
+    checkUnnamed3567(o.providers);
+    checkUnnamed3568(o.rules);
   }
   buildCounterAuthentication--;
 }
 
-buildUnnamed2083() {
+buildUnnamed3569() {
   var o = new core.List<api.AuthRequirement>();
   o.add(buildAuthRequirement());
   o.add(buildAuthRequirement());
   return o;
 }
 
-checkUnnamed2083(core.List<api.AuthRequirement> o) {
+checkUnnamed3569(core.List<api.AuthRequirement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthRequirement(o[0]);
   checkAuthRequirement(o[1]);
@@ -257,7 +257,7 @@
     o.allowWithoutCredential = true;
     o.customAuth = buildCustomAuthRequirements();
     o.oauth = buildOAuthRequirements();
-    o.requirements = buildUnnamed2083();
+    o.requirements = buildUnnamed3569();
     o.selector = "foo";
   }
   buildCounterAuthenticationRule--;
@@ -270,7 +270,7 @@
     unittest.expect(o.allowWithoutCredential, unittest.isTrue);
     checkCustomAuthRequirements(o.customAuth);
     checkOAuthRequirements(o.oauth);
-    checkUnnamed2083(o.requirements);
+    checkUnnamed3569(o.requirements);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterAuthenticationRule--;
@@ -316,14 +316,14 @@
   buildCounterAuthorizationRule--;
 }
 
-buildUnnamed2084() {
+buildUnnamed3570() {
   var o = new core.List<api.BackendRule>();
   o.add(buildBackendRule());
   o.add(buildBackendRule());
   return o;
 }
 
-checkUnnamed2084(core.List<api.BackendRule> o) {
+checkUnnamed3570(core.List<api.BackendRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendRule(o[0]);
   checkBackendRule(o[1]);
@@ -334,7 +334,7 @@
   var o = new api.Backend();
   buildCounterBackend++;
   if (buildCounterBackend < 3) {
-    o.rules = buildUnnamed2084();
+    o.rules = buildUnnamed3570();
   }
   buildCounterBackend--;
   return o;
@@ -343,7 +343,7 @@
 checkBackend(api.Backend o) {
   buildCounterBackend++;
   if (buildCounterBackend < 3) {
-    checkUnnamed2084(o.rules);
+    checkUnnamed3570(o.rules);
   }
   buildCounterBackend--;
 }
@@ -373,14 +373,14 @@
   buildCounterBackendRule--;
 }
 
-buildUnnamed2085() {
+buildUnnamed3571() {
   var o = new core.List<api.BillingDestination>();
   o.add(buildBillingDestination());
   o.add(buildBillingDestination());
   return o;
 }
 
-checkUnnamed2085(core.List<api.BillingDestination> o) {
+checkUnnamed3571(core.List<api.BillingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBillingDestination(o[0]);
   checkBillingDestination(o[1]);
@@ -391,7 +391,7 @@
   var o = new api.Billing();
   buildCounterBilling++;
   if (buildCounterBilling < 3) {
-    o.consumerDestinations = buildUnnamed2085();
+    o.consumerDestinations = buildUnnamed3571();
   }
   buildCounterBilling--;
   return o;
@@ -400,7 +400,7 @@
 checkBilling(api.Billing o) {
   buildCounterBilling++;
   if (buildCounterBilling < 3) {
-    checkUnnamed2085(o.consumerDestinations);
+    checkUnnamed3571(o.consumerDestinations);
   }
   buildCounterBilling--;
 }
@@ -424,14 +424,14 @@
   buildCounterBillingConfig--;
 }
 
-buildUnnamed2086() {
+buildUnnamed3572() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2086(core.List<core.String> o) {
+checkUnnamed3572(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -442,7 +442,7 @@
   var o = new api.BillingDestination();
   buildCounterBillingDestination++;
   if (buildCounterBillingDestination < 3) {
-    o.metrics = buildUnnamed2086();
+    o.metrics = buildUnnamed3572();
     o.monitoredResource = "foo";
   }
   buildCounterBillingDestination--;
@@ -452,7 +452,7 @@
 checkBillingDestination(api.BillingDestination o) {
   buildCounterBillingDestination++;
   if (buildCounterBillingDestination < 3) {
-    checkUnnamed2086(o.metrics);
+    checkUnnamed3572(o.metrics);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterBillingDestination--;
@@ -473,14 +473,14 @@
   buildCounterCancelOperationRequest--;
 }
 
-buildUnnamed2087() {
+buildUnnamed3573() {
   var o = new core.List<api.ContextRule>();
   o.add(buildContextRule());
   o.add(buildContextRule());
   return o;
 }
 
-checkUnnamed2087(core.List<api.ContextRule> o) {
+checkUnnamed3573(core.List<api.ContextRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContextRule(o[0]);
   checkContextRule(o[1]);
@@ -491,7 +491,7 @@
   var o = new api.Context();
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    o.rules = buildUnnamed2087();
+    o.rules = buildUnnamed3573();
   }
   buildCounterContext--;
   return o;
@@ -500,58 +500,58 @@
 checkContext(api.Context o) {
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    checkUnnamed2087(o.rules);
+    checkUnnamed3573(o.rules);
   }
   buildCounterContext--;
 }
 
-buildUnnamed2088() {
+buildUnnamed3574() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2088(core.List<core.String> o) {
+checkUnnamed3574(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2089() {
+buildUnnamed3575() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2089(core.List<core.String> o) {
+checkUnnamed3575(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2090() {
+buildUnnamed3576() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2090(core.List<core.String> o) {
+checkUnnamed3576(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2091() {
+buildUnnamed3577() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2091(core.List<core.String> o) {
+checkUnnamed3577(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -562,10 +562,10 @@
   var o = new api.ContextRule();
   buildCounterContextRule++;
   if (buildCounterContextRule < 3) {
-    o.allowedRequestExtensions = buildUnnamed2088();
-    o.allowedResponseExtensions = buildUnnamed2089();
-    o.provided = buildUnnamed2090();
-    o.requested = buildUnnamed2091();
+    o.allowedRequestExtensions = buildUnnamed3574();
+    o.allowedResponseExtensions = buildUnnamed3575();
+    o.provided = buildUnnamed3576();
+    o.requested = buildUnnamed3577();
     o.selector = "foo";
   }
   buildCounterContextRule--;
@@ -575,10 +575,10 @@
 checkContextRule(api.ContextRule o) {
   buildCounterContextRule++;
   if (buildCounterContextRule < 3) {
-    checkUnnamed2088(o.allowedRequestExtensions);
-    checkUnnamed2089(o.allowedResponseExtensions);
-    checkUnnamed2090(o.provided);
-    checkUnnamed2091(o.requested);
+    checkUnnamed3574(o.allowedRequestExtensions);
+    checkUnnamed3575(o.allowedResponseExtensions);
+    checkUnnamed3576(o.provided);
+    checkUnnamed3577(o.requested);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterContextRule--;
@@ -641,27 +641,27 @@
   buildCounterCustomAuthRequirements--;
 }
 
-buildUnnamed2092() {
+buildUnnamed3578() {
   var o = new core.List<api.CustomErrorRule>();
   o.add(buildCustomErrorRule());
   o.add(buildCustomErrorRule());
   return o;
 }
 
-checkUnnamed2092(core.List<api.CustomErrorRule> o) {
+checkUnnamed3578(core.List<api.CustomErrorRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomErrorRule(o[0]);
   checkCustomErrorRule(o[1]);
 }
 
-buildUnnamed2093() {
+buildUnnamed3579() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2093(core.List<core.String> o) {
+checkUnnamed3579(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -672,8 +672,8 @@
   var o = new api.CustomError();
   buildCounterCustomError++;
   if (buildCounterCustomError < 3) {
-    o.rules = buildUnnamed2092();
-    o.types = buildUnnamed2093();
+    o.rules = buildUnnamed3578();
+    o.types = buildUnnamed3579();
   }
   buildCounterCustomError--;
   return o;
@@ -682,8 +682,8 @@
 checkCustomError(api.CustomError o) {
   buildCounterCustomError++;
   if (buildCounterCustomError < 3) {
-    checkUnnamed2092(o.rules);
-    checkUnnamed2093(o.types);
+    checkUnnamed3578(o.rules);
+    checkUnnamed3579(o.types);
   }
   buildCounterCustomError--;
 }
@@ -730,27 +730,27 @@
   buildCounterCustomHttpPattern--;
 }
 
-buildUnnamed2094() {
+buildUnnamed3580() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed2094(core.List<api.Page> o) {
+checkUnnamed3580(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
 }
 
-buildUnnamed2095() {
+buildUnnamed3581() {
   var o = new core.List<api.DocumentationRule>();
   o.add(buildDocumentationRule());
   o.add(buildDocumentationRule());
   return o;
 }
 
-checkUnnamed2095(core.List<api.DocumentationRule> o) {
+checkUnnamed3581(core.List<api.DocumentationRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDocumentationRule(o[0]);
   checkDocumentationRule(o[1]);
@@ -763,8 +763,8 @@
   if (buildCounterDocumentation < 3) {
     o.documentationRootUrl = "foo";
     o.overview = "foo";
-    o.pages = buildUnnamed2094();
-    o.rules = buildUnnamed2095();
+    o.pages = buildUnnamed3580();
+    o.rules = buildUnnamed3581();
     o.summary = "foo";
   }
   buildCounterDocumentation--;
@@ -776,8 +776,8 @@
   if (buildCounterDocumentation < 3) {
     unittest.expect(o.documentationRootUrl, unittest.equals('foo'));
     unittest.expect(o.overview, unittest.equals('foo'));
-    checkUnnamed2094(o.pages);
-    checkUnnamed2095(o.rules);
+    checkUnnamed3580(o.pages);
+    checkUnnamed3581(o.rules);
     unittest.expect(o.summary, unittest.equals('foo'));
   }
   buildCounterDocumentation--;
@@ -821,27 +821,27 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed2096() {
+buildUnnamed3582() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2096(core.List<core.String> o) {
+checkUnnamed3582(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2097() {
+buildUnnamed3583() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2097(core.List<core.String> o) {
+checkUnnamed3583(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -852,9 +852,9 @@
   var o = new api.Endpoint();
   buildCounterEndpoint++;
   if (buildCounterEndpoint < 3) {
-    o.aliases = buildUnnamed2096();
+    o.aliases = buildUnnamed3582();
     o.allowCors = true;
-    o.features = buildUnnamed2097();
+    o.features = buildUnnamed3583();
     o.name = "foo";
     o.target = "foo";
   }
@@ -865,36 +865,36 @@
 checkEndpoint(api.Endpoint o) {
   buildCounterEndpoint++;
   if (buildCounterEndpoint < 3) {
-    checkUnnamed2096(o.aliases);
+    checkUnnamed3582(o.aliases);
     unittest.expect(o.allowCors, unittest.isTrue);
-    checkUnnamed2097(o.features);
+    checkUnnamed3583(o.features);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
   }
   buildCounterEndpoint--;
 }
 
-buildUnnamed2098() {
+buildUnnamed3584() {
   var o = new core.List<api.EnumValue>();
   o.add(buildEnumValue());
   o.add(buildEnumValue());
   return o;
 }
 
-checkUnnamed2098(core.List<api.EnumValue> o) {
+checkUnnamed3584(core.List<api.EnumValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnumValue(o[0]);
   checkEnumValue(o[1]);
 }
 
-buildUnnamed2099() {
+buildUnnamed3585() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed2099(core.List<api.Option> o) {
+checkUnnamed3585(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -905,9 +905,9 @@
   var o = new api.Enum();
   buildCounterEnum++;
   if (buildCounterEnum < 3) {
-    o.enumvalue = buildUnnamed2098();
+    o.enumvalue = buildUnnamed3584();
     o.name = "foo";
-    o.options = buildUnnamed2099();
+    o.options = buildUnnamed3585();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
   }
@@ -918,23 +918,23 @@
 checkEnum(api.Enum o) {
   buildCounterEnum++;
   if (buildCounterEnum < 3) {
-    checkUnnamed2098(o.enumvalue);
+    checkUnnamed3584(o.enumvalue);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2099(o.options);
+    checkUnnamed3585(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
   }
   buildCounterEnum--;
 }
 
-buildUnnamed2100() {
+buildUnnamed3586() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed2100(core.List<api.Option> o) {
+checkUnnamed3586(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -947,7 +947,7 @@
   if (buildCounterEnumValue < 3) {
     o.name = "foo";
     o.number = 42;
-    o.options = buildUnnamed2100();
+    o.options = buildUnnamed3586();
   }
   buildCounterEnumValue--;
   return o;
@@ -958,7 +958,7 @@
   if (buildCounterEnumValue < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.number, unittest.equals(42));
-    checkUnnamed2100(o.options);
+    checkUnnamed3586(o.options);
   }
   buildCounterEnumValue--;
 }
@@ -982,14 +982,14 @@
   buildCounterExperimental--;
 }
 
-buildUnnamed2101() {
+buildUnnamed3587() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed2101(core.List<api.Option> o) {
+checkUnnamed3587(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -1007,7 +1007,7 @@
     o.name = "foo";
     o.number = 42;
     o.oneofIndex = 42;
-    o.options = buildUnnamed2101();
+    o.options = buildUnnamed3587();
     o.packed = true;
     o.typeUrl = "foo";
   }
@@ -1025,21 +1025,21 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.number, unittest.equals(42));
     unittest.expect(o.oneofIndex, unittest.equals(42));
-    checkUnnamed2101(o.options);
+    checkUnnamed3587(o.options);
     unittest.expect(o.packed, unittest.isTrue);
     unittest.expect(o.typeUrl, unittest.equals('foo'));
   }
   buildCounterField--;
 }
 
-buildUnnamed2102() {
+buildUnnamed3588() {
   var o = new core.List<api.HttpRule>();
   o.add(buildHttpRule());
   o.add(buildHttpRule());
   return o;
 }
 
-checkUnnamed2102(core.List<api.HttpRule> o) {
+checkUnnamed3588(core.List<api.HttpRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpRule(o[0]);
   checkHttpRule(o[1]);
@@ -1051,7 +1051,7 @@
   buildCounterHttp++;
   if (buildCounterHttp < 3) {
     o.fullyDecodeReservedExpansion = true;
-    o.rules = buildUnnamed2102();
+    o.rules = buildUnnamed3588();
   }
   buildCounterHttp--;
   return o;
@@ -1061,32 +1061,32 @@
   buildCounterHttp++;
   if (buildCounterHttp < 3) {
     unittest.expect(o.fullyDecodeReservedExpansion, unittest.isTrue);
-    checkUnnamed2102(o.rules);
+    checkUnnamed3588(o.rules);
   }
   buildCounterHttp--;
 }
 
-buildUnnamed2103() {
+buildUnnamed3589() {
   var o = new core.List<api.HttpRule>();
   o.add(buildHttpRule());
   o.add(buildHttpRule());
   return o;
 }
 
-checkUnnamed2103(core.List<api.HttpRule> o) {
+checkUnnamed3589(core.List<api.HttpRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpRule(o[0]);
   checkHttpRule(o[1]);
 }
 
-buildUnnamed2104() {
+buildUnnamed3590() {
   var o = new core.List<api.AuthorizationRule>();
   o.add(buildAuthorizationRule());
   o.add(buildAuthorizationRule());
   return o;
 }
 
-checkUnnamed2104(core.List<api.AuthorizationRule> o) {
+checkUnnamed3590(core.List<api.AuthorizationRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthorizationRule(o[0]);
   checkAuthorizationRule(o[1]);
@@ -1097,8 +1097,8 @@
   var o = new api.HttpRule();
   buildCounterHttpRule++;
   if (buildCounterHttpRule < 3) {
-    o.additionalBindings = buildUnnamed2103();
-    o.authorizations = buildUnnamed2104();
+    o.additionalBindings = buildUnnamed3589();
+    o.authorizations = buildUnnamed3590();
     o.body = "foo";
     o.custom = buildCustomHttpPattern();
     o.delete = "foo";
@@ -1119,8 +1119,8 @@
 checkHttpRule(api.HttpRule o) {
   buildCounterHttpRule++;
   if (buildCounterHttpRule < 3) {
-    checkUnnamed2103(o.additionalBindings);
-    checkUnnamed2104(o.authorizations);
+    checkUnnamed3589(o.additionalBindings);
+    checkUnnamed3590(o.authorizations);
     unittest.expect(o.body, unittest.equals('foo'));
     checkCustomHttpPattern(o.custom);
     unittest.expect(o.delete, unittest.equals('foo'));
@@ -1160,14 +1160,14 @@
   buildCounterLabelDescriptor--;
 }
 
-buildUnnamed2105() {
+buildUnnamed3591() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed2105(core.List<api.Operation> o) {
+checkUnnamed3591(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -1179,7 +1179,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed2105();
+    o.operations = buildUnnamed3591();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -1189,19 +1189,19 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2105(o.operations);
+    checkUnnamed3591(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed2106() {
+buildUnnamed3592() {
   var o = new core.List<api.TenancyUnit>();
   o.add(buildTenancyUnit());
   o.add(buildTenancyUnit());
   return o;
 }
 
-checkUnnamed2106(core.List<api.TenancyUnit> o) {
+checkUnnamed3592(core.List<api.TenancyUnit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTenancyUnit(o[0]);
   checkTenancyUnit(o[1]);
@@ -1213,7 +1213,7 @@
   buildCounterListTenancyUnitsResponse++;
   if (buildCounterListTenancyUnitsResponse < 3) {
     o.nextPageToken = "foo";
-    o.tenancyUnits = buildUnnamed2106();
+    o.tenancyUnits = buildUnnamed3592();
   }
   buildCounterListTenancyUnitsResponse--;
   return o;
@@ -1223,19 +1223,19 @@
   buildCounterListTenancyUnitsResponse++;
   if (buildCounterListTenancyUnitsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2106(o.tenancyUnits);
+    checkUnnamed3592(o.tenancyUnits);
   }
   buildCounterListTenancyUnitsResponse--;
 }
 
-buildUnnamed2107() {
+buildUnnamed3593() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed2107(core.List<api.LabelDescriptor> o) {
+checkUnnamed3593(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -1248,7 +1248,7 @@
   if (buildCounterLogDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed2107();
+    o.labels = buildUnnamed3593();
     o.name = "foo";
   }
   buildCounterLogDescriptor--;
@@ -1260,33 +1260,33 @@
   if (buildCounterLogDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed2107(o.labels);
+    checkUnnamed3593(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLogDescriptor--;
 }
 
-buildUnnamed2108() {
+buildUnnamed3594() {
   var o = new core.List<api.LoggingDestination>();
   o.add(buildLoggingDestination());
   o.add(buildLoggingDestination());
   return o;
 }
 
-checkUnnamed2108(core.List<api.LoggingDestination> o) {
+checkUnnamed3594(core.List<api.LoggingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLoggingDestination(o[0]);
   checkLoggingDestination(o[1]);
 }
 
-buildUnnamed2109() {
+buildUnnamed3595() {
   var o = new core.List<api.LoggingDestination>();
   o.add(buildLoggingDestination());
   o.add(buildLoggingDestination());
   return o;
 }
 
-checkUnnamed2109(core.List<api.LoggingDestination> o) {
+checkUnnamed3595(core.List<api.LoggingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLoggingDestination(o[0]);
   checkLoggingDestination(o[1]);
@@ -1297,8 +1297,8 @@
   var o = new api.Logging();
   buildCounterLogging++;
   if (buildCounterLogging < 3) {
-    o.consumerDestinations = buildUnnamed2108();
-    o.producerDestinations = buildUnnamed2109();
+    o.consumerDestinations = buildUnnamed3594();
+    o.producerDestinations = buildUnnamed3595();
   }
   buildCounterLogging--;
   return o;
@@ -1307,20 +1307,20 @@
 checkLogging(api.Logging o) {
   buildCounterLogging++;
   if (buildCounterLogging < 3) {
-    checkUnnamed2108(o.consumerDestinations);
-    checkUnnamed2109(o.producerDestinations);
+    checkUnnamed3594(o.consumerDestinations);
+    checkUnnamed3595(o.producerDestinations);
   }
   buildCounterLogging--;
 }
 
-buildUnnamed2110() {
+buildUnnamed3596() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2110(core.List<core.String> o) {
+checkUnnamed3596(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1331,7 +1331,7 @@
   var o = new api.LoggingDestination();
   buildCounterLoggingDestination++;
   if (buildCounterLoggingDestination < 3) {
-    o.logs = buildUnnamed2110();
+    o.logs = buildUnnamed3596();
     o.monitoredResource = "foo";
   }
   buildCounterLoggingDestination--;
@@ -1341,7 +1341,7 @@
 checkLoggingDestination(api.LoggingDestination o) {
   buildCounterLoggingDestination++;
   if (buildCounterLoggingDestination < 3) {
-    checkUnnamed2110(o.logs);
+    checkUnnamed3596(o.logs);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterLoggingDestination--;
@@ -1376,14 +1376,14 @@
   buildCounterMediaDownload--;
 }
 
-buildUnnamed2111() {
+buildUnnamed3597() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2111(core.List<core.String> o) {
+checkUnnamed3597(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1398,7 +1398,7 @@
     o.dropzone = "foo";
     o.enabled = true;
     o.maxSize = "foo";
-    o.mimeTypes = buildUnnamed2111();
+    o.mimeTypes = buildUnnamed3597();
     o.progressNotification = true;
     o.startNotification = true;
     o.uploadService = "foo";
@@ -1414,7 +1414,7 @@
     unittest.expect(o.dropzone, unittest.equals('foo'));
     unittest.expect(o.enabled, unittest.isTrue);
     unittest.expect(o.maxSize, unittest.equals('foo'));
-    checkUnnamed2111(o.mimeTypes);
+    checkUnnamed3597(o.mimeTypes);
     unittest.expect(o.progressNotification, unittest.isTrue);
     unittest.expect(o.startNotification, unittest.isTrue);
     unittest.expect(o.uploadService, unittest.equals('foo'));
@@ -1422,14 +1422,14 @@
   buildCounterMediaUpload--;
 }
 
-buildUnnamed2112() {
+buildUnnamed3598() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed2112(core.List<api.Option> o) {
+checkUnnamed3598(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -1441,7 +1441,7 @@
   buildCounterMethod++;
   if (buildCounterMethod < 3) {
     o.name = "foo";
-    o.options = buildUnnamed2112();
+    o.options = buildUnnamed3598();
     o.requestStreaming = true;
     o.requestTypeUrl = "foo";
     o.responseStreaming = true;
@@ -1456,7 +1456,7 @@
   buildCounterMethod++;
   if (buildCounterMethod < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2112(o.options);
+    checkUnnamed3598(o.options);
     unittest.expect(o.requestStreaming, unittest.isTrue);
     unittest.expect(o.requestTypeUrl, unittest.equals('foo'));
     unittest.expect(o.responseStreaming, unittest.isTrue);
@@ -1466,14 +1466,14 @@
   buildCounterMethod--;
 }
 
-buildUnnamed2113() {
+buildUnnamed3599() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed2113(core.List<api.LabelDescriptor> o) {
+checkUnnamed3599(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -1486,7 +1486,7 @@
   if (buildCounterMetricDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed2113();
+    o.labels = buildUnnamed3599();
     o.metricKind = "foo";
     o.name = "foo";
     o.type = "foo";
@@ -1502,7 +1502,7 @@
   if (buildCounterMetricDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed2113(o.labels);
+    checkUnnamed3599(o.labels);
     unittest.expect(o.metricKind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -1512,14 +1512,14 @@
   buildCounterMetricDescriptor--;
 }
 
-buildUnnamed2114() {
+buildUnnamed3600() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2114(core.Map<core.String, core.String> o) {
+checkUnnamed3600(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1530,7 +1530,7 @@
   var o = new api.MetricRule();
   buildCounterMetricRule++;
   if (buildCounterMetricRule < 3) {
-    o.metricCosts = buildUnnamed2114();
+    o.metricCosts = buildUnnamed3600();
     o.selector = "foo";
   }
   buildCounterMetricRule--;
@@ -1540,7 +1540,7 @@
 checkMetricRule(api.MetricRule o) {
   buildCounterMetricRule++;
   if (buildCounterMetricRule < 3) {
-    checkUnnamed2114(o.metricCosts);
+    checkUnnamed3600(o.metricCosts);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterMetricRule--;
@@ -1567,14 +1567,14 @@
   buildCounterMixin--;
 }
 
-buildUnnamed2115() {
+buildUnnamed3601() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed2115(core.List<api.LabelDescriptor> o) {
+checkUnnamed3601(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -1587,7 +1587,7 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed2115();
+    o.labels = buildUnnamed3601();
     o.name = "foo";
     o.type = "foo";
   }
@@ -1600,34 +1600,34 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed2115(o.labels);
+    checkUnnamed3601(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMonitoredResourceDescriptor--;
 }
 
-buildUnnamed2116() {
+buildUnnamed3602() {
   var o = new core.List<api.MonitoringDestination>();
   o.add(buildMonitoringDestination());
   o.add(buildMonitoringDestination());
   return o;
 }
 
-checkUnnamed2116(core.List<api.MonitoringDestination> o) {
+checkUnnamed3602(core.List<api.MonitoringDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoringDestination(o[0]);
   checkMonitoringDestination(o[1]);
 }
 
-buildUnnamed2117() {
+buildUnnamed3603() {
   var o = new core.List<api.MonitoringDestination>();
   o.add(buildMonitoringDestination());
   o.add(buildMonitoringDestination());
   return o;
 }
 
-checkUnnamed2117(core.List<api.MonitoringDestination> o) {
+checkUnnamed3603(core.List<api.MonitoringDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoringDestination(o[0]);
   checkMonitoringDestination(o[1]);
@@ -1638,8 +1638,8 @@
   var o = new api.Monitoring();
   buildCounterMonitoring++;
   if (buildCounterMonitoring < 3) {
-    o.consumerDestinations = buildUnnamed2116();
-    o.producerDestinations = buildUnnamed2117();
+    o.consumerDestinations = buildUnnamed3602();
+    o.producerDestinations = buildUnnamed3603();
   }
   buildCounterMonitoring--;
   return o;
@@ -1648,20 +1648,20 @@
 checkMonitoring(api.Monitoring o) {
   buildCounterMonitoring++;
   if (buildCounterMonitoring < 3) {
-    checkUnnamed2116(o.consumerDestinations);
-    checkUnnamed2117(o.producerDestinations);
+    checkUnnamed3602(o.consumerDestinations);
+    checkUnnamed3603(o.producerDestinations);
   }
   buildCounterMonitoring--;
 }
 
-buildUnnamed2118() {
+buildUnnamed3604() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2118(core.List<core.String> o) {
+checkUnnamed3604(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1672,7 +1672,7 @@
   var o = new api.MonitoringDestination();
   buildCounterMonitoringDestination++;
   if (buildCounterMonitoringDestination < 3) {
-    o.metrics = buildUnnamed2118();
+    o.metrics = buildUnnamed3604();
     o.monitoredResource = "foo";
   }
   buildCounterMonitoringDestination--;
@@ -1682,7 +1682,7 @@
 checkMonitoringDestination(api.MonitoringDestination o) {
   buildCounterMonitoringDestination++;
   if (buildCounterMonitoringDestination < 3) {
-    checkUnnamed2118(o.metrics);
+    checkUnnamed3604(o.metrics);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterMonitoringDestination--;
@@ -1707,7 +1707,7 @@
   buildCounterOAuthRequirements--;
 }
 
-buildUnnamed2119() {
+buildUnnamed3605() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1722,7 +1722,7 @@
   return o;
 }
 
-checkUnnamed2119(core.Map<core.String, core.Object> o) {
+checkUnnamed3605(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1736,7 +1736,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2120() {
+buildUnnamed3606() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1751,7 +1751,7 @@
   return o;
 }
 
-checkUnnamed2120(core.Map<core.String, core.Object> o) {
+checkUnnamed3606(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -1772,9 +1772,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed2119();
+    o.metadata = buildUnnamed3605();
     o.name = "foo";
-    o.response = buildUnnamed2120();
+    o.response = buildUnnamed3606();
   }
   buildCounterOperation--;
   return o;
@@ -1785,14 +1785,14 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed2119(o.metadata);
+    checkUnnamed3605(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2120(o.response);
+    checkUnnamed3606(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed2121() {
+buildUnnamed3607() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1807,7 +1807,7 @@
   return o;
 }
 
-checkUnnamed2121(core.Map<core.String, core.Object> o) {
+checkUnnamed3607(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1827,7 +1827,7 @@
   buildCounterOption++;
   if (buildCounterOption < 3) {
     o.name = "foo";
-    o.value = buildUnnamed2121();
+    o.value = buildUnnamed3607();
   }
   buildCounterOption--;
   return o;
@@ -1837,19 +1837,19 @@
   buildCounterOption++;
   if (buildCounterOption < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2121(o.value);
+    checkUnnamed3607(o.value);
   }
   buildCounterOption--;
 }
 
-buildUnnamed2122() {
+buildUnnamed3608() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed2122(core.List<api.Page> o) {
+checkUnnamed3608(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
@@ -1862,7 +1862,7 @@
   if (buildCounterPage < 3) {
     o.content = "foo";
     o.name = "foo";
-    o.subpages = buildUnnamed2122();
+    o.subpages = buildUnnamed3608();
   }
   buildCounterPage--;
   return o;
@@ -1873,19 +1873,19 @@
   if (buildCounterPage < 3) {
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2122(o.subpages);
+    checkUnnamed3608(o.subpages);
   }
   buildCounterPage--;
 }
 
-buildUnnamed2123() {
+buildUnnamed3609() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2123(core.List<core.String> o) {
+checkUnnamed3609(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1896,7 +1896,7 @@
   var o = new api.PolicyBinding();
   buildCounterPolicyBinding++;
   if (buildCounterPolicyBinding < 3) {
-    o.members = buildUnnamed2123();
+    o.members = buildUnnamed3609();
     o.role = "foo";
   }
   buildCounterPolicyBinding--;
@@ -1906,33 +1906,33 @@
 checkPolicyBinding(api.PolicyBinding o) {
   buildCounterPolicyBinding++;
   if (buildCounterPolicyBinding < 3) {
-    checkUnnamed2123(o.members);
+    checkUnnamed3609(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterPolicyBinding--;
 }
 
-buildUnnamed2124() {
+buildUnnamed3610() {
   var o = new core.List<api.QuotaLimit>();
   o.add(buildQuotaLimit());
   o.add(buildQuotaLimit());
   return o;
 }
 
-checkUnnamed2124(core.List<api.QuotaLimit> o) {
+checkUnnamed3610(core.List<api.QuotaLimit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuotaLimit(o[0]);
   checkQuotaLimit(o[1]);
 }
 
-buildUnnamed2125() {
+buildUnnamed3611() {
   var o = new core.List<api.MetricRule>();
   o.add(buildMetricRule());
   o.add(buildMetricRule());
   return o;
 }
 
-checkUnnamed2125(core.List<api.MetricRule> o) {
+checkUnnamed3611(core.List<api.MetricRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricRule(o[0]);
   checkMetricRule(o[1]);
@@ -1943,8 +1943,8 @@
   var o = new api.Quota();
   buildCounterQuota++;
   if (buildCounterQuota < 3) {
-    o.limits = buildUnnamed2124();
-    o.metricRules = buildUnnamed2125();
+    o.limits = buildUnnamed3610();
+    o.metricRules = buildUnnamed3611();
   }
   buildCounterQuota--;
   return o;
@@ -1953,20 +1953,20 @@
 checkQuota(api.Quota o) {
   buildCounterQuota++;
   if (buildCounterQuota < 3) {
-    checkUnnamed2124(o.limits);
-    checkUnnamed2125(o.metricRules);
+    checkUnnamed3610(o.limits);
+    checkUnnamed3611(o.metricRules);
   }
   buildCounterQuota--;
 }
 
-buildUnnamed2126() {
+buildUnnamed3612() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2126(core.Map<core.String, core.String> o) {
+checkUnnamed3612(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1986,7 +1986,7 @@
     o.metric = "foo";
     o.name = "foo";
     o.unit = "foo";
-    o.values = buildUnnamed2126();
+    o.values = buildUnnamed3612();
   }
   buildCounterQuotaLimit--;
   return o;
@@ -2004,7 +2004,7 @@
     unittest.expect(o.metric, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.unit, unittest.equals('foo'));
-    checkUnnamed2126(o.values);
+    checkUnnamed3612(o.values);
   }
   buildCounterQuotaLimit--;
 }
@@ -2028,14 +2028,14 @@
   buildCounterRemoveTenantProjectRequest--;
 }
 
-buildUnnamed2127() {
+buildUnnamed3613() {
   var o = new core.List<api.TenancyUnit>();
   o.add(buildTenancyUnit());
   o.add(buildTenancyUnit());
   return o;
 }
 
-checkUnnamed2127(core.List<api.TenancyUnit> o) {
+checkUnnamed3613(core.List<api.TenancyUnit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTenancyUnit(o[0]);
   checkTenancyUnit(o[1]);
@@ -2047,7 +2047,7 @@
   buildCounterSearchTenancyUnitsResponse++;
   if (buildCounterSearchTenancyUnitsResponse < 3) {
     o.nextPageToken = "foo";
-    o.tenancyUnits = buildUnnamed2127();
+    o.tenancyUnits = buildUnnamed3613();
   }
   buildCounterSearchTenancyUnitsResponse--;
   return o;
@@ -2057,110 +2057,110 @@
   buildCounterSearchTenancyUnitsResponse++;
   if (buildCounterSearchTenancyUnitsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2127(o.tenancyUnits);
+    checkUnnamed3613(o.tenancyUnits);
   }
   buildCounterSearchTenancyUnitsResponse--;
 }
 
-buildUnnamed2128() {
+buildUnnamed3614() {
   var o = new core.List<api.Api>();
   o.add(buildApi());
   o.add(buildApi());
   return o;
 }
 
-checkUnnamed2128(core.List<api.Api> o) {
+checkUnnamed3614(core.List<api.Api> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApi(o[0]);
   checkApi(o[1]);
 }
 
-buildUnnamed2129() {
+buildUnnamed3615() {
   var o = new core.List<api.Endpoint>();
   o.add(buildEndpoint());
   o.add(buildEndpoint());
   return o;
 }
 
-checkUnnamed2129(core.List<api.Endpoint> o) {
+checkUnnamed3615(core.List<api.Endpoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEndpoint(o[0]);
   checkEndpoint(o[1]);
 }
 
-buildUnnamed2130() {
+buildUnnamed3616() {
   var o = new core.List<api.Enum>();
   o.add(buildEnum());
   o.add(buildEnum());
   return o;
 }
 
-checkUnnamed2130(core.List<api.Enum> o) {
+checkUnnamed3616(core.List<api.Enum> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnum(o[0]);
   checkEnum(o[1]);
 }
 
-buildUnnamed2131() {
+buildUnnamed3617() {
   var o = new core.List<api.LogDescriptor>();
   o.add(buildLogDescriptor());
   o.add(buildLogDescriptor());
   return o;
 }
 
-checkUnnamed2131(core.List<api.LogDescriptor> o) {
+checkUnnamed3617(core.List<api.LogDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogDescriptor(o[0]);
   checkLogDescriptor(o[1]);
 }
 
-buildUnnamed2132() {
+buildUnnamed3618() {
   var o = new core.List<api.MetricDescriptor>();
   o.add(buildMetricDescriptor());
   o.add(buildMetricDescriptor());
   return o;
 }
 
-checkUnnamed2132(core.List<api.MetricDescriptor> o) {
+checkUnnamed3618(core.List<api.MetricDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricDescriptor(o[0]);
   checkMetricDescriptor(o[1]);
 }
 
-buildUnnamed2133() {
+buildUnnamed3619() {
   var o = new core.List<api.MonitoredResourceDescriptor>();
   o.add(buildMonitoredResourceDescriptor());
   o.add(buildMonitoredResourceDescriptor());
   return o;
 }
 
-checkUnnamed2133(core.List<api.MonitoredResourceDescriptor> o) {
+checkUnnamed3619(core.List<api.MonitoredResourceDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoredResourceDescriptor(o[0]);
   checkMonitoredResourceDescriptor(o[1]);
 }
 
-buildUnnamed2134() {
+buildUnnamed3620() {
   var o = new core.List<api.Type>();
   o.add(buildType());
   o.add(buildType());
   return o;
 }
 
-checkUnnamed2134(core.List<api.Type> o) {
+checkUnnamed3620(core.List<api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o[0]);
   checkType(o[1]);
 }
 
-buildUnnamed2135() {
+buildUnnamed3621() {
   var o = new core.List<api.Type>();
   o.add(buildType());
   o.add(buildType());
   return o;
 }
 
-checkUnnamed2135(core.List<api.Type> o) {
+checkUnnamed3621(core.List<api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o[0]);
   checkType(o[1]);
@@ -2171,7 +2171,7 @@
   var o = new api.Service();
   buildCounterService++;
   if (buildCounterService < 3) {
-    o.apis = buildUnnamed2128();
+    o.apis = buildUnnamed3614();
     o.authentication = buildAuthentication();
     o.backend = buildBackend();
     o.billing = buildBilling();
@@ -2180,24 +2180,24 @@
     o.control = buildControl();
     o.customError = buildCustomError();
     o.documentation = buildDocumentation();
-    o.endpoints = buildUnnamed2129();
-    o.enums = buildUnnamed2130();
+    o.endpoints = buildUnnamed3615();
+    o.enums = buildUnnamed3616();
     o.experimental = buildExperimental();
     o.http = buildHttp();
     o.id = "foo";
     o.logging = buildLogging();
-    o.logs = buildUnnamed2131();
-    o.metrics = buildUnnamed2132();
-    o.monitoredResources = buildUnnamed2133();
+    o.logs = buildUnnamed3617();
+    o.metrics = buildUnnamed3618();
+    o.monitoredResources = buildUnnamed3619();
     o.monitoring = buildMonitoring();
     o.name = "foo";
     o.producerProjectId = "foo";
     o.quota = buildQuota();
     o.sourceInfo = buildSourceInfo();
     o.systemParameters = buildSystemParameters();
-    o.systemTypes = buildUnnamed2134();
+    o.systemTypes = buildUnnamed3620();
     o.title = "foo";
-    o.types = buildUnnamed2135();
+    o.types = buildUnnamed3621();
     o.usage = buildUsage();
     o.visibility = buildVisibility();
   }
@@ -2208,7 +2208,7 @@
 checkService(api.Service o) {
   buildCounterService++;
   if (buildCounterService < 3) {
-    checkUnnamed2128(o.apis);
+    checkUnnamed3614(o.apis);
     checkAuthentication(o.authentication);
     checkBackend(o.backend);
     checkBilling(o.billing);
@@ -2217,38 +2217,38 @@
     checkControl(o.control);
     checkCustomError(o.customError);
     checkDocumentation(o.documentation);
-    checkUnnamed2129(o.endpoints);
-    checkUnnamed2130(o.enums);
+    checkUnnamed3615(o.endpoints);
+    checkUnnamed3616(o.enums);
     checkExperimental(o.experimental);
     checkHttp(o.http);
     unittest.expect(o.id, unittest.equals('foo'));
     checkLogging(o.logging);
-    checkUnnamed2131(o.logs);
-    checkUnnamed2132(o.metrics);
-    checkUnnamed2133(o.monitoredResources);
+    checkUnnamed3617(o.logs);
+    checkUnnamed3618(o.metrics);
+    checkUnnamed3619(o.monitoredResources);
     checkMonitoring(o.monitoring);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.producerProjectId, unittest.equals('foo'));
     checkQuota(o.quota);
     checkSourceInfo(o.sourceInfo);
     checkSystemParameters(o.systemParameters);
-    checkUnnamed2134(o.systemTypes);
+    checkUnnamed3620(o.systemTypes);
     unittest.expect(o.title, unittest.equals('foo'));
-    checkUnnamed2135(o.types);
+    checkUnnamed3621(o.types);
     checkUsage(o.usage);
     checkVisibility(o.visibility);
   }
   buildCounterService--;
 }
 
-buildUnnamed2136() {
+buildUnnamed3622() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2136(core.List<core.String> o) {
+checkUnnamed3622(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2260,7 +2260,7 @@
   buildCounterServiceAccountConfig++;
   if (buildCounterServiceAccountConfig < 3) {
     o.accountId = "foo";
-    o.tenantProjectRoles = buildUnnamed2136();
+    o.tenantProjectRoles = buildUnnamed3622();
   }
   buildCounterServiceAccountConfig--;
   return o;
@@ -2270,7 +2270,7 @@
   buildCounterServiceAccountConfig++;
   if (buildCounterServiceAccountConfig < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed2136(o.tenantProjectRoles);
+    checkUnnamed3622(o.tenantProjectRoles);
   }
   buildCounterServiceAccountConfig--;
 }
@@ -2294,7 +2294,7 @@
   buildCounterSourceContext--;
 }
 
-buildUnnamed2137() {
+buildUnnamed3623() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2309,7 +2309,7 @@
   return o;
 }
 
-checkUnnamed2137(core.Map<core.String, core.Object> o) {
+checkUnnamed3623(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -2323,17 +2323,17 @@
   unittest.expect(casted8["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2138() {
+buildUnnamed3624() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2137());
-  o.add(buildUnnamed2137());
+  o.add(buildUnnamed3623());
+  o.add(buildUnnamed3623());
   return o;
 }
 
-checkUnnamed2138(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed3624(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2137(o[0]);
-  checkUnnamed2137(o[1]);
+  checkUnnamed3623(o[0]);
+  checkUnnamed3623(o[1]);
 }
 
 core.int buildCounterSourceInfo = 0;
@@ -2341,7 +2341,7 @@
   var o = new api.SourceInfo();
   buildCounterSourceInfo++;
   if (buildCounterSourceInfo < 3) {
-    o.sourceFiles = buildUnnamed2138();
+    o.sourceFiles = buildUnnamed3624();
   }
   buildCounterSourceInfo--;
   return o;
@@ -2350,12 +2350,12 @@
 checkSourceInfo(api.SourceInfo o) {
   buildCounterSourceInfo++;
   if (buildCounterSourceInfo < 3) {
-    checkUnnamed2138(o.sourceFiles);
+    checkUnnamed3624(o.sourceFiles);
   }
   buildCounterSourceInfo--;
 }
 
-buildUnnamed2139() {
+buildUnnamed3625() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2370,7 +2370,7 @@
   return o;
 }
 
-checkUnnamed2139(core.Map<core.String, core.Object> o) {
+checkUnnamed3625(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted9 = (o["x"]) as core.Map;
   unittest.expect(casted9, unittest.hasLength(3));
@@ -2384,17 +2384,17 @@
   unittest.expect(casted10["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2140() {
+buildUnnamed3626() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2139());
-  o.add(buildUnnamed2139());
+  o.add(buildUnnamed3625());
+  o.add(buildUnnamed3625());
   return o;
 }
 
-checkUnnamed2140(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed3626(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2139(o[0]);
-  checkUnnamed2139(o[1]);
+  checkUnnamed3625(o[0]);
+  checkUnnamed3625(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -2403,7 +2403,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed2140();
+    o.details = buildUnnamed3626();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -2414,7 +2414,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed2140(o.details);
+    checkUnnamed3626(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -2443,14 +2443,14 @@
   buildCounterSystemParameter--;
 }
 
-buildUnnamed2141() {
+buildUnnamed3627() {
   var o = new core.List<api.SystemParameter>();
   o.add(buildSystemParameter());
   o.add(buildSystemParameter());
   return o;
 }
 
-checkUnnamed2141(core.List<api.SystemParameter> o) {
+checkUnnamed3627(core.List<api.SystemParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSystemParameter(o[0]);
   checkSystemParameter(o[1]);
@@ -2461,7 +2461,7 @@
   var o = new api.SystemParameterRule();
   buildCounterSystemParameterRule++;
   if (buildCounterSystemParameterRule < 3) {
-    o.parameters = buildUnnamed2141();
+    o.parameters = buildUnnamed3627();
     o.selector = "foo";
   }
   buildCounterSystemParameterRule--;
@@ -2471,20 +2471,20 @@
 checkSystemParameterRule(api.SystemParameterRule o) {
   buildCounterSystemParameterRule++;
   if (buildCounterSystemParameterRule < 3) {
-    checkUnnamed2141(o.parameters);
+    checkUnnamed3627(o.parameters);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterSystemParameterRule--;
 }
 
-buildUnnamed2142() {
+buildUnnamed3628() {
   var o = new core.List<api.SystemParameterRule>();
   o.add(buildSystemParameterRule());
   o.add(buildSystemParameterRule());
   return o;
 }
 
-checkUnnamed2142(core.List<api.SystemParameterRule> o) {
+checkUnnamed3628(core.List<api.SystemParameterRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSystemParameterRule(o[0]);
   checkSystemParameterRule(o[1]);
@@ -2495,7 +2495,7 @@
   var o = new api.SystemParameters();
   buildCounterSystemParameters++;
   if (buildCounterSystemParameters < 3) {
-    o.rules = buildUnnamed2142();
+    o.rules = buildUnnamed3628();
   }
   buildCounterSystemParameters--;
   return o;
@@ -2504,19 +2504,19 @@
 checkSystemParameters(api.SystemParameters o) {
   buildCounterSystemParameters++;
   if (buildCounterSystemParameters < 3) {
-    checkUnnamed2142(o.rules);
+    checkUnnamed3628(o.rules);
   }
   buildCounterSystemParameters--;
 }
 
-buildUnnamed2143() {
+buildUnnamed3629() {
   var o = new core.List<api.TenantResource>();
   o.add(buildTenantResource());
   o.add(buildTenantResource());
   return o;
 }
 
-checkUnnamed2143(core.List<api.TenantResource> o) {
+checkUnnamed3629(core.List<api.TenantResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTenantResource(o[0]);
   checkTenantResource(o[1]);
@@ -2531,7 +2531,7 @@
     o.createTime = "foo";
     o.name = "foo";
     o.service = "foo";
-    o.tenantResources = buildUnnamed2143();
+    o.tenantResources = buildUnnamed3629();
   }
   buildCounterTenancyUnit--;
   return o;
@@ -2544,32 +2544,32 @@
     unittest.expect(o.createTime, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.service, unittest.equals('foo'));
-    checkUnnamed2143(o.tenantResources);
+    checkUnnamed3629(o.tenantResources);
   }
   buildCounterTenancyUnit--;
 }
 
-buildUnnamed2144() {
+buildUnnamed3630() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2144(core.Map<core.String, core.String> o) {
+checkUnnamed3630(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed2145() {
+buildUnnamed3631() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2145(core.List<core.String> o) {
+checkUnnamed3631(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2582,9 +2582,9 @@
   if (buildCounterTenantProjectConfig < 3) {
     o.billingConfig = buildBillingConfig();
     o.folder = "foo";
-    o.labels = buildUnnamed2144();
+    o.labels = buildUnnamed3630();
     o.serviceAccountConfig = buildServiceAccountConfig();
-    o.services = buildUnnamed2145();
+    o.services = buildUnnamed3631();
     o.tenantProjectPolicy = buildTenantProjectPolicy();
   }
   buildCounterTenantProjectConfig--;
@@ -2596,22 +2596,22 @@
   if (buildCounterTenantProjectConfig < 3) {
     checkBillingConfig(o.billingConfig);
     unittest.expect(o.folder, unittest.equals('foo'));
-    checkUnnamed2144(o.labels);
+    checkUnnamed3630(o.labels);
     checkServiceAccountConfig(o.serviceAccountConfig);
-    checkUnnamed2145(o.services);
+    checkUnnamed3631(o.services);
     checkTenantProjectPolicy(o.tenantProjectPolicy);
   }
   buildCounterTenantProjectConfig--;
 }
 
-buildUnnamed2146() {
+buildUnnamed3632() {
   var o = new core.List<api.PolicyBinding>();
   o.add(buildPolicyBinding());
   o.add(buildPolicyBinding());
   return o;
 }
 
-checkUnnamed2146(core.List<api.PolicyBinding> o) {
+checkUnnamed3632(core.List<api.PolicyBinding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPolicyBinding(o[0]);
   checkPolicyBinding(o[1]);
@@ -2622,7 +2622,7 @@
   var o = new api.TenantProjectPolicy();
   buildCounterTenantProjectPolicy++;
   if (buildCounterTenantProjectPolicy < 3) {
-    o.policyBindings = buildUnnamed2146();
+    o.policyBindings = buildUnnamed3632();
   }
   buildCounterTenantProjectPolicy--;
   return o;
@@ -2631,7 +2631,7 @@
 checkTenantProjectPolicy(api.TenantProjectPolicy o) {
   buildCounterTenantProjectPolicy++;
   if (buildCounterTenantProjectPolicy < 3) {
-    checkUnnamed2146(o.policyBindings);
+    checkUnnamed3632(o.policyBindings);
   }
   buildCounterTenantProjectPolicy--;
 }
@@ -2659,40 +2659,40 @@
   buildCounterTenantResource--;
 }
 
-buildUnnamed2147() {
+buildUnnamed3633() {
   var o = new core.List<api.Field>();
   o.add(buildField());
   o.add(buildField());
   return o;
 }
 
-checkUnnamed2147(core.List<api.Field> o) {
+checkUnnamed3633(core.List<api.Field> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkField(o[0]);
   checkField(o[1]);
 }
 
-buildUnnamed2148() {
+buildUnnamed3634() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2148(core.List<core.String> o) {
+checkUnnamed3634(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2149() {
+buildUnnamed3635() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed2149(core.List<api.Option> o) {
+checkUnnamed3635(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -2703,10 +2703,10 @@
   var o = new api.Type();
   buildCounterType++;
   if (buildCounterType < 3) {
-    o.fields = buildUnnamed2147();
+    o.fields = buildUnnamed3633();
     o.name = "foo";
-    o.oneofs = buildUnnamed2148();
-    o.options = buildUnnamed2149();
+    o.oneofs = buildUnnamed3634();
+    o.options = buildUnnamed3635();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
   }
@@ -2717,37 +2717,37 @@
 checkType(api.Type o) {
   buildCounterType++;
   if (buildCounterType < 3) {
-    checkUnnamed2147(o.fields);
+    checkUnnamed3633(o.fields);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2148(o.oneofs);
-    checkUnnamed2149(o.options);
+    checkUnnamed3634(o.oneofs);
+    checkUnnamed3635(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
   }
   buildCounterType--;
 }
 
-buildUnnamed2150() {
+buildUnnamed3636() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2150(core.List<core.String> o) {
+checkUnnamed3636(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2151() {
+buildUnnamed3637() {
   var o = new core.List<api.UsageRule>();
   o.add(buildUsageRule());
   o.add(buildUsageRule());
   return o;
 }
 
-checkUnnamed2151(core.List<api.UsageRule> o) {
+checkUnnamed3637(core.List<api.UsageRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageRule(o[0]);
   checkUsageRule(o[1]);
@@ -2759,8 +2759,8 @@
   buildCounterUsage++;
   if (buildCounterUsage < 3) {
     o.producerNotificationChannel = "foo";
-    o.requirements = buildUnnamed2150();
-    o.rules = buildUnnamed2151();
+    o.requirements = buildUnnamed3636();
+    o.rules = buildUnnamed3637();
   }
   buildCounterUsage--;
   return o;
@@ -2770,8 +2770,8 @@
   buildCounterUsage++;
   if (buildCounterUsage < 3) {
     unittest.expect(o.producerNotificationChannel, unittest.equals('foo'));
-    checkUnnamed2150(o.requirements);
-    checkUnnamed2151(o.rules);
+    checkUnnamed3636(o.requirements);
+    checkUnnamed3637(o.rules);
   }
   buildCounterUsage--;
 }
@@ -2799,14 +2799,14 @@
   buildCounterUsageRule--;
 }
 
-buildUnnamed2152() {
+buildUnnamed3638() {
   var o = new core.List<api.VisibilityRule>();
   o.add(buildVisibilityRule());
   o.add(buildVisibilityRule());
   return o;
 }
 
-checkUnnamed2152(core.List<api.VisibilityRule> o) {
+checkUnnamed3638(core.List<api.VisibilityRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVisibilityRule(o[0]);
   checkVisibilityRule(o[1]);
@@ -2817,7 +2817,7 @@
   var o = new api.Visibility();
   buildCounterVisibility++;
   if (buildCounterVisibility < 3) {
-    o.rules = buildUnnamed2152();
+    o.rules = buildUnnamed3638();
   }
   buildCounterVisibility--;
   return o;
@@ -2826,7 +2826,7 @@
 checkVisibility(api.Visibility o) {
   buildCounterVisibility++;
   if (buildCounterVisibility < 3) {
-    checkUnnamed2152(o.rules);
+    checkUnnamed3638(o.rules);
   }
   buildCounterVisibility--;
 }
@@ -3489,7 +3489,7 @@
       }), true);
       res
           .cancel(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3541,7 +3541,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3593,7 +3593,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3657,7 +3657,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -3723,8 +3723,7 @@
               pageSize: arg_pageSize,
               query: arg_query,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.SearchTenancyUnitsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSearchTenancyUnitsResponse(response);
       })));
     });
@@ -3782,7 +3781,7 @@
       }), true);
       res
           .addProject(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3838,7 +3837,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TenancyUnit response) {
+          .then(unittest.expectAsync1(((response) {
         checkTenancyUnit(response);
       })));
     });
@@ -3890,7 +3889,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3954,7 +3953,7 @@
               filter: arg_filter,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTenancyUnitsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTenancyUnitsResponse(response);
       })));
     });
@@ -4010,7 +4009,7 @@
       }), true);
       res
           .removeProject(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
diff --git a/generated/googleapis/test/servicecontrol/v1_test.dart b/generated/googleapis/test/servicecontrol/v1_test.dart
index dc686d6..0723b2c 100644
--- a/generated/googleapis/test/servicecontrol/v1_test.dart
+++ b/generated/googleapis/test/servicecontrol/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed1885() {
+buildUnnamed1595() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1885(core.List<core.String> o) {
+checkUnnamed1595(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -68,7 +68,7 @@
   var o = new api.AllocateInfo();
   buildCounterAllocateInfo++;
   if (buildCounterAllocateInfo < 3) {
-    o.unusedArguments = buildUnnamed1885();
+    o.unusedArguments = buildUnnamed1595();
   }
   buildCounterAllocateInfo--;
   return o;
@@ -77,7 +77,7 @@
 checkAllocateInfo(api.AllocateInfo o) {
   buildCounterAllocateInfo++;
   if (buildCounterAllocateInfo < 3) {
-    checkUnnamed1885(o.unusedArguments);
+    checkUnnamed1595(o.unusedArguments);
   }
   buildCounterAllocateInfo--;
 }
@@ -103,27 +103,27 @@
   buildCounterAllocateQuotaRequest--;
 }
 
-buildUnnamed1886() {
+buildUnnamed1596() {
   var o = new core.List<api.QuotaError>();
   o.add(buildQuotaError());
   o.add(buildQuotaError());
   return o;
 }
 
-checkUnnamed1886(core.List<api.QuotaError> o) {
+checkUnnamed1596(core.List<api.QuotaError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuotaError(o[0]);
   checkQuotaError(o[1]);
 }
 
-buildUnnamed1887() {
+buildUnnamed1597() {
   var o = new core.List<api.MetricValueSet>();
   o.add(buildMetricValueSet());
   o.add(buildMetricValueSet());
   return o;
 }
 
-checkUnnamed1887(core.List<api.MetricValueSet> o) {
+checkUnnamed1597(core.List<api.MetricValueSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricValueSet(o[0]);
   checkMetricValueSet(o[1]);
@@ -134,10 +134,10 @@
   var o = new api.AllocateQuotaResponse();
   buildCounterAllocateQuotaResponse++;
   if (buildCounterAllocateQuotaResponse < 3) {
-    o.allocateErrors = buildUnnamed1886();
+    o.allocateErrors = buildUnnamed1596();
     o.allocateInfo = buildAllocateInfo();
     o.operationId = "foo";
-    o.quotaMetrics = buildUnnamed1887();
+    o.quotaMetrics = buildUnnamed1597();
     o.serviceConfigId = "foo";
   }
   buildCounterAllocateQuotaResponse--;
@@ -147,29 +147,29 @@
 checkAllocateQuotaResponse(api.AllocateQuotaResponse o) {
   buildCounterAllocateQuotaResponse++;
   if (buildCounterAllocateQuotaResponse < 3) {
-    checkUnnamed1886(o.allocateErrors);
+    checkUnnamed1596(o.allocateErrors);
     checkAllocateInfo(o.allocateInfo);
     unittest.expect(o.operationId, unittest.equals('foo'));
-    checkUnnamed1887(o.quotaMetrics);
+    checkUnnamed1597(o.quotaMetrics);
     unittest.expect(o.serviceConfigId, unittest.equals('foo'));
   }
   buildCounterAllocateQuotaResponse--;
 }
 
-buildUnnamed1888() {
+buildUnnamed1598() {
   var o = new core.List<api.AuthorizationInfo>();
   o.add(buildAuthorizationInfo());
   o.add(buildAuthorizationInfo());
   return o;
 }
 
-checkUnnamed1888(core.List<api.AuthorizationInfo> o) {
+checkUnnamed1598(core.List<api.AuthorizationInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthorizationInfo(o[0]);
   checkAuthorizationInfo(o[1]);
 }
 
-buildUnnamed1889() {
+buildUnnamed1599() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -184,7 +184,7 @@
   return o;
 }
 
-checkUnnamed1889(core.Map<core.String, core.Object> o) {
+checkUnnamed1599(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -198,7 +198,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1890() {
+buildUnnamed1600() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -213,7 +213,7 @@
   return o;
 }
 
-checkUnnamed1890(core.Map<core.String, core.Object> o) {
+checkUnnamed1600(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -227,7 +227,7 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1891() {
+buildUnnamed1601() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -242,7 +242,7 @@
   return o;
 }
 
-checkUnnamed1891(core.Map<core.String, core.Object> o) {
+checkUnnamed1601(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -256,7 +256,7 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1892() {
+buildUnnamed1602() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -271,7 +271,7 @@
   return o;
 }
 
-checkUnnamed1892(core.Map<core.String, core.Object> o) {
+checkUnnamed1602(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -291,15 +291,15 @@
   buildCounterAuditLog++;
   if (buildCounterAuditLog < 3) {
     o.authenticationInfo = buildAuthenticationInfo();
-    o.authorizationInfo = buildUnnamed1888();
-    o.metadata = buildUnnamed1889();
+    o.authorizationInfo = buildUnnamed1598();
+    o.metadata = buildUnnamed1599();
     o.methodName = "foo";
     o.numResponseItems = "foo";
-    o.request = buildUnnamed1890();
+    o.request = buildUnnamed1600();
     o.requestMetadata = buildRequestMetadata();
     o.resourceName = "foo";
-    o.response = buildUnnamed1891();
-    o.serviceData = buildUnnamed1892();
+    o.response = buildUnnamed1601();
+    o.serviceData = buildUnnamed1602();
     o.serviceName = "foo";
     o.status = buildStatus();
   }
@@ -311,22 +311,22 @@
   buildCounterAuditLog++;
   if (buildCounterAuditLog < 3) {
     checkAuthenticationInfo(o.authenticationInfo);
-    checkUnnamed1888(o.authorizationInfo);
-    checkUnnamed1889(o.metadata);
+    checkUnnamed1598(o.authorizationInfo);
+    checkUnnamed1599(o.metadata);
     unittest.expect(o.methodName, unittest.equals('foo'));
     unittest.expect(o.numResponseItems, unittest.equals('foo'));
-    checkUnnamed1890(o.request);
+    checkUnnamed1600(o.request);
     checkRequestMetadata(o.requestMetadata);
     unittest.expect(o.resourceName, unittest.equals('foo'));
-    checkUnnamed1891(o.response);
-    checkUnnamed1892(o.serviceData);
+    checkUnnamed1601(o.response);
+    checkUnnamed1602(o.serviceData);
     unittest.expect(o.serviceName, unittest.equals('foo'));
     checkStatus(o.status);
   }
   buildCounterAuditLog--;
 }
 
-buildUnnamed1893() {
+buildUnnamed1603() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -341,7 +341,7 @@
   return o;
 }
 
-checkUnnamed1893(core.Map<core.String, core.Object> o) {
+checkUnnamed1603(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted9 = (o["x"]) as core.Map;
   unittest.expect(casted9, unittest.hasLength(3));
@@ -362,7 +362,7 @@
   if (buildCounterAuthenticationInfo < 3) {
     o.authoritySelector = "foo";
     o.principalEmail = "foo";
-    o.thirdPartyPrincipal = buildUnnamed1893();
+    o.thirdPartyPrincipal = buildUnnamed1603();
   }
   buildCounterAuthenticationInfo--;
   return o;
@@ -373,7 +373,7 @@
   if (buildCounterAuthenticationInfo < 3) {
     unittest.expect(o.authoritySelector, unittest.equals('foo'));
     unittest.expect(o.principalEmail, unittest.equals('foo'));
-    checkUnnamed1893(o.thirdPartyPrincipal);
+    checkUnnamed1603(o.thirdPartyPrincipal);
   }
   buildCounterAuthenticationInfo--;
 }
@@ -424,14 +424,14 @@
   buildCounterCheckError--;
 }
 
-buildUnnamed1894() {
+buildUnnamed1604() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1894(core.List<core.String> o) {
+checkUnnamed1604(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -443,7 +443,7 @@
   buildCounterCheckInfo++;
   if (buildCounterCheckInfo < 3) {
     o.consumerInfo = buildConsumerInfo();
-    o.unusedArguments = buildUnnamed1894();
+    o.unusedArguments = buildUnnamed1604();
   }
   buildCounterCheckInfo--;
   return o;
@@ -453,7 +453,7 @@
   buildCounterCheckInfo++;
   if (buildCounterCheckInfo < 3) {
     checkConsumerInfo(o.consumerInfo);
-    checkUnnamed1894(o.unusedArguments);
+    checkUnnamed1604(o.unusedArguments);
   }
   buildCounterCheckInfo--;
 }
@@ -483,14 +483,14 @@
   buildCounterCheckRequest--;
 }
 
-buildUnnamed1895() {
+buildUnnamed1605() {
   var o = new core.List<api.CheckError>();
   o.add(buildCheckError());
   o.add(buildCheckError());
   return o;
 }
 
-checkUnnamed1895(core.List<api.CheckError> o) {
+checkUnnamed1605(core.List<api.CheckError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCheckError(o[0]);
   checkCheckError(o[1]);
@@ -501,7 +501,7 @@
   var o = new api.CheckResponse();
   buildCounterCheckResponse++;
   if (buildCounterCheckResponse < 3) {
-    o.checkErrors = buildUnnamed1895();
+    o.checkErrors = buildUnnamed1605();
     o.checkInfo = buildCheckInfo();
     o.operationId = "foo";
     o.quotaInfo = buildQuotaInfo();
@@ -514,7 +514,7 @@
 checkCheckResponse(api.CheckResponse o) {
   buildCounterCheckResponse++;
   if (buildCounterCheckResponse < 3) {
-    checkUnnamed1895(o.checkErrors);
+    checkUnnamed1605(o.checkErrors);
     checkCheckInfo(o.checkInfo);
     unittest.expect(o.operationId, unittest.equals('foo'));
     checkQuotaInfo(o.quotaInfo);
@@ -542,14 +542,14 @@
   buildCounterConsumerInfo--;
 }
 
-buildUnnamed1896() {
+buildUnnamed1606() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1896(core.List<core.String> o) {
+checkUnnamed1606(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -560,7 +560,7 @@
   var o = new api.Distribution();
   buildCounterDistribution++;
   if (buildCounterDistribution < 3) {
-    o.bucketCounts = buildUnnamed1896();
+    o.bucketCounts = buildUnnamed1606();
     o.count = "foo";
     o.explicitBuckets = buildExplicitBuckets();
     o.exponentialBuckets = buildExponentialBuckets();
@@ -577,7 +577,7 @@
 checkDistribution(api.Distribution o) {
   buildCounterDistribution++;
   if (buildCounterDistribution < 3) {
-    checkUnnamed1896(o.bucketCounts);
+    checkUnnamed1606(o.bucketCounts);
     unittest.expect(o.count, unittest.equals('foo'));
     checkExplicitBuckets(o.explicitBuckets);
     checkExponentialBuckets(o.exponentialBuckets);
@@ -611,27 +611,27 @@
   buildCounterEndReconciliationRequest--;
 }
 
-buildUnnamed1897() {
+buildUnnamed1607() {
   var o = new core.List<api.MetricValueSet>();
   o.add(buildMetricValueSet());
   o.add(buildMetricValueSet());
   return o;
 }
 
-checkUnnamed1897(core.List<api.MetricValueSet> o) {
+checkUnnamed1607(core.List<api.MetricValueSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricValueSet(o[0]);
   checkMetricValueSet(o[1]);
 }
 
-buildUnnamed1898() {
+buildUnnamed1608() {
   var o = new core.List<api.QuotaError>();
   o.add(buildQuotaError());
   o.add(buildQuotaError());
   return o;
 }
 
-checkUnnamed1898(core.List<api.QuotaError> o) {
+checkUnnamed1608(core.List<api.QuotaError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuotaError(o[0]);
   checkQuotaError(o[1]);
@@ -643,8 +643,8 @@
   buildCounterEndReconciliationResponse++;
   if (buildCounterEndReconciliationResponse < 3) {
     o.operationId = "foo";
-    o.quotaMetrics = buildUnnamed1897();
-    o.reconciliationErrors = buildUnnamed1898();
+    o.quotaMetrics = buildUnnamed1607();
+    o.reconciliationErrors = buildUnnamed1608();
     o.serviceConfigId = "foo";
   }
   buildCounterEndReconciliationResponse--;
@@ -655,21 +655,21 @@
   buildCounterEndReconciliationResponse++;
   if (buildCounterEndReconciliationResponse < 3) {
     unittest.expect(o.operationId, unittest.equals('foo'));
-    checkUnnamed1897(o.quotaMetrics);
-    checkUnnamed1898(o.reconciliationErrors);
+    checkUnnamed1607(o.quotaMetrics);
+    checkUnnamed1608(o.reconciliationErrors);
     unittest.expect(o.serviceConfigId, unittest.equals('foo'));
   }
   buildCounterEndReconciliationResponse--;
 }
 
-buildUnnamed1899() {
+buildUnnamed1609() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed1899(core.List<core.double> o) {
+checkUnnamed1609(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -680,7 +680,7 @@
   var o = new api.ExplicitBuckets();
   buildCounterExplicitBuckets++;
   if (buildCounterExplicitBuckets < 3) {
-    o.bounds = buildUnnamed1899();
+    o.bounds = buildUnnamed1609();
   }
   buildCounterExplicitBuckets--;
   return o;
@@ -689,7 +689,7 @@
 checkExplicitBuckets(api.ExplicitBuckets o) {
   buildCounterExplicitBuckets++;
   if (buildCounterExplicitBuckets < 3) {
-    checkUnnamed1899(o.bounds);
+    checkUnnamed1609(o.bounds);
   }
   buildCounterExplicitBuckets--;
 }
@@ -740,20 +740,20 @@
   buildCounterLinearBuckets--;
 }
 
-buildUnnamed1900() {
+buildUnnamed1610() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1900(core.Map<core.String, core.String> o) {
+checkUnnamed1610(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1901() {
+buildUnnamed1611() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -768,7 +768,7 @@
   return o;
 }
 
-checkUnnamed1901(core.Map<core.String, core.Object> o) {
+checkUnnamed1611(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted11 = (o["x"]) as core.Map;
   unittest.expect(casted11, unittest.hasLength(3));
@@ -782,7 +782,7 @@
   unittest.expect(casted12["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1902() {
+buildUnnamed1612() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -797,7 +797,7 @@
   return o;
 }
 
-checkUnnamed1902(core.Map<core.String, core.Object> o) {
+checkUnnamed1612(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted13 = (o["x"]) as core.Map;
   unittest.expect(casted13, unittest.hasLength(3));
@@ -817,11 +817,11 @@
   buildCounterLogEntry++;
   if (buildCounterLogEntry < 3) {
     o.insertId = "foo";
-    o.labels = buildUnnamed1900();
+    o.labels = buildUnnamed1610();
     o.name = "foo";
-    o.protoPayload = buildUnnamed1901();
+    o.protoPayload = buildUnnamed1611();
     o.severity = "foo";
-    o.structPayload = buildUnnamed1902();
+    o.structPayload = buildUnnamed1612();
     o.textPayload = "foo";
     o.timestamp = "foo";
   }
@@ -833,25 +833,25 @@
   buildCounterLogEntry++;
   if (buildCounterLogEntry < 3) {
     unittest.expect(o.insertId, unittest.equals('foo'));
-    checkUnnamed1900(o.labels);
+    checkUnnamed1610(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1901(o.protoPayload);
+    checkUnnamed1611(o.protoPayload);
     unittest.expect(o.severity, unittest.equals('foo'));
-    checkUnnamed1902(o.structPayload);
+    checkUnnamed1612(o.structPayload);
     unittest.expect(o.textPayload, unittest.equals('foo'));
     unittest.expect(o.timestamp, unittest.equals('foo'));
   }
   buildCounterLogEntry--;
 }
 
-buildUnnamed1903() {
+buildUnnamed1613() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1903(core.Map<core.String, core.String> o) {
+checkUnnamed1613(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -867,7 +867,7 @@
     o.doubleValue = 42.0;
     o.endTime = "foo";
     o.int64Value = "foo";
-    o.labels = buildUnnamed1903();
+    o.labels = buildUnnamed1613();
     o.moneyValue = buildMoney();
     o.startTime = "foo";
     o.stringValue = "foo";
@@ -884,7 +884,7 @@
     unittest.expect(o.doubleValue, unittest.equals(42.0));
     unittest.expect(o.endTime, unittest.equals('foo'));
     unittest.expect(o.int64Value, unittest.equals('foo'));
-    checkUnnamed1903(o.labels);
+    checkUnnamed1613(o.labels);
     checkMoney(o.moneyValue);
     unittest.expect(o.startTime, unittest.equals('foo'));
     unittest.expect(o.stringValue, unittest.equals('foo'));
@@ -892,14 +892,14 @@
   buildCounterMetricValue--;
 }
 
-buildUnnamed1904() {
+buildUnnamed1614() {
   var o = new core.List<api.MetricValue>();
   o.add(buildMetricValue());
   o.add(buildMetricValue());
   return o;
 }
 
-checkUnnamed1904(core.List<api.MetricValue> o) {
+checkUnnamed1614(core.List<api.MetricValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricValue(o[0]);
   checkMetricValue(o[1]);
@@ -911,7 +911,7 @@
   buildCounterMetricValueSet++;
   if (buildCounterMetricValueSet < 3) {
     o.metricName = "foo";
-    o.metricValues = buildUnnamed1904();
+    o.metricValues = buildUnnamed1614();
   }
   buildCounterMetricValueSet--;
   return o;
@@ -921,7 +921,7 @@
   buildCounterMetricValueSet++;
   if (buildCounterMetricValueSet < 3) {
     unittest.expect(o.metricName, unittest.equals('foo'));
-    checkUnnamed1904(o.metricValues);
+    checkUnnamed1614(o.metricValues);
   }
   buildCounterMetricValueSet--;
 }
@@ -949,66 +949,66 @@
   buildCounterMoney--;
 }
 
-buildUnnamed1905() {
+buildUnnamed1615() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1905(core.Map<core.String, core.String> o) {
+checkUnnamed1615(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1906() {
+buildUnnamed1616() {
   var o = new core.List<api.LogEntry>();
   o.add(buildLogEntry());
   o.add(buildLogEntry());
   return o;
 }
 
-checkUnnamed1906(core.List<api.LogEntry> o) {
+checkUnnamed1616(core.List<api.LogEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogEntry(o[0]);
   checkLogEntry(o[1]);
 }
 
-buildUnnamed1907() {
+buildUnnamed1617() {
   var o = new core.List<api.MetricValueSet>();
   o.add(buildMetricValueSet());
   o.add(buildMetricValueSet());
   return o;
 }
 
-checkUnnamed1907(core.List<api.MetricValueSet> o) {
+checkUnnamed1617(core.List<api.MetricValueSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricValueSet(o[0]);
   checkMetricValueSet(o[1]);
 }
 
-buildUnnamed1908() {
+buildUnnamed1618() {
   var o = new core.List<api.ResourceInfo>();
   o.add(buildResourceInfo());
   o.add(buildResourceInfo());
   return o;
 }
 
-checkUnnamed1908(core.List<api.ResourceInfo> o) {
+checkUnnamed1618(core.List<api.ResourceInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceInfo(o[0]);
   checkResourceInfo(o[1]);
 }
 
-buildUnnamed1909() {
+buildUnnamed1619() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1909(core.Map<core.String, core.String> o) {
+checkUnnamed1619(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1022,16 +1022,16 @@
     o.consumerId = "foo";
     o.endTime = "foo";
     o.importance = "foo";
-    o.labels = buildUnnamed1905();
-    o.logEntries = buildUnnamed1906();
-    o.metricValueSets = buildUnnamed1907();
+    o.labels = buildUnnamed1615();
+    o.logEntries = buildUnnamed1616();
+    o.metricValueSets = buildUnnamed1617();
     o.operationId = "foo";
     o.operationName = "foo";
     o.quotaProperties = buildQuotaProperties();
     o.resourceContainer = "foo";
-    o.resources = buildUnnamed1908();
+    o.resources = buildUnnamed1618();
     o.startTime = "foo";
-    o.userLabels = buildUnnamed1909();
+    o.userLabels = buildUnnamed1619();
   }
   buildCounterOperation--;
   return o;
@@ -1043,16 +1043,16 @@
     unittest.expect(o.consumerId, unittest.equals('foo'));
     unittest.expect(o.endTime, unittest.equals('foo'));
     unittest.expect(o.importance, unittest.equals('foo'));
-    checkUnnamed1905(o.labels);
-    checkUnnamed1906(o.logEntries);
-    checkUnnamed1907(o.metricValueSets);
+    checkUnnamed1615(o.labels);
+    checkUnnamed1616(o.logEntries);
+    checkUnnamed1617(o.metricValueSets);
     unittest.expect(o.operationId, unittest.equals('foo'));
     unittest.expect(o.operationName, unittest.equals('foo'));
     checkQuotaProperties(o.quotaProperties);
     unittest.expect(o.resourceContainer, unittest.equals('foo'));
-    checkUnnamed1908(o.resources);
+    checkUnnamed1618(o.resources);
     unittest.expect(o.startTime, unittest.equals('foo'));
-    checkUnnamed1909(o.userLabels);
+    checkUnnamed1619(o.userLabels);
   }
   buildCounterOperation--;
 }
@@ -1080,40 +1080,40 @@
   buildCounterQuotaError--;
 }
 
-buildUnnamed1910() {
+buildUnnamed1620() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1910(core.List<core.String> o) {
+checkUnnamed1620(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1911() {
+buildUnnamed1621() {
   var o = new core.Map<core.String, core.int>();
   o["x"] = 42;
   o["y"] = 42;
   return o;
 }
 
-checkUnnamed1911(core.Map<core.String, core.int> o) {
+checkUnnamed1621(core.Map<core.String, core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals(42));
   unittest.expect(o["y"], unittest.equals(42));
 }
 
-buildUnnamed1912() {
+buildUnnamed1622() {
   var o = new core.List<api.MetricValueSet>();
   o.add(buildMetricValueSet());
   o.add(buildMetricValueSet());
   return o;
 }
 
-checkUnnamed1912(core.List<api.MetricValueSet> o) {
+checkUnnamed1622(core.List<api.MetricValueSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricValueSet(o[0]);
   checkMetricValueSet(o[1]);
@@ -1124,9 +1124,9 @@
   var o = new api.QuotaInfo();
   buildCounterQuotaInfo++;
   if (buildCounterQuotaInfo < 3) {
-    o.limitExceeded = buildUnnamed1910();
-    o.quotaConsumed = buildUnnamed1911();
-    o.quotaMetrics = buildUnnamed1912();
+    o.limitExceeded = buildUnnamed1620();
+    o.quotaConsumed = buildUnnamed1621();
+    o.quotaMetrics = buildUnnamed1622();
   }
   buildCounterQuotaInfo--;
   return o;
@@ -1135,34 +1135,34 @@
 checkQuotaInfo(api.QuotaInfo o) {
   buildCounterQuotaInfo++;
   if (buildCounterQuotaInfo < 3) {
-    checkUnnamed1910(o.limitExceeded);
-    checkUnnamed1911(o.quotaConsumed);
-    checkUnnamed1912(o.quotaMetrics);
+    checkUnnamed1620(o.limitExceeded);
+    checkUnnamed1621(o.quotaConsumed);
+    checkUnnamed1622(o.quotaMetrics);
   }
   buildCounterQuotaInfo--;
 }
 
-buildUnnamed1913() {
+buildUnnamed1623() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1913(core.Map<core.String, core.String> o) {
+checkUnnamed1623(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed1914() {
+buildUnnamed1624() {
   var o = new core.List<api.MetricValueSet>();
   o.add(buildMetricValueSet());
   o.add(buildMetricValueSet());
   return o;
 }
 
-checkUnnamed1914(core.List<api.MetricValueSet> o) {
+checkUnnamed1624(core.List<api.MetricValueSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricValueSet(o[0]);
   checkMetricValueSet(o[1]);
@@ -1174,10 +1174,10 @@
   buildCounterQuotaOperation++;
   if (buildCounterQuotaOperation < 3) {
     o.consumerId = "foo";
-    o.labels = buildUnnamed1913();
+    o.labels = buildUnnamed1623();
     o.methodName = "foo";
     o.operationId = "foo";
-    o.quotaMetrics = buildUnnamed1914();
+    o.quotaMetrics = buildUnnamed1624();
     o.quotaMode = "foo";
   }
   buildCounterQuotaOperation--;
@@ -1188,10 +1188,10 @@
   buildCounterQuotaOperation++;
   if (buildCounterQuotaOperation < 3) {
     unittest.expect(o.consumerId, unittest.equals('foo'));
-    checkUnnamed1913(o.labels);
+    checkUnnamed1623(o.labels);
     unittest.expect(o.methodName, unittest.equals('foo'));
     unittest.expect(o.operationId, unittest.equals('foo'));
-    checkUnnamed1914(o.quotaMetrics);
+    checkUnnamed1624(o.quotaMetrics);
     unittest.expect(o.quotaMode, unittest.equals('foo'));
   }
   buildCounterQuotaOperation--;
@@ -1237,27 +1237,27 @@
   buildCounterReleaseQuotaRequest--;
 }
 
-buildUnnamed1915() {
+buildUnnamed1625() {
   var o = new core.List<api.MetricValueSet>();
   o.add(buildMetricValueSet());
   o.add(buildMetricValueSet());
   return o;
 }
 
-checkUnnamed1915(core.List<api.MetricValueSet> o) {
+checkUnnamed1625(core.List<api.MetricValueSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricValueSet(o[0]);
   checkMetricValueSet(o[1]);
 }
 
-buildUnnamed1916() {
+buildUnnamed1626() {
   var o = new core.List<api.QuotaError>();
   o.add(buildQuotaError());
   o.add(buildQuotaError());
   return o;
 }
 
-checkUnnamed1916(core.List<api.QuotaError> o) {
+checkUnnamed1626(core.List<api.QuotaError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuotaError(o[0]);
   checkQuotaError(o[1]);
@@ -1269,8 +1269,8 @@
   buildCounterReleaseQuotaResponse++;
   if (buildCounterReleaseQuotaResponse < 3) {
     o.operationId = "foo";
-    o.quotaMetrics = buildUnnamed1915();
-    o.releaseErrors = buildUnnamed1916();
+    o.quotaMetrics = buildUnnamed1625();
+    o.releaseErrors = buildUnnamed1626();
     o.serviceConfigId = "foo";
   }
   buildCounterReleaseQuotaResponse--;
@@ -1281,8 +1281,8 @@
   buildCounterReleaseQuotaResponse++;
   if (buildCounterReleaseQuotaResponse < 3) {
     unittest.expect(o.operationId, unittest.equals('foo'));
-    checkUnnamed1915(o.quotaMetrics);
-    checkUnnamed1916(o.releaseErrors);
+    checkUnnamed1625(o.quotaMetrics);
+    checkUnnamed1626(o.releaseErrors);
     unittest.expect(o.serviceConfigId, unittest.equals('foo'));
   }
   buildCounterReleaseQuotaResponse--;
@@ -1330,14 +1330,14 @@
   buildCounterReportInfo--;
 }
 
-buildUnnamed1917() {
+buildUnnamed1627() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed1917(core.List<api.Operation> o) {
+checkUnnamed1627(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -1348,7 +1348,7 @@
   var o = new api.ReportRequest();
   buildCounterReportRequest++;
   if (buildCounterReportRequest < 3) {
-    o.operations = buildUnnamed1917();
+    o.operations = buildUnnamed1627();
     o.serviceConfigId = "foo";
   }
   buildCounterReportRequest--;
@@ -1358,33 +1358,33 @@
 checkReportRequest(api.ReportRequest o) {
   buildCounterReportRequest++;
   if (buildCounterReportRequest < 3) {
-    checkUnnamed1917(o.operations);
+    checkUnnamed1627(o.operations);
     unittest.expect(o.serviceConfigId, unittest.equals('foo'));
   }
   buildCounterReportRequest--;
 }
 
-buildUnnamed1918() {
+buildUnnamed1628() {
   var o = new core.List<api.ReportError>();
   o.add(buildReportError());
   o.add(buildReportError());
   return o;
 }
 
-checkUnnamed1918(core.List<api.ReportError> o) {
+checkUnnamed1628(core.List<api.ReportError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportError(o[0]);
   checkReportError(o[1]);
 }
 
-buildUnnamed1919() {
+buildUnnamed1629() {
   var o = new core.List<api.ReportInfo>();
   o.add(buildReportInfo());
   o.add(buildReportInfo());
   return o;
 }
 
-checkUnnamed1919(core.List<api.ReportInfo> o) {
+checkUnnamed1629(core.List<api.ReportInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportInfo(o[0]);
   checkReportInfo(o[1]);
@@ -1395,8 +1395,8 @@
   var o = new api.ReportResponse();
   buildCounterReportResponse++;
   if (buildCounterReportResponse < 3) {
-    o.reportErrors = buildUnnamed1918();
-    o.reportInfos = buildUnnamed1919();
+    o.reportErrors = buildUnnamed1628();
+    o.reportInfos = buildUnnamed1629();
     o.serviceConfigId = "foo";
   }
   buildCounterReportResponse--;
@@ -1406,8 +1406,8 @@
 checkReportResponse(api.ReportResponse o) {
   buildCounterReportResponse++;
   if (buildCounterReportResponse < 3) {
-    checkUnnamed1918(o.reportErrors);
-    checkUnnamed1919(o.reportInfos);
+    checkUnnamed1628(o.reportErrors);
+    checkUnnamed1629(o.reportInfos);
     unittest.expect(o.serviceConfigId, unittest.equals('foo'));
   }
   buildCounterReportResponse--;
@@ -1478,27 +1478,27 @@
   buildCounterStartReconciliationRequest--;
 }
 
-buildUnnamed1920() {
+buildUnnamed1630() {
   var o = new core.List<api.MetricValueSet>();
   o.add(buildMetricValueSet());
   o.add(buildMetricValueSet());
   return o;
 }
 
-checkUnnamed1920(core.List<api.MetricValueSet> o) {
+checkUnnamed1630(core.List<api.MetricValueSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricValueSet(o[0]);
   checkMetricValueSet(o[1]);
 }
 
-buildUnnamed1921() {
+buildUnnamed1631() {
   var o = new core.List<api.QuotaError>();
   o.add(buildQuotaError());
   o.add(buildQuotaError());
   return o;
 }
 
-checkUnnamed1921(core.List<api.QuotaError> o) {
+checkUnnamed1631(core.List<api.QuotaError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuotaError(o[0]);
   checkQuotaError(o[1]);
@@ -1510,8 +1510,8 @@
   buildCounterStartReconciliationResponse++;
   if (buildCounterStartReconciliationResponse < 3) {
     o.operationId = "foo";
-    o.quotaMetrics = buildUnnamed1920();
-    o.reconciliationErrors = buildUnnamed1921();
+    o.quotaMetrics = buildUnnamed1630();
+    o.reconciliationErrors = buildUnnamed1631();
     o.serviceConfigId = "foo";
   }
   buildCounterStartReconciliationResponse--;
@@ -1522,14 +1522,14 @@
   buildCounterStartReconciliationResponse++;
   if (buildCounterStartReconciliationResponse < 3) {
     unittest.expect(o.operationId, unittest.equals('foo'));
-    checkUnnamed1920(o.quotaMetrics);
-    checkUnnamed1921(o.reconciliationErrors);
+    checkUnnamed1630(o.quotaMetrics);
+    checkUnnamed1631(o.reconciliationErrors);
     unittest.expect(o.serviceConfigId, unittest.equals('foo'));
   }
   buildCounterStartReconciliationResponse--;
 }
 
-buildUnnamed1922() {
+buildUnnamed1632() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1544,7 +1544,7 @@
   return o;
 }
 
-checkUnnamed1922(core.Map<core.String, core.Object> o) {
+checkUnnamed1632(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted15 = (o["x"]) as core.Map;
   unittest.expect(casted15, unittest.hasLength(3));
@@ -1558,17 +1558,17 @@
   unittest.expect(casted16["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1923() {
+buildUnnamed1633() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed1922());
-  o.add(buildUnnamed1922());
+  o.add(buildUnnamed1632());
+  o.add(buildUnnamed1632());
   return o;
 }
 
-checkUnnamed1923(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1633(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1922(o[0]);
-  checkUnnamed1922(o[1]);
+  checkUnnamed1632(o[0]);
+  checkUnnamed1632(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1577,7 +1577,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed1923();
+    o.details = buildUnnamed1633();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1588,7 +1588,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed1923(o.details);
+    checkUnnamed1633(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -1950,7 +1950,7 @@
       }), true);
       res
           .allocateQuota(arg_request, arg_serviceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AllocateQuotaResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAllocateQuotaResponse(response);
       })));
     });
@@ -2013,7 +2013,7 @@
       }), true);
       res
           .check(arg_request, arg_serviceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CheckResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCheckResponse(response);
       })));
     });
@@ -2076,8 +2076,7 @@
       }), true);
       res
           .endReconciliation(arg_request, arg_serviceName, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.EndReconciliationResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkEndReconciliationResponse(response);
       })));
     });
@@ -2140,7 +2139,7 @@
       }), true);
       res
           .releaseQuota(arg_request, arg_serviceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReleaseQuotaResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkReleaseQuotaResponse(response);
       })));
     });
@@ -2203,7 +2202,7 @@
       }), true);
       res
           .report(arg_request, arg_serviceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReportResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkReportResponse(response);
       })));
     });
@@ -2267,8 +2266,7 @@
       res
           .startReconciliation(arg_request, arg_serviceName,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.StartReconciliationResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkStartReconciliationResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/servicemanagement/v1_test.dart b/generated/googleapis/test/servicemanagement/v1_test.dart
index c0b4f76..5d19c6c 100644
--- a/generated/googleapis/test/servicemanagement/v1_test.dart
+++ b/generated/googleapis/test/servicemanagement/v1_test.dart
@@ -69,40 +69,40 @@
   buildCounterAdvice--;
 }
 
-buildUnnamed3611() {
+buildUnnamed2894() {
   var o = new core.List<api.Method>();
   o.add(buildMethod());
   o.add(buildMethod());
   return o;
 }
 
-checkUnnamed3611(core.List<api.Method> o) {
+checkUnnamed2894(core.List<api.Method> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMethod(o[0]);
   checkMethod(o[1]);
 }
 
-buildUnnamed3612() {
+buildUnnamed2895() {
   var o = new core.List<api.Mixin>();
   o.add(buildMixin());
   o.add(buildMixin());
   return o;
 }
 
-checkUnnamed3612(core.List<api.Mixin> o) {
+checkUnnamed2895(core.List<api.Mixin> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMixin(o[0]);
   checkMixin(o[1]);
 }
 
-buildUnnamed3613() {
+buildUnnamed2896() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3613(core.List<api.Option> o) {
+checkUnnamed2896(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -113,10 +113,10 @@
   var o = new api.Api();
   buildCounterApi++;
   if (buildCounterApi < 3) {
-    o.methods = buildUnnamed3611();
-    o.mixins = buildUnnamed3612();
+    o.methods = buildUnnamed2894();
+    o.mixins = buildUnnamed2895();
     o.name = "foo";
-    o.options = buildUnnamed3613();
+    o.options = buildUnnamed2896();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
     o.version = "foo";
@@ -128,10 +128,10 @@
 checkApi(api.Api o) {
   buildCounterApi++;
   if (buildCounterApi < 3) {
-    checkUnnamed3611(o.methods);
-    checkUnnamed3612(o.mixins);
+    checkUnnamed2894(o.methods);
+    checkUnnamed2895(o.mixins);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3613(o.options);
+    checkUnnamed2896(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals('foo'));
@@ -139,14 +139,14 @@
   buildCounterApi--;
 }
 
-buildUnnamed3614() {
+buildUnnamed2897() {
   var o = new core.List<api.AuditLogConfig>();
   o.add(buildAuditLogConfig());
   o.add(buildAuditLogConfig());
   return o;
 }
 
-checkUnnamed3614(core.List<api.AuditLogConfig> o) {
+checkUnnamed2897(core.List<api.AuditLogConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditLogConfig(o[0]);
   checkAuditLogConfig(o[1]);
@@ -157,7 +157,7 @@
   var o = new api.AuditConfig();
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    o.auditLogConfigs = buildUnnamed3614();
+    o.auditLogConfigs = buildUnnamed2897();
     o.service = "foo";
   }
   buildCounterAuditConfig--;
@@ -167,20 +167,20 @@
 checkAuditConfig(api.AuditConfig o) {
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    checkUnnamed3614(o.auditLogConfigs);
+    checkUnnamed2897(o.auditLogConfigs);
     unittest.expect(o.service, unittest.equals('foo'));
   }
   buildCounterAuditConfig--;
 }
 
-buildUnnamed3615() {
+buildUnnamed2898() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3615(core.List<core.String> o) {
+checkUnnamed2898(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -191,7 +191,7 @@
   var o = new api.AuditLogConfig();
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    o.exemptedMembers = buildUnnamed3615();
+    o.exemptedMembers = buildUnnamed2898();
     o.logType = "foo";
   }
   buildCounterAuditLogConfig--;
@@ -201,7 +201,7 @@
 checkAuditLogConfig(api.AuditLogConfig o) {
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    checkUnnamed3615(o.exemptedMembers);
+    checkUnnamed2898(o.exemptedMembers);
     unittest.expect(o.logType, unittest.equals('foo'));
   }
   buildCounterAuditLogConfig--;
@@ -255,27 +255,27 @@
   buildCounterAuthRequirement--;
 }
 
-buildUnnamed3616() {
+buildUnnamed2899() {
   var o = new core.List<api.AuthProvider>();
   o.add(buildAuthProvider());
   o.add(buildAuthProvider());
   return o;
 }
 
-checkUnnamed3616(core.List<api.AuthProvider> o) {
+checkUnnamed2899(core.List<api.AuthProvider> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthProvider(o[0]);
   checkAuthProvider(o[1]);
 }
 
-buildUnnamed3617() {
+buildUnnamed2900() {
   var o = new core.List<api.AuthenticationRule>();
   o.add(buildAuthenticationRule());
   o.add(buildAuthenticationRule());
   return o;
 }
 
-checkUnnamed3617(core.List<api.AuthenticationRule> o) {
+checkUnnamed2900(core.List<api.AuthenticationRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthenticationRule(o[0]);
   checkAuthenticationRule(o[1]);
@@ -286,8 +286,8 @@
   var o = new api.Authentication();
   buildCounterAuthentication++;
   if (buildCounterAuthentication < 3) {
-    o.providers = buildUnnamed3616();
-    o.rules = buildUnnamed3617();
+    o.providers = buildUnnamed2899();
+    o.rules = buildUnnamed2900();
   }
   buildCounterAuthentication--;
   return o;
@@ -296,20 +296,20 @@
 checkAuthentication(api.Authentication o) {
   buildCounterAuthentication++;
   if (buildCounterAuthentication < 3) {
-    checkUnnamed3616(o.providers);
-    checkUnnamed3617(o.rules);
+    checkUnnamed2899(o.providers);
+    checkUnnamed2900(o.rules);
   }
   buildCounterAuthentication--;
 }
 
-buildUnnamed3618() {
+buildUnnamed2901() {
   var o = new core.List<api.AuthRequirement>();
   o.add(buildAuthRequirement());
   o.add(buildAuthRequirement());
   return o;
 }
 
-checkUnnamed3618(core.List<api.AuthRequirement> o) {
+checkUnnamed2901(core.List<api.AuthRequirement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthRequirement(o[0]);
   checkAuthRequirement(o[1]);
@@ -323,7 +323,7 @@
     o.allowWithoutCredential = true;
     o.customAuth = buildCustomAuthRequirements();
     o.oauth = buildOAuthRequirements();
-    o.requirements = buildUnnamed3618();
+    o.requirements = buildUnnamed2901();
     o.selector = "foo";
   }
   buildCounterAuthenticationRule--;
@@ -336,7 +336,7 @@
     unittest.expect(o.allowWithoutCredential, unittest.isTrue);
     checkCustomAuthRequirements(o.customAuth);
     checkOAuthRequirements(o.oauth);
-    checkUnnamed3618(o.requirements);
+    checkUnnamed2901(o.requirements);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterAuthenticationRule--;
@@ -361,14 +361,14 @@
   buildCounterAuthorizationConfig--;
 }
 
-buildUnnamed3619() {
+buildUnnamed2902() {
   var o = new core.List<api.BackendRule>();
   o.add(buildBackendRule());
   o.add(buildBackendRule());
   return o;
 }
 
-checkUnnamed3619(core.List<api.BackendRule> o) {
+checkUnnamed2902(core.List<api.BackendRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendRule(o[0]);
   checkBackendRule(o[1]);
@@ -379,7 +379,7 @@
   var o = new api.Backend();
   buildCounterBackend++;
   if (buildCounterBackend < 3) {
-    o.rules = buildUnnamed3619();
+    o.rules = buildUnnamed2902();
   }
   buildCounterBackend--;
   return o;
@@ -388,7 +388,7 @@
 checkBackend(api.Backend o) {
   buildCounterBackend++;
   if (buildCounterBackend < 3) {
-    checkUnnamed3619(o.rules);
+    checkUnnamed2902(o.rules);
   }
   buildCounterBackend--;
 }
@@ -418,14 +418,14 @@
   buildCounterBackendRule--;
 }
 
-buildUnnamed3620() {
+buildUnnamed2903() {
   var o = new core.List<api.BillingDestination>();
   o.add(buildBillingDestination());
   o.add(buildBillingDestination());
   return o;
 }
 
-checkUnnamed3620(core.List<api.BillingDestination> o) {
+checkUnnamed2903(core.List<api.BillingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBillingDestination(o[0]);
   checkBillingDestination(o[1]);
@@ -436,7 +436,7 @@
   var o = new api.Billing();
   buildCounterBilling++;
   if (buildCounterBilling < 3) {
-    o.consumerDestinations = buildUnnamed3620();
+    o.consumerDestinations = buildUnnamed2903();
   }
   buildCounterBilling--;
   return o;
@@ -445,19 +445,19 @@
 checkBilling(api.Billing o) {
   buildCounterBilling++;
   if (buildCounterBilling < 3) {
-    checkUnnamed3620(o.consumerDestinations);
+    checkUnnamed2903(o.consumerDestinations);
   }
   buildCounterBilling--;
 }
 
-buildUnnamed3621() {
+buildUnnamed2904() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3621(core.List<core.String> o) {
+checkUnnamed2904(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -468,7 +468,7 @@
   var o = new api.BillingDestination();
   buildCounterBillingDestination++;
   if (buildCounterBillingDestination < 3) {
-    o.metrics = buildUnnamed3621();
+    o.metrics = buildUnnamed2904();
     o.monitoredResource = "foo";
   }
   buildCounterBillingDestination--;
@@ -478,20 +478,20 @@
 checkBillingDestination(api.BillingDestination o) {
   buildCounterBillingDestination++;
   if (buildCounterBillingDestination < 3) {
-    checkUnnamed3621(o.metrics);
+    checkUnnamed2904(o.metrics);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterBillingDestination--;
 }
 
-buildUnnamed3622() {
+buildUnnamed2905() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3622(core.List<core.String> o) {
+checkUnnamed2905(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -503,7 +503,7 @@
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
     o.condition = buildExpr();
-    o.members = buildUnnamed3622();
+    o.members = buildUnnamed2905();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -514,20 +514,20 @@
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
     checkExpr(o.condition);
-    checkUnnamed3622(o.members);
+    checkUnnamed2905(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
 }
 
-buildUnnamed3623() {
+buildUnnamed2906() {
   var o = new core.List<api.ConfigChange>();
   o.add(buildConfigChange());
   o.add(buildConfigChange());
   return o;
 }
 
-checkUnnamed3623(core.List<api.ConfigChange> o) {
+checkUnnamed2906(core.List<api.ConfigChange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConfigChange(o[0]);
   checkConfigChange(o[1]);
@@ -538,7 +538,7 @@
   var o = new api.ChangeReport();
   buildCounterChangeReport++;
   if (buildCounterChangeReport < 3) {
-    o.configChanges = buildUnnamed3623();
+    o.configChanges = buildUnnamed2906();
   }
   buildCounterChangeReport--;
   return o;
@@ -547,19 +547,19 @@
 checkChangeReport(api.ChangeReport o) {
   buildCounterChangeReport++;
   if (buildCounterChangeReport < 3) {
-    checkUnnamed3623(o.configChanges);
+    checkUnnamed2906(o.configChanges);
   }
   buildCounterChangeReport--;
 }
 
-buildUnnamed3624() {
+buildUnnamed2907() {
   var o = new core.List<api.Advice>();
   o.add(buildAdvice());
   o.add(buildAdvice());
   return o;
 }
 
-checkUnnamed3624(core.List<api.Advice> o) {
+checkUnnamed2907(core.List<api.Advice> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAdvice(o[0]);
   checkAdvice(o[1]);
@@ -570,7 +570,7 @@
   var o = new api.ConfigChange();
   buildCounterConfigChange++;
   if (buildCounterConfigChange < 3) {
-    o.advices = buildUnnamed3624();
+    o.advices = buildUnnamed2907();
     o.changeType = "foo";
     o.element = "foo";
     o.newValue = "foo";
@@ -583,7 +583,7 @@
 checkConfigChange(api.ConfigChange o) {
   buildCounterConfigChange++;
   if (buildCounterConfigChange < 3) {
-    checkUnnamed3624(o.advices);
+    checkUnnamed2907(o.advices);
     unittest.expect(o.changeType, unittest.equals('foo'));
     unittest.expect(o.element, unittest.equals('foo'));
     unittest.expect(o.newValue, unittest.equals('foo'));
@@ -634,14 +634,14 @@
   buildCounterConfigRef--;
 }
 
-buildUnnamed3625() {
+buildUnnamed2908() {
   var o = new core.List<api.ConfigFile>();
   o.add(buildConfigFile());
   o.add(buildConfigFile());
   return o;
 }
 
-checkUnnamed3625(core.List<api.ConfigFile> o) {
+checkUnnamed2908(core.List<api.ConfigFile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConfigFile(o[0]);
   checkConfigFile(o[1]);
@@ -652,7 +652,7 @@
   var o = new api.ConfigSource();
   buildCounterConfigSource++;
   if (buildCounterConfigSource < 3) {
-    o.files = buildUnnamed3625();
+    o.files = buildUnnamed2908();
     o.id = "foo";
   }
   buildCounterConfigSource--;
@@ -662,20 +662,20 @@
 checkConfigSource(api.ConfigSource o) {
   buildCounterConfigSource++;
   if (buildCounterConfigSource < 3) {
-    checkUnnamed3625(o.files);
+    checkUnnamed2908(o.files);
     unittest.expect(o.id, unittest.equals('foo'));
   }
   buildCounterConfigSource--;
 }
 
-buildUnnamed3626() {
+buildUnnamed2909() {
   var o = new core.List<api.ContextRule>();
   o.add(buildContextRule());
   o.add(buildContextRule());
   return o;
 }
 
-checkUnnamed3626(core.List<api.ContextRule> o) {
+checkUnnamed2909(core.List<api.ContextRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContextRule(o[0]);
   checkContextRule(o[1]);
@@ -686,7 +686,7 @@
   var o = new api.Context();
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    o.rules = buildUnnamed3626();
+    o.rules = buildUnnamed2909();
   }
   buildCounterContext--;
   return o;
@@ -695,32 +695,32 @@
 checkContext(api.Context o) {
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    checkUnnamed3626(o.rules);
+    checkUnnamed2909(o.rules);
   }
   buildCounterContext--;
 }
 
-buildUnnamed3627() {
+buildUnnamed2910() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3627(core.List<core.String> o) {
+checkUnnamed2910(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3628() {
+buildUnnamed2911() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3628(core.List<core.String> o) {
+checkUnnamed2911(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -731,8 +731,8 @@
   var o = new api.ContextRule();
   buildCounterContextRule++;
   if (buildCounterContextRule < 3) {
-    o.provided = buildUnnamed3627();
-    o.requested = buildUnnamed3628();
+    o.provided = buildUnnamed2910();
+    o.requested = buildUnnamed2911();
     o.selector = "foo";
   }
   buildCounterContextRule--;
@@ -742,8 +742,8 @@
 checkContextRule(api.ContextRule o) {
   buildCounterContextRule++;
   if (buildCounterContextRule < 3) {
-    checkUnnamed3627(o.provided);
-    checkUnnamed3628(o.requested);
+    checkUnnamed2910(o.provided);
+    checkUnnamed2911(o.requested);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterContextRule--;
@@ -787,27 +787,27 @@
   buildCounterCustomAuthRequirements--;
 }
 
-buildUnnamed3629() {
+buildUnnamed2912() {
   var o = new core.List<api.CustomErrorRule>();
   o.add(buildCustomErrorRule());
   o.add(buildCustomErrorRule());
   return o;
 }
 
-checkUnnamed3629(core.List<api.CustomErrorRule> o) {
+checkUnnamed2912(core.List<api.CustomErrorRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomErrorRule(o[0]);
   checkCustomErrorRule(o[1]);
 }
 
-buildUnnamed3630() {
+buildUnnamed2913() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3630(core.List<core.String> o) {
+checkUnnamed2913(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -818,8 +818,8 @@
   var o = new api.CustomError();
   buildCounterCustomError++;
   if (buildCounterCustomError < 3) {
-    o.rules = buildUnnamed3629();
-    o.types = buildUnnamed3630();
+    o.rules = buildUnnamed2912();
+    o.types = buildUnnamed2913();
   }
   buildCounterCustomError--;
   return o;
@@ -828,8 +828,8 @@
 checkCustomError(api.CustomError o) {
   buildCounterCustomError++;
   if (buildCounterCustomError < 3) {
-    checkUnnamed3629(o.rules);
-    checkUnnamed3630(o.types);
+    checkUnnamed2912(o.rules);
+    checkUnnamed2913(o.types);
   }
   buildCounterCustomError--;
 }
@@ -933,27 +933,27 @@
   buildCounterDisableServiceRequest--;
 }
 
-buildUnnamed3631() {
+buildUnnamed2914() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed3631(core.List<api.Page> o) {
+checkUnnamed2914(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
 }
 
-buildUnnamed3632() {
+buildUnnamed2915() {
   var o = new core.List<api.DocumentationRule>();
   o.add(buildDocumentationRule());
   o.add(buildDocumentationRule());
   return o;
 }
 
-checkUnnamed3632(core.List<api.DocumentationRule> o) {
+checkUnnamed2915(core.List<api.DocumentationRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDocumentationRule(o[0]);
   checkDocumentationRule(o[1]);
@@ -966,8 +966,8 @@
   if (buildCounterDocumentation < 3) {
     o.documentationRootUrl = "foo";
     o.overview = "foo";
-    o.pages = buildUnnamed3631();
-    o.rules = buildUnnamed3632();
+    o.pages = buildUnnamed2914();
+    o.rules = buildUnnamed2915();
     o.summary = "foo";
   }
   buildCounterDocumentation--;
@@ -979,8 +979,8 @@
   if (buildCounterDocumentation < 3) {
     unittest.expect(o.documentationRootUrl, unittest.equals('foo'));
     unittest.expect(o.overview, unittest.equals('foo'));
-    checkUnnamed3631(o.pages);
-    checkUnnamed3632(o.rules);
+    checkUnnamed2914(o.pages);
+    checkUnnamed2915(o.rules);
     unittest.expect(o.summary, unittest.equals('foo'));
   }
   buildCounterDocumentation--;
@@ -1028,27 +1028,27 @@
   buildCounterEnableServiceRequest--;
 }
 
-buildUnnamed3633() {
+buildUnnamed2916() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3633(core.List<core.String> o) {
+checkUnnamed2916(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3634() {
+buildUnnamed2917() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3634(core.List<core.String> o) {
+checkUnnamed2917(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1059,9 +1059,9 @@
   var o = new api.Endpoint();
   buildCounterEndpoint++;
   if (buildCounterEndpoint < 3) {
-    o.aliases = buildUnnamed3633();
+    o.aliases = buildUnnamed2916();
     o.allowCors = true;
-    o.features = buildUnnamed3634();
+    o.features = buildUnnamed2917();
     o.name = "foo";
     o.target = "foo";
   }
@@ -1072,36 +1072,36 @@
 checkEndpoint(api.Endpoint o) {
   buildCounterEndpoint++;
   if (buildCounterEndpoint < 3) {
-    checkUnnamed3633(o.aliases);
+    checkUnnamed2916(o.aliases);
     unittest.expect(o.allowCors, unittest.isTrue);
-    checkUnnamed3634(o.features);
+    checkUnnamed2917(o.features);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
   }
   buildCounterEndpoint--;
 }
 
-buildUnnamed3635() {
+buildUnnamed2918() {
   var o = new core.List<api.EnumValue>();
   o.add(buildEnumValue());
   o.add(buildEnumValue());
   return o;
 }
 
-checkUnnamed3635(core.List<api.EnumValue> o) {
+checkUnnamed2918(core.List<api.EnumValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnumValue(o[0]);
   checkEnumValue(o[1]);
 }
 
-buildUnnamed3636() {
+buildUnnamed2919() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3636(core.List<api.Option> o) {
+checkUnnamed2919(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -1112,9 +1112,9 @@
   var o = new api.Enum();
   buildCounterEnum++;
   if (buildCounterEnum < 3) {
-    o.enumvalue = buildUnnamed3635();
+    o.enumvalue = buildUnnamed2918();
     o.name = "foo";
-    o.options = buildUnnamed3636();
+    o.options = buildUnnamed2919();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
   }
@@ -1125,23 +1125,23 @@
 checkEnum(api.Enum o) {
   buildCounterEnum++;
   if (buildCounterEnum < 3) {
-    checkUnnamed3635(o.enumvalue);
+    checkUnnamed2918(o.enumvalue);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3636(o.options);
+    checkUnnamed2919(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
   }
   buildCounterEnum--;
 }
 
-buildUnnamed3637() {
+buildUnnamed2920() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3637(core.List<api.Option> o) {
+checkUnnamed2920(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -1154,7 +1154,7 @@
   if (buildCounterEnumValue < 3) {
     o.name = "foo";
     o.number = 42;
-    o.options = buildUnnamed3637();
+    o.options = buildUnnamed2920();
   }
   buildCounterEnumValue--;
   return o;
@@ -1165,7 +1165,7 @@
   if (buildCounterEnumValue < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.number, unittest.equals(42));
-    checkUnnamed3637(o.options);
+    checkUnnamed2920(o.options);
   }
   buildCounterEnumValue--;
 }
@@ -1214,14 +1214,14 @@
   buildCounterExpr--;
 }
 
-buildUnnamed3638() {
+buildUnnamed2921() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3638(core.List<api.Option> o) {
+checkUnnamed2921(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -1239,7 +1239,7 @@
     o.name = "foo";
     o.number = 42;
     o.oneofIndex = 42;
-    o.options = buildUnnamed3638();
+    o.options = buildUnnamed2921();
     o.packed = true;
     o.typeUrl = "foo";
   }
@@ -1257,14 +1257,14 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.number, unittest.equals(42));
     unittest.expect(o.oneofIndex, unittest.equals(42));
-    checkUnnamed3638(o.options);
+    checkUnnamed2921(o.options);
     unittest.expect(o.packed, unittest.isTrue);
     unittest.expect(o.typeUrl, unittest.equals('foo'));
   }
   buildCounterField--;
 }
 
-buildUnnamed3639() {
+buildUnnamed2922() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1279,7 +1279,7 @@
   return o;
 }
 
-checkUnnamed3639(core.Map<core.String, core.Object> o) {
+checkUnnamed2922(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1293,7 +1293,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3640() {
+buildUnnamed2923() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1308,7 +1308,7 @@
   return o;
 }
 
-checkUnnamed3640(core.Map<core.String, core.Object> o) {
+checkUnnamed2923(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -1327,8 +1327,8 @@
   var o = new api.GenerateConfigReportRequest();
   buildCounterGenerateConfigReportRequest++;
   if (buildCounterGenerateConfigReportRequest < 3) {
-    o.newConfig = buildUnnamed3639();
-    o.oldConfig = buildUnnamed3640();
+    o.newConfig = buildUnnamed2922();
+    o.oldConfig = buildUnnamed2923();
   }
   buildCounterGenerateConfigReportRequest--;
   return o;
@@ -1337,33 +1337,33 @@
 checkGenerateConfigReportRequest(api.GenerateConfigReportRequest o) {
   buildCounterGenerateConfigReportRequest++;
   if (buildCounterGenerateConfigReportRequest < 3) {
-    checkUnnamed3639(o.newConfig);
-    checkUnnamed3640(o.oldConfig);
+    checkUnnamed2922(o.newConfig);
+    checkUnnamed2923(o.oldConfig);
   }
   buildCounterGenerateConfigReportRequest--;
 }
 
-buildUnnamed3641() {
+buildUnnamed2924() {
   var o = new core.List<api.ChangeReport>();
   o.add(buildChangeReport());
   o.add(buildChangeReport());
   return o;
 }
 
-checkUnnamed3641(core.List<api.ChangeReport> o) {
+checkUnnamed2924(core.List<api.ChangeReport> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChangeReport(o[0]);
   checkChangeReport(o[1]);
 }
 
-buildUnnamed3642() {
+buildUnnamed2925() {
   var o = new core.List<api.Diagnostic>();
   o.add(buildDiagnostic());
   o.add(buildDiagnostic());
   return o;
 }
 
-checkUnnamed3642(core.List<api.Diagnostic> o) {
+checkUnnamed2925(core.List<api.Diagnostic> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiagnostic(o[0]);
   checkDiagnostic(o[1]);
@@ -1374,8 +1374,8 @@
   var o = new api.GenerateConfigReportResponse();
   buildCounterGenerateConfigReportResponse++;
   if (buildCounterGenerateConfigReportResponse < 3) {
-    o.changeReports = buildUnnamed3641();
-    o.diagnostics = buildUnnamed3642();
+    o.changeReports = buildUnnamed2924();
+    o.diagnostics = buildUnnamed2925();
     o.id = "foo";
     o.serviceName = "foo";
   }
@@ -1386,8 +1386,8 @@
 checkGenerateConfigReportResponse(api.GenerateConfigReportResponse o) {
   buildCounterGenerateConfigReportResponse++;
   if (buildCounterGenerateConfigReportResponse < 3) {
-    checkUnnamed3641(o.changeReports);
-    checkUnnamed3642(o.diagnostics);
+    checkUnnamed2924(o.changeReports);
+    checkUnnamed2925(o.diagnostics);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.serviceName, unittest.equals('foo'));
   }
@@ -1409,14 +1409,14 @@
   buildCounterGetIamPolicyRequest--;
 }
 
-buildUnnamed3643() {
+buildUnnamed2926() {
   var o = new core.List<api.HttpRule>();
   o.add(buildHttpRule());
   o.add(buildHttpRule());
   return o;
 }
 
-checkUnnamed3643(core.List<api.HttpRule> o) {
+checkUnnamed2926(core.List<api.HttpRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpRule(o[0]);
   checkHttpRule(o[1]);
@@ -1428,7 +1428,7 @@
   buildCounterHttp++;
   if (buildCounterHttp < 3) {
     o.fullyDecodeReservedExpansion = true;
-    o.rules = buildUnnamed3643();
+    o.rules = buildUnnamed2926();
   }
   buildCounterHttp--;
   return o;
@@ -1438,19 +1438,19 @@
   buildCounterHttp++;
   if (buildCounterHttp < 3) {
     unittest.expect(o.fullyDecodeReservedExpansion, unittest.isTrue);
-    checkUnnamed3643(o.rules);
+    checkUnnamed2926(o.rules);
   }
   buildCounterHttp--;
 }
 
-buildUnnamed3644() {
+buildUnnamed2927() {
   var o = new core.List<api.HttpRule>();
   o.add(buildHttpRule());
   o.add(buildHttpRule());
   return o;
 }
 
-checkUnnamed3644(core.List<api.HttpRule> o) {
+checkUnnamed2927(core.List<api.HttpRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpRule(o[0]);
   checkHttpRule(o[1]);
@@ -1461,7 +1461,7 @@
   var o = new api.HttpRule();
   buildCounterHttpRule++;
   if (buildCounterHttpRule < 3) {
-    o.additionalBindings = buildUnnamed3644();
+    o.additionalBindings = buildUnnamed2927();
     o.body = "foo";
     o.custom = buildCustomHttpPattern();
     o.delete = "foo";
@@ -1480,7 +1480,7 @@
 checkHttpRule(api.HttpRule o) {
   buildCounterHttpRule++;
   if (buildCounterHttpRule < 3) {
-    checkUnnamed3644(o.additionalBindings);
+    checkUnnamed2927(o.additionalBindings);
     unittest.expect(o.body, unittest.equals('foo'));
     checkCustomHttpPattern(o.custom);
     unittest.expect(o.delete, unittest.equals('foo'));
@@ -1518,14 +1518,14 @@
   buildCounterLabelDescriptor--;
 }
 
-buildUnnamed3645() {
+buildUnnamed2928() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed3645(core.List<api.Operation> o) {
+checkUnnamed2928(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -1537,7 +1537,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed3645();
+    o.operations = buildUnnamed2928();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -1547,19 +1547,19 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3645(o.operations);
+    checkUnnamed2928(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed3646() {
+buildUnnamed2929() {
   var o = new core.List<api.Service>();
   o.add(buildService());
   o.add(buildService());
   return o;
 }
 
-checkUnnamed3646(core.List<api.Service> o) {
+checkUnnamed2929(core.List<api.Service> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkService(o[0]);
   checkService(o[1]);
@@ -1571,7 +1571,7 @@
   buildCounterListServiceConfigsResponse++;
   if (buildCounterListServiceConfigsResponse < 3) {
     o.nextPageToken = "foo";
-    o.serviceConfigs = buildUnnamed3646();
+    o.serviceConfigs = buildUnnamed2929();
   }
   buildCounterListServiceConfigsResponse--;
   return o;
@@ -1581,19 +1581,19 @@
   buildCounterListServiceConfigsResponse++;
   if (buildCounterListServiceConfigsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3646(o.serviceConfigs);
+    checkUnnamed2929(o.serviceConfigs);
   }
   buildCounterListServiceConfigsResponse--;
 }
 
-buildUnnamed3647() {
+buildUnnamed2930() {
   var o = new core.List<api.Rollout>();
   o.add(buildRollout());
   o.add(buildRollout());
   return o;
 }
 
-checkUnnamed3647(core.List<api.Rollout> o) {
+checkUnnamed2930(core.List<api.Rollout> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRollout(o[0]);
   checkRollout(o[1]);
@@ -1605,7 +1605,7 @@
   buildCounterListServiceRolloutsResponse++;
   if (buildCounterListServiceRolloutsResponse < 3) {
     o.nextPageToken = "foo";
-    o.rollouts = buildUnnamed3647();
+    o.rollouts = buildUnnamed2930();
   }
   buildCounterListServiceRolloutsResponse--;
   return o;
@@ -1615,19 +1615,19 @@
   buildCounterListServiceRolloutsResponse++;
   if (buildCounterListServiceRolloutsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3647(o.rollouts);
+    checkUnnamed2930(o.rollouts);
   }
   buildCounterListServiceRolloutsResponse--;
 }
 
-buildUnnamed3648() {
+buildUnnamed2931() {
   var o = new core.List<api.ManagedService>();
   o.add(buildManagedService());
   o.add(buildManagedService());
   return o;
 }
 
-checkUnnamed3648(core.List<api.ManagedService> o) {
+checkUnnamed2931(core.List<api.ManagedService> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedService(o[0]);
   checkManagedService(o[1]);
@@ -1639,7 +1639,7 @@
   buildCounterListServicesResponse++;
   if (buildCounterListServicesResponse < 3) {
     o.nextPageToken = "foo";
-    o.services = buildUnnamed3648();
+    o.services = buildUnnamed2931();
   }
   buildCounterListServicesResponse--;
   return o;
@@ -1649,19 +1649,19 @@
   buildCounterListServicesResponse++;
   if (buildCounterListServicesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3648(o.services);
+    checkUnnamed2931(o.services);
   }
   buildCounterListServicesResponse--;
 }
 
-buildUnnamed3649() {
+buildUnnamed2932() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed3649(core.List<api.LabelDescriptor> o) {
+checkUnnamed2932(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -1674,7 +1674,7 @@
   if (buildCounterLogDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed3649();
+    o.labels = buildUnnamed2932();
     o.name = "foo";
   }
   buildCounterLogDescriptor--;
@@ -1686,33 +1686,33 @@
   if (buildCounterLogDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed3649(o.labels);
+    checkUnnamed2932(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLogDescriptor--;
 }
 
-buildUnnamed3650() {
+buildUnnamed2933() {
   var o = new core.List<api.LoggingDestination>();
   o.add(buildLoggingDestination());
   o.add(buildLoggingDestination());
   return o;
 }
 
-checkUnnamed3650(core.List<api.LoggingDestination> o) {
+checkUnnamed2933(core.List<api.LoggingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLoggingDestination(o[0]);
   checkLoggingDestination(o[1]);
 }
 
-buildUnnamed3651() {
+buildUnnamed2934() {
   var o = new core.List<api.LoggingDestination>();
   o.add(buildLoggingDestination());
   o.add(buildLoggingDestination());
   return o;
 }
 
-checkUnnamed3651(core.List<api.LoggingDestination> o) {
+checkUnnamed2934(core.List<api.LoggingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLoggingDestination(o[0]);
   checkLoggingDestination(o[1]);
@@ -1723,8 +1723,8 @@
   var o = new api.Logging();
   buildCounterLogging++;
   if (buildCounterLogging < 3) {
-    o.consumerDestinations = buildUnnamed3650();
-    o.producerDestinations = buildUnnamed3651();
+    o.consumerDestinations = buildUnnamed2933();
+    o.producerDestinations = buildUnnamed2934();
   }
   buildCounterLogging--;
   return o;
@@ -1733,20 +1733,20 @@
 checkLogging(api.Logging o) {
   buildCounterLogging++;
   if (buildCounterLogging < 3) {
-    checkUnnamed3650(o.consumerDestinations);
-    checkUnnamed3651(o.producerDestinations);
+    checkUnnamed2933(o.consumerDestinations);
+    checkUnnamed2934(o.producerDestinations);
   }
   buildCounterLogging--;
 }
 
-buildUnnamed3652() {
+buildUnnamed2935() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3652(core.List<core.String> o) {
+checkUnnamed2935(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1757,7 +1757,7 @@
   var o = new api.LoggingDestination();
   buildCounterLoggingDestination++;
   if (buildCounterLoggingDestination < 3) {
-    o.logs = buildUnnamed3652();
+    o.logs = buildUnnamed2935();
     o.monitoredResource = "foo";
   }
   buildCounterLoggingDestination--;
@@ -1767,7 +1767,7 @@
 checkLoggingDestination(api.LoggingDestination o) {
   buildCounterLoggingDestination++;
   if (buildCounterLoggingDestination < 3) {
-    checkUnnamed3652(o.logs);
+    checkUnnamed2935(o.logs);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterLoggingDestination--;
@@ -1823,14 +1823,14 @@
   buildCounterMediaDownload--;
 }
 
-buildUnnamed3653() {
+buildUnnamed2936() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3653(core.List<core.String> o) {
+checkUnnamed2936(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1845,7 +1845,7 @@
     o.dropzone = "foo";
     o.enabled = true;
     o.maxSize = "foo";
-    o.mimeTypes = buildUnnamed3653();
+    o.mimeTypes = buildUnnamed2936();
     o.progressNotification = true;
     o.startNotification = true;
     o.uploadService = "foo";
@@ -1861,7 +1861,7 @@
     unittest.expect(o.dropzone, unittest.equals('foo'));
     unittest.expect(o.enabled, unittest.isTrue);
     unittest.expect(o.maxSize, unittest.equals('foo'));
-    checkUnnamed3653(o.mimeTypes);
+    checkUnnamed2936(o.mimeTypes);
     unittest.expect(o.progressNotification, unittest.isTrue);
     unittest.expect(o.startNotification, unittest.isTrue);
     unittest.expect(o.uploadService, unittest.equals('foo'));
@@ -1869,14 +1869,14 @@
   buildCounterMediaUpload--;
 }
 
-buildUnnamed3654() {
+buildUnnamed2937() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3654(core.List<api.Option> o) {
+checkUnnamed2937(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -1888,7 +1888,7 @@
   buildCounterMethod++;
   if (buildCounterMethod < 3) {
     o.name = "foo";
-    o.options = buildUnnamed3654();
+    o.options = buildUnnamed2937();
     o.requestStreaming = true;
     o.requestTypeUrl = "foo";
     o.responseStreaming = true;
@@ -1903,7 +1903,7 @@
   buildCounterMethod++;
   if (buildCounterMethod < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3654(o.options);
+    checkUnnamed2937(o.options);
     unittest.expect(o.requestStreaming, unittest.isTrue);
     unittest.expect(o.requestTypeUrl, unittest.equals('foo'));
     unittest.expect(o.responseStreaming, unittest.isTrue);
@@ -1913,14 +1913,14 @@
   buildCounterMethod--;
 }
 
-buildUnnamed3655() {
+buildUnnamed2938() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed3655(core.List<api.LabelDescriptor> o) {
+checkUnnamed2938(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -1933,7 +1933,7 @@
   if (buildCounterMetricDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed3655();
+    o.labels = buildUnnamed2938();
     o.metricKind = "foo";
     o.name = "foo";
     o.type = "foo";
@@ -1949,7 +1949,7 @@
   if (buildCounterMetricDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed3655(o.labels);
+    checkUnnamed2938(o.labels);
     unittest.expect(o.metricKind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -1959,14 +1959,14 @@
   buildCounterMetricDescriptor--;
 }
 
-buildUnnamed3656() {
+buildUnnamed2939() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3656(core.Map<core.String, core.String> o) {
+checkUnnamed2939(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1977,7 +1977,7 @@
   var o = new api.MetricRule();
   buildCounterMetricRule++;
   if (buildCounterMetricRule < 3) {
-    o.metricCosts = buildUnnamed3656();
+    o.metricCosts = buildUnnamed2939();
     o.selector = "foo";
   }
   buildCounterMetricRule--;
@@ -1987,7 +1987,7 @@
 checkMetricRule(api.MetricRule o) {
   buildCounterMetricRule++;
   if (buildCounterMetricRule < 3) {
-    checkUnnamed3656(o.metricCosts);
+    checkUnnamed2939(o.metricCosts);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterMetricRule--;
@@ -2014,14 +2014,14 @@
   buildCounterMixin--;
 }
 
-buildUnnamed3657() {
+buildUnnamed2940() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed3657(core.List<api.LabelDescriptor> o) {
+checkUnnamed2940(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -2034,7 +2034,7 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed3657();
+    o.labels = buildUnnamed2940();
     o.name = "foo";
     o.type = "foo";
   }
@@ -2047,34 +2047,34 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed3657(o.labels);
+    checkUnnamed2940(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMonitoredResourceDescriptor--;
 }
 
-buildUnnamed3658() {
+buildUnnamed2941() {
   var o = new core.List<api.MonitoringDestination>();
   o.add(buildMonitoringDestination());
   o.add(buildMonitoringDestination());
   return o;
 }
 
-checkUnnamed3658(core.List<api.MonitoringDestination> o) {
+checkUnnamed2941(core.List<api.MonitoringDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoringDestination(o[0]);
   checkMonitoringDestination(o[1]);
 }
 
-buildUnnamed3659() {
+buildUnnamed2942() {
   var o = new core.List<api.MonitoringDestination>();
   o.add(buildMonitoringDestination());
   o.add(buildMonitoringDestination());
   return o;
 }
 
-checkUnnamed3659(core.List<api.MonitoringDestination> o) {
+checkUnnamed2942(core.List<api.MonitoringDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoringDestination(o[0]);
   checkMonitoringDestination(o[1]);
@@ -2085,8 +2085,8 @@
   var o = new api.Monitoring();
   buildCounterMonitoring++;
   if (buildCounterMonitoring < 3) {
-    o.consumerDestinations = buildUnnamed3658();
-    o.producerDestinations = buildUnnamed3659();
+    o.consumerDestinations = buildUnnamed2941();
+    o.producerDestinations = buildUnnamed2942();
   }
   buildCounterMonitoring--;
   return o;
@@ -2095,20 +2095,20 @@
 checkMonitoring(api.Monitoring o) {
   buildCounterMonitoring++;
   if (buildCounterMonitoring < 3) {
-    checkUnnamed3658(o.consumerDestinations);
-    checkUnnamed3659(o.producerDestinations);
+    checkUnnamed2941(o.consumerDestinations);
+    checkUnnamed2942(o.producerDestinations);
   }
   buildCounterMonitoring--;
 }
 
-buildUnnamed3660() {
+buildUnnamed2943() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3660(core.List<core.String> o) {
+checkUnnamed2943(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2119,7 +2119,7 @@
   var o = new api.MonitoringDestination();
   buildCounterMonitoringDestination++;
   if (buildCounterMonitoringDestination < 3) {
-    o.metrics = buildUnnamed3660();
+    o.metrics = buildUnnamed2943();
     o.monitoredResource = "foo";
   }
   buildCounterMonitoringDestination--;
@@ -2129,7 +2129,7 @@
 checkMonitoringDestination(api.MonitoringDestination o) {
   buildCounterMonitoringDestination++;
   if (buildCounterMonitoringDestination < 3) {
-    checkUnnamed3660(o.metrics);
+    checkUnnamed2943(o.metrics);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterMonitoringDestination--;
@@ -2154,7 +2154,7 @@
   buildCounterOAuthRequirements--;
 }
 
-buildUnnamed3661() {
+buildUnnamed2944() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2169,7 +2169,7 @@
   return o;
 }
 
-checkUnnamed3661(core.Map<core.String, core.Object> o) {
+checkUnnamed2944(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -2183,7 +2183,7 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3662() {
+buildUnnamed2945() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2198,7 +2198,7 @@
   return o;
 }
 
-checkUnnamed3662(core.Map<core.String, core.Object> o) {
+checkUnnamed2945(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -2219,9 +2219,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed3661();
+    o.metadata = buildUnnamed2944();
     o.name = "foo";
-    o.response = buildUnnamed3662();
+    o.response = buildUnnamed2945();
   }
   buildCounterOperation--;
   return o;
@@ -2232,34 +2232,34 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed3661(o.metadata);
+    checkUnnamed2944(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3662(o.response);
+    checkUnnamed2945(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed3663() {
+buildUnnamed2946() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3663(core.List<core.String> o) {
+checkUnnamed2946(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3664() {
+buildUnnamed2947() {
   var o = new core.List<api.Step>();
   o.add(buildStep());
   o.add(buildStep());
   return o;
 }
 
-checkUnnamed3664(core.List<api.Step> o) {
+checkUnnamed2947(core.List<api.Step> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStep(o[0]);
   checkStep(o[1]);
@@ -2271,9 +2271,9 @@
   buildCounterOperationMetadata++;
   if (buildCounterOperationMetadata < 3) {
     o.progressPercentage = 42;
-    o.resourceNames = buildUnnamed3663();
+    o.resourceNames = buildUnnamed2946();
     o.startTime = "foo";
-    o.steps = buildUnnamed3664();
+    o.steps = buildUnnamed2947();
   }
   buildCounterOperationMetadata--;
   return o;
@@ -2283,14 +2283,14 @@
   buildCounterOperationMetadata++;
   if (buildCounterOperationMetadata < 3) {
     unittest.expect(o.progressPercentage, unittest.equals(42));
-    checkUnnamed3663(o.resourceNames);
+    checkUnnamed2946(o.resourceNames);
     unittest.expect(o.startTime, unittest.equals('foo'));
-    checkUnnamed3664(o.steps);
+    checkUnnamed2947(o.steps);
   }
   buildCounterOperationMetadata--;
 }
 
-buildUnnamed3665() {
+buildUnnamed2948() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2305,7 +2305,7 @@
   return o;
 }
 
-checkUnnamed3665(core.Map<core.String, core.Object> o) {
+checkUnnamed2948(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted9 = (o["x"]) as core.Map;
   unittest.expect(casted9, unittest.hasLength(3));
@@ -2325,7 +2325,7 @@
   buildCounterOption++;
   if (buildCounterOption < 3) {
     o.name = "foo";
-    o.value = buildUnnamed3665();
+    o.value = buildUnnamed2948();
   }
   buildCounterOption--;
   return o;
@@ -2335,19 +2335,19 @@
   buildCounterOption++;
   if (buildCounterOption < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3665(o.value);
+    checkUnnamed2948(o.value);
   }
   buildCounterOption--;
 }
 
-buildUnnamed3666() {
+buildUnnamed2949() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed3666(core.List<api.Page> o) {
+checkUnnamed2949(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
@@ -2360,7 +2360,7 @@
   if (buildCounterPage < 3) {
     o.content = "foo";
     o.name = "foo";
-    o.subpages = buildUnnamed3666();
+    o.subpages = buildUnnamed2949();
   }
   buildCounterPage--;
   return o;
@@ -2371,32 +2371,32 @@
   if (buildCounterPage < 3) {
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3666(o.subpages);
+    checkUnnamed2949(o.subpages);
   }
   buildCounterPage--;
 }
 
-buildUnnamed3667() {
+buildUnnamed2950() {
   var o = new core.List<api.AuditConfig>();
   o.add(buildAuditConfig());
   o.add(buildAuditConfig());
   return o;
 }
 
-checkUnnamed3667(core.List<api.AuditConfig> o) {
+checkUnnamed2950(core.List<api.AuditConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditConfig(o[0]);
   checkAuditConfig(o[1]);
 }
 
-buildUnnamed3668() {
+buildUnnamed2951() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed3668(core.List<api.Binding> o) {
+checkUnnamed2951(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -2407,8 +2407,8 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.auditConfigs = buildUnnamed3667();
-    o.bindings = buildUnnamed3668();
+    o.auditConfigs = buildUnnamed2950();
+    o.bindings = buildUnnamed2951();
     o.etag = "foo";
     o.version = 42;
   }
@@ -2419,35 +2419,35 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed3667(o.auditConfigs);
-    checkUnnamed3668(o.bindings);
+    checkUnnamed2950(o.auditConfigs);
+    checkUnnamed2951(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
   buildCounterPolicy--;
 }
 
-buildUnnamed3669() {
+buildUnnamed2952() {
   var o = new core.List<api.QuotaLimit>();
   o.add(buildQuotaLimit());
   o.add(buildQuotaLimit());
   return o;
 }
 
-checkUnnamed3669(core.List<api.QuotaLimit> o) {
+checkUnnamed2952(core.List<api.QuotaLimit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuotaLimit(o[0]);
   checkQuotaLimit(o[1]);
 }
 
-buildUnnamed3670() {
+buildUnnamed2953() {
   var o = new core.List<api.MetricRule>();
   o.add(buildMetricRule());
   o.add(buildMetricRule());
   return o;
 }
 
-checkUnnamed3670(core.List<api.MetricRule> o) {
+checkUnnamed2953(core.List<api.MetricRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricRule(o[0]);
   checkMetricRule(o[1]);
@@ -2458,8 +2458,8 @@
   var o = new api.Quota();
   buildCounterQuota++;
   if (buildCounterQuota < 3) {
-    o.limits = buildUnnamed3669();
-    o.metricRules = buildUnnamed3670();
+    o.limits = buildUnnamed2952();
+    o.metricRules = buildUnnamed2953();
   }
   buildCounterQuota--;
   return o;
@@ -2468,20 +2468,20 @@
 checkQuota(api.Quota o) {
   buildCounterQuota++;
   if (buildCounterQuota < 3) {
-    checkUnnamed3669(o.limits);
-    checkUnnamed3670(o.metricRules);
+    checkUnnamed2952(o.limits);
+    checkUnnamed2953(o.metricRules);
   }
   buildCounterQuota--;
 }
 
-buildUnnamed3671() {
+buildUnnamed2954() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3671(core.Map<core.String, core.String> o) {
+checkUnnamed2954(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -2501,7 +2501,7 @@
     o.metric = "foo";
     o.name = "foo";
     o.unit = "foo";
-    o.values = buildUnnamed3671();
+    o.values = buildUnnamed2954();
   }
   buildCounterQuotaLimit--;
   return o;
@@ -2519,7 +2519,7 @@
     unittest.expect(o.metric, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.unit, unittest.equals('foo'));
-    checkUnnamed3671(o.values);
+    checkUnnamed2954(o.values);
   }
   buildCounterQuotaLimit--;
 }
@@ -2555,105 +2555,105 @@
   buildCounterRollout--;
 }
 
-buildUnnamed3672() {
+buildUnnamed2955() {
   var o = new core.List<api.Api>();
   o.add(buildApi());
   o.add(buildApi());
   return o;
 }
 
-checkUnnamed3672(core.List<api.Api> o) {
+checkUnnamed2955(core.List<api.Api> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApi(o[0]);
   checkApi(o[1]);
 }
 
-buildUnnamed3673() {
+buildUnnamed2956() {
   var o = new core.List<api.Endpoint>();
   o.add(buildEndpoint());
   o.add(buildEndpoint());
   return o;
 }
 
-checkUnnamed3673(core.List<api.Endpoint> o) {
+checkUnnamed2956(core.List<api.Endpoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEndpoint(o[0]);
   checkEndpoint(o[1]);
 }
 
-buildUnnamed3674() {
+buildUnnamed2957() {
   var o = new core.List<api.Enum>();
   o.add(buildEnum());
   o.add(buildEnum());
   return o;
 }
 
-checkUnnamed3674(core.List<api.Enum> o) {
+checkUnnamed2957(core.List<api.Enum> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnum(o[0]);
   checkEnum(o[1]);
 }
 
-buildUnnamed3675() {
+buildUnnamed2958() {
   var o = new core.List<api.LogDescriptor>();
   o.add(buildLogDescriptor());
   o.add(buildLogDescriptor());
   return o;
 }
 
-checkUnnamed3675(core.List<api.LogDescriptor> o) {
+checkUnnamed2958(core.List<api.LogDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogDescriptor(o[0]);
   checkLogDescriptor(o[1]);
 }
 
-buildUnnamed3676() {
+buildUnnamed2959() {
   var o = new core.List<api.MetricDescriptor>();
   o.add(buildMetricDescriptor());
   o.add(buildMetricDescriptor());
   return o;
 }
 
-checkUnnamed3676(core.List<api.MetricDescriptor> o) {
+checkUnnamed2959(core.List<api.MetricDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricDescriptor(o[0]);
   checkMetricDescriptor(o[1]);
 }
 
-buildUnnamed3677() {
+buildUnnamed2960() {
   var o = new core.List<api.MonitoredResourceDescriptor>();
   o.add(buildMonitoredResourceDescriptor());
   o.add(buildMonitoredResourceDescriptor());
   return o;
 }
 
-checkUnnamed3677(core.List<api.MonitoredResourceDescriptor> o) {
+checkUnnamed2960(core.List<api.MonitoredResourceDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoredResourceDescriptor(o[0]);
   checkMonitoredResourceDescriptor(o[1]);
 }
 
-buildUnnamed3678() {
+buildUnnamed2961() {
   var o = new core.List<api.Type>();
   o.add(buildType());
   o.add(buildType());
   return o;
 }
 
-checkUnnamed3678(core.List<api.Type> o) {
+checkUnnamed2961(core.List<api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o[0]);
   checkType(o[1]);
 }
 
-buildUnnamed3679() {
+buildUnnamed2962() {
   var o = new core.List<api.Type>();
   o.add(buildType());
   o.add(buildType());
   return o;
 }
 
-checkUnnamed3679(core.List<api.Type> o) {
+checkUnnamed2962(core.List<api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o[0]);
   checkType(o[1]);
@@ -2664,7 +2664,7 @@
   var o = new api.Service();
   buildCounterService++;
   if (buildCounterService < 3) {
-    o.apis = buildUnnamed3672();
+    o.apis = buildUnnamed2955();
     o.authentication = buildAuthentication();
     o.backend = buildBackend();
     o.billing = buildBilling();
@@ -2673,24 +2673,24 @@
     o.control = buildControl();
     o.customError = buildCustomError();
     o.documentation = buildDocumentation();
-    o.endpoints = buildUnnamed3673();
-    o.enums = buildUnnamed3674();
+    o.endpoints = buildUnnamed2956();
+    o.enums = buildUnnamed2957();
     o.experimental = buildExperimental();
     o.http = buildHttp();
     o.id = "foo";
     o.logging = buildLogging();
-    o.logs = buildUnnamed3675();
-    o.metrics = buildUnnamed3676();
-    o.monitoredResources = buildUnnamed3677();
+    o.logs = buildUnnamed2958();
+    o.metrics = buildUnnamed2959();
+    o.monitoredResources = buildUnnamed2960();
     o.monitoring = buildMonitoring();
     o.name = "foo";
     o.producerProjectId = "foo";
     o.quota = buildQuota();
     o.sourceInfo = buildSourceInfo();
     o.systemParameters = buildSystemParameters();
-    o.systemTypes = buildUnnamed3678();
+    o.systemTypes = buildUnnamed2961();
     o.title = "foo";
-    o.types = buildUnnamed3679();
+    o.types = buildUnnamed2962();
     o.usage = buildUsage();
     o.visibility = buildVisibility();
   }
@@ -2701,7 +2701,7 @@
 checkService(api.Service o) {
   buildCounterService++;
   if (buildCounterService < 3) {
-    checkUnnamed3672(o.apis);
+    checkUnnamed2955(o.apis);
     checkAuthentication(o.authentication);
     checkBackend(o.backend);
     checkBilling(o.billing);
@@ -2710,24 +2710,24 @@
     checkControl(o.control);
     checkCustomError(o.customError);
     checkDocumentation(o.documentation);
-    checkUnnamed3673(o.endpoints);
-    checkUnnamed3674(o.enums);
+    checkUnnamed2956(o.endpoints);
+    checkUnnamed2957(o.enums);
     checkExperimental(o.experimental);
     checkHttp(o.http);
     unittest.expect(o.id, unittest.equals('foo'));
     checkLogging(o.logging);
-    checkUnnamed3675(o.logs);
-    checkUnnamed3676(o.metrics);
-    checkUnnamed3677(o.monitoredResources);
+    checkUnnamed2958(o.logs);
+    checkUnnamed2959(o.metrics);
+    checkUnnamed2960(o.monitoredResources);
     checkMonitoring(o.monitoring);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.producerProjectId, unittest.equals('foo'));
     checkQuota(o.quota);
     checkSourceInfo(o.sourceInfo);
     checkSystemParameters(o.systemParameters);
-    checkUnnamed3678(o.systemTypes);
+    checkUnnamed2961(o.systemTypes);
     unittest.expect(o.title, unittest.equals('foo'));
-    checkUnnamed3679(o.types);
+    checkUnnamed2962(o.types);
     checkUsage(o.usage);
     checkVisibility(o.visibility);
   }
@@ -2774,7 +2774,7 @@
   buildCounterSourceContext--;
 }
 
-buildUnnamed3680() {
+buildUnnamed2963() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2789,7 +2789,7 @@
   return o;
 }
 
-checkUnnamed3680(core.Map<core.String, core.Object> o) {
+checkUnnamed2963(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted11 = (o["x"]) as core.Map;
   unittest.expect(casted11, unittest.hasLength(3));
@@ -2803,17 +2803,17 @@
   unittest.expect(casted12["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3681() {
+buildUnnamed2964() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3680());
-  o.add(buildUnnamed3680());
+  o.add(buildUnnamed2963());
+  o.add(buildUnnamed2963());
   return o;
 }
 
-checkUnnamed3681(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed2964(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3680(o[0]);
-  checkUnnamed3680(o[1]);
+  checkUnnamed2963(o[0]);
+  checkUnnamed2963(o[1]);
 }
 
 core.int buildCounterSourceInfo = 0;
@@ -2821,7 +2821,7 @@
   var o = new api.SourceInfo();
   buildCounterSourceInfo++;
   if (buildCounterSourceInfo < 3) {
-    o.sourceFiles = buildUnnamed3681();
+    o.sourceFiles = buildUnnamed2964();
   }
   buildCounterSourceInfo--;
   return o;
@@ -2830,12 +2830,12 @@
 checkSourceInfo(api.SourceInfo o) {
   buildCounterSourceInfo++;
   if (buildCounterSourceInfo < 3) {
-    checkUnnamed3681(o.sourceFiles);
+    checkUnnamed2964(o.sourceFiles);
   }
   buildCounterSourceInfo--;
 }
 
-buildUnnamed3682() {
+buildUnnamed2965() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2850,7 +2850,7 @@
   return o;
 }
 
-checkUnnamed3682(core.Map<core.String, core.Object> o) {
+checkUnnamed2965(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted13 = (o["x"]) as core.Map;
   unittest.expect(casted13, unittest.hasLength(3));
@@ -2864,17 +2864,17 @@
   unittest.expect(casted14["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3683() {
+buildUnnamed2966() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3682());
-  o.add(buildUnnamed3682());
+  o.add(buildUnnamed2965());
+  o.add(buildUnnamed2965());
   return o;
 }
 
-checkUnnamed3683(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed2966(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3682(o[0]);
-  checkUnnamed3682(o[1]);
+  checkUnnamed2965(o[0]);
+  checkUnnamed2965(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -2883,7 +2883,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed3683();
+    o.details = buildUnnamed2966();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -2894,7 +2894,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed3683(o.details);
+    checkUnnamed2966(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -2984,14 +2984,14 @@
   buildCounterSystemParameter--;
 }
 
-buildUnnamed3684() {
+buildUnnamed2967() {
   var o = new core.List<api.SystemParameter>();
   o.add(buildSystemParameter());
   o.add(buildSystemParameter());
   return o;
 }
 
-checkUnnamed3684(core.List<api.SystemParameter> o) {
+checkUnnamed2967(core.List<api.SystemParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSystemParameter(o[0]);
   checkSystemParameter(o[1]);
@@ -3002,7 +3002,7 @@
   var o = new api.SystemParameterRule();
   buildCounterSystemParameterRule++;
   if (buildCounterSystemParameterRule < 3) {
-    o.parameters = buildUnnamed3684();
+    o.parameters = buildUnnamed2967();
     o.selector = "foo";
   }
   buildCounterSystemParameterRule--;
@@ -3012,20 +3012,20 @@
 checkSystemParameterRule(api.SystemParameterRule o) {
   buildCounterSystemParameterRule++;
   if (buildCounterSystemParameterRule < 3) {
-    checkUnnamed3684(o.parameters);
+    checkUnnamed2967(o.parameters);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterSystemParameterRule--;
 }
 
-buildUnnamed3685() {
+buildUnnamed2968() {
   var o = new core.List<api.SystemParameterRule>();
   o.add(buildSystemParameterRule());
   o.add(buildSystemParameterRule());
   return o;
 }
 
-checkUnnamed3685(core.List<api.SystemParameterRule> o) {
+checkUnnamed2968(core.List<api.SystemParameterRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSystemParameterRule(o[0]);
   checkSystemParameterRule(o[1]);
@@ -3036,7 +3036,7 @@
   var o = new api.SystemParameters();
   buildCounterSystemParameters++;
   if (buildCounterSystemParameters < 3) {
-    o.rules = buildUnnamed3685();
+    o.rules = buildUnnamed2968();
   }
   buildCounterSystemParameters--;
   return o;
@@ -3045,19 +3045,19 @@
 checkSystemParameters(api.SystemParameters o) {
   buildCounterSystemParameters++;
   if (buildCounterSystemParameters < 3) {
-    checkUnnamed3685(o.rules);
+    checkUnnamed2968(o.rules);
   }
   buildCounterSystemParameters--;
 }
 
-buildUnnamed3686() {
+buildUnnamed2969() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3686(core.List<core.String> o) {
+checkUnnamed2969(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3068,7 +3068,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed3686();
+    o.permissions = buildUnnamed2969();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -3077,19 +3077,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed3686(o.permissions);
+    checkUnnamed2969(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed3687() {
+buildUnnamed2970() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3687(core.List<core.String> o) {
+checkUnnamed2970(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3100,7 +3100,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed3687();
+    o.permissions = buildUnnamed2970();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -3109,19 +3109,19 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed3687(o.permissions);
+    checkUnnamed2970(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
 
-buildUnnamed3688() {
+buildUnnamed2971() {
   var o = new core.Map<core.String, core.double>();
   o["x"] = 42.0;
   o["y"] = 42.0;
   return o;
 }
 
-checkUnnamed3688(core.Map<core.String, core.double> o) {
+checkUnnamed2971(core.Map<core.String, core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals(42.0));
   unittest.expect(o["y"], unittest.equals(42.0));
@@ -3132,7 +3132,7 @@
   var o = new api.TrafficPercentStrategy();
   buildCounterTrafficPercentStrategy++;
   if (buildCounterTrafficPercentStrategy < 3) {
-    o.percentages = buildUnnamed3688();
+    o.percentages = buildUnnamed2971();
   }
   buildCounterTrafficPercentStrategy--;
   return o;
@@ -3141,45 +3141,45 @@
 checkTrafficPercentStrategy(api.TrafficPercentStrategy o) {
   buildCounterTrafficPercentStrategy++;
   if (buildCounterTrafficPercentStrategy < 3) {
-    checkUnnamed3688(o.percentages);
+    checkUnnamed2971(o.percentages);
   }
   buildCounterTrafficPercentStrategy--;
 }
 
-buildUnnamed3689() {
+buildUnnamed2972() {
   var o = new core.List<api.Field>();
   o.add(buildField());
   o.add(buildField());
   return o;
 }
 
-checkUnnamed3689(core.List<api.Field> o) {
+checkUnnamed2972(core.List<api.Field> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkField(o[0]);
   checkField(o[1]);
 }
 
-buildUnnamed3690() {
+buildUnnamed2973() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3690(core.List<core.String> o) {
+checkUnnamed2973(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3691() {
+buildUnnamed2974() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3691(core.List<api.Option> o) {
+checkUnnamed2974(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -3190,10 +3190,10 @@
   var o = new api.Type();
   buildCounterType++;
   if (buildCounterType < 3) {
-    o.fields = buildUnnamed3689();
+    o.fields = buildUnnamed2972();
     o.name = "foo";
-    o.oneofs = buildUnnamed3690();
-    o.options = buildUnnamed3691();
+    o.oneofs = buildUnnamed2973();
+    o.options = buildUnnamed2974();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
   }
@@ -3204,10 +3204,10 @@
 checkType(api.Type o) {
   buildCounterType++;
   if (buildCounterType < 3) {
-    checkUnnamed3689(o.fields);
+    checkUnnamed2972(o.fields);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3690(o.oneofs);
-    checkUnnamed3691(o.options);
+    checkUnnamed2973(o.oneofs);
+    checkUnnamed2974(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
   }
@@ -3233,27 +3233,27 @@
   buildCounterUndeleteServiceResponse--;
 }
 
-buildUnnamed3692() {
+buildUnnamed2975() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3692(core.List<core.String> o) {
+checkUnnamed2975(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3693() {
+buildUnnamed2976() {
   var o = new core.List<api.UsageRule>();
   o.add(buildUsageRule());
   o.add(buildUsageRule());
   return o;
 }
 
-checkUnnamed3693(core.List<api.UsageRule> o) {
+checkUnnamed2976(core.List<api.UsageRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageRule(o[0]);
   checkUsageRule(o[1]);
@@ -3265,8 +3265,8 @@
   buildCounterUsage++;
   if (buildCounterUsage < 3) {
     o.producerNotificationChannel = "foo";
-    o.requirements = buildUnnamed3692();
-    o.rules = buildUnnamed3693();
+    o.requirements = buildUnnamed2975();
+    o.rules = buildUnnamed2976();
   }
   buildCounterUsage--;
   return o;
@@ -3276,8 +3276,8 @@
   buildCounterUsage++;
   if (buildCounterUsage < 3) {
     unittest.expect(o.producerNotificationChannel, unittest.equals('foo'));
-    checkUnnamed3692(o.requirements);
-    checkUnnamed3693(o.rules);
+    checkUnnamed2975(o.requirements);
+    checkUnnamed2976(o.rules);
   }
   buildCounterUsage--;
 }
@@ -3305,14 +3305,14 @@
   buildCounterUsageRule--;
 }
 
-buildUnnamed3694() {
+buildUnnamed2977() {
   var o = new core.List<api.VisibilityRule>();
   o.add(buildVisibilityRule());
   o.add(buildVisibilityRule());
   return o;
 }
 
-checkUnnamed3694(core.List<api.VisibilityRule> o) {
+checkUnnamed2977(core.List<api.VisibilityRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVisibilityRule(o[0]);
   checkVisibilityRule(o[1]);
@@ -3323,7 +3323,7 @@
   var o = new api.Visibility();
   buildCounterVisibility++;
   if (buildCounterVisibility < 3) {
-    o.rules = buildUnnamed3694();
+    o.rules = buildUnnamed2977();
   }
   buildCounterVisibility--;
   return o;
@@ -3332,7 +3332,7 @@
 checkVisibility(api.Visibility o) {
   buildCounterVisibility++;
   if (buildCounterVisibility < 3) {
-    checkUnnamed3694(o.rules);
+    checkUnnamed2977(o.rules);
   }
   buildCounterVisibility--;
 }
@@ -4127,7 +4127,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4192,7 +4192,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -4247,7 +4247,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4300,7 +4300,7 @@
       }), true);
       res
           .delete(arg_serviceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4363,7 +4363,7 @@
       }), true);
       res
           .disable(arg_request, arg_serviceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4426,7 +4426,7 @@
       }), true);
       res
           .enable(arg_request, arg_serviceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4477,8 +4477,9 @@
         var resp = convert.JSON.encode(buildGenerateConfigReportResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.generateConfigReport(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GenerateConfigReportResponse response) {
+      res
+          .generateConfigReport(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGenerateConfigReportResponse(response);
       })));
     });
@@ -4531,7 +4532,7 @@
       }), true);
       res
           .get(arg_serviceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedService response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedService(response);
       })));
     });
@@ -4596,7 +4597,7 @@
       res
           .getConfig(arg_serviceName,
               configId: arg_configId, view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Service response) {
+          .then(unittest.expectAsync1(((response) {
         checkService(response);
       })));
     });
@@ -4651,7 +4652,7 @@
       }), true);
       res
           .getIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -4717,7 +4718,7 @@
               consumerId: arg_consumerId,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListServicesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListServicesResponse(response);
       })));
     });
@@ -4772,7 +4773,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -4827,8 +4828,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -4887,7 +4887,7 @@
       }), true);
       res
           .undelete(arg_serviceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4953,7 +4953,7 @@
       }), true);
       res
           .create(arg_request, arg_serviceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Service response) {
+          .then(unittest.expectAsync1(((response) {
         checkService(response);
       })));
     });
@@ -5020,7 +5020,7 @@
       res
           .get(arg_serviceName, arg_configId,
               view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Service response) {
+          .then(unittest.expectAsync1(((response) {
         checkService(response);
       })));
     });
@@ -5089,8 +5089,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListServiceConfigsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListServiceConfigsResponse(response);
       })));
     });
@@ -5154,7 +5153,7 @@
       }), true);
       res
           .submit(arg_request, arg_serviceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5212,7 +5211,7 @@
       }), true);
       res
           .getIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -5268,7 +5267,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -5324,8 +5323,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -5391,7 +5389,7 @@
       }), true);
       res
           .create(arg_request, arg_serviceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5455,7 +5453,7 @@
       }), true);
       res
           .get(arg_serviceName, arg_rolloutId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Rollout response) {
+          .then(unittest.expectAsync1(((response) {
         checkRollout(response);
       })));
     });
@@ -5527,8 +5525,7 @@
               filter: arg_filter,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListServiceRolloutsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListServiceRolloutsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/serviceusage/v1_test.dart b/generated/googleapis/test/serviceusage/v1_test.dart
index ab415aa..d7fb523 100644
--- a/generated/googleapis/test/serviceusage/v1_test.dart
+++ b/generated/googleapis/test/serviceusage/v1_test.dart
@@ -50,40 +50,40 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2881() {
+buildUnnamed2380() {
   var o = new core.List<api.Method>();
   o.add(buildMethod());
   o.add(buildMethod());
   return o;
 }
 
-checkUnnamed2881(core.List<api.Method> o) {
+checkUnnamed2380(core.List<api.Method> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMethod(o[0]);
   checkMethod(o[1]);
 }
 
-buildUnnamed2882() {
+buildUnnamed2381() {
   var o = new core.List<api.Mixin>();
   o.add(buildMixin());
   o.add(buildMixin());
   return o;
 }
 
-checkUnnamed2882(core.List<api.Mixin> o) {
+checkUnnamed2381(core.List<api.Mixin> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMixin(o[0]);
   checkMixin(o[1]);
 }
 
-buildUnnamed2883() {
+buildUnnamed2382() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed2883(core.List<api.Option> o) {
+checkUnnamed2382(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -94,10 +94,10 @@
   var o = new api.Api();
   buildCounterApi++;
   if (buildCounterApi < 3) {
-    o.methods = buildUnnamed2881();
-    o.mixins = buildUnnamed2882();
+    o.methods = buildUnnamed2380();
+    o.mixins = buildUnnamed2381();
     o.name = "foo";
-    o.options = buildUnnamed2883();
+    o.options = buildUnnamed2382();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
     o.version = "foo";
@@ -109,10 +109,10 @@
 checkApi(api.Api o) {
   buildCounterApi++;
   if (buildCounterApi < 3) {
-    checkUnnamed2881(o.methods);
-    checkUnnamed2882(o.mixins);
+    checkUnnamed2380(o.methods);
+    checkUnnamed2381(o.mixins);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2883(o.options);
+    checkUnnamed2382(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals('foo'));
@@ -168,27 +168,27 @@
   buildCounterAuthRequirement--;
 }
 
-buildUnnamed2884() {
+buildUnnamed2383() {
   var o = new core.List<api.AuthProvider>();
   o.add(buildAuthProvider());
   o.add(buildAuthProvider());
   return o;
 }
 
-checkUnnamed2884(core.List<api.AuthProvider> o) {
+checkUnnamed2383(core.List<api.AuthProvider> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthProvider(o[0]);
   checkAuthProvider(o[1]);
 }
 
-buildUnnamed2885() {
+buildUnnamed2384() {
   var o = new core.List<api.AuthenticationRule>();
   o.add(buildAuthenticationRule());
   o.add(buildAuthenticationRule());
   return o;
 }
 
-checkUnnamed2885(core.List<api.AuthenticationRule> o) {
+checkUnnamed2384(core.List<api.AuthenticationRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthenticationRule(o[0]);
   checkAuthenticationRule(o[1]);
@@ -199,8 +199,8 @@
   var o = new api.Authentication();
   buildCounterAuthentication++;
   if (buildCounterAuthentication < 3) {
-    o.providers = buildUnnamed2884();
-    o.rules = buildUnnamed2885();
+    o.providers = buildUnnamed2383();
+    o.rules = buildUnnamed2384();
   }
   buildCounterAuthentication--;
   return o;
@@ -209,20 +209,20 @@
 checkAuthentication(api.Authentication o) {
   buildCounterAuthentication++;
   if (buildCounterAuthentication < 3) {
-    checkUnnamed2884(o.providers);
-    checkUnnamed2885(o.rules);
+    checkUnnamed2383(o.providers);
+    checkUnnamed2384(o.rules);
   }
   buildCounterAuthentication--;
 }
 
-buildUnnamed2886() {
+buildUnnamed2385() {
   var o = new core.List<api.AuthRequirement>();
   o.add(buildAuthRequirement());
   o.add(buildAuthRequirement());
   return o;
 }
 
-checkUnnamed2886(core.List<api.AuthRequirement> o) {
+checkUnnamed2385(core.List<api.AuthRequirement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthRequirement(o[0]);
   checkAuthRequirement(o[1]);
@@ -236,7 +236,7 @@
     o.allowWithoutCredential = true;
     o.customAuth = buildCustomAuthRequirements();
     o.oauth = buildOAuthRequirements();
-    o.requirements = buildUnnamed2886();
+    o.requirements = buildUnnamed2385();
     o.selector = "foo";
   }
   buildCounterAuthenticationRule--;
@@ -249,7 +249,7 @@
     unittest.expect(o.allowWithoutCredential, unittest.isTrue);
     checkCustomAuthRequirements(o.customAuth);
     checkOAuthRequirements(o.oauth);
-    checkUnnamed2886(o.requirements);
+    checkUnnamed2385(o.requirements);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterAuthenticationRule--;
@@ -295,14 +295,14 @@
   buildCounterAuthorizationRule--;
 }
 
-buildUnnamed2887() {
+buildUnnamed2386() {
   var o = new core.List<api.BackendRule>();
   o.add(buildBackendRule());
   o.add(buildBackendRule());
   return o;
 }
 
-checkUnnamed2887(core.List<api.BackendRule> o) {
+checkUnnamed2386(core.List<api.BackendRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendRule(o[0]);
   checkBackendRule(o[1]);
@@ -313,7 +313,7 @@
   var o = new api.Backend();
   buildCounterBackend++;
   if (buildCounterBackend < 3) {
-    o.rules = buildUnnamed2887();
+    o.rules = buildUnnamed2386();
   }
   buildCounterBackend--;
   return o;
@@ -322,7 +322,7 @@
 checkBackend(api.Backend o) {
   buildCounterBackend++;
   if (buildCounterBackend < 3) {
-    checkUnnamed2887(o.rules);
+    checkUnnamed2386(o.rules);
   }
   buildCounterBackend--;
 }
@@ -352,14 +352,14 @@
   buildCounterBackendRule--;
 }
 
-buildUnnamed2888() {
+buildUnnamed2387() {
   var o = new core.List<api.BillingDestination>();
   o.add(buildBillingDestination());
   o.add(buildBillingDestination());
   return o;
 }
 
-checkUnnamed2888(core.List<api.BillingDestination> o) {
+checkUnnamed2387(core.List<api.BillingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBillingDestination(o[0]);
   checkBillingDestination(o[1]);
@@ -370,7 +370,7 @@
   var o = new api.Billing();
   buildCounterBilling++;
   if (buildCounterBilling < 3) {
-    o.consumerDestinations = buildUnnamed2888();
+    o.consumerDestinations = buildUnnamed2387();
   }
   buildCounterBilling--;
   return o;
@@ -379,19 +379,19 @@
 checkBilling(api.Billing o) {
   buildCounterBilling++;
   if (buildCounterBilling < 3) {
-    checkUnnamed2888(o.consumerDestinations);
+    checkUnnamed2387(o.consumerDestinations);
   }
   buildCounterBilling--;
 }
 
-buildUnnamed2889() {
+buildUnnamed2388() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2889(core.List<core.String> o) {
+checkUnnamed2388(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -402,7 +402,7 @@
   var o = new api.BillingDestination();
   buildCounterBillingDestination++;
   if (buildCounterBillingDestination < 3) {
-    o.metrics = buildUnnamed2889();
+    o.metrics = buildUnnamed2388();
     o.monitoredResource = "foo";
   }
   buildCounterBillingDestination--;
@@ -412,7 +412,7 @@
 checkBillingDestination(api.BillingDestination o) {
   buildCounterBillingDestination++;
   if (buildCounterBillingDestination < 3) {
-    checkUnnamed2889(o.metrics);
+    checkUnnamed2388(o.metrics);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterBillingDestination--;
@@ -433,14 +433,14 @@
   buildCounterCancelOperationRequest--;
 }
 
-buildUnnamed2890() {
+buildUnnamed2389() {
   var o = new core.List<api.ContextRule>();
   o.add(buildContextRule());
   o.add(buildContextRule());
   return o;
 }
 
-checkUnnamed2890(core.List<api.ContextRule> o) {
+checkUnnamed2389(core.List<api.ContextRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContextRule(o[0]);
   checkContextRule(o[1]);
@@ -451,7 +451,7 @@
   var o = new api.Context();
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    o.rules = buildUnnamed2890();
+    o.rules = buildUnnamed2389();
   }
   buildCounterContext--;
   return o;
@@ -460,58 +460,58 @@
 checkContext(api.Context o) {
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    checkUnnamed2890(o.rules);
+    checkUnnamed2389(o.rules);
   }
   buildCounterContext--;
 }
 
-buildUnnamed2891() {
+buildUnnamed2390() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2891(core.List<core.String> o) {
+checkUnnamed2390(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2892() {
+buildUnnamed2391() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2892(core.List<core.String> o) {
+checkUnnamed2391(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2893() {
+buildUnnamed2392() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2893(core.List<core.String> o) {
+checkUnnamed2392(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2894() {
+buildUnnamed2393() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2894(core.List<core.String> o) {
+checkUnnamed2393(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -522,10 +522,10 @@
   var o = new api.ContextRule();
   buildCounterContextRule++;
   if (buildCounterContextRule < 3) {
-    o.allowedRequestExtensions = buildUnnamed2891();
-    o.allowedResponseExtensions = buildUnnamed2892();
-    o.provided = buildUnnamed2893();
-    o.requested = buildUnnamed2894();
+    o.allowedRequestExtensions = buildUnnamed2390();
+    o.allowedResponseExtensions = buildUnnamed2391();
+    o.provided = buildUnnamed2392();
+    o.requested = buildUnnamed2393();
     o.selector = "foo";
   }
   buildCounterContextRule--;
@@ -535,10 +535,10 @@
 checkContextRule(api.ContextRule o) {
   buildCounterContextRule++;
   if (buildCounterContextRule < 3) {
-    checkUnnamed2891(o.allowedRequestExtensions);
-    checkUnnamed2892(o.allowedResponseExtensions);
-    checkUnnamed2893(o.provided);
-    checkUnnamed2894(o.requested);
+    checkUnnamed2390(o.allowedRequestExtensions);
+    checkUnnamed2391(o.allowedResponseExtensions);
+    checkUnnamed2392(o.provided);
+    checkUnnamed2393(o.requested);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterContextRule--;
@@ -582,27 +582,27 @@
   buildCounterCustomAuthRequirements--;
 }
 
-buildUnnamed2895() {
+buildUnnamed2394() {
   var o = new core.List<api.CustomErrorRule>();
   o.add(buildCustomErrorRule());
   o.add(buildCustomErrorRule());
   return o;
 }
 
-checkUnnamed2895(core.List<api.CustomErrorRule> o) {
+checkUnnamed2394(core.List<api.CustomErrorRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomErrorRule(o[0]);
   checkCustomErrorRule(o[1]);
 }
 
-buildUnnamed2896() {
+buildUnnamed2395() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2896(core.List<core.String> o) {
+checkUnnamed2395(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -613,8 +613,8 @@
   var o = new api.CustomError();
   buildCounterCustomError++;
   if (buildCounterCustomError < 3) {
-    o.rules = buildUnnamed2895();
-    o.types = buildUnnamed2896();
+    o.rules = buildUnnamed2394();
+    o.types = buildUnnamed2395();
   }
   buildCounterCustomError--;
   return o;
@@ -623,8 +623,8 @@
 checkCustomError(api.CustomError o) {
   buildCounterCustomError++;
   if (buildCounterCustomError < 3) {
-    checkUnnamed2895(o.rules);
-    checkUnnamed2896(o.types);
+    checkUnnamed2394(o.rules);
+    checkUnnamed2395(o.types);
   }
   buildCounterCustomError--;
 }
@@ -686,27 +686,27 @@
   buildCounterDisableServiceRequest--;
 }
 
-buildUnnamed2897() {
+buildUnnamed2396() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed2897(core.List<api.Page> o) {
+checkUnnamed2396(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
 }
 
-buildUnnamed2898() {
+buildUnnamed2397() {
   var o = new core.List<api.DocumentationRule>();
   o.add(buildDocumentationRule());
   o.add(buildDocumentationRule());
   return o;
 }
 
-checkUnnamed2898(core.List<api.DocumentationRule> o) {
+checkUnnamed2397(core.List<api.DocumentationRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDocumentationRule(o[0]);
   checkDocumentationRule(o[1]);
@@ -719,8 +719,8 @@
   if (buildCounterDocumentation < 3) {
     o.documentationRootUrl = "foo";
     o.overview = "foo";
-    o.pages = buildUnnamed2897();
-    o.rules = buildUnnamed2898();
+    o.pages = buildUnnamed2396();
+    o.rules = buildUnnamed2397();
     o.summary = "foo";
   }
   buildCounterDocumentation--;
@@ -732,8 +732,8 @@
   if (buildCounterDocumentation < 3) {
     unittest.expect(o.documentationRootUrl, unittest.equals('foo'));
     unittest.expect(o.overview, unittest.equals('foo'));
-    checkUnnamed2897(o.pages);
-    checkUnnamed2898(o.rules);
+    checkUnnamed2396(o.pages);
+    checkUnnamed2397(o.rules);
     unittest.expect(o.summary, unittest.equals('foo'));
   }
   buildCounterDocumentation--;
@@ -811,27 +811,27 @@
   buildCounterEnabledState--;
 }
 
-buildUnnamed2899() {
+buildUnnamed2398() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2899(core.List<core.String> o) {
+checkUnnamed2398(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2900() {
+buildUnnamed2399() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2900(core.List<core.String> o) {
+checkUnnamed2399(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -842,9 +842,9 @@
   var o = new api.Endpoint();
   buildCounterEndpoint++;
   if (buildCounterEndpoint < 3) {
-    o.aliases = buildUnnamed2899();
+    o.aliases = buildUnnamed2398();
     o.allowCors = true;
-    o.features = buildUnnamed2900();
+    o.features = buildUnnamed2399();
     o.name = "foo";
     o.target = "foo";
   }
@@ -855,36 +855,36 @@
 checkEndpoint(api.Endpoint o) {
   buildCounterEndpoint++;
   if (buildCounterEndpoint < 3) {
-    checkUnnamed2899(o.aliases);
+    checkUnnamed2398(o.aliases);
     unittest.expect(o.allowCors, unittest.isTrue);
-    checkUnnamed2900(o.features);
+    checkUnnamed2399(o.features);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
   }
   buildCounterEndpoint--;
 }
 
-buildUnnamed2901() {
+buildUnnamed2400() {
   var o = new core.List<api.EnumValue>();
   o.add(buildEnumValue());
   o.add(buildEnumValue());
   return o;
 }
 
-checkUnnamed2901(core.List<api.EnumValue> o) {
+checkUnnamed2400(core.List<api.EnumValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnumValue(o[0]);
   checkEnumValue(o[1]);
 }
 
-buildUnnamed2902() {
+buildUnnamed2401() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed2902(core.List<api.Option> o) {
+checkUnnamed2401(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -895,9 +895,9 @@
   var o = new api.Enum();
   buildCounterEnum++;
   if (buildCounterEnum < 3) {
-    o.enumvalue = buildUnnamed2901();
+    o.enumvalue = buildUnnamed2400();
     o.name = "foo";
-    o.options = buildUnnamed2902();
+    o.options = buildUnnamed2401();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
   }
@@ -908,23 +908,23 @@
 checkEnum(api.Enum o) {
   buildCounterEnum++;
   if (buildCounterEnum < 3) {
-    checkUnnamed2901(o.enumvalue);
+    checkUnnamed2400(o.enumvalue);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2902(o.options);
+    checkUnnamed2401(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
   }
   buildCounterEnum--;
 }
 
-buildUnnamed2903() {
+buildUnnamed2402() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed2903(core.List<api.Option> o) {
+checkUnnamed2402(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -937,7 +937,7 @@
   if (buildCounterEnumValue < 3) {
     o.name = "foo";
     o.number = 42;
-    o.options = buildUnnamed2903();
+    o.options = buildUnnamed2402();
   }
   buildCounterEnumValue--;
   return o;
@@ -948,7 +948,7 @@
   if (buildCounterEnumValue < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.number, unittest.equals(42));
-    checkUnnamed2903(o.options);
+    checkUnnamed2402(o.options);
   }
   buildCounterEnumValue--;
 }
@@ -972,14 +972,14 @@
   buildCounterExperimental--;
 }
 
-buildUnnamed2904() {
+buildUnnamed2403() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed2904(core.List<api.Option> o) {
+checkUnnamed2403(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -997,7 +997,7 @@
     o.name = "foo";
     o.number = 42;
     o.oneofIndex = 42;
-    o.options = buildUnnamed2904();
+    o.options = buildUnnamed2403();
     o.packed = true;
     o.typeUrl = "foo";
   }
@@ -1015,112 +1015,112 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.number, unittest.equals(42));
     unittest.expect(o.oneofIndex, unittest.equals(42));
-    checkUnnamed2904(o.options);
+    checkUnnamed2403(o.options);
     unittest.expect(o.packed, unittest.isTrue);
     unittest.expect(o.typeUrl, unittest.equals('foo'));
   }
   buildCounterField--;
 }
 
-buildUnnamed2905() {
+buildUnnamed2404() {
   var o = new core.List<api.Api>();
   o.add(buildApi());
   o.add(buildApi());
   return o;
 }
 
-checkUnnamed2905(core.List<api.Api> o) {
+checkUnnamed2404(core.List<api.Api> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApi(o[0]);
   checkApi(o[1]);
 }
 
-buildUnnamed2906() {
+buildUnnamed2405() {
   var o = new core.List<api.Endpoint>();
   o.add(buildEndpoint());
   o.add(buildEndpoint());
   return o;
 }
 
-checkUnnamed2906(core.List<api.Endpoint> o) {
+checkUnnamed2405(core.List<api.Endpoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEndpoint(o[0]);
   checkEndpoint(o[1]);
 }
 
-buildUnnamed2907() {
+buildUnnamed2406() {
   var o = new core.List<api.Enum>();
   o.add(buildEnum());
   o.add(buildEnum());
   return o;
 }
 
-checkUnnamed2907(core.List<api.Enum> o) {
+checkUnnamed2406(core.List<api.Enum> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnum(o[0]);
   checkEnum(o[1]);
 }
 
-buildUnnamed2908() {
+buildUnnamed2407() {
   var o = new core.List<api.LogDescriptor>();
   o.add(buildLogDescriptor());
   o.add(buildLogDescriptor());
   return o;
 }
 
-checkUnnamed2908(core.List<api.LogDescriptor> o) {
+checkUnnamed2407(core.List<api.LogDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogDescriptor(o[0]);
   checkLogDescriptor(o[1]);
 }
 
-buildUnnamed2909() {
+buildUnnamed2408() {
   var o = new core.List<api.MetricDescriptor>();
   o.add(buildMetricDescriptor());
   o.add(buildMetricDescriptor());
   return o;
 }
 
-checkUnnamed2909(core.List<api.MetricDescriptor> o) {
+checkUnnamed2408(core.List<api.MetricDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricDescriptor(o[0]);
   checkMetricDescriptor(o[1]);
 }
 
-buildUnnamed2910() {
+buildUnnamed2409() {
   var o = new core.List<api.MonitoredResourceDescriptor>();
   o.add(buildMonitoredResourceDescriptor());
   o.add(buildMonitoredResourceDescriptor());
   return o;
 }
 
-checkUnnamed2910(core.List<api.MonitoredResourceDescriptor> o) {
+checkUnnamed2409(core.List<api.MonitoredResourceDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoredResourceDescriptor(o[0]);
   checkMonitoredResourceDescriptor(o[1]);
 }
 
-buildUnnamed2911() {
+buildUnnamed2410() {
   var o = new core.List<api.Type>();
   o.add(buildType());
   o.add(buildType());
   return o;
 }
 
-checkUnnamed2911(core.List<api.Type> o) {
+checkUnnamed2410(core.List<api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o[0]);
   checkType(o[1]);
 }
 
-buildUnnamed2912() {
+buildUnnamed2411() {
   var o = new core.List<api.Type>();
   o.add(buildType());
   o.add(buildType());
   return o;
 }
 
-checkUnnamed2912(core.List<api.Type> o) {
+checkUnnamed2411(core.List<api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o[0]);
   checkType(o[1]);
@@ -1131,7 +1131,7 @@
   var o = new api.GoogleApiService();
   buildCounterGoogleApiService++;
   if (buildCounterGoogleApiService < 3) {
-    o.apis = buildUnnamed2905();
+    o.apis = buildUnnamed2404();
     o.authentication = buildAuthentication();
     o.backend = buildBackend();
     o.billing = buildBilling();
@@ -1140,24 +1140,24 @@
     o.control = buildControl();
     o.customError = buildCustomError();
     o.documentation = buildDocumentation();
-    o.endpoints = buildUnnamed2906();
-    o.enums = buildUnnamed2907();
+    o.endpoints = buildUnnamed2405();
+    o.enums = buildUnnamed2406();
     o.experimental = buildExperimental();
     o.http = buildHttp();
     o.id = "foo";
     o.logging = buildLogging();
-    o.logs = buildUnnamed2908();
-    o.metrics = buildUnnamed2909();
-    o.monitoredResources = buildUnnamed2910();
+    o.logs = buildUnnamed2407();
+    o.metrics = buildUnnamed2408();
+    o.monitoredResources = buildUnnamed2409();
     o.monitoring = buildMonitoring();
     o.name = "foo";
     o.producerProjectId = "foo";
     o.quota = buildQuota();
     o.sourceInfo = buildSourceInfo();
     o.systemParameters = buildSystemParameters();
-    o.systemTypes = buildUnnamed2911();
+    o.systemTypes = buildUnnamed2410();
     o.title = "foo";
-    o.types = buildUnnamed2912();
+    o.types = buildUnnamed2411();
     o.usage = buildUsage();
     o.visibility = buildVisibility();
   }
@@ -1168,7 +1168,7 @@
 checkGoogleApiService(api.GoogleApiService o) {
   buildCounterGoogleApiService++;
   if (buildCounterGoogleApiService < 3) {
-    checkUnnamed2905(o.apis);
+    checkUnnamed2404(o.apis);
     checkAuthentication(o.authentication);
     checkBackend(o.backend);
     checkBilling(o.billing);
@@ -1177,38 +1177,38 @@
     checkControl(o.control);
     checkCustomError(o.customError);
     checkDocumentation(o.documentation);
-    checkUnnamed2906(o.endpoints);
-    checkUnnamed2907(o.enums);
+    checkUnnamed2405(o.endpoints);
+    checkUnnamed2406(o.enums);
     checkExperimental(o.experimental);
     checkHttp(o.http);
     unittest.expect(o.id, unittest.equals('foo'));
     checkLogging(o.logging);
-    checkUnnamed2908(o.logs);
-    checkUnnamed2909(o.metrics);
-    checkUnnamed2910(o.monitoredResources);
+    checkUnnamed2407(o.logs);
+    checkUnnamed2408(o.metrics);
+    checkUnnamed2409(o.monitoredResources);
     checkMonitoring(o.monitoring);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.producerProjectId, unittest.equals('foo'));
     checkQuota(o.quota);
     checkSourceInfo(o.sourceInfo);
     checkSystemParameters(o.systemParameters);
-    checkUnnamed2911(o.systemTypes);
+    checkUnnamed2410(o.systemTypes);
     unittest.expect(o.title, unittest.equals('foo'));
-    checkUnnamed2912(o.types);
+    checkUnnamed2411(o.types);
     checkUsage(o.usage);
     checkVisibility(o.visibility);
   }
   buildCounterGoogleApiService--;
 }
 
-buildUnnamed2913() {
+buildUnnamed2412() {
   var o = new core.List<api.HttpRule>();
   o.add(buildHttpRule());
   o.add(buildHttpRule());
   return o;
 }
 
-checkUnnamed2913(core.List<api.HttpRule> o) {
+checkUnnamed2412(core.List<api.HttpRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpRule(o[0]);
   checkHttpRule(o[1]);
@@ -1220,7 +1220,7 @@
   buildCounterHttp++;
   if (buildCounterHttp < 3) {
     o.fullyDecodeReservedExpansion = true;
-    o.rules = buildUnnamed2913();
+    o.rules = buildUnnamed2412();
   }
   buildCounterHttp--;
   return o;
@@ -1230,32 +1230,32 @@
   buildCounterHttp++;
   if (buildCounterHttp < 3) {
     unittest.expect(o.fullyDecodeReservedExpansion, unittest.isTrue);
-    checkUnnamed2913(o.rules);
+    checkUnnamed2412(o.rules);
   }
   buildCounterHttp--;
 }
 
-buildUnnamed2914() {
+buildUnnamed2413() {
   var o = new core.List<api.HttpRule>();
   o.add(buildHttpRule());
   o.add(buildHttpRule());
   return o;
 }
 
-checkUnnamed2914(core.List<api.HttpRule> o) {
+checkUnnamed2413(core.List<api.HttpRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpRule(o[0]);
   checkHttpRule(o[1]);
 }
 
-buildUnnamed2915() {
+buildUnnamed2414() {
   var o = new core.List<api.AuthorizationRule>();
   o.add(buildAuthorizationRule());
   o.add(buildAuthorizationRule());
   return o;
 }
 
-checkUnnamed2915(core.List<api.AuthorizationRule> o) {
+checkUnnamed2414(core.List<api.AuthorizationRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthorizationRule(o[0]);
   checkAuthorizationRule(o[1]);
@@ -1266,8 +1266,8 @@
   var o = new api.HttpRule();
   buildCounterHttpRule++;
   if (buildCounterHttpRule < 3) {
-    o.additionalBindings = buildUnnamed2914();
-    o.authorizations = buildUnnamed2915();
+    o.additionalBindings = buildUnnamed2413();
+    o.authorizations = buildUnnamed2414();
     o.body = "foo";
     o.custom = buildCustomHttpPattern();
     o.delete = "foo";
@@ -1288,8 +1288,8 @@
 checkHttpRule(api.HttpRule o) {
   buildCounterHttpRule++;
   if (buildCounterHttpRule < 3) {
-    checkUnnamed2914(o.additionalBindings);
-    checkUnnamed2915(o.authorizations);
+    checkUnnamed2413(o.additionalBindings);
+    checkUnnamed2414(o.authorizations);
     unittest.expect(o.body, unittest.equals('foo'));
     checkCustomHttpPattern(o.custom);
     unittest.expect(o.delete, unittest.equals('foo'));
@@ -1329,14 +1329,14 @@
   buildCounterLabelDescriptor--;
 }
 
-buildUnnamed2916() {
+buildUnnamed2415() {
   var o = new core.List<api.ServiceState>();
   o.add(buildServiceState());
   o.add(buildServiceState());
   return o;
 }
 
-checkUnnamed2916(core.List<api.ServiceState> o) {
+checkUnnamed2415(core.List<api.ServiceState> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServiceState(o[0]);
   checkServiceState(o[1]);
@@ -1348,7 +1348,7 @@
   buildCounterListEnabledServicesResponse++;
   if (buildCounterListEnabledServicesResponse < 3) {
     o.nextPageToken = "foo";
-    o.services = buildUnnamed2916();
+    o.services = buildUnnamed2415();
   }
   buildCounterListEnabledServicesResponse--;
   return o;
@@ -1358,19 +1358,19 @@
   buildCounterListEnabledServicesResponse++;
   if (buildCounterListEnabledServicesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2916(o.services);
+    checkUnnamed2415(o.services);
   }
   buildCounterListEnabledServicesResponse--;
 }
 
-buildUnnamed2917() {
+buildUnnamed2416() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed2917(core.List<api.Operation> o) {
+checkUnnamed2416(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -1382,7 +1382,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed2917();
+    o.operations = buildUnnamed2416();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -1392,19 +1392,19 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2917(o.operations);
+    checkUnnamed2416(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed2918() {
+buildUnnamed2417() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed2918(core.List<api.LabelDescriptor> o) {
+checkUnnamed2417(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -1417,7 +1417,7 @@
   if (buildCounterLogDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed2918();
+    o.labels = buildUnnamed2417();
     o.name = "foo";
   }
   buildCounterLogDescriptor--;
@@ -1429,33 +1429,33 @@
   if (buildCounterLogDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed2918(o.labels);
+    checkUnnamed2417(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLogDescriptor--;
 }
 
-buildUnnamed2919() {
+buildUnnamed2418() {
   var o = new core.List<api.LoggingDestination>();
   o.add(buildLoggingDestination());
   o.add(buildLoggingDestination());
   return o;
 }
 
-checkUnnamed2919(core.List<api.LoggingDestination> o) {
+checkUnnamed2418(core.List<api.LoggingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLoggingDestination(o[0]);
   checkLoggingDestination(o[1]);
 }
 
-buildUnnamed2920() {
+buildUnnamed2419() {
   var o = new core.List<api.LoggingDestination>();
   o.add(buildLoggingDestination());
   o.add(buildLoggingDestination());
   return o;
 }
 
-checkUnnamed2920(core.List<api.LoggingDestination> o) {
+checkUnnamed2419(core.List<api.LoggingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLoggingDestination(o[0]);
   checkLoggingDestination(o[1]);
@@ -1466,8 +1466,8 @@
   var o = new api.Logging();
   buildCounterLogging++;
   if (buildCounterLogging < 3) {
-    o.consumerDestinations = buildUnnamed2919();
-    o.producerDestinations = buildUnnamed2920();
+    o.consumerDestinations = buildUnnamed2418();
+    o.producerDestinations = buildUnnamed2419();
   }
   buildCounterLogging--;
   return o;
@@ -1476,20 +1476,20 @@
 checkLogging(api.Logging o) {
   buildCounterLogging++;
   if (buildCounterLogging < 3) {
-    checkUnnamed2919(o.consumerDestinations);
-    checkUnnamed2920(o.producerDestinations);
+    checkUnnamed2418(o.consumerDestinations);
+    checkUnnamed2419(o.producerDestinations);
   }
   buildCounterLogging--;
 }
 
-buildUnnamed2921() {
+buildUnnamed2420() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2921(core.List<core.String> o) {
+checkUnnamed2420(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1500,7 +1500,7 @@
   var o = new api.LoggingDestination();
   buildCounterLoggingDestination++;
   if (buildCounterLoggingDestination < 3) {
-    o.logs = buildUnnamed2921();
+    o.logs = buildUnnamed2420();
     o.monitoredResource = "foo";
   }
   buildCounterLoggingDestination--;
@@ -1510,7 +1510,7 @@
 checkLoggingDestination(api.LoggingDestination o) {
   buildCounterLoggingDestination++;
   if (buildCounterLoggingDestination < 3) {
-    checkUnnamed2921(o.logs);
+    checkUnnamed2420(o.logs);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterLoggingDestination--;
@@ -1545,14 +1545,14 @@
   buildCounterMediaDownload--;
 }
 
-buildUnnamed2922() {
+buildUnnamed2421() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2922(core.List<core.String> o) {
+checkUnnamed2421(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1567,7 +1567,7 @@
     o.dropzone = "foo";
     o.enabled = true;
     o.maxSize = "foo";
-    o.mimeTypes = buildUnnamed2922();
+    o.mimeTypes = buildUnnamed2421();
     o.progressNotification = true;
     o.startNotification = true;
     o.uploadService = "foo";
@@ -1583,7 +1583,7 @@
     unittest.expect(o.dropzone, unittest.equals('foo'));
     unittest.expect(o.enabled, unittest.isTrue);
     unittest.expect(o.maxSize, unittest.equals('foo'));
-    checkUnnamed2922(o.mimeTypes);
+    checkUnnamed2421(o.mimeTypes);
     unittest.expect(o.progressNotification, unittest.isTrue);
     unittest.expect(o.startNotification, unittest.isTrue);
     unittest.expect(o.uploadService, unittest.equals('foo'));
@@ -1591,14 +1591,14 @@
   buildCounterMediaUpload--;
 }
 
-buildUnnamed2923() {
+buildUnnamed2422() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed2923(core.List<api.Option> o) {
+checkUnnamed2422(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -1610,7 +1610,7 @@
   buildCounterMethod++;
   if (buildCounterMethod < 3) {
     o.name = "foo";
-    o.options = buildUnnamed2923();
+    o.options = buildUnnamed2422();
     o.requestStreaming = true;
     o.requestTypeUrl = "foo";
     o.responseStreaming = true;
@@ -1625,7 +1625,7 @@
   buildCounterMethod++;
   if (buildCounterMethod < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2923(o.options);
+    checkUnnamed2422(o.options);
     unittest.expect(o.requestStreaming, unittest.isTrue);
     unittest.expect(o.requestTypeUrl, unittest.equals('foo'));
     unittest.expect(o.responseStreaming, unittest.isTrue);
@@ -1635,14 +1635,14 @@
   buildCounterMethod--;
 }
 
-buildUnnamed2924() {
+buildUnnamed2423() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed2924(core.List<api.LabelDescriptor> o) {
+checkUnnamed2423(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -1655,7 +1655,7 @@
   if (buildCounterMetricDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed2924();
+    o.labels = buildUnnamed2423();
     o.metricKind = "foo";
     o.name = "foo";
     o.type = "foo";
@@ -1671,7 +1671,7 @@
   if (buildCounterMetricDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed2924(o.labels);
+    checkUnnamed2423(o.labels);
     unittest.expect(o.metricKind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -1681,14 +1681,14 @@
   buildCounterMetricDescriptor--;
 }
 
-buildUnnamed2925() {
+buildUnnamed2424() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2925(core.Map<core.String, core.String> o) {
+checkUnnamed2424(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1699,7 +1699,7 @@
   var o = new api.MetricRule();
   buildCounterMetricRule++;
   if (buildCounterMetricRule < 3) {
-    o.metricCosts = buildUnnamed2925();
+    o.metricCosts = buildUnnamed2424();
     o.selector = "foo";
   }
   buildCounterMetricRule--;
@@ -1709,7 +1709,7 @@
 checkMetricRule(api.MetricRule o) {
   buildCounterMetricRule++;
   if (buildCounterMetricRule < 3) {
-    checkUnnamed2925(o.metricCosts);
+    checkUnnamed2424(o.metricCosts);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterMetricRule--;
@@ -1736,14 +1736,14 @@
   buildCounterMixin--;
 }
 
-buildUnnamed2926() {
+buildUnnamed2425() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed2926(core.List<api.LabelDescriptor> o) {
+checkUnnamed2425(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -1756,7 +1756,7 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed2926();
+    o.labels = buildUnnamed2425();
     o.name = "foo";
     o.type = "foo";
   }
@@ -1769,34 +1769,34 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed2926(o.labels);
+    checkUnnamed2425(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMonitoredResourceDescriptor--;
 }
 
-buildUnnamed2927() {
+buildUnnamed2426() {
   var o = new core.List<api.MonitoringDestination>();
   o.add(buildMonitoringDestination());
   o.add(buildMonitoringDestination());
   return o;
 }
 
-checkUnnamed2927(core.List<api.MonitoringDestination> o) {
+checkUnnamed2426(core.List<api.MonitoringDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoringDestination(o[0]);
   checkMonitoringDestination(o[1]);
 }
 
-buildUnnamed2928() {
+buildUnnamed2427() {
   var o = new core.List<api.MonitoringDestination>();
   o.add(buildMonitoringDestination());
   o.add(buildMonitoringDestination());
   return o;
 }
 
-checkUnnamed2928(core.List<api.MonitoringDestination> o) {
+checkUnnamed2427(core.List<api.MonitoringDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoringDestination(o[0]);
   checkMonitoringDestination(o[1]);
@@ -1807,8 +1807,8 @@
   var o = new api.Monitoring();
   buildCounterMonitoring++;
   if (buildCounterMonitoring < 3) {
-    o.consumerDestinations = buildUnnamed2927();
-    o.producerDestinations = buildUnnamed2928();
+    o.consumerDestinations = buildUnnamed2426();
+    o.producerDestinations = buildUnnamed2427();
   }
   buildCounterMonitoring--;
   return o;
@@ -1817,20 +1817,20 @@
 checkMonitoring(api.Monitoring o) {
   buildCounterMonitoring++;
   if (buildCounterMonitoring < 3) {
-    checkUnnamed2927(o.consumerDestinations);
-    checkUnnamed2928(o.producerDestinations);
+    checkUnnamed2426(o.consumerDestinations);
+    checkUnnamed2427(o.producerDestinations);
   }
   buildCounterMonitoring--;
 }
 
-buildUnnamed2929() {
+buildUnnamed2428() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2929(core.List<core.String> o) {
+checkUnnamed2428(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1841,7 +1841,7 @@
   var o = new api.MonitoringDestination();
   buildCounterMonitoringDestination++;
   if (buildCounterMonitoringDestination < 3) {
-    o.metrics = buildUnnamed2929();
+    o.metrics = buildUnnamed2428();
     o.monitoredResource = "foo";
   }
   buildCounterMonitoringDestination--;
@@ -1851,7 +1851,7 @@
 checkMonitoringDestination(api.MonitoringDestination o) {
   buildCounterMonitoringDestination++;
   if (buildCounterMonitoringDestination < 3) {
-    checkUnnamed2929(o.metrics);
+    checkUnnamed2428(o.metrics);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterMonitoringDestination--;
@@ -1876,7 +1876,7 @@
   buildCounterOAuthRequirements--;
 }
 
-buildUnnamed2930() {
+buildUnnamed2429() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1891,7 +1891,7 @@
   return o;
 }
 
-checkUnnamed2930(core.Map<core.String, core.Object> o) {
+checkUnnamed2429(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1905,7 +1905,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2931() {
+buildUnnamed2430() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1920,7 +1920,7 @@
   return o;
 }
 
-checkUnnamed2931(core.Map<core.String, core.Object> o) {
+checkUnnamed2430(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -1941,9 +1941,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed2930();
+    o.metadata = buildUnnamed2429();
     o.name = "foo";
-    o.response = buildUnnamed2931();
+    o.response = buildUnnamed2430();
   }
   buildCounterOperation--;
   return o;
@@ -1954,34 +1954,34 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed2930(o.metadata);
+    checkUnnamed2429(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2931(o.response);
+    checkUnnamed2430(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed2932() {
+buildUnnamed2431() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2932(core.List<core.String> o) {
+checkUnnamed2431(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2933() {
+buildUnnamed2432() {
   var o = new core.List<api.Step>();
   o.add(buildStep());
   o.add(buildStep());
   return o;
 }
 
-checkUnnamed2933(core.List<api.Step> o) {
+checkUnnamed2432(core.List<api.Step> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStep(o[0]);
   checkStep(o[1]);
@@ -1993,9 +1993,9 @@
   buildCounterOperationMetadata++;
   if (buildCounterOperationMetadata < 3) {
     o.progressPercentage = 42;
-    o.resourceNames = buildUnnamed2932();
+    o.resourceNames = buildUnnamed2431();
     o.startTime = "foo";
-    o.steps = buildUnnamed2933();
+    o.steps = buildUnnamed2432();
   }
   buildCounterOperationMetadata--;
   return o;
@@ -2005,14 +2005,14 @@
   buildCounterOperationMetadata++;
   if (buildCounterOperationMetadata < 3) {
     unittest.expect(o.progressPercentage, unittest.equals(42));
-    checkUnnamed2932(o.resourceNames);
+    checkUnnamed2431(o.resourceNames);
     unittest.expect(o.startTime, unittest.equals('foo'));
-    checkUnnamed2933(o.steps);
+    checkUnnamed2432(o.steps);
   }
   buildCounterOperationMetadata--;
 }
 
-buildUnnamed2934() {
+buildUnnamed2433() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2027,7 +2027,7 @@
   return o;
 }
 
-checkUnnamed2934(core.Map<core.String, core.Object> o) {
+checkUnnamed2433(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -2047,7 +2047,7 @@
   buildCounterOption++;
   if (buildCounterOption < 3) {
     o.name = "foo";
-    o.value = buildUnnamed2934();
+    o.value = buildUnnamed2433();
   }
   buildCounterOption--;
   return o;
@@ -2057,19 +2057,19 @@
   buildCounterOption++;
   if (buildCounterOption < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2934(o.value);
+    checkUnnamed2433(o.value);
   }
   buildCounterOption--;
 }
 
-buildUnnamed2935() {
+buildUnnamed2434() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed2935(core.List<api.Page> o) {
+checkUnnamed2434(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
@@ -2082,7 +2082,7 @@
   if (buildCounterPage < 3) {
     o.content = "foo";
     o.name = "foo";
-    o.subpages = buildUnnamed2935();
+    o.subpages = buildUnnamed2434();
   }
   buildCounterPage--;
   return o;
@@ -2093,7 +2093,7 @@
   if (buildCounterPage < 3) {
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2935(o.subpages);
+    checkUnnamed2434(o.subpages);
   }
   buildCounterPage--;
 }
@@ -2119,27 +2119,27 @@
   buildCounterPublishedService--;
 }
 
-buildUnnamed2936() {
+buildUnnamed2435() {
   var o = new core.List<api.QuotaLimit>();
   o.add(buildQuotaLimit());
   o.add(buildQuotaLimit());
   return o;
 }
 
-checkUnnamed2936(core.List<api.QuotaLimit> o) {
+checkUnnamed2435(core.List<api.QuotaLimit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuotaLimit(o[0]);
   checkQuotaLimit(o[1]);
 }
 
-buildUnnamed2937() {
+buildUnnamed2436() {
   var o = new core.List<api.MetricRule>();
   o.add(buildMetricRule());
   o.add(buildMetricRule());
   return o;
 }
 
-checkUnnamed2937(core.List<api.MetricRule> o) {
+checkUnnamed2436(core.List<api.MetricRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricRule(o[0]);
   checkMetricRule(o[1]);
@@ -2150,8 +2150,8 @@
   var o = new api.Quota();
   buildCounterQuota++;
   if (buildCounterQuota < 3) {
-    o.limits = buildUnnamed2936();
-    o.metricRules = buildUnnamed2937();
+    o.limits = buildUnnamed2435();
+    o.metricRules = buildUnnamed2436();
   }
   buildCounterQuota--;
   return o;
@@ -2160,20 +2160,20 @@
 checkQuota(api.Quota o) {
   buildCounterQuota++;
   if (buildCounterQuota < 3) {
-    checkUnnamed2936(o.limits);
-    checkUnnamed2937(o.metricRules);
+    checkUnnamed2435(o.limits);
+    checkUnnamed2436(o.metricRules);
   }
   buildCounterQuota--;
 }
 
-buildUnnamed2938() {
+buildUnnamed2437() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed2938(core.Map<core.String, core.String> o) {
+checkUnnamed2437(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -2193,7 +2193,7 @@
     o.metric = "foo";
     o.name = "foo";
     o.unit = "foo";
-    o.values = buildUnnamed2938();
+    o.values = buildUnnamed2437();
   }
   buildCounterQuotaLimit--;
   return o;
@@ -2211,19 +2211,19 @@
     unittest.expect(o.metric, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.unit, unittest.equals('foo'));
-    checkUnnamed2938(o.values);
+    checkUnnamed2437(o.values);
   }
   buildCounterQuotaLimit--;
 }
 
-buildUnnamed2939() {
+buildUnnamed2438() {
   var o = new core.List<api.PublishedService>();
   o.add(buildPublishedService());
   o.add(buildPublishedService());
   return o;
 }
 
-checkUnnamed2939(core.List<api.PublishedService> o) {
+checkUnnamed2438(core.List<api.PublishedService> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPublishedService(o[0]);
   checkPublishedService(o[1]);
@@ -2235,7 +2235,7 @@
   buildCounterSearchServicesResponse++;
   if (buildCounterSearchServicesResponse < 3) {
     o.nextPageToken = "foo";
-    o.services = buildUnnamed2939();
+    o.services = buildUnnamed2438();
   }
   buildCounterSearchServicesResponse--;
   return o;
@@ -2245,7 +2245,7 @@
   buildCounterSearchServicesResponse++;
   if (buildCounterSearchServicesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2939(o.services);
+    checkUnnamed2438(o.services);
   }
   buildCounterSearchServicesResponse--;
 }
@@ -2292,7 +2292,7 @@
   buildCounterSourceContext--;
 }
 
-buildUnnamed2940() {
+buildUnnamed2439() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2307,7 +2307,7 @@
   return o;
 }
 
-checkUnnamed2940(core.Map<core.String, core.Object> o) {
+checkUnnamed2439(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -2321,17 +2321,17 @@
   unittest.expect(casted8["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2941() {
+buildUnnamed2440() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2940());
-  o.add(buildUnnamed2940());
+  o.add(buildUnnamed2439());
+  o.add(buildUnnamed2439());
   return o;
 }
 
-checkUnnamed2941(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed2440(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2940(o[0]);
-  checkUnnamed2940(o[1]);
+  checkUnnamed2439(o[0]);
+  checkUnnamed2439(o[1]);
 }
 
 core.int buildCounterSourceInfo = 0;
@@ -2339,7 +2339,7 @@
   var o = new api.SourceInfo();
   buildCounterSourceInfo++;
   if (buildCounterSourceInfo < 3) {
-    o.sourceFiles = buildUnnamed2941();
+    o.sourceFiles = buildUnnamed2440();
   }
   buildCounterSourceInfo--;
   return o;
@@ -2348,12 +2348,12 @@
 checkSourceInfo(api.SourceInfo o) {
   buildCounterSourceInfo++;
   if (buildCounterSourceInfo < 3) {
-    checkUnnamed2941(o.sourceFiles);
+    checkUnnamed2440(o.sourceFiles);
   }
   buildCounterSourceInfo--;
 }
 
-buildUnnamed2942() {
+buildUnnamed2441() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2368,7 +2368,7 @@
   return o;
 }
 
-checkUnnamed2942(core.Map<core.String, core.Object> o) {
+checkUnnamed2441(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted9 = (o["x"]) as core.Map;
   unittest.expect(casted9, unittest.hasLength(3));
@@ -2382,17 +2382,17 @@
   unittest.expect(casted10["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2943() {
+buildUnnamed2442() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2942());
-  o.add(buildUnnamed2942());
+  o.add(buildUnnamed2441());
+  o.add(buildUnnamed2441());
   return o;
 }
 
-checkUnnamed2943(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed2442(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2942(o[0]);
-  checkUnnamed2942(o[1]);
+  checkUnnamed2441(o[0]);
+  checkUnnamed2441(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -2401,7 +2401,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed2943();
+    o.details = buildUnnamed2442();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -2412,7 +2412,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed2943(o.details);
+    checkUnnamed2442(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -2462,14 +2462,14 @@
   buildCounterSystemParameter--;
 }
 
-buildUnnamed2944() {
+buildUnnamed2443() {
   var o = new core.List<api.SystemParameter>();
   o.add(buildSystemParameter());
   o.add(buildSystemParameter());
   return o;
 }
 
-checkUnnamed2944(core.List<api.SystemParameter> o) {
+checkUnnamed2443(core.List<api.SystemParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSystemParameter(o[0]);
   checkSystemParameter(o[1]);
@@ -2480,7 +2480,7 @@
   var o = new api.SystemParameterRule();
   buildCounterSystemParameterRule++;
   if (buildCounterSystemParameterRule < 3) {
-    o.parameters = buildUnnamed2944();
+    o.parameters = buildUnnamed2443();
     o.selector = "foo";
   }
   buildCounterSystemParameterRule--;
@@ -2490,20 +2490,20 @@
 checkSystemParameterRule(api.SystemParameterRule o) {
   buildCounterSystemParameterRule++;
   if (buildCounterSystemParameterRule < 3) {
-    checkUnnamed2944(o.parameters);
+    checkUnnamed2443(o.parameters);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterSystemParameterRule--;
 }
 
-buildUnnamed2945() {
+buildUnnamed2444() {
   var o = new core.List<api.SystemParameterRule>();
   o.add(buildSystemParameterRule());
   o.add(buildSystemParameterRule());
   return o;
 }
 
-checkUnnamed2945(core.List<api.SystemParameterRule> o) {
+checkUnnamed2444(core.List<api.SystemParameterRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSystemParameterRule(o[0]);
   checkSystemParameterRule(o[1]);
@@ -2514,7 +2514,7 @@
   var o = new api.SystemParameters();
   buildCounterSystemParameters++;
   if (buildCounterSystemParameters < 3) {
-    o.rules = buildUnnamed2945();
+    o.rules = buildUnnamed2444();
   }
   buildCounterSystemParameters--;
   return o;
@@ -2523,45 +2523,45 @@
 checkSystemParameters(api.SystemParameters o) {
   buildCounterSystemParameters++;
   if (buildCounterSystemParameters < 3) {
-    checkUnnamed2945(o.rules);
+    checkUnnamed2444(o.rules);
   }
   buildCounterSystemParameters--;
 }
 
-buildUnnamed2946() {
+buildUnnamed2445() {
   var o = new core.List<api.Field>();
   o.add(buildField());
   o.add(buildField());
   return o;
 }
 
-checkUnnamed2946(core.List<api.Field> o) {
+checkUnnamed2445(core.List<api.Field> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkField(o[0]);
   checkField(o[1]);
 }
 
-buildUnnamed2947() {
+buildUnnamed2446() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2947(core.List<core.String> o) {
+checkUnnamed2446(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2948() {
+buildUnnamed2447() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed2948(core.List<api.Option> o) {
+checkUnnamed2447(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -2572,10 +2572,10 @@
   var o = new api.Type();
   buildCounterType++;
   if (buildCounterType < 3) {
-    o.fields = buildUnnamed2946();
+    o.fields = buildUnnamed2445();
     o.name = "foo";
-    o.oneofs = buildUnnamed2947();
-    o.options = buildUnnamed2948();
+    o.oneofs = buildUnnamed2446();
+    o.options = buildUnnamed2447();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
   }
@@ -2586,37 +2586,37 @@
 checkType(api.Type o) {
   buildCounterType++;
   if (buildCounterType < 3) {
-    checkUnnamed2946(o.fields);
+    checkUnnamed2445(o.fields);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2947(o.oneofs);
-    checkUnnamed2948(o.options);
+    checkUnnamed2446(o.oneofs);
+    checkUnnamed2447(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
   }
   buildCounterType--;
 }
 
-buildUnnamed2949() {
+buildUnnamed2448() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2949(core.List<core.String> o) {
+checkUnnamed2448(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2950() {
+buildUnnamed2449() {
   var o = new core.List<api.UsageRule>();
   o.add(buildUsageRule());
   o.add(buildUsageRule());
   return o;
 }
 
-checkUnnamed2950(core.List<api.UsageRule> o) {
+checkUnnamed2449(core.List<api.UsageRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageRule(o[0]);
   checkUsageRule(o[1]);
@@ -2628,8 +2628,8 @@
   buildCounterUsage++;
   if (buildCounterUsage < 3) {
     o.producerNotificationChannel = "foo";
-    o.requirements = buildUnnamed2949();
-    o.rules = buildUnnamed2950();
+    o.requirements = buildUnnamed2448();
+    o.rules = buildUnnamed2449();
   }
   buildCounterUsage--;
   return o;
@@ -2639,8 +2639,8 @@
   buildCounterUsage++;
   if (buildCounterUsage < 3) {
     unittest.expect(o.producerNotificationChannel, unittest.equals('foo'));
-    checkUnnamed2949(o.requirements);
-    checkUnnamed2950(o.rules);
+    checkUnnamed2448(o.requirements);
+    checkUnnamed2449(o.rules);
   }
   buildCounterUsage--;
 }
@@ -2668,14 +2668,14 @@
   buildCounterUsageRule--;
 }
 
-buildUnnamed2951() {
+buildUnnamed2450() {
   var o = new core.List<api.VisibilityRule>();
   o.add(buildVisibilityRule());
   o.add(buildVisibilityRule());
   return o;
 }
 
-checkUnnamed2951(core.List<api.VisibilityRule> o) {
+checkUnnamed2450(core.List<api.VisibilityRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVisibilityRule(o[0]);
   checkVisibilityRule(o[1]);
@@ -2686,7 +2686,7 @@
   var o = new api.Visibility();
   buildCounterVisibility++;
   if (buildCounterVisibility < 3) {
-    o.rules = buildUnnamed2951();
+    o.rules = buildUnnamed2450();
   }
   buildCounterVisibility--;
   return o;
@@ -2695,7 +2695,7 @@
 checkVisibility(api.Visibility o) {
   buildCounterVisibility++;
   if (buildCounterVisibility < 3) {
-    checkUnnamed2951(o.rules);
+    checkUnnamed2450(o.rules);
   }
   buildCounterVisibility--;
 }
@@ -3333,7 +3333,7 @@
       }), true);
       res
           .cancel(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3384,7 +3384,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3435,7 +3435,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3499,7 +3499,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -3556,7 +3556,7 @@
       }), true);
       res
           .disable(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3611,7 +3611,7 @@
       }), true);
       res
           .enable(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3662,7 +3662,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ServiceState response) {
+          .then(unittest.expectAsync1(((response) {
         checkServiceState(response);
       })));
     });
@@ -3722,8 +3722,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListEnabledServicesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListEnabledServicesResponse(response);
       })));
     });
@@ -3781,7 +3780,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SearchServicesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSearchServicesResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/serviceuser/v1_test.dart b/generated/googleapis/test/serviceuser/v1_test.dart
index 02df96e..a42da16 100644
--- a/generated/googleapis/test/serviceuser/v1_test.dart
+++ b/generated/googleapis/test/serviceuser/v1_test.dart
@@ -50,40 +50,40 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3162() {
+buildUnnamed14() {
   var o = new core.List<api.Method>();
   o.add(buildMethod());
   o.add(buildMethod());
   return o;
 }
 
-checkUnnamed3162(core.List<api.Method> o) {
+checkUnnamed14(core.List<api.Method> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMethod(o[0]);
   checkMethod(o[1]);
 }
 
-buildUnnamed3163() {
+buildUnnamed15() {
   var o = new core.List<api.Mixin>();
   o.add(buildMixin());
   o.add(buildMixin());
   return o;
 }
 
-checkUnnamed3163(core.List<api.Mixin> o) {
+checkUnnamed15(core.List<api.Mixin> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMixin(o[0]);
   checkMixin(o[1]);
 }
 
-buildUnnamed3164() {
+buildUnnamed16() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3164(core.List<api.Option> o) {
+checkUnnamed16(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -94,10 +94,10 @@
   var o = new api.Api();
   buildCounterApi++;
   if (buildCounterApi < 3) {
-    o.methods = buildUnnamed3162();
-    o.mixins = buildUnnamed3163();
+    o.methods = buildUnnamed14();
+    o.mixins = buildUnnamed15();
     o.name = "foo";
-    o.options = buildUnnamed3164();
+    o.options = buildUnnamed16();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
     o.version = "foo";
@@ -109,10 +109,10 @@
 checkApi(api.Api o) {
   buildCounterApi++;
   if (buildCounterApi < 3) {
-    checkUnnamed3162(o.methods);
-    checkUnnamed3163(o.mixins);
+    checkUnnamed14(o.methods);
+    checkUnnamed15(o.mixins);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3164(o.options);
+    checkUnnamed16(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals('foo'));
@@ -168,27 +168,27 @@
   buildCounterAuthRequirement--;
 }
 
-buildUnnamed3165() {
+buildUnnamed17() {
   var o = new core.List<api.AuthProvider>();
   o.add(buildAuthProvider());
   o.add(buildAuthProvider());
   return o;
 }
 
-checkUnnamed3165(core.List<api.AuthProvider> o) {
+checkUnnamed17(core.List<api.AuthProvider> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthProvider(o[0]);
   checkAuthProvider(o[1]);
 }
 
-buildUnnamed3166() {
+buildUnnamed18() {
   var o = new core.List<api.AuthenticationRule>();
   o.add(buildAuthenticationRule());
   o.add(buildAuthenticationRule());
   return o;
 }
 
-checkUnnamed3166(core.List<api.AuthenticationRule> o) {
+checkUnnamed18(core.List<api.AuthenticationRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthenticationRule(o[0]);
   checkAuthenticationRule(o[1]);
@@ -199,8 +199,8 @@
   var o = new api.Authentication();
   buildCounterAuthentication++;
   if (buildCounterAuthentication < 3) {
-    o.providers = buildUnnamed3165();
-    o.rules = buildUnnamed3166();
+    o.providers = buildUnnamed17();
+    o.rules = buildUnnamed18();
   }
   buildCounterAuthentication--;
   return o;
@@ -209,20 +209,20 @@
 checkAuthentication(api.Authentication o) {
   buildCounterAuthentication++;
   if (buildCounterAuthentication < 3) {
-    checkUnnamed3165(o.providers);
-    checkUnnamed3166(o.rules);
+    checkUnnamed17(o.providers);
+    checkUnnamed18(o.rules);
   }
   buildCounterAuthentication--;
 }
 
-buildUnnamed3167() {
+buildUnnamed19() {
   var o = new core.List<api.AuthRequirement>();
   o.add(buildAuthRequirement());
   o.add(buildAuthRequirement());
   return o;
 }
 
-checkUnnamed3167(core.List<api.AuthRequirement> o) {
+checkUnnamed19(core.List<api.AuthRequirement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthRequirement(o[0]);
   checkAuthRequirement(o[1]);
@@ -236,7 +236,7 @@
     o.allowWithoutCredential = true;
     o.customAuth = buildCustomAuthRequirements();
     o.oauth = buildOAuthRequirements();
-    o.requirements = buildUnnamed3167();
+    o.requirements = buildUnnamed19();
     o.selector = "foo";
   }
   buildCounterAuthenticationRule--;
@@ -249,7 +249,7 @@
     unittest.expect(o.allowWithoutCredential, unittest.isTrue);
     checkCustomAuthRequirements(o.customAuth);
     checkOAuthRequirements(o.oauth);
-    checkUnnamed3167(o.requirements);
+    checkUnnamed19(o.requirements);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterAuthenticationRule--;
@@ -274,14 +274,14 @@
   buildCounterAuthorizationConfig--;
 }
 
-buildUnnamed3168() {
+buildUnnamed20() {
   var o = new core.List<api.BackendRule>();
   o.add(buildBackendRule());
   o.add(buildBackendRule());
   return o;
 }
 
-checkUnnamed3168(core.List<api.BackendRule> o) {
+checkUnnamed20(core.List<api.BackendRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackendRule(o[0]);
   checkBackendRule(o[1]);
@@ -292,7 +292,7 @@
   var o = new api.Backend();
   buildCounterBackend++;
   if (buildCounterBackend < 3) {
-    o.rules = buildUnnamed3168();
+    o.rules = buildUnnamed20();
   }
   buildCounterBackend--;
   return o;
@@ -301,7 +301,7 @@
 checkBackend(api.Backend o) {
   buildCounterBackend++;
   if (buildCounterBackend < 3) {
-    checkUnnamed3168(o.rules);
+    checkUnnamed20(o.rules);
   }
   buildCounterBackend--;
 }
@@ -331,14 +331,14 @@
   buildCounterBackendRule--;
 }
 
-buildUnnamed3169() {
+buildUnnamed21() {
   var o = new core.List<api.BillingDestination>();
   o.add(buildBillingDestination());
   o.add(buildBillingDestination());
   return o;
 }
 
-checkUnnamed3169(core.List<api.BillingDestination> o) {
+checkUnnamed21(core.List<api.BillingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBillingDestination(o[0]);
   checkBillingDestination(o[1]);
@@ -349,7 +349,7 @@
   var o = new api.Billing();
   buildCounterBilling++;
   if (buildCounterBilling < 3) {
-    o.consumerDestinations = buildUnnamed3169();
+    o.consumerDestinations = buildUnnamed21();
   }
   buildCounterBilling--;
   return o;
@@ -358,19 +358,19 @@
 checkBilling(api.Billing o) {
   buildCounterBilling++;
   if (buildCounterBilling < 3) {
-    checkUnnamed3169(o.consumerDestinations);
+    checkUnnamed21(o.consumerDestinations);
   }
   buildCounterBilling--;
 }
 
-buildUnnamed3170() {
+buildUnnamed22() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3170(core.List<core.String> o) {
+checkUnnamed22(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -381,7 +381,7 @@
   var o = new api.BillingDestination();
   buildCounterBillingDestination++;
   if (buildCounterBillingDestination < 3) {
-    o.metrics = buildUnnamed3170();
+    o.metrics = buildUnnamed22();
     o.monitoredResource = "foo";
   }
   buildCounterBillingDestination--;
@@ -391,20 +391,20 @@
 checkBillingDestination(api.BillingDestination o) {
   buildCounterBillingDestination++;
   if (buildCounterBillingDestination < 3) {
-    checkUnnamed3170(o.metrics);
+    checkUnnamed22(o.metrics);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterBillingDestination--;
 }
 
-buildUnnamed3171() {
+buildUnnamed23() {
   var o = new core.List<api.ContextRule>();
   o.add(buildContextRule());
   o.add(buildContextRule());
   return o;
 }
 
-checkUnnamed3171(core.List<api.ContextRule> o) {
+checkUnnamed23(core.List<api.ContextRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContextRule(o[0]);
   checkContextRule(o[1]);
@@ -415,7 +415,7 @@
   var o = new api.Context();
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    o.rules = buildUnnamed3171();
+    o.rules = buildUnnamed23();
   }
   buildCounterContext--;
   return o;
@@ -424,32 +424,32 @@
 checkContext(api.Context o) {
   buildCounterContext++;
   if (buildCounterContext < 3) {
-    checkUnnamed3171(o.rules);
+    checkUnnamed23(o.rules);
   }
   buildCounterContext--;
 }
 
-buildUnnamed3172() {
+buildUnnamed24() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3172(core.List<core.String> o) {
+checkUnnamed24(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3173() {
+buildUnnamed25() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3173(core.List<core.String> o) {
+checkUnnamed25(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -460,8 +460,8 @@
   var o = new api.ContextRule();
   buildCounterContextRule++;
   if (buildCounterContextRule < 3) {
-    o.provided = buildUnnamed3172();
-    o.requested = buildUnnamed3173();
+    o.provided = buildUnnamed24();
+    o.requested = buildUnnamed25();
     o.selector = "foo";
   }
   buildCounterContextRule--;
@@ -471,8 +471,8 @@
 checkContextRule(api.ContextRule o) {
   buildCounterContextRule++;
   if (buildCounterContextRule < 3) {
-    checkUnnamed3172(o.provided);
-    checkUnnamed3173(o.requested);
+    checkUnnamed24(o.provided);
+    checkUnnamed25(o.requested);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterContextRule--;
@@ -516,27 +516,27 @@
   buildCounterCustomAuthRequirements--;
 }
 
-buildUnnamed3174() {
+buildUnnamed26() {
   var o = new core.List<api.CustomErrorRule>();
   o.add(buildCustomErrorRule());
   o.add(buildCustomErrorRule());
   return o;
 }
 
-checkUnnamed3174(core.List<api.CustomErrorRule> o) {
+checkUnnamed26(core.List<api.CustomErrorRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomErrorRule(o[0]);
   checkCustomErrorRule(o[1]);
 }
 
-buildUnnamed3175() {
+buildUnnamed27() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3175(core.List<core.String> o) {
+checkUnnamed27(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -547,8 +547,8 @@
   var o = new api.CustomError();
   buildCounterCustomError++;
   if (buildCounterCustomError < 3) {
-    o.rules = buildUnnamed3174();
-    o.types = buildUnnamed3175();
+    o.rules = buildUnnamed26();
+    o.types = buildUnnamed27();
   }
   buildCounterCustomError--;
   return o;
@@ -557,8 +557,8 @@
 checkCustomError(api.CustomError o) {
   buildCounterCustomError++;
   if (buildCounterCustomError < 3) {
-    checkUnnamed3174(o.rules);
-    checkUnnamed3175(o.types);
+    checkUnnamed26(o.rules);
+    checkUnnamed27(o.types);
   }
   buildCounterCustomError--;
 }
@@ -620,27 +620,27 @@
   buildCounterDisableServiceRequest--;
 }
 
-buildUnnamed3176() {
+buildUnnamed28() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed3176(core.List<api.Page> o) {
+checkUnnamed28(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
 }
 
-buildUnnamed3177() {
+buildUnnamed29() {
   var o = new core.List<api.DocumentationRule>();
   o.add(buildDocumentationRule());
   o.add(buildDocumentationRule());
   return o;
 }
 
-checkUnnamed3177(core.List<api.DocumentationRule> o) {
+checkUnnamed29(core.List<api.DocumentationRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDocumentationRule(o[0]);
   checkDocumentationRule(o[1]);
@@ -653,8 +653,8 @@
   if (buildCounterDocumentation < 3) {
     o.documentationRootUrl = "foo";
     o.overview = "foo";
-    o.pages = buildUnnamed3176();
-    o.rules = buildUnnamed3177();
+    o.pages = buildUnnamed28();
+    o.rules = buildUnnamed29();
     o.summary = "foo";
   }
   buildCounterDocumentation--;
@@ -666,8 +666,8 @@
   if (buildCounterDocumentation < 3) {
     unittest.expect(o.documentationRootUrl, unittest.equals('foo'));
     unittest.expect(o.overview, unittest.equals('foo'));
-    checkUnnamed3176(o.pages);
-    checkUnnamed3177(o.rules);
+    checkUnnamed28(o.pages);
+    checkUnnamed29(o.rules);
     unittest.expect(o.summary, unittest.equals('foo'));
   }
   buildCounterDocumentation--;
@@ -711,27 +711,27 @@
   buildCounterEnableServiceRequest--;
 }
 
-buildUnnamed3178() {
+buildUnnamed30() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3178(core.List<core.String> o) {
+checkUnnamed30(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3179() {
+buildUnnamed31() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3179(core.List<core.String> o) {
+checkUnnamed31(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -742,9 +742,9 @@
   var o = new api.Endpoint();
   buildCounterEndpoint++;
   if (buildCounterEndpoint < 3) {
-    o.aliases = buildUnnamed3178();
+    o.aliases = buildUnnamed30();
     o.allowCors = true;
-    o.features = buildUnnamed3179();
+    o.features = buildUnnamed31();
     o.name = "foo";
     o.target = "foo";
   }
@@ -755,36 +755,36 @@
 checkEndpoint(api.Endpoint o) {
   buildCounterEndpoint++;
   if (buildCounterEndpoint < 3) {
-    checkUnnamed3178(o.aliases);
+    checkUnnamed30(o.aliases);
     unittest.expect(o.allowCors, unittest.isTrue);
-    checkUnnamed3179(o.features);
+    checkUnnamed31(o.features);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
   }
   buildCounterEndpoint--;
 }
 
-buildUnnamed3180() {
+buildUnnamed32() {
   var o = new core.List<api.EnumValue>();
   o.add(buildEnumValue());
   o.add(buildEnumValue());
   return o;
 }
 
-checkUnnamed3180(core.List<api.EnumValue> o) {
+checkUnnamed32(core.List<api.EnumValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnumValue(o[0]);
   checkEnumValue(o[1]);
 }
 
-buildUnnamed3181() {
+buildUnnamed33() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3181(core.List<api.Option> o) {
+checkUnnamed33(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -795,9 +795,9 @@
   var o = new api.Enum();
   buildCounterEnum++;
   if (buildCounterEnum < 3) {
-    o.enumvalue = buildUnnamed3180();
+    o.enumvalue = buildUnnamed32();
     o.name = "foo";
-    o.options = buildUnnamed3181();
+    o.options = buildUnnamed33();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
   }
@@ -808,23 +808,23 @@
 checkEnum(api.Enum o) {
   buildCounterEnum++;
   if (buildCounterEnum < 3) {
-    checkUnnamed3180(o.enumvalue);
+    checkUnnamed32(o.enumvalue);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3181(o.options);
+    checkUnnamed33(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
   }
   buildCounterEnum--;
 }
 
-buildUnnamed3182() {
+buildUnnamed34() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3182(core.List<api.Option> o) {
+checkUnnamed34(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -837,7 +837,7 @@
   if (buildCounterEnumValue < 3) {
     o.name = "foo";
     o.number = 42;
-    o.options = buildUnnamed3182();
+    o.options = buildUnnamed34();
   }
   buildCounterEnumValue--;
   return o;
@@ -848,7 +848,7 @@
   if (buildCounterEnumValue < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.number, unittest.equals(42));
-    checkUnnamed3182(o.options);
+    checkUnnamed34(o.options);
   }
   buildCounterEnumValue--;
 }
@@ -872,14 +872,14 @@
   buildCounterExperimental--;
 }
 
-buildUnnamed3183() {
+buildUnnamed35() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3183(core.List<api.Option> o) {
+checkUnnamed35(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -897,7 +897,7 @@
     o.name = "foo";
     o.number = 42;
     o.oneofIndex = 42;
-    o.options = buildUnnamed3183();
+    o.options = buildUnnamed35();
     o.packed = true;
     o.typeUrl = "foo";
   }
@@ -915,21 +915,21 @@
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.number, unittest.equals(42));
     unittest.expect(o.oneofIndex, unittest.equals(42));
-    checkUnnamed3183(o.options);
+    checkUnnamed35(o.options);
     unittest.expect(o.packed, unittest.isTrue);
     unittest.expect(o.typeUrl, unittest.equals('foo'));
   }
   buildCounterField--;
 }
 
-buildUnnamed3184() {
+buildUnnamed36() {
   var o = new core.List<api.HttpRule>();
   o.add(buildHttpRule());
   o.add(buildHttpRule());
   return o;
 }
 
-checkUnnamed3184(core.List<api.HttpRule> o) {
+checkUnnamed36(core.List<api.HttpRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpRule(o[0]);
   checkHttpRule(o[1]);
@@ -941,7 +941,7 @@
   buildCounterHttp++;
   if (buildCounterHttp < 3) {
     o.fullyDecodeReservedExpansion = true;
-    o.rules = buildUnnamed3184();
+    o.rules = buildUnnamed36();
   }
   buildCounterHttp--;
   return o;
@@ -951,19 +951,19 @@
   buildCounterHttp++;
   if (buildCounterHttp < 3) {
     unittest.expect(o.fullyDecodeReservedExpansion, unittest.isTrue);
-    checkUnnamed3184(o.rules);
+    checkUnnamed36(o.rules);
   }
   buildCounterHttp--;
 }
 
-buildUnnamed3185() {
+buildUnnamed37() {
   var o = new core.List<api.HttpRule>();
   o.add(buildHttpRule());
   o.add(buildHttpRule());
   return o;
 }
 
-checkUnnamed3185(core.List<api.HttpRule> o) {
+checkUnnamed37(core.List<api.HttpRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHttpRule(o[0]);
   checkHttpRule(o[1]);
@@ -974,7 +974,7 @@
   var o = new api.HttpRule();
   buildCounterHttpRule++;
   if (buildCounterHttpRule < 3) {
-    o.additionalBindings = buildUnnamed3185();
+    o.additionalBindings = buildUnnamed37();
     o.body = "foo";
     o.custom = buildCustomHttpPattern();
     o.delete = "foo";
@@ -993,7 +993,7 @@
 checkHttpRule(api.HttpRule o) {
   buildCounterHttpRule++;
   if (buildCounterHttpRule < 3) {
-    checkUnnamed3185(o.additionalBindings);
+    checkUnnamed37(o.additionalBindings);
     unittest.expect(o.body, unittest.equals('foo'));
     checkCustomHttpPattern(o.custom);
     unittest.expect(o.delete, unittest.equals('foo'));
@@ -1031,14 +1031,14 @@
   buildCounterLabelDescriptor--;
 }
 
-buildUnnamed3186() {
+buildUnnamed38() {
   var o = new core.List<api.PublishedService>();
   o.add(buildPublishedService());
   o.add(buildPublishedService());
   return o;
 }
 
-checkUnnamed3186(core.List<api.PublishedService> o) {
+checkUnnamed38(core.List<api.PublishedService> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPublishedService(o[0]);
   checkPublishedService(o[1]);
@@ -1050,7 +1050,7 @@
   buildCounterListEnabledServicesResponse++;
   if (buildCounterListEnabledServicesResponse < 3) {
     o.nextPageToken = "foo";
-    o.services = buildUnnamed3186();
+    o.services = buildUnnamed38();
   }
   buildCounterListEnabledServicesResponse--;
   return o;
@@ -1060,19 +1060,19 @@
   buildCounterListEnabledServicesResponse++;
   if (buildCounterListEnabledServicesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3186(o.services);
+    checkUnnamed38(o.services);
   }
   buildCounterListEnabledServicesResponse--;
 }
 
-buildUnnamed3187() {
+buildUnnamed39() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed3187(core.List<api.LabelDescriptor> o) {
+checkUnnamed39(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -1085,7 +1085,7 @@
   if (buildCounterLogDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed3187();
+    o.labels = buildUnnamed39();
     o.name = "foo";
   }
   buildCounterLogDescriptor--;
@@ -1097,33 +1097,33 @@
   if (buildCounterLogDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed3187(o.labels);
+    checkUnnamed39(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLogDescriptor--;
 }
 
-buildUnnamed3188() {
+buildUnnamed40() {
   var o = new core.List<api.LoggingDestination>();
   o.add(buildLoggingDestination());
   o.add(buildLoggingDestination());
   return o;
 }
 
-checkUnnamed3188(core.List<api.LoggingDestination> o) {
+checkUnnamed40(core.List<api.LoggingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLoggingDestination(o[0]);
   checkLoggingDestination(o[1]);
 }
 
-buildUnnamed3189() {
+buildUnnamed41() {
   var o = new core.List<api.LoggingDestination>();
   o.add(buildLoggingDestination());
   o.add(buildLoggingDestination());
   return o;
 }
 
-checkUnnamed3189(core.List<api.LoggingDestination> o) {
+checkUnnamed41(core.List<api.LoggingDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLoggingDestination(o[0]);
   checkLoggingDestination(o[1]);
@@ -1134,8 +1134,8 @@
   var o = new api.Logging();
   buildCounterLogging++;
   if (buildCounterLogging < 3) {
-    o.consumerDestinations = buildUnnamed3188();
-    o.producerDestinations = buildUnnamed3189();
+    o.consumerDestinations = buildUnnamed40();
+    o.producerDestinations = buildUnnamed41();
   }
   buildCounterLogging--;
   return o;
@@ -1144,20 +1144,20 @@
 checkLogging(api.Logging o) {
   buildCounterLogging++;
   if (buildCounterLogging < 3) {
-    checkUnnamed3188(o.consumerDestinations);
-    checkUnnamed3189(o.producerDestinations);
+    checkUnnamed40(o.consumerDestinations);
+    checkUnnamed41(o.producerDestinations);
   }
   buildCounterLogging--;
 }
 
-buildUnnamed3190() {
+buildUnnamed42() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3190(core.List<core.String> o) {
+checkUnnamed42(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1168,7 +1168,7 @@
   var o = new api.LoggingDestination();
   buildCounterLoggingDestination++;
   if (buildCounterLoggingDestination < 3) {
-    o.logs = buildUnnamed3190();
+    o.logs = buildUnnamed42();
     o.monitoredResource = "foo";
   }
   buildCounterLoggingDestination--;
@@ -1178,7 +1178,7 @@
 checkLoggingDestination(api.LoggingDestination o) {
   buildCounterLoggingDestination++;
   if (buildCounterLoggingDestination < 3) {
-    checkUnnamed3190(o.logs);
+    checkUnnamed42(o.logs);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterLoggingDestination--;
@@ -1213,14 +1213,14 @@
   buildCounterMediaDownload--;
 }
 
-buildUnnamed3191() {
+buildUnnamed43() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3191(core.List<core.String> o) {
+checkUnnamed43(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1235,7 +1235,7 @@
     o.dropzone = "foo";
     o.enabled = true;
     o.maxSize = "foo";
-    o.mimeTypes = buildUnnamed3191();
+    o.mimeTypes = buildUnnamed43();
     o.progressNotification = true;
     o.startNotification = true;
     o.uploadService = "foo";
@@ -1251,7 +1251,7 @@
     unittest.expect(o.dropzone, unittest.equals('foo'));
     unittest.expect(o.enabled, unittest.isTrue);
     unittest.expect(o.maxSize, unittest.equals('foo'));
-    checkUnnamed3191(o.mimeTypes);
+    checkUnnamed43(o.mimeTypes);
     unittest.expect(o.progressNotification, unittest.isTrue);
     unittest.expect(o.startNotification, unittest.isTrue);
     unittest.expect(o.uploadService, unittest.equals('foo'));
@@ -1259,14 +1259,14 @@
   buildCounterMediaUpload--;
 }
 
-buildUnnamed3192() {
+buildUnnamed44() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3192(core.List<api.Option> o) {
+checkUnnamed44(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -1278,7 +1278,7 @@
   buildCounterMethod++;
   if (buildCounterMethod < 3) {
     o.name = "foo";
-    o.options = buildUnnamed3192();
+    o.options = buildUnnamed44();
     o.requestStreaming = true;
     o.requestTypeUrl = "foo";
     o.responseStreaming = true;
@@ -1293,7 +1293,7 @@
   buildCounterMethod++;
   if (buildCounterMethod < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3192(o.options);
+    checkUnnamed44(o.options);
     unittest.expect(o.requestStreaming, unittest.isTrue);
     unittest.expect(o.requestTypeUrl, unittest.equals('foo'));
     unittest.expect(o.responseStreaming, unittest.isTrue);
@@ -1303,14 +1303,14 @@
   buildCounterMethod--;
 }
 
-buildUnnamed3193() {
+buildUnnamed45() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed3193(core.List<api.LabelDescriptor> o) {
+checkUnnamed45(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -1323,7 +1323,7 @@
   if (buildCounterMetricDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed3193();
+    o.labels = buildUnnamed45();
     o.metricKind = "foo";
     o.name = "foo";
     o.type = "foo";
@@ -1339,7 +1339,7 @@
   if (buildCounterMetricDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed3193(o.labels);
+    checkUnnamed45(o.labels);
     unittest.expect(o.metricKind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -1349,14 +1349,14 @@
   buildCounterMetricDescriptor--;
 }
 
-buildUnnamed3194() {
+buildUnnamed46() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3194(core.Map<core.String, core.String> o) {
+checkUnnamed46(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1367,7 +1367,7 @@
   var o = new api.MetricRule();
   buildCounterMetricRule++;
   if (buildCounterMetricRule < 3) {
-    o.metricCosts = buildUnnamed3194();
+    o.metricCosts = buildUnnamed46();
     o.selector = "foo";
   }
   buildCounterMetricRule--;
@@ -1377,7 +1377,7 @@
 checkMetricRule(api.MetricRule o) {
   buildCounterMetricRule++;
   if (buildCounterMetricRule < 3) {
-    checkUnnamed3194(o.metricCosts);
+    checkUnnamed46(o.metricCosts);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterMetricRule--;
@@ -1404,14 +1404,14 @@
   buildCounterMixin--;
 }
 
-buildUnnamed3195() {
+buildUnnamed47() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed3195(core.List<api.LabelDescriptor> o) {
+checkUnnamed47(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -1424,7 +1424,7 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed3195();
+    o.labels = buildUnnamed47();
     o.name = "foo";
     o.type = "foo";
   }
@@ -1437,34 +1437,34 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed3195(o.labels);
+    checkUnnamed47(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMonitoredResourceDescriptor--;
 }
 
-buildUnnamed3196() {
+buildUnnamed48() {
   var o = new core.List<api.MonitoringDestination>();
   o.add(buildMonitoringDestination());
   o.add(buildMonitoringDestination());
   return o;
 }
 
-checkUnnamed3196(core.List<api.MonitoringDestination> o) {
+checkUnnamed48(core.List<api.MonitoringDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoringDestination(o[0]);
   checkMonitoringDestination(o[1]);
 }
 
-buildUnnamed3197() {
+buildUnnamed49() {
   var o = new core.List<api.MonitoringDestination>();
   o.add(buildMonitoringDestination());
   o.add(buildMonitoringDestination());
   return o;
 }
 
-checkUnnamed3197(core.List<api.MonitoringDestination> o) {
+checkUnnamed49(core.List<api.MonitoringDestination> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoringDestination(o[0]);
   checkMonitoringDestination(o[1]);
@@ -1475,8 +1475,8 @@
   var o = new api.Monitoring();
   buildCounterMonitoring++;
   if (buildCounterMonitoring < 3) {
-    o.consumerDestinations = buildUnnamed3196();
-    o.producerDestinations = buildUnnamed3197();
+    o.consumerDestinations = buildUnnamed48();
+    o.producerDestinations = buildUnnamed49();
   }
   buildCounterMonitoring--;
   return o;
@@ -1485,20 +1485,20 @@
 checkMonitoring(api.Monitoring o) {
   buildCounterMonitoring++;
   if (buildCounterMonitoring < 3) {
-    checkUnnamed3196(o.consumerDestinations);
-    checkUnnamed3197(o.producerDestinations);
+    checkUnnamed48(o.consumerDestinations);
+    checkUnnamed49(o.producerDestinations);
   }
   buildCounterMonitoring--;
 }
 
-buildUnnamed3198() {
+buildUnnamed50() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3198(core.List<core.String> o) {
+checkUnnamed50(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1509,7 +1509,7 @@
   var o = new api.MonitoringDestination();
   buildCounterMonitoringDestination++;
   if (buildCounterMonitoringDestination < 3) {
-    o.metrics = buildUnnamed3198();
+    o.metrics = buildUnnamed50();
     o.monitoredResource = "foo";
   }
   buildCounterMonitoringDestination--;
@@ -1519,7 +1519,7 @@
 checkMonitoringDestination(api.MonitoringDestination o) {
   buildCounterMonitoringDestination++;
   if (buildCounterMonitoringDestination < 3) {
-    checkUnnamed3198(o.metrics);
+    checkUnnamed50(o.metrics);
     unittest.expect(o.monitoredResource, unittest.equals('foo'));
   }
   buildCounterMonitoringDestination--;
@@ -1544,7 +1544,7 @@
   buildCounterOAuthRequirements--;
 }
 
-buildUnnamed3199() {
+buildUnnamed51() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1559,7 +1559,7 @@
   return o;
 }
 
-checkUnnamed3199(core.Map<core.String, core.Object> o) {
+checkUnnamed51(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1573,7 +1573,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3200() {
+buildUnnamed52() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1588,7 +1588,7 @@
   return o;
 }
 
-checkUnnamed3200(core.Map<core.String, core.Object> o) {
+checkUnnamed52(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -1609,9 +1609,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed3199();
+    o.metadata = buildUnnamed51();
     o.name = "foo";
-    o.response = buildUnnamed3200();
+    o.response = buildUnnamed52();
   }
   buildCounterOperation--;
   return o;
@@ -1622,34 +1622,34 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed3199(o.metadata);
+    checkUnnamed51(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3200(o.response);
+    checkUnnamed52(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed3201() {
+buildUnnamed53() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3201(core.List<core.String> o) {
+checkUnnamed53(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3202() {
+buildUnnamed54() {
   var o = new core.List<api.Step>();
   o.add(buildStep());
   o.add(buildStep());
   return o;
 }
 
-checkUnnamed3202(core.List<api.Step> o) {
+checkUnnamed54(core.List<api.Step> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStep(o[0]);
   checkStep(o[1]);
@@ -1661,9 +1661,9 @@
   buildCounterOperationMetadata++;
   if (buildCounterOperationMetadata < 3) {
     o.progressPercentage = 42;
-    o.resourceNames = buildUnnamed3201();
+    o.resourceNames = buildUnnamed53();
     o.startTime = "foo";
-    o.steps = buildUnnamed3202();
+    o.steps = buildUnnamed54();
   }
   buildCounterOperationMetadata--;
   return o;
@@ -1673,14 +1673,14 @@
   buildCounterOperationMetadata++;
   if (buildCounterOperationMetadata < 3) {
     unittest.expect(o.progressPercentage, unittest.equals(42));
-    checkUnnamed3201(o.resourceNames);
+    checkUnnamed53(o.resourceNames);
     unittest.expect(o.startTime, unittest.equals('foo'));
-    checkUnnamed3202(o.steps);
+    checkUnnamed54(o.steps);
   }
   buildCounterOperationMetadata--;
 }
 
-buildUnnamed3203() {
+buildUnnamed55() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1695,7 +1695,7 @@
   return o;
 }
 
-checkUnnamed3203(core.Map<core.String, core.Object> o) {
+checkUnnamed55(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1715,7 +1715,7 @@
   buildCounterOption++;
   if (buildCounterOption < 3) {
     o.name = "foo";
-    o.value = buildUnnamed3203();
+    o.value = buildUnnamed55();
   }
   buildCounterOption--;
   return o;
@@ -1725,19 +1725,19 @@
   buildCounterOption++;
   if (buildCounterOption < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3203(o.value);
+    checkUnnamed55(o.value);
   }
   buildCounterOption--;
 }
 
-buildUnnamed3204() {
+buildUnnamed56() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed3204(core.List<api.Page> o) {
+checkUnnamed56(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
@@ -1750,7 +1750,7 @@
   if (buildCounterPage < 3) {
     o.content = "foo";
     o.name = "foo";
-    o.subpages = buildUnnamed3204();
+    o.subpages = buildUnnamed56();
   }
   buildCounterPage--;
   return o;
@@ -1761,7 +1761,7 @@
   if (buildCounterPage < 3) {
     unittest.expect(o.content, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3204(o.subpages);
+    checkUnnamed56(o.subpages);
   }
   buildCounterPage--;
 }
@@ -1787,27 +1787,27 @@
   buildCounterPublishedService--;
 }
 
-buildUnnamed3205() {
+buildUnnamed57() {
   var o = new core.List<api.QuotaLimit>();
   o.add(buildQuotaLimit());
   o.add(buildQuotaLimit());
   return o;
 }
 
-checkUnnamed3205(core.List<api.QuotaLimit> o) {
+checkUnnamed57(core.List<api.QuotaLimit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQuotaLimit(o[0]);
   checkQuotaLimit(o[1]);
 }
 
-buildUnnamed3206() {
+buildUnnamed58() {
   var o = new core.List<api.MetricRule>();
   o.add(buildMetricRule());
   o.add(buildMetricRule());
   return o;
 }
 
-checkUnnamed3206(core.List<api.MetricRule> o) {
+checkUnnamed58(core.List<api.MetricRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricRule(o[0]);
   checkMetricRule(o[1]);
@@ -1818,8 +1818,8 @@
   var o = new api.Quota();
   buildCounterQuota++;
   if (buildCounterQuota < 3) {
-    o.limits = buildUnnamed3205();
-    o.metricRules = buildUnnamed3206();
+    o.limits = buildUnnamed57();
+    o.metricRules = buildUnnamed58();
   }
   buildCounterQuota--;
   return o;
@@ -1828,20 +1828,20 @@
 checkQuota(api.Quota o) {
   buildCounterQuota++;
   if (buildCounterQuota < 3) {
-    checkUnnamed3205(o.limits);
-    checkUnnamed3206(o.metricRules);
+    checkUnnamed57(o.limits);
+    checkUnnamed58(o.metricRules);
   }
   buildCounterQuota--;
 }
 
-buildUnnamed3207() {
+buildUnnamed59() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3207(core.Map<core.String, core.String> o) {
+checkUnnamed59(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1861,7 +1861,7 @@
     o.metric = "foo";
     o.name = "foo";
     o.unit = "foo";
-    o.values = buildUnnamed3207();
+    o.values = buildUnnamed59();
   }
   buildCounterQuotaLimit--;
   return o;
@@ -1879,19 +1879,19 @@
     unittest.expect(o.metric, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.unit, unittest.equals('foo'));
-    checkUnnamed3207(o.values);
+    checkUnnamed59(o.values);
   }
   buildCounterQuotaLimit--;
 }
 
-buildUnnamed3208() {
+buildUnnamed60() {
   var o = new core.List<api.PublishedService>();
   o.add(buildPublishedService());
   o.add(buildPublishedService());
   return o;
 }
 
-checkUnnamed3208(core.List<api.PublishedService> o) {
+checkUnnamed60(core.List<api.PublishedService> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPublishedService(o[0]);
   checkPublishedService(o[1]);
@@ -1903,7 +1903,7 @@
   buildCounterSearchServicesResponse++;
   if (buildCounterSearchServicesResponse < 3) {
     o.nextPageToken = "foo";
-    o.services = buildUnnamed3208();
+    o.services = buildUnnamed60();
   }
   buildCounterSearchServicesResponse--;
   return o;
@@ -1913,110 +1913,110 @@
   buildCounterSearchServicesResponse++;
   if (buildCounterSearchServicesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3208(o.services);
+    checkUnnamed60(o.services);
   }
   buildCounterSearchServicesResponse--;
 }
 
-buildUnnamed3209() {
+buildUnnamed61() {
   var o = new core.List<api.Api>();
   o.add(buildApi());
   o.add(buildApi());
   return o;
 }
 
-checkUnnamed3209(core.List<api.Api> o) {
+checkUnnamed61(core.List<api.Api> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApi(o[0]);
   checkApi(o[1]);
 }
 
-buildUnnamed3210() {
+buildUnnamed62() {
   var o = new core.List<api.Endpoint>();
   o.add(buildEndpoint());
   o.add(buildEndpoint());
   return o;
 }
 
-checkUnnamed3210(core.List<api.Endpoint> o) {
+checkUnnamed62(core.List<api.Endpoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEndpoint(o[0]);
   checkEndpoint(o[1]);
 }
 
-buildUnnamed3211() {
+buildUnnamed63() {
   var o = new core.List<api.Enum>();
   o.add(buildEnum());
   o.add(buildEnum());
   return o;
 }
 
-checkUnnamed3211(core.List<api.Enum> o) {
+checkUnnamed63(core.List<api.Enum> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnum(o[0]);
   checkEnum(o[1]);
 }
 
-buildUnnamed3212() {
+buildUnnamed64() {
   var o = new core.List<api.LogDescriptor>();
   o.add(buildLogDescriptor());
   o.add(buildLogDescriptor());
   return o;
 }
 
-checkUnnamed3212(core.List<api.LogDescriptor> o) {
+checkUnnamed64(core.List<api.LogDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogDescriptor(o[0]);
   checkLogDescriptor(o[1]);
 }
 
-buildUnnamed3213() {
+buildUnnamed65() {
   var o = new core.List<api.MetricDescriptor>();
   o.add(buildMetricDescriptor());
   o.add(buildMetricDescriptor());
   return o;
 }
 
-checkUnnamed3213(core.List<api.MetricDescriptor> o) {
+checkUnnamed65(core.List<api.MetricDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricDescriptor(o[0]);
   checkMetricDescriptor(o[1]);
 }
 
-buildUnnamed3214() {
+buildUnnamed66() {
   var o = new core.List<api.MonitoredResourceDescriptor>();
   o.add(buildMonitoredResourceDescriptor());
   o.add(buildMonitoredResourceDescriptor());
   return o;
 }
 
-checkUnnamed3214(core.List<api.MonitoredResourceDescriptor> o) {
+checkUnnamed66(core.List<api.MonitoredResourceDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoredResourceDescriptor(o[0]);
   checkMonitoredResourceDescriptor(o[1]);
 }
 
-buildUnnamed3215() {
+buildUnnamed67() {
   var o = new core.List<api.Type>();
   o.add(buildType());
   o.add(buildType());
   return o;
 }
 
-checkUnnamed3215(core.List<api.Type> o) {
+checkUnnamed67(core.List<api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o[0]);
   checkType(o[1]);
 }
 
-buildUnnamed3216() {
+buildUnnamed68() {
   var o = new core.List<api.Type>();
   o.add(buildType());
   o.add(buildType());
   return o;
 }
 
-checkUnnamed3216(core.List<api.Type> o) {
+checkUnnamed68(core.List<api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o[0]);
   checkType(o[1]);
@@ -2027,7 +2027,7 @@
   var o = new api.Service();
   buildCounterService++;
   if (buildCounterService < 3) {
-    o.apis = buildUnnamed3209();
+    o.apis = buildUnnamed61();
     o.authentication = buildAuthentication();
     o.backend = buildBackend();
     o.billing = buildBilling();
@@ -2036,24 +2036,24 @@
     o.control = buildControl();
     o.customError = buildCustomError();
     o.documentation = buildDocumentation();
-    o.endpoints = buildUnnamed3210();
-    o.enums = buildUnnamed3211();
+    o.endpoints = buildUnnamed62();
+    o.enums = buildUnnamed63();
     o.experimental = buildExperimental();
     o.http = buildHttp();
     o.id = "foo";
     o.logging = buildLogging();
-    o.logs = buildUnnamed3212();
-    o.metrics = buildUnnamed3213();
-    o.monitoredResources = buildUnnamed3214();
+    o.logs = buildUnnamed64();
+    o.metrics = buildUnnamed65();
+    o.monitoredResources = buildUnnamed66();
     o.monitoring = buildMonitoring();
     o.name = "foo";
     o.producerProjectId = "foo";
     o.quota = buildQuota();
     o.sourceInfo = buildSourceInfo();
     o.systemParameters = buildSystemParameters();
-    o.systemTypes = buildUnnamed3215();
+    o.systemTypes = buildUnnamed67();
     o.title = "foo";
-    o.types = buildUnnamed3216();
+    o.types = buildUnnamed68();
     o.usage = buildUsage();
     o.visibility = buildVisibility();
   }
@@ -2064,7 +2064,7 @@
 checkService(api.Service o) {
   buildCounterService++;
   if (buildCounterService < 3) {
-    checkUnnamed3209(o.apis);
+    checkUnnamed61(o.apis);
     checkAuthentication(o.authentication);
     checkBackend(o.backend);
     checkBilling(o.billing);
@@ -2073,24 +2073,24 @@
     checkControl(o.control);
     checkCustomError(o.customError);
     checkDocumentation(o.documentation);
-    checkUnnamed3210(o.endpoints);
-    checkUnnamed3211(o.enums);
+    checkUnnamed62(o.endpoints);
+    checkUnnamed63(o.enums);
     checkExperimental(o.experimental);
     checkHttp(o.http);
     unittest.expect(o.id, unittest.equals('foo'));
     checkLogging(o.logging);
-    checkUnnamed3212(o.logs);
-    checkUnnamed3213(o.metrics);
-    checkUnnamed3214(o.monitoredResources);
+    checkUnnamed64(o.logs);
+    checkUnnamed65(o.metrics);
+    checkUnnamed66(o.monitoredResources);
     checkMonitoring(o.monitoring);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.producerProjectId, unittest.equals('foo'));
     checkQuota(o.quota);
     checkSourceInfo(o.sourceInfo);
     checkSystemParameters(o.systemParameters);
-    checkUnnamed3215(o.systemTypes);
+    checkUnnamed67(o.systemTypes);
     unittest.expect(o.title, unittest.equals('foo'));
-    checkUnnamed3216(o.types);
+    checkUnnamed68(o.types);
     checkUsage(o.usage);
     checkVisibility(o.visibility);
   }
@@ -2116,7 +2116,7 @@
   buildCounterSourceContext--;
 }
 
-buildUnnamed3217() {
+buildUnnamed69() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2131,7 +2131,7 @@
   return o;
 }
 
-checkUnnamed3217(core.Map<core.String, core.Object> o) {
+checkUnnamed69(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -2145,17 +2145,17 @@
   unittest.expect(casted8["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3218() {
+buildUnnamed70() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3217());
-  o.add(buildUnnamed3217());
+  o.add(buildUnnamed69());
+  o.add(buildUnnamed69());
   return o;
 }
 
-checkUnnamed3218(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed70(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3217(o[0]);
-  checkUnnamed3217(o[1]);
+  checkUnnamed69(o[0]);
+  checkUnnamed69(o[1]);
 }
 
 core.int buildCounterSourceInfo = 0;
@@ -2163,7 +2163,7 @@
   var o = new api.SourceInfo();
   buildCounterSourceInfo++;
   if (buildCounterSourceInfo < 3) {
-    o.sourceFiles = buildUnnamed3218();
+    o.sourceFiles = buildUnnamed70();
   }
   buildCounterSourceInfo--;
   return o;
@@ -2172,12 +2172,12 @@
 checkSourceInfo(api.SourceInfo o) {
   buildCounterSourceInfo++;
   if (buildCounterSourceInfo < 3) {
-    checkUnnamed3218(o.sourceFiles);
+    checkUnnamed70(o.sourceFiles);
   }
   buildCounterSourceInfo--;
 }
 
-buildUnnamed3219() {
+buildUnnamed71() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2192,7 +2192,7 @@
   return o;
 }
 
-checkUnnamed3219(core.Map<core.String, core.Object> o) {
+checkUnnamed71(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted9 = (o["x"]) as core.Map;
   unittest.expect(casted9, unittest.hasLength(3));
@@ -2206,17 +2206,17 @@
   unittest.expect(casted10["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3220() {
+buildUnnamed72() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3219());
-  o.add(buildUnnamed3219());
+  o.add(buildUnnamed71());
+  o.add(buildUnnamed71());
   return o;
 }
 
-checkUnnamed3220(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed72(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3219(o[0]);
-  checkUnnamed3219(o[1]);
+  checkUnnamed71(o[0]);
+  checkUnnamed71(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -2225,7 +2225,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed3220();
+    o.details = buildUnnamed72();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -2236,7 +2236,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed3220(o.details);
+    checkUnnamed72(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -2286,14 +2286,14 @@
   buildCounterSystemParameter--;
 }
 
-buildUnnamed3221() {
+buildUnnamed73() {
   var o = new core.List<api.SystemParameter>();
   o.add(buildSystemParameter());
   o.add(buildSystemParameter());
   return o;
 }
 
-checkUnnamed3221(core.List<api.SystemParameter> o) {
+checkUnnamed73(core.List<api.SystemParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSystemParameter(o[0]);
   checkSystemParameter(o[1]);
@@ -2304,7 +2304,7 @@
   var o = new api.SystemParameterRule();
   buildCounterSystemParameterRule++;
   if (buildCounterSystemParameterRule < 3) {
-    o.parameters = buildUnnamed3221();
+    o.parameters = buildUnnamed73();
     o.selector = "foo";
   }
   buildCounterSystemParameterRule--;
@@ -2314,20 +2314,20 @@
 checkSystemParameterRule(api.SystemParameterRule o) {
   buildCounterSystemParameterRule++;
   if (buildCounterSystemParameterRule < 3) {
-    checkUnnamed3221(o.parameters);
+    checkUnnamed73(o.parameters);
     unittest.expect(o.selector, unittest.equals('foo'));
   }
   buildCounterSystemParameterRule--;
 }
 
-buildUnnamed3222() {
+buildUnnamed74() {
   var o = new core.List<api.SystemParameterRule>();
   o.add(buildSystemParameterRule());
   o.add(buildSystemParameterRule());
   return o;
 }
 
-checkUnnamed3222(core.List<api.SystemParameterRule> o) {
+checkUnnamed74(core.List<api.SystemParameterRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSystemParameterRule(o[0]);
   checkSystemParameterRule(o[1]);
@@ -2338,7 +2338,7 @@
   var o = new api.SystemParameters();
   buildCounterSystemParameters++;
   if (buildCounterSystemParameters < 3) {
-    o.rules = buildUnnamed3222();
+    o.rules = buildUnnamed74();
   }
   buildCounterSystemParameters--;
   return o;
@@ -2347,45 +2347,45 @@
 checkSystemParameters(api.SystemParameters o) {
   buildCounterSystemParameters++;
   if (buildCounterSystemParameters < 3) {
-    checkUnnamed3222(o.rules);
+    checkUnnamed74(o.rules);
   }
   buildCounterSystemParameters--;
 }
 
-buildUnnamed3223() {
+buildUnnamed75() {
   var o = new core.List<api.Field>();
   o.add(buildField());
   o.add(buildField());
   return o;
 }
 
-checkUnnamed3223(core.List<api.Field> o) {
+checkUnnamed75(core.List<api.Field> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkField(o[0]);
   checkField(o[1]);
 }
 
-buildUnnamed3224() {
+buildUnnamed76() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3224(core.List<core.String> o) {
+checkUnnamed76(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3225() {
+buildUnnamed77() {
   var o = new core.List<api.Option>();
   o.add(buildOption());
   o.add(buildOption());
   return o;
 }
 
-checkUnnamed3225(core.List<api.Option> o) {
+checkUnnamed77(core.List<api.Option> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOption(o[0]);
   checkOption(o[1]);
@@ -2396,10 +2396,10 @@
   var o = new api.Type();
   buildCounterType++;
   if (buildCounterType < 3) {
-    o.fields = buildUnnamed3223();
+    o.fields = buildUnnamed75();
     o.name = "foo";
-    o.oneofs = buildUnnamed3224();
-    o.options = buildUnnamed3225();
+    o.oneofs = buildUnnamed76();
+    o.options = buildUnnamed77();
     o.sourceContext = buildSourceContext();
     o.syntax = "foo";
   }
@@ -2410,37 +2410,37 @@
 checkType(api.Type o) {
   buildCounterType++;
   if (buildCounterType < 3) {
-    checkUnnamed3223(o.fields);
+    checkUnnamed75(o.fields);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3224(o.oneofs);
-    checkUnnamed3225(o.options);
+    checkUnnamed76(o.oneofs);
+    checkUnnamed77(o.options);
     checkSourceContext(o.sourceContext);
     unittest.expect(o.syntax, unittest.equals('foo'));
   }
   buildCounterType--;
 }
 
-buildUnnamed3226() {
+buildUnnamed78() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3226(core.List<core.String> o) {
+checkUnnamed78(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3227() {
+buildUnnamed79() {
   var o = new core.List<api.UsageRule>();
   o.add(buildUsageRule());
   o.add(buildUsageRule());
   return o;
 }
 
-checkUnnamed3227(core.List<api.UsageRule> o) {
+checkUnnamed79(core.List<api.UsageRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUsageRule(o[0]);
   checkUsageRule(o[1]);
@@ -2452,8 +2452,8 @@
   buildCounterUsage++;
   if (buildCounterUsage < 3) {
     o.producerNotificationChannel = "foo";
-    o.requirements = buildUnnamed3226();
-    o.rules = buildUnnamed3227();
+    o.requirements = buildUnnamed78();
+    o.rules = buildUnnamed79();
   }
   buildCounterUsage--;
   return o;
@@ -2463,8 +2463,8 @@
   buildCounterUsage++;
   if (buildCounterUsage < 3) {
     unittest.expect(o.producerNotificationChannel, unittest.equals('foo'));
-    checkUnnamed3226(o.requirements);
-    checkUnnamed3227(o.rules);
+    checkUnnamed78(o.requirements);
+    checkUnnamed79(o.rules);
   }
   buildCounterUsage--;
 }
@@ -2492,14 +2492,14 @@
   buildCounterUsageRule--;
 }
 
-buildUnnamed3228() {
+buildUnnamed80() {
   var o = new core.List<api.VisibilityRule>();
   o.add(buildVisibilityRule());
   o.add(buildVisibilityRule());
   return o;
 }
 
-checkUnnamed3228(core.List<api.VisibilityRule> o) {
+checkUnnamed80(core.List<api.VisibilityRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVisibilityRule(o[0]);
   checkVisibilityRule(o[1]);
@@ -2510,7 +2510,7 @@
   var o = new api.Visibility();
   buildCounterVisibility++;
   if (buildCounterVisibility < 3) {
-    o.rules = buildUnnamed3228();
+    o.rules = buildUnnamed80();
   }
   buildCounterVisibility--;
   return o;
@@ -2519,7 +2519,7 @@
 checkVisibility(api.Visibility o) {
   buildCounterVisibility++;
   if (buildCounterVisibility < 3) {
-    checkUnnamed3228(o.rules);
+    checkUnnamed80(o.rules);
   }
   buildCounterVisibility--;
 }
@@ -3110,7 +3110,7 @@
       }), true);
       res
           .disable(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3166,7 +3166,7 @@
       }), true);
       res
           .enable(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3227,8 +3227,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListEnabledServicesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListEnabledServicesResponse(response);
       })));
     });
@@ -3288,7 +3287,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SearchServicesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSearchServicesResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/sheets/v4_test.dart b/generated/googleapis/test/sheets/v4_test.dart
index bc0ec1c..f962a5f 100644
--- a/generated/googleapis/test/sheets/v4_test.dart
+++ b/generated/googleapis/test/sheets/v4_test.dart
@@ -299,14 +299,14 @@
   buildCounterAddSheetResponse--;
 }
 
-buildUnnamed3316() {
+buildUnnamed3016() {
   var o = new core.List<api.RowData>();
   o.add(buildRowData());
   o.add(buildRowData());
   return o;
 }
 
-checkUnnamed3316(core.List<api.RowData> o) {
+checkUnnamed3016(core.List<api.RowData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRowData(o[0]);
   checkRowData(o[1]);
@@ -318,7 +318,7 @@
   buildCounterAppendCellsRequest++;
   if (buildCounterAppendCellsRequest < 3) {
     o.fields = "foo";
-    o.rows = buildUnnamed3316();
+    o.rows = buildUnnamed3016();
     o.sheetId = 42;
   }
   buildCounterAppendCellsRequest--;
@@ -329,7 +329,7 @@
   buildCounterAppendCellsRequest++;
   if (buildCounterAppendCellsRequest < 3) {
     unittest.expect(o.fields, unittest.equals('foo'));
-    checkUnnamed3316(o.rows);
+    checkUnnamed3016(o.rows);
     unittest.expect(o.sheetId, unittest.equals(42));
   }
   buildCounterAppendCellsRequest--;
@@ -544,40 +544,40 @@
   buildCounterBasicChartSeries--;
 }
 
-buildUnnamed3317() {
+buildUnnamed3017() {
   var o = new core.List<api.BasicChartAxis>();
   o.add(buildBasicChartAxis());
   o.add(buildBasicChartAxis());
   return o;
 }
 
-checkUnnamed3317(core.List<api.BasicChartAxis> o) {
+checkUnnamed3017(core.List<api.BasicChartAxis> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBasicChartAxis(o[0]);
   checkBasicChartAxis(o[1]);
 }
 
-buildUnnamed3318() {
+buildUnnamed3018() {
   var o = new core.List<api.BasicChartDomain>();
   o.add(buildBasicChartDomain());
   o.add(buildBasicChartDomain());
   return o;
 }
 
-checkUnnamed3318(core.List<api.BasicChartDomain> o) {
+checkUnnamed3018(core.List<api.BasicChartDomain> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBasicChartDomain(o[0]);
   checkBasicChartDomain(o[1]);
 }
 
-buildUnnamed3319() {
+buildUnnamed3019() {
   var o = new core.List<api.BasicChartSeries>();
   o.add(buildBasicChartSeries());
   o.add(buildBasicChartSeries());
   return o;
 }
 
-checkUnnamed3319(core.List<api.BasicChartSeries> o) {
+checkUnnamed3019(core.List<api.BasicChartSeries> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBasicChartSeries(o[0]);
   checkBasicChartSeries(o[1]);
@@ -588,15 +588,15 @@
   var o = new api.BasicChartSpec();
   buildCounterBasicChartSpec++;
   if (buildCounterBasicChartSpec < 3) {
-    o.axis = buildUnnamed3317();
+    o.axis = buildUnnamed3017();
     o.chartType = "foo";
     o.compareMode = "foo";
-    o.domains = buildUnnamed3318();
+    o.domains = buildUnnamed3018();
     o.headerCount = 42;
     o.interpolateNulls = true;
     o.legendPosition = "foo";
     o.lineSmoothing = true;
-    o.series = buildUnnamed3319();
+    o.series = buildUnnamed3019();
     o.stackedType = "foo";
     o.threeDimensional = true;
   }
@@ -607,42 +607,42 @@
 checkBasicChartSpec(api.BasicChartSpec o) {
   buildCounterBasicChartSpec++;
   if (buildCounterBasicChartSpec < 3) {
-    checkUnnamed3317(o.axis);
+    checkUnnamed3017(o.axis);
     unittest.expect(o.chartType, unittest.equals('foo'));
     unittest.expect(o.compareMode, unittest.equals('foo'));
-    checkUnnamed3318(o.domains);
+    checkUnnamed3018(o.domains);
     unittest.expect(o.headerCount, unittest.equals(42));
     unittest.expect(o.interpolateNulls, unittest.isTrue);
     unittest.expect(o.legendPosition, unittest.equals('foo'));
     unittest.expect(o.lineSmoothing, unittest.isTrue);
-    checkUnnamed3319(o.series);
+    checkUnnamed3019(o.series);
     unittest.expect(o.stackedType, unittest.equals('foo'));
     unittest.expect(o.threeDimensional, unittest.isTrue);
   }
   buildCounterBasicChartSpec--;
 }
 
-buildUnnamed3320() {
+buildUnnamed3020() {
   var o = new core.Map<core.String, api.FilterCriteria>();
   o["x"] = buildFilterCriteria();
   o["y"] = buildFilterCriteria();
   return o;
 }
 
-checkUnnamed3320(core.Map<core.String, api.FilterCriteria> o) {
+checkUnnamed3020(core.Map<core.String, api.FilterCriteria> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilterCriteria(o["x"]);
   checkFilterCriteria(o["y"]);
 }
 
-buildUnnamed3321() {
+buildUnnamed3021() {
   var o = new core.List<api.SortSpec>();
   o.add(buildSortSpec());
   o.add(buildSortSpec());
   return o;
 }
 
-checkUnnamed3321(core.List<api.SortSpec> o) {
+checkUnnamed3021(core.List<api.SortSpec> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortSpec(o[0]);
   checkSortSpec(o[1]);
@@ -653,9 +653,9 @@
   var o = new api.BasicFilter();
   buildCounterBasicFilter++;
   if (buildCounterBasicFilter < 3) {
-    o.criteria = buildUnnamed3320();
+    o.criteria = buildUnnamed3020();
     o.range = buildGridRange();
-    o.sortSpecs = buildUnnamed3321();
+    o.sortSpecs = buildUnnamed3021();
   }
   buildCounterBasicFilter--;
   return o;
@@ -664,21 +664,21 @@
 checkBasicFilter(api.BasicFilter o) {
   buildCounterBasicFilter++;
   if (buildCounterBasicFilter < 3) {
-    checkUnnamed3320(o.criteria);
+    checkUnnamed3020(o.criteria);
     checkGridRange(o.range);
-    checkUnnamed3321(o.sortSpecs);
+    checkUnnamed3021(o.sortSpecs);
   }
   buildCounterBasicFilter--;
 }
 
-buildUnnamed3322() {
+buildUnnamed3022() {
   var o = new core.List<api.DataFilter>();
   o.add(buildDataFilter());
   o.add(buildDataFilter());
   return o;
 }
 
-checkUnnamed3322(core.List<api.DataFilter> o) {
+checkUnnamed3022(core.List<api.DataFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataFilter(o[0]);
   checkDataFilter(o[1]);
@@ -689,7 +689,7 @@
   var o = new api.BatchClearValuesByDataFilterRequest();
   buildCounterBatchClearValuesByDataFilterRequest++;
   if (buildCounterBatchClearValuesByDataFilterRequest < 3) {
-    o.dataFilters = buildUnnamed3322();
+    o.dataFilters = buildUnnamed3022();
   }
   buildCounterBatchClearValuesByDataFilterRequest--;
   return o;
@@ -699,19 +699,19 @@
     api.BatchClearValuesByDataFilterRequest o) {
   buildCounterBatchClearValuesByDataFilterRequest++;
   if (buildCounterBatchClearValuesByDataFilterRequest < 3) {
-    checkUnnamed3322(o.dataFilters);
+    checkUnnamed3022(o.dataFilters);
   }
   buildCounterBatchClearValuesByDataFilterRequest--;
 }
 
-buildUnnamed3323() {
+buildUnnamed3023() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3323(core.List<core.String> o) {
+checkUnnamed3023(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -722,7 +722,7 @@
   var o = new api.BatchClearValuesByDataFilterResponse();
   buildCounterBatchClearValuesByDataFilterResponse++;
   if (buildCounterBatchClearValuesByDataFilterResponse < 3) {
-    o.clearedRanges = buildUnnamed3323();
+    o.clearedRanges = buildUnnamed3023();
     o.spreadsheetId = "foo";
   }
   buildCounterBatchClearValuesByDataFilterResponse--;
@@ -733,20 +733,20 @@
     api.BatchClearValuesByDataFilterResponse o) {
   buildCounterBatchClearValuesByDataFilterResponse++;
   if (buildCounterBatchClearValuesByDataFilterResponse < 3) {
-    checkUnnamed3323(o.clearedRanges);
+    checkUnnamed3023(o.clearedRanges);
     unittest.expect(o.spreadsheetId, unittest.equals('foo'));
   }
   buildCounterBatchClearValuesByDataFilterResponse--;
 }
 
-buildUnnamed3324() {
+buildUnnamed3024() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3324(core.List<core.String> o) {
+checkUnnamed3024(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -757,7 +757,7 @@
   var o = new api.BatchClearValuesRequest();
   buildCounterBatchClearValuesRequest++;
   if (buildCounterBatchClearValuesRequest < 3) {
-    o.ranges = buildUnnamed3324();
+    o.ranges = buildUnnamed3024();
   }
   buildCounterBatchClearValuesRequest--;
   return o;
@@ -766,19 +766,19 @@
 checkBatchClearValuesRequest(api.BatchClearValuesRequest o) {
   buildCounterBatchClearValuesRequest++;
   if (buildCounterBatchClearValuesRequest < 3) {
-    checkUnnamed3324(o.ranges);
+    checkUnnamed3024(o.ranges);
   }
   buildCounterBatchClearValuesRequest--;
 }
 
-buildUnnamed3325() {
+buildUnnamed3025() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3325(core.List<core.String> o) {
+checkUnnamed3025(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -789,7 +789,7 @@
   var o = new api.BatchClearValuesResponse();
   buildCounterBatchClearValuesResponse++;
   if (buildCounterBatchClearValuesResponse < 3) {
-    o.clearedRanges = buildUnnamed3325();
+    o.clearedRanges = buildUnnamed3025();
     o.spreadsheetId = "foo";
   }
   buildCounterBatchClearValuesResponse--;
@@ -799,20 +799,20 @@
 checkBatchClearValuesResponse(api.BatchClearValuesResponse o) {
   buildCounterBatchClearValuesResponse++;
   if (buildCounterBatchClearValuesResponse < 3) {
-    checkUnnamed3325(o.clearedRanges);
+    checkUnnamed3025(o.clearedRanges);
     unittest.expect(o.spreadsheetId, unittest.equals('foo'));
   }
   buildCounterBatchClearValuesResponse--;
 }
 
-buildUnnamed3326() {
+buildUnnamed3026() {
   var o = new core.List<api.DataFilter>();
   o.add(buildDataFilter());
   o.add(buildDataFilter());
   return o;
 }
 
-checkUnnamed3326(core.List<api.DataFilter> o) {
+checkUnnamed3026(core.List<api.DataFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataFilter(o[0]);
   checkDataFilter(o[1]);
@@ -823,7 +823,7 @@
   var o = new api.BatchGetValuesByDataFilterRequest();
   buildCounterBatchGetValuesByDataFilterRequest++;
   if (buildCounterBatchGetValuesByDataFilterRequest < 3) {
-    o.dataFilters = buildUnnamed3326();
+    o.dataFilters = buildUnnamed3026();
     o.dateTimeRenderOption = "foo";
     o.majorDimension = "foo";
     o.valueRenderOption = "foo";
@@ -836,7 +836,7 @@
     api.BatchGetValuesByDataFilterRequest o) {
   buildCounterBatchGetValuesByDataFilterRequest++;
   if (buildCounterBatchGetValuesByDataFilterRequest < 3) {
-    checkUnnamed3326(o.dataFilters);
+    checkUnnamed3026(o.dataFilters);
     unittest.expect(o.dateTimeRenderOption, unittest.equals('foo'));
     unittest.expect(o.majorDimension, unittest.equals('foo'));
     unittest.expect(o.valueRenderOption, unittest.equals('foo'));
@@ -844,14 +844,14 @@
   buildCounterBatchGetValuesByDataFilterRequest--;
 }
 
-buildUnnamed3327() {
+buildUnnamed3027() {
   var o = new core.List<api.MatchedValueRange>();
   o.add(buildMatchedValueRange());
   o.add(buildMatchedValueRange());
   return o;
 }
 
-checkUnnamed3327(core.List<api.MatchedValueRange> o) {
+checkUnnamed3027(core.List<api.MatchedValueRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMatchedValueRange(o[0]);
   checkMatchedValueRange(o[1]);
@@ -863,7 +863,7 @@
   buildCounterBatchGetValuesByDataFilterResponse++;
   if (buildCounterBatchGetValuesByDataFilterResponse < 3) {
     o.spreadsheetId = "foo";
-    o.valueRanges = buildUnnamed3327();
+    o.valueRanges = buildUnnamed3027();
   }
   buildCounterBatchGetValuesByDataFilterResponse--;
   return o;
@@ -874,19 +874,19 @@
   buildCounterBatchGetValuesByDataFilterResponse++;
   if (buildCounterBatchGetValuesByDataFilterResponse < 3) {
     unittest.expect(o.spreadsheetId, unittest.equals('foo'));
-    checkUnnamed3327(o.valueRanges);
+    checkUnnamed3027(o.valueRanges);
   }
   buildCounterBatchGetValuesByDataFilterResponse--;
 }
 
-buildUnnamed3328() {
+buildUnnamed3028() {
   var o = new core.List<api.ValueRange>();
   o.add(buildValueRange());
   o.add(buildValueRange());
   return o;
 }
 
-checkUnnamed3328(core.List<api.ValueRange> o) {
+checkUnnamed3028(core.List<api.ValueRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValueRange(o[0]);
   checkValueRange(o[1]);
@@ -898,7 +898,7 @@
   buildCounterBatchGetValuesResponse++;
   if (buildCounterBatchGetValuesResponse < 3) {
     o.spreadsheetId = "foo";
-    o.valueRanges = buildUnnamed3328();
+    o.valueRanges = buildUnnamed3028();
   }
   buildCounterBatchGetValuesResponse--;
   return o;
@@ -908,32 +908,32 @@
   buildCounterBatchGetValuesResponse++;
   if (buildCounterBatchGetValuesResponse < 3) {
     unittest.expect(o.spreadsheetId, unittest.equals('foo'));
-    checkUnnamed3328(o.valueRanges);
+    checkUnnamed3028(o.valueRanges);
   }
   buildCounterBatchGetValuesResponse--;
 }
 
-buildUnnamed3329() {
+buildUnnamed3029() {
   var o = new core.List<api.Request>();
   o.add(buildRequest());
   o.add(buildRequest());
   return o;
 }
 
-checkUnnamed3329(core.List<api.Request> o) {
+checkUnnamed3029(core.List<api.Request> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRequest(o[0]);
   checkRequest(o[1]);
 }
 
-buildUnnamed3330() {
+buildUnnamed3030() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3330(core.List<core.String> o) {
+checkUnnamed3030(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -945,9 +945,9 @@
   buildCounterBatchUpdateSpreadsheetRequest++;
   if (buildCounterBatchUpdateSpreadsheetRequest < 3) {
     o.includeSpreadsheetInResponse = true;
-    o.requests = buildUnnamed3329();
+    o.requests = buildUnnamed3029();
     o.responseIncludeGridData = true;
-    o.responseRanges = buildUnnamed3330();
+    o.responseRanges = buildUnnamed3030();
   }
   buildCounterBatchUpdateSpreadsheetRequest--;
   return o;
@@ -957,21 +957,21 @@
   buildCounterBatchUpdateSpreadsheetRequest++;
   if (buildCounterBatchUpdateSpreadsheetRequest < 3) {
     unittest.expect(o.includeSpreadsheetInResponse, unittest.isTrue);
-    checkUnnamed3329(o.requests);
+    checkUnnamed3029(o.requests);
     unittest.expect(o.responseIncludeGridData, unittest.isTrue);
-    checkUnnamed3330(o.responseRanges);
+    checkUnnamed3030(o.responseRanges);
   }
   buildCounterBatchUpdateSpreadsheetRequest--;
 }
 
-buildUnnamed3331() {
+buildUnnamed3031() {
   var o = new core.List<api.Response>();
   o.add(buildResponse());
   o.add(buildResponse());
   return o;
 }
 
-checkUnnamed3331(core.List<api.Response> o) {
+checkUnnamed3031(core.List<api.Response> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResponse(o[0]);
   checkResponse(o[1]);
@@ -982,7 +982,7 @@
   var o = new api.BatchUpdateSpreadsheetResponse();
   buildCounterBatchUpdateSpreadsheetResponse++;
   if (buildCounterBatchUpdateSpreadsheetResponse < 3) {
-    o.replies = buildUnnamed3331();
+    o.replies = buildUnnamed3031();
     o.spreadsheetId = "foo";
     o.updatedSpreadsheet = buildSpreadsheet();
   }
@@ -993,21 +993,21 @@
 checkBatchUpdateSpreadsheetResponse(api.BatchUpdateSpreadsheetResponse o) {
   buildCounterBatchUpdateSpreadsheetResponse++;
   if (buildCounterBatchUpdateSpreadsheetResponse < 3) {
-    checkUnnamed3331(o.replies);
+    checkUnnamed3031(o.replies);
     unittest.expect(o.spreadsheetId, unittest.equals('foo'));
     checkSpreadsheet(o.updatedSpreadsheet);
   }
   buildCounterBatchUpdateSpreadsheetResponse--;
 }
 
-buildUnnamed3332() {
+buildUnnamed3032() {
   var o = new core.List<api.DataFilterValueRange>();
   o.add(buildDataFilterValueRange());
   o.add(buildDataFilterValueRange());
   return o;
 }
 
-checkUnnamed3332(core.List<api.DataFilterValueRange> o) {
+checkUnnamed3032(core.List<api.DataFilterValueRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataFilterValueRange(o[0]);
   checkDataFilterValueRange(o[1]);
@@ -1018,7 +1018,7 @@
   var o = new api.BatchUpdateValuesByDataFilterRequest();
   buildCounterBatchUpdateValuesByDataFilterRequest++;
   if (buildCounterBatchUpdateValuesByDataFilterRequest < 3) {
-    o.data = buildUnnamed3332();
+    o.data = buildUnnamed3032();
     o.includeValuesInResponse = true;
     o.responseDateTimeRenderOption = "foo";
     o.responseValueRenderOption = "foo";
@@ -1032,7 +1032,7 @@
     api.BatchUpdateValuesByDataFilterRequest o) {
   buildCounterBatchUpdateValuesByDataFilterRequest++;
   if (buildCounterBatchUpdateValuesByDataFilterRequest < 3) {
-    checkUnnamed3332(o.data);
+    checkUnnamed3032(o.data);
     unittest.expect(o.includeValuesInResponse, unittest.isTrue);
     unittest.expect(o.responseDateTimeRenderOption, unittest.equals('foo'));
     unittest.expect(o.responseValueRenderOption, unittest.equals('foo'));
@@ -1041,14 +1041,14 @@
   buildCounterBatchUpdateValuesByDataFilterRequest--;
 }
 
-buildUnnamed3333() {
+buildUnnamed3033() {
   var o = new core.List<api.UpdateValuesByDataFilterResponse>();
   o.add(buildUpdateValuesByDataFilterResponse());
   o.add(buildUpdateValuesByDataFilterResponse());
   return o;
 }
 
-checkUnnamed3333(core.List<api.UpdateValuesByDataFilterResponse> o) {
+checkUnnamed3033(core.List<api.UpdateValuesByDataFilterResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUpdateValuesByDataFilterResponse(o[0]);
   checkUpdateValuesByDataFilterResponse(o[1]);
@@ -1059,7 +1059,7 @@
   var o = new api.BatchUpdateValuesByDataFilterResponse();
   buildCounterBatchUpdateValuesByDataFilterResponse++;
   if (buildCounterBatchUpdateValuesByDataFilterResponse < 3) {
-    o.responses = buildUnnamed3333();
+    o.responses = buildUnnamed3033();
     o.spreadsheetId = "foo";
     o.totalUpdatedCells = 42;
     o.totalUpdatedColumns = 42;
@@ -1074,7 +1074,7 @@
     api.BatchUpdateValuesByDataFilterResponse o) {
   buildCounterBatchUpdateValuesByDataFilterResponse++;
   if (buildCounterBatchUpdateValuesByDataFilterResponse < 3) {
-    checkUnnamed3333(o.responses);
+    checkUnnamed3033(o.responses);
     unittest.expect(o.spreadsheetId, unittest.equals('foo'));
     unittest.expect(o.totalUpdatedCells, unittest.equals(42));
     unittest.expect(o.totalUpdatedColumns, unittest.equals(42));
@@ -1084,14 +1084,14 @@
   buildCounterBatchUpdateValuesByDataFilterResponse--;
 }
 
-buildUnnamed3334() {
+buildUnnamed3034() {
   var o = new core.List<api.ValueRange>();
   o.add(buildValueRange());
   o.add(buildValueRange());
   return o;
 }
 
-checkUnnamed3334(core.List<api.ValueRange> o) {
+checkUnnamed3034(core.List<api.ValueRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValueRange(o[0]);
   checkValueRange(o[1]);
@@ -1102,7 +1102,7 @@
   var o = new api.BatchUpdateValuesRequest();
   buildCounterBatchUpdateValuesRequest++;
   if (buildCounterBatchUpdateValuesRequest < 3) {
-    o.data = buildUnnamed3334();
+    o.data = buildUnnamed3034();
     o.includeValuesInResponse = true;
     o.responseDateTimeRenderOption = "foo";
     o.responseValueRenderOption = "foo";
@@ -1115,7 +1115,7 @@
 checkBatchUpdateValuesRequest(api.BatchUpdateValuesRequest o) {
   buildCounterBatchUpdateValuesRequest++;
   if (buildCounterBatchUpdateValuesRequest < 3) {
-    checkUnnamed3334(o.data);
+    checkUnnamed3034(o.data);
     unittest.expect(o.includeValuesInResponse, unittest.isTrue);
     unittest.expect(o.responseDateTimeRenderOption, unittest.equals('foo'));
     unittest.expect(o.responseValueRenderOption, unittest.equals('foo'));
@@ -1124,14 +1124,14 @@
   buildCounterBatchUpdateValuesRequest--;
 }
 
-buildUnnamed3335() {
+buildUnnamed3035() {
   var o = new core.List<api.UpdateValuesResponse>();
   o.add(buildUpdateValuesResponse());
   o.add(buildUpdateValuesResponse());
   return o;
 }
 
-checkUnnamed3335(core.List<api.UpdateValuesResponse> o) {
+checkUnnamed3035(core.List<api.UpdateValuesResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUpdateValuesResponse(o[0]);
   checkUpdateValuesResponse(o[1]);
@@ -1142,7 +1142,7 @@
   var o = new api.BatchUpdateValuesResponse();
   buildCounterBatchUpdateValuesResponse++;
   if (buildCounterBatchUpdateValuesResponse < 3) {
-    o.responses = buildUnnamed3335();
+    o.responses = buildUnnamed3035();
     o.spreadsheetId = "foo";
     o.totalUpdatedCells = 42;
     o.totalUpdatedColumns = 42;
@@ -1156,7 +1156,7 @@
 checkBatchUpdateValuesResponse(api.BatchUpdateValuesResponse o) {
   buildCounterBatchUpdateValuesResponse++;
   if (buildCounterBatchUpdateValuesResponse < 3) {
-    checkUnnamed3335(o.responses);
+    checkUnnamed3035(o.responses);
     unittest.expect(o.spreadsheetId, unittest.equals('foo'));
     unittest.expect(o.totalUpdatedCells, unittest.equals(42));
     unittest.expect(o.totalUpdatedColumns, unittest.equals(42));
@@ -1166,14 +1166,14 @@
   buildCounterBatchUpdateValuesResponse--;
 }
 
-buildUnnamed3336() {
+buildUnnamed3036() {
   var o = new core.List<api.ConditionValue>();
   o.add(buildConditionValue());
   o.add(buildConditionValue());
   return o;
 }
 
-checkUnnamed3336(core.List<api.ConditionValue> o) {
+checkUnnamed3036(core.List<api.ConditionValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConditionValue(o[0]);
   checkConditionValue(o[1]);
@@ -1185,7 +1185,7 @@
   buildCounterBooleanCondition++;
   if (buildCounterBooleanCondition < 3) {
     o.type = "foo";
-    o.values = buildUnnamed3336();
+    o.values = buildUnnamed3036();
   }
   buildCounterBooleanCondition--;
   return o;
@@ -1195,7 +1195,7 @@
   buildCounterBooleanCondition++;
   if (buildCounterBooleanCondition < 3) {
     unittest.expect(o.type, unittest.equals('foo'));
-    checkUnnamed3336(o.values);
+    checkUnnamed3036(o.values);
   }
   buildCounterBooleanCondition--;
 }
@@ -1308,14 +1308,14 @@
   buildCounterBubbleChartSpec--;
 }
 
-buildUnnamed3337() {
+buildUnnamed3037() {
   var o = new core.List<api.CandlestickData>();
   o.add(buildCandlestickData());
   o.add(buildCandlestickData());
   return o;
 }
 
-checkUnnamed3337(core.List<api.CandlestickData> o) {
+checkUnnamed3037(core.List<api.CandlestickData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCandlestickData(o[0]);
   checkCandlestickData(o[1]);
@@ -1326,7 +1326,7 @@
   var o = new api.CandlestickChartSpec();
   buildCounterCandlestickChartSpec++;
   if (buildCounterCandlestickChartSpec < 3) {
-    o.data = buildUnnamed3337();
+    o.data = buildUnnamed3037();
     o.domain = buildCandlestickDomain();
   }
   buildCounterCandlestickChartSpec--;
@@ -1336,7 +1336,7 @@
 checkCandlestickChartSpec(api.CandlestickChartSpec o) {
   buildCounterCandlestickChartSpec++;
   if (buildCounterCandlestickChartSpec < 3) {
-    checkUnnamed3337(o.data);
+    checkUnnamed3037(o.data);
     checkCandlestickDomain(o.domain);
   }
   buildCounterCandlestickChartSpec--;
@@ -1407,14 +1407,14 @@
   buildCounterCandlestickSeries--;
 }
 
-buildUnnamed3338() {
+buildUnnamed3038() {
   var o = new core.List<api.TextFormatRun>();
   o.add(buildTextFormatRun());
   o.add(buildTextFormatRun());
   return o;
 }
 
-checkUnnamed3338(core.List<api.TextFormatRun> o) {
+checkUnnamed3038(core.List<api.TextFormatRun> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTextFormatRun(o[0]);
   checkTextFormatRun(o[1]);
@@ -1432,7 +1432,7 @@
     o.hyperlink = "foo";
     o.note = "foo";
     o.pivotTable = buildPivotTable();
-    o.textFormatRuns = buildUnnamed3338();
+    o.textFormatRuns = buildUnnamed3038();
     o.userEnteredFormat = buildCellFormat();
     o.userEnteredValue = buildExtendedValue();
   }
@@ -1450,7 +1450,7 @@
     unittest.expect(o.hyperlink, unittest.equals('foo'));
     unittest.expect(o.note, unittest.equals('foo'));
     checkPivotTable(o.pivotTable);
-    checkUnnamed3338(o.textFormatRuns);
+    checkUnnamed3038(o.textFormatRuns);
     checkCellFormat(o.userEnteredFormat);
     checkExtendedValue(o.userEnteredValue);
   }
@@ -1515,14 +1515,14 @@
   buildCounterChartData--;
 }
 
-buildUnnamed3339() {
+buildUnnamed3039() {
   var o = new core.List<api.GridRange>();
   o.add(buildGridRange());
   o.add(buildGridRange());
   return o;
 }
 
-checkUnnamed3339(core.List<api.GridRange> o) {
+checkUnnamed3039(core.List<api.GridRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGridRange(o[0]);
   checkGridRange(o[1]);
@@ -1533,7 +1533,7 @@
   var o = new api.ChartSourceRange();
   buildCounterChartSourceRange++;
   if (buildCounterChartSourceRange < 3) {
-    o.sources = buildUnnamed3339();
+    o.sources = buildUnnamed3039();
   }
   buildCounterChartSourceRange--;
   return o;
@@ -1542,7 +1542,7 @@
 checkChartSourceRange(api.ChartSourceRange o) {
   buildCounterChartSourceRange++;
   if (buildCounterChartSourceRange < 3) {
-    checkUnnamed3339(o.sources);
+    checkUnnamed3039(o.sources);
   }
   buildCounterChartSourceRange--;
 }
@@ -1701,14 +1701,14 @@
   buildCounterConditionValue--;
 }
 
-buildUnnamed3340() {
+buildUnnamed3040() {
   var o = new core.List<api.GridRange>();
   o.add(buildGridRange());
   o.add(buildGridRange());
   return o;
 }
 
-checkUnnamed3340(core.List<api.GridRange> o) {
+checkUnnamed3040(core.List<api.GridRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGridRange(o[0]);
   checkGridRange(o[1]);
@@ -1721,7 +1721,7 @@
   if (buildCounterConditionalFormatRule < 3) {
     o.booleanRule = buildBooleanRule();
     o.gradientRule = buildGradientRule();
-    o.ranges = buildUnnamed3340();
+    o.ranges = buildUnnamed3040();
   }
   buildCounterConditionalFormatRule--;
   return o;
@@ -1732,7 +1732,7 @@
   if (buildCounterConditionalFormatRule < 3) {
     checkBooleanRule(o.booleanRule);
     checkGradientRule(o.gradientRule);
-    checkUnnamed3340(o.ranges);
+    checkUnnamed3040(o.ranges);
   }
   buildCounterConditionalFormatRule--;
 }
@@ -1866,7 +1866,7 @@
   buildCounterDataFilter--;
 }
 
-buildUnnamed3341() {
+buildUnnamed3041() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -1881,7 +1881,7 @@
   return o;
 }
 
-checkUnnamed3341(core.List<core.Object> o) {
+checkUnnamed3041(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1895,17 +1895,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3342() {
+buildUnnamed3042() {
   var o = new core.List<core.List<core.Object>>();
-  o.add(buildUnnamed3341());
-  o.add(buildUnnamed3341());
+  o.add(buildUnnamed3041());
+  o.add(buildUnnamed3041());
   return o;
 }
 
-checkUnnamed3342(core.List<core.List<core.Object>> o) {
+checkUnnamed3042(core.List<core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3341(o[0]);
-  checkUnnamed3341(o[1]);
+  checkUnnamed3041(o[0]);
+  checkUnnamed3041(o[1]);
 }
 
 core.int buildCounterDataFilterValueRange = 0;
@@ -1915,7 +1915,7 @@
   if (buildCounterDataFilterValueRange < 3) {
     o.dataFilter = buildDataFilter();
     o.majorDimension = "foo";
-    o.values = buildUnnamed3342();
+    o.values = buildUnnamed3042();
   }
   buildCounterDataFilterValueRange--;
   return o;
@@ -1926,7 +1926,7 @@
   if (buildCounterDataFilterValueRange < 3) {
     checkDataFilter(o.dataFilter);
     unittest.expect(o.majorDimension, unittest.equals('foo'));
-    checkUnnamed3342(o.values);
+    checkUnnamed3042(o.values);
   }
   buildCounterDataFilterValueRange--;
 }
@@ -2036,14 +2036,14 @@
   buildCounterDeleteDeveloperMetadataRequest--;
 }
 
-buildUnnamed3343() {
+buildUnnamed3043() {
   var o = new core.List<api.DeveloperMetadata>();
   o.add(buildDeveloperMetadata());
   o.add(buildDeveloperMetadata());
   return o;
 }
 
-checkUnnamed3343(core.List<api.DeveloperMetadata> o) {
+checkUnnamed3043(core.List<api.DeveloperMetadata> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeveloperMetadata(o[0]);
   checkDeveloperMetadata(o[1]);
@@ -2054,7 +2054,7 @@
   var o = new api.DeleteDeveloperMetadataResponse();
   buildCounterDeleteDeveloperMetadataResponse++;
   if (buildCounterDeleteDeveloperMetadataResponse < 3) {
-    o.deletedDeveloperMetadata = buildUnnamed3343();
+    o.deletedDeveloperMetadata = buildUnnamed3043();
   }
   buildCounterDeleteDeveloperMetadataResponse--;
   return o;
@@ -2063,7 +2063,7 @@
 checkDeleteDeveloperMetadataResponse(api.DeleteDeveloperMetadataResponse o) {
   buildCounterDeleteDeveloperMetadataResponse++;
   if (buildCounterDeleteDeveloperMetadataResponse < 3) {
-    checkUnnamed3343(o.deletedDeveloperMetadata);
+    checkUnnamed3043(o.deletedDeveloperMetadata);
   }
   buildCounterDeleteDeveloperMetadataResponse--;
 }
@@ -2286,14 +2286,14 @@
   buildCounterDeveloperMetadataLookup--;
 }
 
-buildUnnamed3344() {
+buildUnnamed3044() {
   var o = new core.List<api.DeveloperMetadata>();
   o.add(buildDeveloperMetadata());
   o.add(buildDeveloperMetadata());
   return o;
 }
 
-checkUnnamed3344(core.List<api.DeveloperMetadata> o) {
+checkUnnamed3044(core.List<api.DeveloperMetadata> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeveloperMetadata(o[0]);
   checkDeveloperMetadata(o[1]);
@@ -2304,7 +2304,7 @@
   var o = new api.DimensionProperties();
   buildCounterDimensionProperties++;
   if (buildCounterDimensionProperties < 3) {
-    o.developerMetadata = buildUnnamed3344();
+    o.developerMetadata = buildUnnamed3044();
     o.hiddenByFilter = true;
     o.hiddenByUser = true;
     o.pixelSize = 42;
@@ -2316,7 +2316,7 @@
 checkDimensionProperties(api.DimensionProperties o) {
   buildCounterDimensionProperties++;
   if (buildCounterDimensionProperties < 3) {
-    checkUnnamed3344(o.developerMetadata);
+    checkUnnamed3044(o.developerMetadata);
     unittest.expect(o.hiddenByFilter, unittest.isTrue);
     unittest.expect(o.hiddenByUser, unittest.isTrue);
     unittest.expect(o.pixelSize, unittest.equals(42));
@@ -2431,27 +2431,27 @@
   buildCounterDuplicateSheetResponse--;
 }
 
-buildUnnamed3345() {
+buildUnnamed3045() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3345(core.List<core.String> o) {
+checkUnnamed3045(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3346() {
+buildUnnamed3046() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3346(core.List<core.String> o) {
+checkUnnamed3046(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2463,8 +2463,8 @@
   buildCounterEditors++;
   if (buildCounterEditors < 3) {
     o.domainUsersCanEdit = true;
-    o.groups = buildUnnamed3345();
-    o.users = buildUnnamed3346();
+    o.groups = buildUnnamed3045();
+    o.users = buildUnnamed3046();
   }
   buildCounterEditors--;
   return o;
@@ -2474,8 +2474,8 @@
   buildCounterEditors++;
   if (buildCounterEditors < 3) {
     unittest.expect(o.domainUsersCanEdit, unittest.isTrue);
-    checkUnnamed3345(o.groups);
-    checkUnnamed3346(o.users);
+    checkUnnamed3045(o.groups);
+    checkUnnamed3046(o.users);
   }
   buildCounterEditors--;
 }
@@ -2574,14 +2574,14 @@
   buildCounterExtendedValue--;
 }
 
-buildUnnamed3347() {
+buildUnnamed3047() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3347(core.List<core.String> o) {
+checkUnnamed3047(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2593,7 +2593,7 @@
   buildCounterFilterCriteria++;
   if (buildCounterFilterCriteria < 3) {
     o.condition = buildBooleanCondition();
-    o.hiddenValues = buildUnnamed3347();
+    o.hiddenValues = buildUnnamed3047();
   }
   buildCounterFilterCriteria--;
   return o;
@@ -2603,32 +2603,32 @@
   buildCounterFilterCriteria++;
   if (buildCounterFilterCriteria < 3) {
     checkBooleanCondition(o.condition);
-    checkUnnamed3347(o.hiddenValues);
+    checkUnnamed3047(o.hiddenValues);
   }
   buildCounterFilterCriteria--;
 }
 
-buildUnnamed3348() {
+buildUnnamed3048() {
   var o = new core.Map<core.String, api.FilterCriteria>();
   o["x"] = buildFilterCriteria();
   o["y"] = buildFilterCriteria();
   return o;
 }
 
-checkUnnamed3348(core.Map<core.String, api.FilterCriteria> o) {
+checkUnnamed3048(core.Map<core.String, api.FilterCriteria> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilterCriteria(o["x"]);
   checkFilterCriteria(o["y"]);
 }
 
-buildUnnamed3349() {
+buildUnnamed3049() {
   var o = new core.List<api.SortSpec>();
   o.add(buildSortSpec());
   o.add(buildSortSpec());
   return o;
 }
 
-checkUnnamed3349(core.List<api.SortSpec> o) {
+checkUnnamed3049(core.List<api.SortSpec> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortSpec(o[0]);
   checkSortSpec(o[1]);
@@ -2639,11 +2639,11 @@
   var o = new api.FilterView();
   buildCounterFilterView++;
   if (buildCounterFilterView < 3) {
-    o.criteria = buildUnnamed3348();
+    o.criteria = buildUnnamed3048();
     o.filterViewId = 42;
     o.namedRangeId = "foo";
     o.range = buildGridRange();
-    o.sortSpecs = buildUnnamed3349();
+    o.sortSpecs = buildUnnamed3049();
     o.title = "foo";
   }
   buildCounterFilterView--;
@@ -2653,11 +2653,11 @@
 checkFilterView(api.FilterView o) {
   buildCounterFilterView++;
   if (buildCounterFilterView < 3) {
-    checkUnnamed3348(o.criteria);
+    checkUnnamed3048(o.criteria);
     unittest.expect(o.filterViewId, unittest.equals(42));
     unittest.expect(o.namedRangeId, unittest.equals('foo'));
     checkGridRange(o.range);
-    checkUnnamed3349(o.sortSpecs);
+    checkUnnamed3049(o.sortSpecs);
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterFilterView--;
@@ -2725,14 +2725,14 @@
   buildCounterFindReplaceResponse--;
 }
 
-buildUnnamed3350() {
+buildUnnamed3050() {
   var o = new core.List<api.DataFilter>();
   o.add(buildDataFilter());
   o.add(buildDataFilter());
   return o;
 }
 
-checkUnnamed3350(core.List<api.DataFilter> o) {
+checkUnnamed3050(core.List<api.DataFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataFilter(o[0]);
   checkDataFilter(o[1]);
@@ -2743,7 +2743,7 @@
   var o = new api.GetSpreadsheetByDataFilterRequest();
   buildCounterGetSpreadsheetByDataFilterRequest++;
   if (buildCounterGetSpreadsheetByDataFilterRequest < 3) {
-    o.dataFilters = buildUnnamed3350();
+    o.dataFilters = buildUnnamed3050();
     o.includeGridData = true;
   }
   buildCounterGetSpreadsheetByDataFilterRequest--;
@@ -2754,7 +2754,7 @@
     api.GetSpreadsheetByDataFilterRequest o) {
   buildCounterGetSpreadsheetByDataFilterRequest++;
   if (buildCounterGetSpreadsheetByDataFilterRequest < 3) {
-    checkUnnamed3350(o.dataFilters);
+    checkUnnamed3050(o.dataFilters);
     unittest.expect(o.includeGridData, unittest.isTrue);
   }
   buildCounterGetSpreadsheetByDataFilterRequest--;
@@ -2806,40 +2806,40 @@
   buildCounterGridCoordinate--;
 }
 
-buildUnnamed3351() {
+buildUnnamed3051() {
   var o = new core.List<api.DimensionProperties>();
   o.add(buildDimensionProperties());
   o.add(buildDimensionProperties());
   return o;
 }
 
-checkUnnamed3351(core.List<api.DimensionProperties> o) {
+checkUnnamed3051(core.List<api.DimensionProperties> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionProperties(o[0]);
   checkDimensionProperties(o[1]);
 }
 
-buildUnnamed3352() {
+buildUnnamed3052() {
   var o = new core.List<api.RowData>();
   o.add(buildRowData());
   o.add(buildRowData());
   return o;
 }
 
-checkUnnamed3352(core.List<api.RowData> o) {
+checkUnnamed3052(core.List<api.RowData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRowData(o[0]);
   checkRowData(o[1]);
 }
 
-buildUnnamed3353() {
+buildUnnamed3053() {
   var o = new core.List<api.DimensionProperties>();
   o.add(buildDimensionProperties());
   o.add(buildDimensionProperties());
   return o;
 }
 
-checkUnnamed3353(core.List<api.DimensionProperties> o) {
+checkUnnamed3053(core.List<api.DimensionProperties> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDimensionProperties(o[0]);
   checkDimensionProperties(o[1]);
@@ -2850,9 +2850,9 @@
   var o = new api.GridData();
   buildCounterGridData++;
   if (buildCounterGridData < 3) {
-    o.columnMetadata = buildUnnamed3351();
-    o.rowData = buildUnnamed3352();
-    o.rowMetadata = buildUnnamed3353();
+    o.columnMetadata = buildUnnamed3051();
+    o.rowData = buildUnnamed3052();
+    o.rowMetadata = buildUnnamed3053();
     o.startColumn = 42;
     o.startRow = 42;
   }
@@ -2863,9 +2863,9 @@
 checkGridData(api.GridData o) {
   buildCounterGridData++;
   if (buildCounterGridData < 3) {
-    checkUnnamed3351(o.columnMetadata);
-    checkUnnamed3352(o.rowData);
-    checkUnnamed3353(o.rowMetadata);
+    checkUnnamed3051(o.columnMetadata);
+    checkUnnamed3052(o.rowData);
+    checkUnnamed3053(o.rowMetadata);
     unittest.expect(o.startColumn, unittest.equals(42));
     unittest.expect(o.startRow, unittest.equals(42));
   }
@@ -2926,14 +2926,14 @@
   buildCounterGridRange--;
 }
 
-buildUnnamed3354() {
+buildUnnamed3054() {
   var o = new core.List<api.HistogramSeries>();
   o.add(buildHistogramSeries());
   o.add(buildHistogramSeries());
   return o;
 }
 
-checkUnnamed3354(core.List<api.HistogramSeries> o) {
+checkUnnamed3054(core.List<api.HistogramSeries> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistogramSeries(o[0]);
   checkHistogramSeries(o[1]);
@@ -2947,7 +2947,7 @@
     o.bucketSize = 42.0;
     o.legendPosition = "foo";
     o.outlierPercentile = 42.0;
-    o.series = buildUnnamed3354();
+    o.series = buildUnnamed3054();
     o.showItemDividers = true;
   }
   buildCounterHistogramChartSpec--;
@@ -2960,7 +2960,7 @@
     unittest.expect(o.bucketSize, unittest.equals(42.0));
     unittest.expect(o.legendPosition, unittest.equals('foo'));
     unittest.expect(o.outlierPercentile, unittest.equals(42.0));
-    checkUnnamed3354(o.series);
+    checkUnnamed3054(o.series);
     unittest.expect(o.showItemDividers, unittest.isTrue);
   }
   buildCounterHistogramChartSpec--;
@@ -3117,14 +3117,14 @@
   buildCounterLineStyle--;
 }
 
-buildUnnamed3355() {
+buildUnnamed3055() {
   var o = new core.List<api.ManualRuleGroup>();
   o.add(buildManualRuleGroup());
   o.add(buildManualRuleGroup());
   return o;
 }
 
-checkUnnamed3355(core.List<api.ManualRuleGroup> o) {
+checkUnnamed3055(core.List<api.ManualRuleGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManualRuleGroup(o[0]);
   checkManualRuleGroup(o[1]);
@@ -3135,7 +3135,7 @@
   var o = new api.ManualRule();
   buildCounterManualRule++;
   if (buildCounterManualRule < 3) {
-    o.groups = buildUnnamed3355();
+    o.groups = buildUnnamed3055();
   }
   buildCounterManualRule--;
   return o;
@@ -3144,19 +3144,19 @@
 checkManualRule(api.ManualRule o) {
   buildCounterManualRule++;
   if (buildCounterManualRule < 3) {
-    checkUnnamed3355(o.groups);
+    checkUnnamed3055(o.groups);
   }
   buildCounterManualRule--;
 }
 
-buildUnnamed3356() {
+buildUnnamed3056() {
   var o = new core.List<api.ExtendedValue>();
   o.add(buildExtendedValue());
   o.add(buildExtendedValue());
   return o;
 }
 
-checkUnnamed3356(core.List<api.ExtendedValue> o) {
+checkUnnamed3056(core.List<api.ExtendedValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExtendedValue(o[0]);
   checkExtendedValue(o[1]);
@@ -3168,7 +3168,7 @@
   buildCounterManualRuleGroup++;
   if (buildCounterManualRuleGroup < 3) {
     o.groupName = buildExtendedValue();
-    o.items = buildUnnamed3356();
+    o.items = buildUnnamed3056();
   }
   buildCounterManualRuleGroup--;
   return o;
@@ -3178,19 +3178,19 @@
   buildCounterManualRuleGroup++;
   if (buildCounterManualRuleGroup < 3) {
     checkExtendedValue(o.groupName);
-    checkUnnamed3356(o.items);
+    checkUnnamed3056(o.items);
   }
   buildCounterManualRuleGroup--;
 }
 
-buildUnnamed3357() {
+buildUnnamed3057() {
   var o = new core.List<api.DataFilter>();
   o.add(buildDataFilter());
   o.add(buildDataFilter());
   return o;
 }
 
-checkUnnamed3357(core.List<api.DataFilter> o) {
+checkUnnamed3057(core.List<api.DataFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataFilter(o[0]);
   checkDataFilter(o[1]);
@@ -3201,7 +3201,7 @@
   var o = new api.MatchedDeveloperMetadata();
   buildCounterMatchedDeveloperMetadata++;
   if (buildCounterMatchedDeveloperMetadata < 3) {
-    o.dataFilters = buildUnnamed3357();
+    o.dataFilters = buildUnnamed3057();
     o.developerMetadata = buildDeveloperMetadata();
   }
   buildCounterMatchedDeveloperMetadata--;
@@ -3211,20 +3211,20 @@
 checkMatchedDeveloperMetadata(api.MatchedDeveloperMetadata o) {
   buildCounterMatchedDeveloperMetadata++;
   if (buildCounterMatchedDeveloperMetadata < 3) {
-    checkUnnamed3357(o.dataFilters);
+    checkUnnamed3057(o.dataFilters);
     checkDeveloperMetadata(o.developerMetadata);
   }
   buildCounterMatchedDeveloperMetadata--;
 }
 
-buildUnnamed3358() {
+buildUnnamed3058() {
   var o = new core.List<api.DataFilter>();
   o.add(buildDataFilter());
   o.add(buildDataFilter());
   return o;
 }
 
-checkUnnamed3358(core.List<api.DataFilter> o) {
+checkUnnamed3058(core.List<api.DataFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataFilter(o[0]);
   checkDataFilter(o[1]);
@@ -3235,7 +3235,7 @@
   var o = new api.MatchedValueRange();
   buildCounterMatchedValueRange++;
   if (buildCounterMatchedValueRange < 3) {
-    o.dataFilters = buildUnnamed3358();
+    o.dataFilters = buildUnnamed3058();
     o.valueRange = buildValueRange();
   }
   buildCounterMatchedValueRange--;
@@ -3245,7 +3245,7 @@
 checkMatchedValueRange(api.MatchedValueRange o) {
   buildCounterMatchedValueRange++;
   if (buildCounterMatchedValueRange < 3) {
-    checkUnnamed3358(o.dataFilters);
+    checkUnnamed3058(o.dataFilters);
     checkValueRange(o.valueRange);
   }
   buildCounterMatchedValueRange--;
@@ -3472,14 +3472,14 @@
   buildCounterPieChartSpec--;
 }
 
-buildUnnamed3359() {
+buildUnnamed3059() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3359(core.List<core.String> o) {
+checkUnnamed3059(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3490,7 +3490,7 @@
   var o = new api.PivotFilterCriteria();
   buildCounterPivotFilterCriteria++;
   if (buildCounterPivotFilterCriteria < 3) {
-    o.visibleValues = buildUnnamed3359();
+    o.visibleValues = buildUnnamed3059();
   }
   buildCounterPivotFilterCriteria--;
   return o;
@@ -3499,19 +3499,19 @@
 checkPivotFilterCriteria(api.PivotFilterCriteria o) {
   buildCounterPivotFilterCriteria++;
   if (buildCounterPivotFilterCriteria < 3) {
-    checkUnnamed3359(o.visibleValues);
+    checkUnnamed3059(o.visibleValues);
   }
   buildCounterPivotFilterCriteria--;
 }
 
-buildUnnamed3360() {
+buildUnnamed3060() {
   var o = new core.List<api.PivotGroupValueMetadata>();
   o.add(buildPivotGroupValueMetadata());
   o.add(buildPivotGroupValueMetadata());
   return o;
 }
 
-checkUnnamed3360(core.List<api.PivotGroupValueMetadata> o) {
+checkUnnamed3060(core.List<api.PivotGroupValueMetadata> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPivotGroupValueMetadata(o[0]);
   checkPivotGroupValueMetadata(o[1]);
@@ -3529,7 +3529,7 @@
     o.sortOrder = "foo";
     o.sourceColumnOffset = 42;
     o.valueBucket = buildPivotGroupSortValueBucket();
-    o.valueMetadata = buildUnnamed3360();
+    o.valueMetadata = buildUnnamed3060();
   }
   buildCounterPivotGroup--;
   return o;
@@ -3545,7 +3545,7 @@
     unittest.expect(o.sortOrder, unittest.equals('foo'));
     unittest.expect(o.sourceColumnOffset, unittest.equals(42));
     checkPivotGroupSortValueBucket(o.valueBucket);
-    checkUnnamed3360(o.valueMetadata);
+    checkUnnamed3060(o.valueMetadata);
   }
   buildCounterPivotGroup--;
 }
@@ -3571,14 +3571,14 @@
   buildCounterPivotGroupRule--;
 }
 
-buildUnnamed3361() {
+buildUnnamed3061() {
   var o = new core.List<api.ExtendedValue>();
   o.add(buildExtendedValue());
   o.add(buildExtendedValue());
   return o;
 }
 
-checkUnnamed3361(core.List<api.ExtendedValue> o) {
+checkUnnamed3061(core.List<api.ExtendedValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExtendedValue(o[0]);
   checkExtendedValue(o[1]);
@@ -3589,7 +3589,7 @@
   var o = new api.PivotGroupSortValueBucket();
   buildCounterPivotGroupSortValueBucket++;
   if (buildCounterPivotGroupSortValueBucket < 3) {
-    o.buckets = buildUnnamed3361();
+    o.buckets = buildUnnamed3061();
     o.valuesIndex = 42;
   }
   buildCounterPivotGroupSortValueBucket--;
@@ -3599,7 +3599,7 @@
 checkPivotGroupSortValueBucket(api.PivotGroupSortValueBucket o) {
   buildCounterPivotGroupSortValueBucket++;
   if (buildCounterPivotGroupSortValueBucket < 3) {
-    checkUnnamed3361(o.buckets);
+    checkUnnamed3061(o.buckets);
     unittest.expect(o.valuesIndex, unittest.equals(42));
   }
   buildCounterPivotGroupSortValueBucket--;
@@ -3626,53 +3626,53 @@
   buildCounterPivotGroupValueMetadata--;
 }
 
-buildUnnamed3362() {
+buildUnnamed3062() {
   var o = new core.List<api.PivotGroup>();
   o.add(buildPivotGroup());
   o.add(buildPivotGroup());
   return o;
 }
 
-checkUnnamed3362(core.List<api.PivotGroup> o) {
+checkUnnamed3062(core.List<api.PivotGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPivotGroup(o[0]);
   checkPivotGroup(o[1]);
 }
 
-buildUnnamed3363() {
+buildUnnamed3063() {
   var o = new core.Map<core.String, api.PivotFilterCriteria>();
   o["x"] = buildPivotFilterCriteria();
   o["y"] = buildPivotFilterCriteria();
   return o;
 }
 
-checkUnnamed3363(core.Map<core.String, api.PivotFilterCriteria> o) {
+checkUnnamed3063(core.Map<core.String, api.PivotFilterCriteria> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPivotFilterCriteria(o["x"]);
   checkPivotFilterCriteria(o["y"]);
 }
 
-buildUnnamed3364() {
+buildUnnamed3064() {
   var o = new core.List<api.PivotGroup>();
   o.add(buildPivotGroup());
   o.add(buildPivotGroup());
   return o;
 }
 
-checkUnnamed3364(core.List<api.PivotGroup> o) {
+checkUnnamed3064(core.List<api.PivotGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPivotGroup(o[0]);
   checkPivotGroup(o[1]);
 }
 
-buildUnnamed3365() {
+buildUnnamed3065() {
   var o = new core.List<api.PivotValue>();
   o.add(buildPivotValue());
   o.add(buildPivotValue());
   return o;
 }
 
-checkUnnamed3365(core.List<api.PivotValue> o) {
+checkUnnamed3065(core.List<api.PivotValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPivotValue(o[0]);
   checkPivotValue(o[1]);
@@ -3683,12 +3683,12 @@
   var o = new api.PivotTable();
   buildCounterPivotTable++;
   if (buildCounterPivotTable < 3) {
-    o.columns = buildUnnamed3362();
-    o.criteria = buildUnnamed3363();
-    o.rows = buildUnnamed3364();
+    o.columns = buildUnnamed3062();
+    o.criteria = buildUnnamed3063();
+    o.rows = buildUnnamed3064();
     o.source = buildGridRange();
     o.valueLayout = "foo";
-    o.values = buildUnnamed3365();
+    o.values = buildUnnamed3065();
   }
   buildCounterPivotTable--;
   return o;
@@ -3697,12 +3697,12 @@
 checkPivotTable(api.PivotTable o) {
   buildCounterPivotTable++;
   if (buildCounterPivotTable < 3) {
-    checkUnnamed3362(o.columns);
-    checkUnnamed3363(o.criteria);
-    checkUnnamed3364(o.rows);
+    checkUnnamed3062(o.columns);
+    checkUnnamed3063(o.criteria);
+    checkUnnamed3064(o.rows);
     checkGridRange(o.source);
     unittest.expect(o.valueLayout, unittest.equals('foo'));
-    checkUnnamed3365(o.values);
+    checkUnnamed3065(o.values);
   }
   buildCounterPivotTable--;
 }
@@ -3734,14 +3734,14 @@
   buildCounterPivotValue--;
 }
 
-buildUnnamed3366() {
+buildUnnamed3066() {
   var o = new core.List<api.GridRange>();
   o.add(buildGridRange());
   o.add(buildGridRange());
   return o;
 }
 
-checkUnnamed3366(core.List<api.GridRange> o) {
+checkUnnamed3066(core.List<api.GridRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGridRange(o[0]);
   checkGridRange(o[1]);
@@ -3758,7 +3758,7 @@
     o.protectedRangeId = 42;
     o.range = buildGridRange();
     o.requestingUserCanEdit = true;
-    o.unprotectedRanges = buildUnnamed3366();
+    o.unprotectedRanges = buildUnnamed3066();
     o.warningOnly = true;
   }
   buildCounterProtectedRange--;
@@ -3774,7 +3774,7 @@
     unittest.expect(o.protectedRangeId, unittest.equals(42));
     checkGridRange(o.range);
     unittest.expect(o.requestingUserCanEdit, unittest.isTrue);
-    checkUnnamed3366(o.unprotectedRanges);
+    checkUnnamed3066(o.unprotectedRanges);
     unittest.expect(o.warningOnly, unittest.isTrue);
   }
   buildCounterProtectedRange--;
@@ -3993,14 +3993,14 @@
   buildCounterResponse--;
 }
 
-buildUnnamed3367() {
+buildUnnamed3067() {
   var o = new core.List<api.CellData>();
   o.add(buildCellData());
   o.add(buildCellData());
   return o;
 }
 
-checkUnnamed3367(core.List<api.CellData> o) {
+checkUnnamed3067(core.List<api.CellData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCellData(o[0]);
   checkCellData(o[1]);
@@ -4011,7 +4011,7 @@
   var o = new api.RowData();
   buildCounterRowData++;
   if (buildCounterRowData < 3) {
-    o.values = buildUnnamed3367();
+    o.values = buildUnnamed3067();
   }
   buildCounterRowData--;
   return o;
@@ -4020,19 +4020,19 @@
 checkRowData(api.RowData o) {
   buildCounterRowData++;
   if (buildCounterRowData < 3) {
-    checkUnnamed3367(o.values);
+    checkUnnamed3067(o.values);
   }
   buildCounterRowData--;
 }
 
-buildUnnamed3368() {
+buildUnnamed3068() {
   var o = new core.List<api.DataFilter>();
   o.add(buildDataFilter());
   o.add(buildDataFilter());
   return o;
 }
 
-checkUnnamed3368(core.List<api.DataFilter> o) {
+checkUnnamed3068(core.List<api.DataFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataFilter(o[0]);
   checkDataFilter(o[1]);
@@ -4043,7 +4043,7 @@
   var o = new api.SearchDeveloperMetadataRequest();
   buildCounterSearchDeveloperMetadataRequest++;
   if (buildCounterSearchDeveloperMetadataRequest < 3) {
-    o.dataFilters = buildUnnamed3368();
+    o.dataFilters = buildUnnamed3068();
   }
   buildCounterSearchDeveloperMetadataRequest--;
   return o;
@@ -4052,19 +4052,19 @@
 checkSearchDeveloperMetadataRequest(api.SearchDeveloperMetadataRequest o) {
   buildCounterSearchDeveloperMetadataRequest++;
   if (buildCounterSearchDeveloperMetadataRequest < 3) {
-    checkUnnamed3368(o.dataFilters);
+    checkUnnamed3068(o.dataFilters);
   }
   buildCounterSearchDeveloperMetadataRequest--;
 }
 
-buildUnnamed3369() {
+buildUnnamed3069() {
   var o = new core.List<api.MatchedDeveloperMetadata>();
   o.add(buildMatchedDeveloperMetadata());
   o.add(buildMatchedDeveloperMetadata());
   return o;
 }
 
-checkUnnamed3369(core.List<api.MatchedDeveloperMetadata> o) {
+checkUnnamed3069(core.List<api.MatchedDeveloperMetadata> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMatchedDeveloperMetadata(o[0]);
   checkMatchedDeveloperMetadata(o[1]);
@@ -4075,7 +4075,7 @@
   var o = new api.SearchDeveloperMetadataResponse();
   buildCounterSearchDeveloperMetadataResponse++;
   if (buildCounterSearchDeveloperMetadataResponse < 3) {
-    o.matchedDeveloperMetadata = buildUnnamed3369();
+    o.matchedDeveloperMetadata = buildUnnamed3069();
   }
   buildCounterSearchDeveloperMetadataResponse--;
   return o;
@@ -4084,7 +4084,7 @@
 checkSearchDeveloperMetadataResponse(api.SearchDeveloperMetadataResponse o) {
   buildCounterSearchDeveloperMetadataResponse++;
   if (buildCounterSearchDeveloperMetadataResponse < 3) {
-    checkUnnamed3369(o.matchedDeveloperMetadata);
+    checkUnnamed3069(o.matchedDeveloperMetadata);
   }
   buildCounterSearchDeveloperMetadataResponse--;
 }
@@ -4129,105 +4129,105 @@
   buildCounterSetDataValidationRequest--;
 }
 
-buildUnnamed3370() {
+buildUnnamed3070() {
   var o = new core.List<api.BandedRange>();
   o.add(buildBandedRange());
   o.add(buildBandedRange());
   return o;
 }
 
-checkUnnamed3370(core.List<api.BandedRange> o) {
+checkUnnamed3070(core.List<api.BandedRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBandedRange(o[0]);
   checkBandedRange(o[1]);
 }
 
-buildUnnamed3371() {
+buildUnnamed3071() {
   var o = new core.List<api.EmbeddedChart>();
   o.add(buildEmbeddedChart());
   o.add(buildEmbeddedChart());
   return o;
 }
 
-checkUnnamed3371(core.List<api.EmbeddedChart> o) {
+checkUnnamed3071(core.List<api.EmbeddedChart> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEmbeddedChart(o[0]);
   checkEmbeddedChart(o[1]);
 }
 
-buildUnnamed3372() {
+buildUnnamed3072() {
   var o = new core.List<api.ConditionalFormatRule>();
   o.add(buildConditionalFormatRule());
   o.add(buildConditionalFormatRule());
   return o;
 }
 
-checkUnnamed3372(core.List<api.ConditionalFormatRule> o) {
+checkUnnamed3072(core.List<api.ConditionalFormatRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConditionalFormatRule(o[0]);
   checkConditionalFormatRule(o[1]);
 }
 
-buildUnnamed3373() {
+buildUnnamed3073() {
   var o = new core.List<api.GridData>();
   o.add(buildGridData());
   o.add(buildGridData());
   return o;
 }
 
-checkUnnamed3373(core.List<api.GridData> o) {
+checkUnnamed3073(core.List<api.GridData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGridData(o[0]);
   checkGridData(o[1]);
 }
 
-buildUnnamed3374() {
+buildUnnamed3074() {
   var o = new core.List<api.DeveloperMetadata>();
   o.add(buildDeveloperMetadata());
   o.add(buildDeveloperMetadata());
   return o;
 }
 
-checkUnnamed3374(core.List<api.DeveloperMetadata> o) {
+checkUnnamed3074(core.List<api.DeveloperMetadata> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeveloperMetadata(o[0]);
   checkDeveloperMetadata(o[1]);
 }
 
-buildUnnamed3375() {
+buildUnnamed3075() {
   var o = new core.List<api.FilterView>();
   o.add(buildFilterView());
   o.add(buildFilterView());
   return o;
 }
 
-checkUnnamed3375(core.List<api.FilterView> o) {
+checkUnnamed3075(core.List<api.FilterView> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilterView(o[0]);
   checkFilterView(o[1]);
 }
 
-buildUnnamed3376() {
+buildUnnamed3076() {
   var o = new core.List<api.GridRange>();
   o.add(buildGridRange());
   o.add(buildGridRange());
   return o;
 }
 
-checkUnnamed3376(core.List<api.GridRange> o) {
+checkUnnamed3076(core.List<api.GridRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGridRange(o[0]);
   checkGridRange(o[1]);
 }
 
-buildUnnamed3377() {
+buildUnnamed3077() {
   var o = new core.List<api.ProtectedRange>();
   o.add(buildProtectedRange());
   o.add(buildProtectedRange());
   return o;
 }
 
-checkUnnamed3377(core.List<api.ProtectedRange> o) {
+checkUnnamed3077(core.List<api.ProtectedRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProtectedRange(o[0]);
   checkProtectedRange(o[1]);
@@ -4238,16 +4238,16 @@
   var o = new api.Sheet();
   buildCounterSheet++;
   if (buildCounterSheet < 3) {
-    o.bandedRanges = buildUnnamed3370();
+    o.bandedRanges = buildUnnamed3070();
     o.basicFilter = buildBasicFilter();
-    o.charts = buildUnnamed3371();
-    o.conditionalFormats = buildUnnamed3372();
-    o.data = buildUnnamed3373();
-    o.developerMetadata = buildUnnamed3374();
-    o.filterViews = buildUnnamed3375();
-    o.merges = buildUnnamed3376();
+    o.charts = buildUnnamed3071();
+    o.conditionalFormats = buildUnnamed3072();
+    o.data = buildUnnamed3073();
+    o.developerMetadata = buildUnnamed3074();
+    o.filterViews = buildUnnamed3075();
+    o.merges = buildUnnamed3076();
     o.properties = buildSheetProperties();
-    o.protectedRanges = buildUnnamed3377();
+    o.protectedRanges = buildUnnamed3077();
   }
   buildCounterSheet--;
   return o;
@@ -4256,16 +4256,16 @@
 checkSheet(api.Sheet o) {
   buildCounterSheet++;
   if (buildCounterSheet < 3) {
-    checkUnnamed3370(o.bandedRanges);
+    checkUnnamed3070(o.bandedRanges);
     checkBasicFilter(o.basicFilter);
-    checkUnnamed3371(o.charts);
-    checkUnnamed3372(o.conditionalFormats);
-    checkUnnamed3373(o.data);
-    checkUnnamed3374(o.developerMetadata);
-    checkUnnamed3375(o.filterViews);
-    checkUnnamed3376(o.merges);
+    checkUnnamed3071(o.charts);
+    checkUnnamed3072(o.conditionalFormats);
+    checkUnnamed3073(o.data);
+    checkUnnamed3074(o.developerMetadata);
+    checkUnnamed3075(o.filterViews);
+    checkUnnamed3076(o.merges);
     checkSheetProperties(o.properties);
-    checkUnnamed3377(o.protectedRanges);
+    checkUnnamed3077(o.protectedRanges);
   }
   buildCounterSheet--;
 }
@@ -4303,14 +4303,14 @@
   buildCounterSheetProperties--;
 }
 
-buildUnnamed3378() {
+buildUnnamed3078() {
   var o = new core.List<api.SortSpec>();
   o.add(buildSortSpec());
   o.add(buildSortSpec());
   return o;
 }
 
-checkUnnamed3378(core.List<api.SortSpec> o) {
+checkUnnamed3078(core.List<api.SortSpec> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSortSpec(o[0]);
   checkSortSpec(o[1]);
@@ -4322,7 +4322,7 @@
   buildCounterSortRangeRequest++;
   if (buildCounterSortRangeRequest < 3) {
     o.range = buildGridRange();
-    o.sortSpecs = buildUnnamed3378();
+    o.sortSpecs = buildUnnamed3078();
   }
   buildCounterSortRangeRequest--;
   return o;
@@ -4332,7 +4332,7 @@
   buildCounterSortRangeRequest++;
   if (buildCounterSortRangeRequest < 3) {
     checkGridRange(o.range);
-    checkUnnamed3378(o.sortSpecs);
+    checkUnnamed3078(o.sortSpecs);
   }
   buildCounterSortRangeRequest--;
 }
@@ -4381,40 +4381,40 @@
   buildCounterSourceAndDestination--;
 }
 
-buildUnnamed3379() {
+buildUnnamed3079() {
   var o = new core.List<api.DeveloperMetadata>();
   o.add(buildDeveloperMetadata());
   o.add(buildDeveloperMetadata());
   return o;
 }
 
-checkUnnamed3379(core.List<api.DeveloperMetadata> o) {
+checkUnnamed3079(core.List<api.DeveloperMetadata> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeveloperMetadata(o[0]);
   checkDeveloperMetadata(o[1]);
 }
 
-buildUnnamed3380() {
+buildUnnamed3080() {
   var o = new core.List<api.NamedRange>();
   o.add(buildNamedRange());
   o.add(buildNamedRange());
   return o;
 }
 
-checkUnnamed3380(core.List<api.NamedRange> o) {
+checkUnnamed3080(core.List<api.NamedRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNamedRange(o[0]);
   checkNamedRange(o[1]);
 }
 
-buildUnnamed3381() {
+buildUnnamed3081() {
   var o = new core.List<api.Sheet>();
   o.add(buildSheet());
   o.add(buildSheet());
   return o;
 }
 
-checkUnnamed3381(core.List<api.Sheet> o) {
+checkUnnamed3081(core.List<api.Sheet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSheet(o[0]);
   checkSheet(o[1]);
@@ -4425,10 +4425,10 @@
   var o = new api.Spreadsheet();
   buildCounterSpreadsheet++;
   if (buildCounterSpreadsheet < 3) {
-    o.developerMetadata = buildUnnamed3379();
-    o.namedRanges = buildUnnamed3380();
+    o.developerMetadata = buildUnnamed3079();
+    o.namedRanges = buildUnnamed3080();
     o.properties = buildSpreadsheetProperties();
-    o.sheets = buildUnnamed3381();
+    o.sheets = buildUnnamed3081();
     o.spreadsheetId = "foo";
     o.spreadsheetUrl = "foo";
   }
@@ -4439,10 +4439,10 @@
 checkSpreadsheet(api.Spreadsheet o) {
   buildCounterSpreadsheet++;
   if (buildCounterSpreadsheet < 3) {
-    checkUnnamed3379(o.developerMetadata);
-    checkUnnamed3380(o.namedRanges);
+    checkUnnamed3079(o.developerMetadata);
+    checkUnnamed3080(o.namedRanges);
     checkSpreadsheetProperties(o.properties);
-    checkUnnamed3381(o.sheets);
+    checkUnnamed3081(o.sheets);
     unittest.expect(o.spreadsheetId, unittest.equals('foo'));
     unittest.expect(o.spreadsheetUrl, unittest.equals('foo'));
   }
@@ -4664,14 +4664,14 @@
   buildCounterUpdateBordersRequest--;
 }
 
-buildUnnamed3382() {
+buildUnnamed3082() {
   var o = new core.List<api.RowData>();
   o.add(buildRowData());
   o.add(buildRowData());
   return o;
 }
 
-checkUnnamed3382(core.List<api.RowData> o) {
+checkUnnamed3082(core.List<api.RowData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRowData(o[0]);
   checkRowData(o[1]);
@@ -4684,7 +4684,7 @@
   if (buildCounterUpdateCellsRequest < 3) {
     o.fields = "foo";
     o.range = buildGridRange();
-    o.rows = buildUnnamed3382();
+    o.rows = buildUnnamed3082();
     o.start = buildGridCoordinate();
   }
   buildCounterUpdateCellsRequest--;
@@ -4696,7 +4696,7 @@
   if (buildCounterUpdateCellsRequest < 3) {
     unittest.expect(o.fields, unittest.equals('foo'));
     checkGridRange(o.range);
-    checkUnnamed3382(o.rows);
+    checkUnnamed3082(o.rows);
     checkGridCoordinate(o.start);
   }
   buildCounterUpdateCellsRequest--;
@@ -4775,14 +4775,14 @@
   buildCounterUpdateConditionalFormatRuleResponse--;
 }
 
-buildUnnamed3383() {
+buildUnnamed3083() {
   var o = new core.List<api.DataFilter>();
   o.add(buildDataFilter());
   o.add(buildDataFilter());
   return o;
 }
 
-checkUnnamed3383(core.List<api.DataFilter> o) {
+checkUnnamed3083(core.List<api.DataFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataFilter(o[0]);
   checkDataFilter(o[1]);
@@ -4793,7 +4793,7 @@
   var o = new api.UpdateDeveloperMetadataRequest();
   buildCounterUpdateDeveloperMetadataRequest++;
   if (buildCounterUpdateDeveloperMetadataRequest < 3) {
-    o.dataFilters = buildUnnamed3383();
+    o.dataFilters = buildUnnamed3083();
     o.developerMetadata = buildDeveloperMetadata();
     o.fields = "foo";
   }
@@ -4804,21 +4804,21 @@
 checkUpdateDeveloperMetadataRequest(api.UpdateDeveloperMetadataRequest o) {
   buildCounterUpdateDeveloperMetadataRequest++;
   if (buildCounterUpdateDeveloperMetadataRequest < 3) {
-    checkUnnamed3383(o.dataFilters);
+    checkUnnamed3083(o.dataFilters);
     checkDeveloperMetadata(o.developerMetadata);
     unittest.expect(o.fields, unittest.equals('foo'));
   }
   buildCounterUpdateDeveloperMetadataRequest--;
 }
 
-buildUnnamed3384() {
+buildUnnamed3084() {
   var o = new core.List<api.DeveloperMetadata>();
   o.add(buildDeveloperMetadata());
   o.add(buildDeveloperMetadata());
   return o;
 }
 
-checkUnnamed3384(core.List<api.DeveloperMetadata> o) {
+checkUnnamed3084(core.List<api.DeveloperMetadata> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeveloperMetadata(o[0]);
   checkDeveloperMetadata(o[1]);
@@ -4829,7 +4829,7 @@
   var o = new api.UpdateDeveloperMetadataResponse();
   buildCounterUpdateDeveloperMetadataResponse++;
   if (buildCounterUpdateDeveloperMetadataResponse < 3) {
-    o.developerMetadata = buildUnnamed3384();
+    o.developerMetadata = buildUnnamed3084();
   }
   buildCounterUpdateDeveloperMetadataResponse--;
   return o;
@@ -4838,7 +4838,7 @@
 checkUpdateDeveloperMetadataResponse(api.UpdateDeveloperMetadataResponse o) {
   buildCounterUpdateDeveloperMetadataResponse++;
   if (buildCounterUpdateDeveloperMetadataResponse < 3) {
-    checkUnnamed3384(o.developerMetadata);
+    checkUnnamed3084(o.developerMetadata);
   }
   buildCounterUpdateDeveloperMetadataResponse--;
 }
@@ -5074,7 +5074,7 @@
   buildCounterUpdateValuesResponse--;
 }
 
-buildUnnamed3385() {
+buildUnnamed3085() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -5089,7 +5089,7 @@
   return o;
 }
 
-checkUnnamed3385(core.List<core.Object> o) {
+checkUnnamed3085(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o[0]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -5103,17 +5103,17 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3386() {
+buildUnnamed3086() {
   var o = new core.List<core.List<core.Object>>();
-  o.add(buildUnnamed3385());
-  o.add(buildUnnamed3385());
+  o.add(buildUnnamed3085());
+  o.add(buildUnnamed3085());
   return o;
 }
 
-checkUnnamed3386(core.List<core.List<core.Object>> o) {
+checkUnnamed3086(core.List<core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3385(o[0]);
-  checkUnnamed3385(o[1]);
+  checkUnnamed3085(o[0]);
+  checkUnnamed3085(o[1]);
 }
 
 core.int buildCounterValueRange = 0;
@@ -5123,7 +5123,7 @@
   if (buildCounterValueRange < 3) {
     o.majorDimension = "foo";
     o.range = "foo";
-    o.values = buildUnnamed3386();
+    o.values = buildUnnamed3086();
   }
   buildCounterValueRange--;
   return o;
@@ -5134,7 +5134,7 @@
   if (buildCounterValueRange < 3) {
     unittest.expect(o.majorDimension, unittest.equals('foo'));
     unittest.expect(o.range, unittest.equals('foo'));
-    checkUnnamed3386(o.values);
+    checkUnnamed3086(o.values);
   }
   buildCounterValueRange--;
 }
@@ -5204,14 +5204,14 @@
   buildCounterWaterfallChartDomain--;
 }
 
-buildUnnamed3387() {
+buildUnnamed3087() {
   var o = new core.List<api.WaterfallChartCustomSubtotal>();
   o.add(buildWaterfallChartCustomSubtotal());
   o.add(buildWaterfallChartCustomSubtotal());
   return o;
 }
 
-checkUnnamed3387(core.List<api.WaterfallChartCustomSubtotal> o) {
+checkUnnamed3087(core.List<api.WaterfallChartCustomSubtotal> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWaterfallChartCustomSubtotal(o[0]);
   checkWaterfallChartCustomSubtotal(o[1]);
@@ -5222,7 +5222,7 @@
   var o = new api.WaterfallChartSeries();
   buildCounterWaterfallChartSeries++;
   if (buildCounterWaterfallChartSeries < 3) {
-    o.customSubtotals = buildUnnamed3387();
+    o.customSubtotals = buildUnnamed3087();
     o.data = buildChartData();
     o.hideTrailingSubtotal = true;
     o.negativeColumnsStyle = buildWaterfallChartColumnStyle();
@@ -5236,7 +5236,7 @@
 checkWaterfallChartSeries(api.WaterfallChartSeries o) {
   buildCounterWaterfallChartSeries++;
   if (buildCounterWaterfallChartSeries < 3) {
-    checkUnnamed3387(o.customSubtotals);
+    checkUnnamed3087(o.customSubtotals);
     checkChartData(o.data);
     unittest.expect(o.hideTrailingSubtotal, unittest.isTrue);
     checkWaterfallChartColumnStyle(o.negativeColumnsStyle);
@@ -5246,14 +5246,14 @@
   buildCounterWaterfallChartSeries--;
 }
 
-buildUnnamed3388() {
+buildUnnamed3088() {
   var o = new core.List<api.WaterfallChartSeries>();
   o.add(buildWaterfallChartSeries());
   o.add(buildWaterfallChartSeries());
   return o;
 }
 
-checkUnnamed3388(core.List<api.WaterfallChartSeries> o) {
+checkUnnamed3088(core.List<api.WaterfallChartSeries> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWaterfallChartSeries(o[0]);
   checkWaterfallChartSeries(o[1]);
@@ -5268,7 +5268,7 @@
     o.domain = buildWaterfallChartDomain();
     o.firstValueIsTotal = true;
     o.hideConnectorLines = true;
-    o.series = buildUnnamed3388();
+    o.series = buildUnnamed3088();
     o.stackedType = "foo";
   }
   buildCounterWaterfallChartSpec--;
@@ -5282,33 +5282,33 @@
     checkWaterfallChartDomain(o.domain);
     unittest.expect(o.firstValueIsTotal, unittest.isTrue);
     unittest.expect(o.hideConnectorLines, unittest.isTrue);
-    checkUnnamed3388(o.series);
+    checkUnnamed3088(o.series);
     unittest.expect(o.stackedType, unittest.equals('foo'));
   }
   buildCounterWaterfallChartSpec--;
 }
 
-buildUnnamed3389() {
+buildUnnamed3089() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3389(core.List<core.String> o) {
+checkUnnamed3089(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3390() {
+buildUnnamed3090() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3390(core.List<core.String> o) {
+checkUnnamed3090(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -6795,8 +6795,7 @@
       }), true);
       res
           .batchUpdate(arg_request, arg_spreadsheetId, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.BatchUpdateSpreadsheetResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBatchUpdateSpreadsheetResponse(response);
       })));
     });
@@ -6849,7 +6848,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Spreadsheet response) {
+          .then(unittest.expectAsync1(((response) {
         checkSpreadsheet(response);
       })));
     });
@@ -6858,7 +6857,7 @@
       var mock = new HttpServerMock();
       api.SpreadsheetsResourceApi res = new api.SheetsApi(mock).spreadsheets;
       var arg_spreadsheetId = "foo";
-      var arg_ranges = buildUnnamed3389();
+      var arg_ranges = buildUnnamed3089();
       var arg_includeGridData = true;
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -6910,7 +6909,7 @@
               ranges: arg_ranges,
               includeGridData: arg_includeGridData,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Spreadsheet response) {
+          .then(unittest.expectAsync1(((response) {
         checkSpreadsheet(response);
       })));
     });
@@ -6973,7 +6972,7 @@
       }), true);
       res
           .getByDataFilter(arg_request, arg_spreadsheetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Spreadsheet response) {
+          .then(unittest.expectAsync1(((response) {
         checkSpreadsheet(response);
       })));
     });
@@ -7039,7 +7038,7 @@
       }), true);
       res
           .get(arg_spreadsheetId, arg_metadataId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DeveloperMetadata response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeveloperMetadata(response);
       })));
     });
@@ -7101,9 +7100,9 @@
         var resp = convert.JSON.encode(buildSearchDeveloperMetadataResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.search(arg_request, arg_spreadsheetId, $fields: arg_$fields).then(
-          unittest
-              .expectAsync1(((api.SearchDeveloperMetadataResponse response) {
+      res
+          .search(arg_request, arg_spreadsheetId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSearchDeveloperMetadataResponse(response);
       })));
     });
@@ -7180,7 +7179,7 @@
       res
           .copyTo(arg_request, arg_spreadsheetId, arg_sheetId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SheetProperties response) {
+          .then(unittest.expectAsync1(((response) {
         checkSheetProperties(response);
       })));
     });
@@ -7277,7 +7276,7 @@
               responseDateTimeRenderOption: arg_responseDateTimeRenderOption,
               includeValuesInResponse: arg_includeValuesInResponse,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AppendValuesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAppendValuesResponse(response);
       })));
     });
@@ -7341,7 +7340,7 @@
       }), true);
       res
           .batchClear(arg_request, arg_spreadsheetId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BatchClearValuesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBatchClearValuesResponse(response);
       })));
     });
@@ -7407,8 +7406,7 @@
       res
           .batchClearByDataFilter(arg_request, arg_spreadsheetId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.BatchClearValuesByDataFilterResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBatchClearValuesByDataFilterResponse(response);
       })));
     });
@@ -7420,7 +7418,7 @@
       var arg_spreadsheetId = "foo";
       var arg_valueRenderOption = "foo";
       var arg_dateTimeRenderOption = "foo";
-      var arg_ranges = buildUnnamed3390();
+      var arg_ranges = buildUnnamed3090();
       var arg_majorDimension = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -7484,7 +7482,7 @@
               ranges: arg_ranges,
               majorDimension: arg_majorDimension,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BatchGetValuesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBatchGetValuesResponse(response);
       })));
     });
@@ -7550,8 +7548,7 @@
       res
           .batchGetByDataFilter(arg_request, arg_spreadsheetId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.BatchGetValuesByDataFilterResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBatchGetValuesByDataFilterResponse(response);
       })));
     });
@@ -7615,8 +7612,7 @@
       }), true);
       res
           .batchUpdate(arg_request, arg_spreadsheetId, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.BatchUpdateValuesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBatchUpdateValuesResponse(response);
       })));
     });
@@ -7682,8 +7678,7 @@
       res
           .batchUpdateByDataFilter(arg_request, arg_spreadsheetId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.BatchUpdateValuesByDataFilterResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBatchUpdateValuesByDataFilterResponse(response);
       })));
     });
@@ -7758,7 +7753,7 @@
       res
           .clear(arg_request, arg_spreadsheetId, arg_range,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ClearValuesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkClearValuesResponse(response);
       })));
     });
@@ -7835,7 +7830,7 @@
               valueRenderOption: arg_valueRenderOption,
               dateTimeRenderOption: arg_dateTimeRenderOption,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ValueRange response) {
+          .then(unittest.expectAsync1(((response) {
         checkValueRange(response);
       })));
     });
@@ -7920,7 +7915,7 @@
               valueInputOption: arg_valueInputOption,
               responseDateTimeRenderOption: arg_responseDateTimeRenderOption,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UpdateValuesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkUpdateValuesResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/siteverification/v1_test.dart b/generated/googleapis/test/siteverification/v1_test.dart
index a059468..cf9a8fd 100644
--- a/generated/googleapis/test/siteverification/v1_test.dart
+++ b/generated/googleapis/test/siteverification/v1_test.dart
@@ -116,14 +116,14 @@
   buildCounterSiteVerificationWebResourceGettokenResponse--;
 }
 
-buildUnnamed0() {
+buildUnnamed952() {
   var o = new core.List<api.SiteVerificationWebResourceResource>();
   o.add(buildSiteVerificationWebResourceResource());
   o.add(buildSiteVerificationWebResourceResource());
   return o;
 }
 
-checkUnnamed0(core.List<api.SiteVerificationWebResourceResource> o) {
+checkUnnamed952(core.List<api.SiteVerificationWebResourceResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSiteVerificationWebResourceResource(o[0]);
   checkSiteVerificationWebResourceResource(o[1]);
@@ -134,7 +134,7 @@
   var o = new api.SiteVerificationWebResourceListResponse();
   buildCounterSiteVerificationWebResourceListResponse++;
   if (buildCounterSiteVerificationWebResourceListResponse < 3) {
-    o.items = buildUnnamed0();
+    o.items = buildUnnamed952();
   }
   buildCounterSiteVerificationWebResourceListResponse--;
   return o;
@@ -144,19 +144,19 @@
     api.SiteVerificationWebResourceListResponse o) {
   buildCounterSiteVerificationWebResourceListResponse++;
   if (buildCounterSiteVerificationWebResourceListResponse < 3) {
-    checkUnnamed0(o.items);
+    checkUnnamed952(o.items);
   }
   buildCounterSiteVerificationWebResourceListResponse--;
 }
 
-buildUnnamed1() {
+buildUnnamed953() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1(core.List<core.String> o) {
+checkUnnamed953(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -190,7 +190,7 @@
   buildCounterSiteVerificationWebResourceResource++;
   if (buildCounterSiteVerificationWebResourceResource < 3) {
     o.id = "foo";
-    o.owners = buildUnnamed1();
+    o.owners = buildUnnamed953();
     o.site = buildSiteVerificationWebResourceResourceSite();
   }
   buildCounterSiteVerificationWebResourceResource--;
@@ -202,7 +202,7 @@
   buildCounterSiteVerificationWebResourceResource++;
   if (buildCounterSiteVerificationWebResourceResource < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed1(o.owners);
+    checkUnnamed953(o.owners);
     checkSiteVerificationWebResourceResourceSite(o.site);
   }
   buildCounterSiteVerificationWebResourceResource--;
@@ -370,8 +370,9 @@
             convert.JSON.encode(buildSiteVerificationWebResourceResource());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_id, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.SiteVerificationWebResourceResource response) {
+      res
+          .get(arg_id, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSiteVerificationWebResourceResource(response);
       })));
     });
@@ -428,9 +429,9 @@
             .encode(buildSiteVerificationWebResourceGettokenResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getToken(arg_request, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.SiteVerificationWebResourceGettokenResponse response) {
+      res
+          .getToken(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSiteVerificationWebResourceGettokenResponse(response);
       })));
     });
@@ -491,8 +492,7 @@
       }), true);
       res
           .insert(arg_request, arg_verificationMethod, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.SiteVerificationWebResourceResource response) {
+          .then(unittest.expectAsync1(((response) {
         checkSiteVerificationWebResourceResource(response);
       })));
     });
@@ -544,8 +544,7 @@
             convert.JSON.encode(buildSiteVerificationWebResourceListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list($fields: arg_$fields).then(unittest.expectAsync1(
-          ((api.SiteVerificationWebResourceListResponse response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkSiteVerificationWebResourceListResponse(response);
       })));
     });
@@ -605,8 +604,9 @@
             convert.JSON.encode(buildSiteVerificationWebResourceResource());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_id, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.SiteVerificationWebResourceResource response) {
+      res
+          .patch(arg_request, arg_id, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSiteVerificationWebResourceResource(response);
       })));
     });
@@ -666,8 +666,9 @@
             convert.JSON.encode(buildSiteVerificationWebResourceResource());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.update(arg_request, arg_id, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.SiteVerificationWebResourceResource response) {
+      res
+          .update(arg_request, arg_id, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSiteVerificationWebResourceResource(response);
       })));
     });
diff --git a/generated/googleapis/test/slides/v1_test.dart b/generated/googleapis/test/slides/v1_test.dart
index 2b2c3c0..84b4d5d 100644
--- a/generated/googleapis/test/slides/v1_test.dart
+++ b/generated/googleapis/test/slides/v1_test.dart
@@ -104,14 +104,14 @@
   buildCounterAutoText--;
 }
 
-buildUnnamed1488() {
+buildUnnamed3500() {
   var o = new core.List<api.Request>();
   o.add(buildRequest());
   o.add(buildRequest());
   return o;
 }
 
-checkUnnamed1488(core.List<api.Request> o) {
+checkUnnamed3500(core.List<api.Request> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRequest(o[0]);
   checkRequest(o[1]);
@@ -122,7 +122,7 @@
   var o = new api.BatchUpdatePresentationRequest();
   buildCounterBatchUpdatePresentationRequest++;
   if (buildCounterBatchUpdatePresentationRequest < 3) {
-    o.requests = buildUnnamed1488();
+    o.requests = buildUnnamed3500();
     o.writeControl = buildWriteControl();
   }
   buildCounterBatchUpdatePresentationRequest--;
@@ -132,20 +132,20 @@
 checkBatchUpdatePresentationRequest(api.BatchUpdatePresentationRequest o) {
   buildCounterBatchUpdatePresentationRequest++;
   if (buildCounterBatchUpdatePresentationRequest < 3) {
-    checkUnnamed1488(o.requests);
+    checkUnnamed3500(o.requests);
     checkWriteControl(o.writeControl);
   }
   buildCounterBatchUpdatePresentationRequest--;
 }
 
-buildUnnamed1489() {
+buildUnnamed3501() {
   var o = new core.List<api.Response>();
   o.add(buildResponse());
   o.add(buildResponse());
   return o;
 }
 
-checkUnnamed1489(core.List<api.Response> o) {
+checkUnnamed3501(core.List<api.Response> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResponse(o[0]);
   checkResponse(o[1]);
@@ -157,7 +157,7 @@
   buildCounterBatchUpdatePresentationResponse++;
   if (buildCounterBatchUpdatePresentationResponse < 3) {
     o.presentationId = "foo";
-    o.replies = buildUnnamed1489();
+    o.replies = buildUnnamed3501();
     o.writeControl = buildWriteControl();
   }
   buildCounterBatchUpdatePresentationResponse--;
@@ -168,7 +168,7 @@
   buildCounterBatchUpdatePresentationResponse++;
   if (buildCounterBatchUpdatePresentationResponse < 3) {
     unittest.expect(o.presentationId, unittest.equals('foo'));
-    checkUnnamed1489(o.replies);
+    checkUnnamed3501(o.replies);
     checkWriteControl(o.writeControl);
   }
   buildCounterBatchUpdatePresentationResponse--;
@@ -199,14 +199,14 @@
   buildCounterBullet--;
 }
 
-buildUnnamed1490() {
+buildUnnamed3502() {
   var o = new core.List<api.ThemeColorPair>();
   o.add(buildThemeColorPair());
   o.add(buildThemeColorPair());
   return o;
 }
 
-checkUnnamed1490(core.List<api.ThemeColorPair> o) {
+checkUnnamed3502(core.List<api.ThemeColorPair> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThemeColorPair(o[0]);
   checkThemeColorPair(o[1]);
@@ -217,7 +217,7 @@
   var o = new api.ColorScheme();
   buildCounterColorScheme++;
   if (buildCounterColorScheme < 3) {
-    o.colors = buildUnnamed1490();
+    o.colors = buildUnnamed3502();
   }
   buildCounterColorScheme--;
   return o;
@@ -226,7 +226,7 @@
 checkColorScheme(api.ColorScheme o) {
   buildCounterColorScheme++;
   if (buildCounterColorScheme < 3) {
-    checkUnnamed1490(o.colors);
+    checkUnnamed3502(o.colors);
   }
   buildCounterColorScheme--;
 }
@@ -451,14 +451,14 @@
   buildCounterCreateSheetsChartResponse--;
 }
 
-buildUnnamed1491() {
+buildUnnamed3503() {
   var o = new core.List<api.LayoutPlaceholderIdMapping>();
   o.add(buildLayoutPlaceholderIdMapping());
   o.add(buildLayoutPlaceholderIdMapping());
   return o;
 }
 
-checkUnnamed1491(core.List<api.LayoutPlaceholderIdMapping> o) {
+checkUnnamed3503(core.List<api.LayoutPlaceholderIdMapping> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLayoutPlaceholderIdMapping(o[0]);
   checkLayoutPlaceholderIdMapping(o[1]);
@@ -471,7 +471,7 @@
   if (buildCounterCreateSlideRequest < 3) {
     o.insertionIndex = 42;
     o.objectId = "foo";
-    o.placeholderIdMappings = buildUnnamed1491();
+    o.placeholderIdMappings = buildUnnamed3503();
     o.slideLayoutReference = buildLayoutReference();
   }
   buildCounterCreateSlideRequest--;
@@ -483,7 +483,7 @@
   if (buildCounterCreateSlideRequest < 3) {
     unittest.expect(o.insertionIndex, unittest.equals(42));
     unittest.expect(o.objectId, unittest.equals('foo'));
-    checkUnnamed1491(o.placeholderIdMappings);
+    checkUnnamed3503(o.placeholderIdMappings);
     checkLayoutReference(o.slideLayoutReference);
   }
   buildCounterCreateSlideRequest--;
@@ -751,14 +751,14 @@
   buildCounterDimension--;
 }
 
-buildUnnamed1492() {
+buildUnnamed3504() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1492(core.Map<core.String, core.String> o) {
+checkUnnamed3504(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -770,7 +770,7 @@
   buildCounterDuplicateObjectRequest++;
   if (buildCounterDuplicateObjectRequest < 3) {
     o.objectId = "foo";
-    o.objectIds = buildUnnamed1492();
+    o.objectIds = buildUnnamed3504();
   }
   buildCounterDuplicateObjectRequest--;
   return o;
@@ -780,7 +780,7 @@
   buildCounterDuplicateObjectRequest++;
   if (buildCounterDuplicateObjectRequest < 3) {
     unittest.expect(o.objectId, unittest.equals('foo'));
-    checkUnnamed1492(o.objectIds);
+    checkUnnamed3504(o.objectIds);
   }
   buildCounterDuplicateObjectRequest--;
 }
@@ -804,14 +804,14 @@
   buildCounterDuplicateObjectResponse--;
 }
 
-buildUnnamed1493() {
+buildUnnamed3505() {
   var o = new core.List<api.PageElement>();
   o.add(buildPageElement());
   o.add(buildPageElement());
   return o;
 }
 
-checkUnnamed1493(core.List<api.PageElement> o) {
+checkUnnamed3505(core.List<api.PageElement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPageElement(o[0]);
   checkPageElement(o[1]);
@@ -822,7 +822,7 @@
   var o = new api.Group();
   buildCounterGroup++;
   if (buildCounterGroup < 3) {
-    o.children = buildUnnamed1493();
+    o.children = buildUnnamed3505();
   }
   buildCounterGroup--;
   return o;
@@ -831,19 +831,19 @@
 checkGroup(api.Group o) {
   buildCounterGroup++;
   if (buildCounterGroup < 3) {
-    checkUnnamed1493(o.children);
+    checkUnnamed3505(o.children);
   }
   buildCounterGroup--;
 }
 
-buildUnnamed1494() {
+buildUnnamed3506() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1494(core.List<core.String> o) {
+checkUnnamed3506(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -854,7 +854,7 @@
   var o = new api.GroupObjectsRequest();
   buildCounterGroupObjectsRequest++;
   if (buildCounterGroupObjectsRequest < 3) {
-    o.childrenObjectIds = buildUnnamed1494();
+    o.childrenObjectIds = buildUnnamed3506();
     o.groupObjectId = "foo";
   }
   buildCounterGroupObjectsRequest--;
@@ -864,7 +864,7 @@
 checkGroupObjectsRequest(api.GroupObjectsRequest o) {
   buildCounterGroupObjectsRequest++;
   if (buildCounterGroupObjectsRequest < 3) {
-    checkUnnamed1494(o.childrenObjectIds);
+    checkUnnamed3506(o.childrenObjectIds);
     unittest.expect(o.groupObjectId, unittest.equals('foo'));
   }
   buildCounterGroupObjectsRequest--;
@@ -1181,14 +1181,14 @@
   buildCounterLink--;
 }
 
-buildUnnamed1495() {
+buildUnnamed3507() {
   var o = new core.Map<core.String, api.NestingLevel>();
   o["x"] = buildNestingLevel();
   o["y"] = buildNestingLevel();
   return o;
 }
 
-checkUnnamed1495(core.Map<core.String, api.NestingLevel> o) {
+checkUnnamed3507(core.Map<core.String, api.NestingLevel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNestingLevel(o["x"]);
   checkNestingLevel(o["y"]);
@@ -1200,7 +1200,7 @@
   buildCounterList++;
   if (buildCounterList < 3) {
     o.listId = "foo";
-    o.nestingLevel = buildUnnamed1495();
+    o.nestingLevel = buildUnnamed3507();
   }
   buildCounterList--;
   return o;
@@ -1210,7 +1210,7 @@
   buildCounterList++;
   if (buildCounterList < 3) {
     unittest.expect(o.listId, unittest.equals('foo'));
-    checkUnnamed1495(o.nestingLevel);
+    checkUnnamed3507(o.nestingLevel);
   }
   buildCounterList--;
 }
@@ -1377,14 +1377,14 @@
   buildCounterOutlineFill--;
 }
 
-buildUnnamed1496() {
+buildUnnamed3508() {
   var o = new core.List<api.PageElement>();
   o.add(buildPageElement());
   o.add(buildPageElement());
   return o;
 }
 
-checkUnnamed1496(core.List<api.PageElement> o) {
+checkUnnamed3508(core.List<api.PageElement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPageElement(o[0]);
   checkPageElement(o[1]);
@@ -1399,7 +1399,7 @@
     o.masterProperties = buildMasterProperties();
     o.notesProperties = buildNotesProperties();
     o.objectId = "foo";
-    o.pageElements = buildUnnamed1496();
+    o.pageElements = buildUnnamed3508();
     o.pageProperties = buildPageProperties();
     o.pageType = "foo";
     o.revisionId = "foo";
@@ -1416,7 +1416,7 @@
     checkMasterProperties(o.masterProperties);
     checkNotesProperties(o.notesProperties);
     unittest.expect(o.objectId, unittest.equals('foo'));
-    checkUnnamed1496(o.pageElements);
+    checkUnnamed3508(o.pageElements);
     checkPageProperties(o.pageProperties);
     unittest.expect(o.pageType, unittest.equals('foo'));
     unittest.expect(o.revisionId, unittest.equals('foo'));
@@ -1614,40 +1614,40 @@
   buildCounterPlaceholder--;
 }
 
-buildUnnamed1497() {
+buildUnnamed3509() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed1497(core.List<api.Page> o) {
+checkUnnamed3509(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
 }
 
-buildUnnamed1498() {
+buildUnnamed3510() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed1498(core.List<api.Page> o) {
+checkUnnamed3510(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
 }
 
-buildUnnamed1499() {
+buildUnnamed3511() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed1499(core.List<api.Page> o) {
+checkUnnamed3511(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
@@ -1658,14 +1658,14 @@
   var o = new api.Presentation();
   buildCounterPresentation++;
   if (buildCounterPresentation < 3) {
-    o.layouts = buildUnnamed1497();
+    o.layouts = buildUnnamed3509();
     o.locale = "foo";
-    o.masters = buildUnnamed1498();
+    o.masters = buildUnnamed3510();
     o.notesMaster = buildPage();
     o.pageSize = buildSize();
     o.presentationId = "foo";
     o.revisionId = "foo";
-    o.slides = buildUnnamed1499();
+    o.slides = buildUnnamed3511();
     o.title = "foo";
   }
   buildCounterPresentation--;
@@ -1675,14 +1675,14 @@
 checkPresentation(api.Presentation o) {
   buildCounterPresentation++;
   if (buildCounterPresentation < 3) {
-    checkUnnamed1497(o.layouts);
+    checkUnnamed3509(o.layouts);
     unittest.expect(o.locale, unittest.equals('foo'));
-    checkUnnamed1498(o.masters);
+    checkUnnamed3510(o.masters);
     checkPage(o.notesMaster);
     checkSize(o.pageSize);
     unittest.expect(o.presentationId, unittest.equals('foo'));
     unittest.expect(o.revisionId, unittest.equals('foo'));
-    checkUnnamed1499(o.slides);
+    checkUnnamed3511(o.slides);
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterPresentation--;
@@ -1711,14 +1711,14 @@
   buildCounterRange--;
 }
 
-buildUnnamed1500() {
+buildUnnamed3512() {
   var o = new core.List<api.ColorStop>();
   o.add(buildColorStop());
   o.add(buildColorStop());
   return o;
 }
 
-checkUnnamed1500(core.List<api.ColorStop> o) {
+checkUnnamed3512(core.List<api.ColorStop> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColorStop(o[0]);
   checkColorStop(o[1]);
@@ -1730,7 +1730,7 @@
   buildCounterRecolor++;
   if (buildCounterRecolor < 3) {
     o.name = "foo";
-    o.recolorStops = buildUnnamed1500();
+    o.recolorStops = buildUnnamed3512();
   }
   buildCounterRecolor--;
   return o;
@@ -1740,7 +1740,7 @@
   buildCounterRecolor++;
   if (buildCounterRecolor < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1500(o.recolorStops);
+    checkUnnamed3512(o.recolorStops);
   }
   buildCounterRecolor--;
 }
@@ -1764,14 +1764,14 @@
   buildCounterRefreshSheetsChartRequest--;
 }
 
-buildUnnamed1501() {
+buildUnnamed3513() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1501(core.List<core.String> o) {
+checkUnnamed3513(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1785,7 +1785,7 @@
     o.containsText = buildSubstringMatchCriteria();
     o.imageReplaceMethod = "foo";
     o.imageUrl = "foo";
-    o.pageObjectIds = buildUnnamed1501();
+    o.pageObjectIds = buildUnnamed3513();
     o.replaceMethod = "foo";
   }
   buildCounterReplaceAllShapesWithImageRequest--;
@@ -1798,7 +1798,7 @@
     checkSubstringMatchCriteria(o.containsText);
     unittest.expect(o.imageReplaceMethod, unittest.equals('foo'));
     unittest.expect(o.imageUrl, unittest.equals('foo'));
-    checkUnnamed1501(o.pageObjectIds);
+    checkUnnamed3513(o.pageObjectIds);
     unittest.expect(o.replaceMethod, unittest.equals('foo'));
   }
   buildCounterReplaceAllShapesWithImageRequest--;
@@ -1824,14 +1824,14 @@
   buildCounterReplaceAllShapesWithImageResponse--;
 }
 
-buildUnnamed1502() {
+buildUnnamed3514() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1502(core.List<core.String> o) {
+checkUnnamed3514(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1845,7 +1845,7 @@
     o.chartId = 42;
     o.containsText = buildSubstringMatchCriteria();
     o.linkingMode = "foo";
-    o.pageObjectIds = buildUnnamed1502();
+    o.pageObjectIds = buildUnnamed3514();
     o.spreadsheetId = "foo";
   }
   buildCounterReplaceAllShapesWithSheetsChartRequest--;
@@ -1859,7 +1859,7 @@
     unittest.expect(o.chartId, unittest.equals(42));
     checkSubstringMatchCriteria(o.containsText);
     unittest.expect(o.linkingMode, unittest.equals('foo'));
-    checkUnnamed1502(o.pageObjectIds);
+    checkUnnamed3514(o.pageObjectIds);
     unittest.expect(o.spreadsheetId, unittest.equals('foo'));
   }
   buildCounterReplaceAllShapesWithSheetsChartRequest--;
@@ -1885,14 +1885,14 @@
   buildCounterReplaceAllShapesWithSheetsChartResponse--;
 }
 
-buildUnnamed1503() {
+buildUnnamed3515() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1503(core.List<core.String> o) {
+checkUnnamed3515(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1904,7 +1904,7 @@
   buildCounterReplaceAllTextRequest++;
   if (buildCounterReplaceAllTextRequest < 3) {
     o.containsText = buildSubstringMatchCriteria();
-    o.pageObjectIds = buildUnnamed1503();
+    o.pageObjectIds = buildUnnamed3515();
     o.replaceText = "foo";
   }
   buildCounterReplaceAllTextRequest--;
@@ -1915,7 +1915,7 @@
   buildCounterReplaceAllTextRequest++;
   if (buildCounterReplaceAllTextRequest < 3) {
     checkSubstringMatchCriteria(o.containsText);
-    checkUnnamed1503(o.pageObjectIds);
+    checkUnnamed3515(o.pageObjectIds);
     unittest.expect(o.replaceText, unittest.equals('foo'));
   }
   buildCounterReplaceAllTextRequest--;
@@ -2360,53 +2360,53 @@
   buildCounterSubstringMatchCriteria--;
 }
 
-buildUnnamed1504() {
+buildUnnamed3516() {
   var o = new core.List<api.TableBorderRow>();
   o.add(buildTableBorderRow());
   o.add(buildTableBorderRow());
   return o;
 }
 
-checkUnnamed1504(core.List<api.TableBorderRow> o) {
+checkUnnamed3516(core.List<api.TableBorderRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableBorderRow(o[0]);
   checkTableBorderRow(o[1]);
 }
 
-buildUnnamed1505() {
+buildUnnamed3517() {
   var o = new core.List<api.TableColumnProperties>();
   o.add(buildTableColumnProperties());
   o.add(buildTableColumnProperties());
   return o;
 }
 
-checkUnnamed1505(core.List<api.TableColumnProperties> o) {
+checkUnnamed3517(core.List<api.TableColumnProperties> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableColumnProperties(o[0]);
   checkTableColumnProperties(o[1]);
 }
 
-buildUnnamed1506() {
+buildUnnamed3518() {
   var o = new core.List<api.TableRow>();
   o.add(buildTableRow());
   o.add(buildTableRow());
   return o;
 }
 
-checkUnnamed1506(core.List<api.TableRow> o) {
+checkUnnamed3518(core.List<api.TableRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableRow(o[0]);
   checkTableRow(o[1]);
 }
 
-buildUnnamed1507() {
+buildUnnamed3519() {
   var o = new core.List<api.TableBorderRow>();
   o.add(buildTableBorderRow());
   o.add(buildTableBorderRow());
   return o;
 }
 
-checkUnnamed1507(core.List<api.TableBorderRow> o) {
+checkUnnamed3519(core.List<api.TableBorderRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableBorderRow(o[0]);
   checkTableBorderRow(o[1]);
@@ -2418,11 +2418,11 @@
   buildCounterTable++;
   if (buildCounterTable < 3) {
     o.columns = 42;
-    o.horizontalBorderRows = buildUnnamed1504();
+    o.horizontalBorderRows = buildUnnamed3516();
     o.rows = 42;
-    o.tableColumns = buildUnnamed1505();
-    o.tableRows = buildUnnamed1506();
-    o.verticalBorderRows = buildUnnamed1507();
+    o.tableColumns = buildUnnamed3517();
+    o.tableRows = buildUnnamed3518();
+    o.verticalBorderRows = buildUnnamed3519();
   }
   buildCounterTable--;
   return o;
@@ -2432,11 +2432,11 @@
   buildCounterTable++;
   if (buildCounterTable < 3) {
     unittest.expect(o.columns, unittest.equals(42));
-    checkUnnamed1504(o.horizontalBorderRows);
+    checkUnnamed3516(o.horizontalBorderRows);
     unittest.expect(o.rows, unittest.equals(42));
-    checkUnnamed1505(o.tableColumns);
-    checkUnnamed1506(o.tableRows);
-    checkUnnamed1507(o.verticalBorderRows);
+    checkUnnamed3517(o.tableColumns);
+    checkUnnamed3518(o.tableRows);
+    checkUnnamed3519(o.verticalBorderRows);
   }
   buildCounterTable--;
 }
@@ -2504,14 +2504,14 @@
   buildCounterTableBorderProperties--;
 }
 
-buildUnnamed1508() {
+buildUnnamed3520() {
   var o = new core.List<api.TableBorderCell>();
   o.add(buildTableBorderCell());
   o.add(buildTableBorderCell());
   return o;
 }
 
-checkUnnamed1508(core.List<api.TableBorderCell> o) {
+checkUnnamed3520(core.List<api.TableBorderCell> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableBorderCell(o[0]);
   checkTableBorderCell(o[1]);
@@ -2522,7 +2522,7 @@
   var o = new api.TableBorderRow();
   buildCounterTableBorderRow++;
   if (buildCounterTableBorderRow < 3) {
-    o.tableBorderCells = buildUnnamed1508();
+    o.tableBorderCells = buildUnnamed3520();
   }
   buildCounterTableBorderRow--;
   return o;
@@ -2531,7 +2531,7 @@
 checkTableBorderRow(api.TableBorderRow o) {
   buildCounterTableBorderRow++;
   if (buildCounterTableBorderRow < 3) {
-    checkUnnamed1508(o.tableBorderCells);
+    checkUnnamed3520(o.tableBorderCells);
   }
   buildCounterTableBorderRow--;
 }
@@ -2668,14 +2668,14 @@
   buildCounterTableRange--;
 }
 
-buildUnnamed1509() {
+buildUnnamed3521() {
   var o = new core.List<api.TableCell>();
   o.add(buildTableCell());
   o.add(buildTableCell());
   return o;
 }
 
-checkUnnamed1509(core.List<api.TableCell> o) {
+checkUnnamed3521(core.List<api.TableCell> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTableCell(o[0]);
   checkTableCell(o[1]);
@@ -2687,7 +2687,7 @@
   buildCounterTableRow++;
   if (buildCounterTableRow < 3) {
     o.rowHeight = buildDimension();
-    o.tableCells = buildUnnamed1509();
+    o.tableCells = buildUnnamed3521();
     o.tableRowProperties = buildTableRowProperties();
   }
   buildCounterTableRow--;
@@ -2698,7 +2698,7 @@
   buildCounterTableRow++;
   if (buildCounterTableRow < 3) {
     checkDimension(o.rowHeight);
-    checkUnnamed1509(o.tableCells);
+    checkUnnamed3521(o.tableCells);
     checkTableRowProperties(o.tableRowProperties);
   }
   buildCounterTableRow--;
@@ -2723,27 +2723,27 @@
   buildCounterTableRowProperties--;
 }
 
-buildUnnamed1510() {
+buildUnnamed3522() {
   var o = new core.Map<core.String, api.List>();
   o["x"] = buildList();
   o["y"] = buildList();
   return o;
 }
 
-checkUnnamed1510(core.Map<core.String, api.List> o) {
+checkUnnamed3522(core.Map<core.String, api.List> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkList(o["x"]);
   checkList(o["y"]);
 }
 
-buildUnnamed1511() {
+buildUnnamed3523() {
   var o = new core.List<api.TextElement>();
   o.add(buildTextElement());
   o.add(buildTextElement());
   return o;
 }
 
-checkUnnamed1511(core.List<api.TextElement> o) {
+checkUnnamed3523(core.List<api.TextElement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTextElement(o[0]);
   checkTextElement(o[1]);
@@ -2754,8 +2754,8 @@
   var o = new api.TextContent();
   buildCounterTextContent++;
   if (buildCounterTextContent < 3) {
-    o.lists = buildUnnamed1510();
-    o.textElements = buildUnnamed1511();
+    o.lists = buildUnnamed3522();
+    o.textElements = buildUnnamed3523();
   }
   buildCounterTextContent--;
   return o;
@@ -2764,8 +2764,8 @@
 checkTextContent(api.TextContent o) {
   buildCounterTextContent++;
   if (buildCounterTextContent < 3) {
-    checkUnnamed1510(o.lists);
-    checkUnnamed1511(o.textElements);
+    checkUnnamed3522(o.lists);
+    checkUnnamed3523(o.textElements);
   }
   buildCounterTextContent--;
 }
@@ -2903,14 +2903,14 @@
   buildCounterThumbnail--;
 }
 
-buildUnnamed1512() {
+buildUnnamed3524() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1512(core.List<core.String> o) {
+checkUnnamed3524(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2921,7 +2921,7 @@
   var o = new api.UngroupObjectsRequest();
   buildCounterUngroupObjectsRequest++;
   if (buildCounterUngroupObjectsRequest < 3) {
-    o.objectIds = buildUnnamed1512();
+    o.objectIds = buildUnnamed3524();
   }
   buildCounterUngroupObjectsRequest--;
   return o;
@@ -2930,7 +2930,7 @@
 checkUngroupObjectsRequest(api.UngroupObjectsRequest o) {
   buildCounterUngroupObjectsRequest++;
   if (buildCounterUngroupObjectsRequest < 3) {
-    checkUnnamed1512(o.objectIds);
+    checkUnnamed3524(o.objectIds);
   }
   buildCounterUngroupObjectsRequest--;
 }
@@ -3122,14 +3122,14 @@
   buildCounterUpdateShapePropertiesRequest--;
 }
 
-buildUnnamed1513() {
+buildUnnamed3525() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1513(core.List<core.String> o) {
+checkUnnamed3525(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3141,7 +3141,7 @@
   buildCounterUpdateSlidesPositionRequest++;
   if (buildCounterUpdateSlidesPositionRequest < 3) {
     o.insertionIndex = 42;
-    o.slideObjectIds = buildUnnamed1513();
+    o.slideObjectIds = buildUnnamed3525();
   }
   buildCounterUpdateSlidesPositionRequest--;
   return o;
@@ -3151,7 +3151,7 @@
   buildCounterUpdateSlidesPositionRequest++;
   if (buildCounterUpdateSlidesPositionRequest < 3) {
     unittest.expect(o.insertionIndex, unittest.equals(42));
-    checkUnnamed1513(o.slideObjectIds);
+    checkUnnamed3525(o.slideObjectIds);
   }
   buildCounterUpdateSlidesPositionRequest--;
 }
@@ -3209,14 +3209,14 @@
   buildCounterUpdateTableCellPropertiesRequest--;
 }
 
-buildUnnamed1514() {
+buildUnnamed3526() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1514(core.List<core.int> o) {
+checkUnnamed3526(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -3227,7 +3227,7 @@
   var o = new api.UpdateTableColumnPropertiesRequest();
   buildCounterUpdateTableColumnPropertiesRequest++;
   if (buildCounterUpdateTableColumnPropertiesRequest < 3) {
-    o.columnIndices = buildUnnamed1514();
+    o.columnIndices = buildUnnamed3526();
     o.fields = "foo";
     o.objectId = "foo";
     o.tableColumnProperties = buildTableColumnProperties();
@@ -3240,7 +3240,7 @@
     api.UpdateTableColumnPropertiesRequest o) {
   buildCounterUpdateTableColumnPropertiesRequest++;
   if (buildCounterUpdateTableColumnPropertiesRequest < 3) {
-    checkUnnamed1514(o.columnIndices);
+    checkUnnamed3526(o.columnIndices);
     unittest.expect(o.fields, unittest.equals('foo'));
     unittest.expect(o.objectId, unittest.equals('foo'));
     checkTableColumnProperties(o.tableColumnProperties);
@@ -3248,14 +3248,14 @@
   buildCounterUpdateTableColumnPropertiesRequest--;
 }
 
-buildUnnamed1515() {
+buildUnnamed3527() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1515(core.List<core.int> o) {
+checkUnnamed3527(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -3268,7 +3268,7 @@
   if (buildCounterUpdateTableRowPropertiesRequest < 3) {
     o.fields = "foo";
     o.objectId = "foo";
-    o.rowIndices = buildUnnamed1515();
+    o.rowIndices = buildUnnamed3527();
     o.tableRowProperties = buildTableRowProperties();
   }
   buildCounterUpdateTableRowPropertiesRequest--;
@@ -3280,7 +3280,7 @@
   if (buildCounterUpdateTableRowPropertiesRequest < 3) {
     unittest.expect(o.fields, unittest.equals('foo'));
     unittest.expect(o.objectId, unittest.equals('foo'));
-    checkUnnamed1515(o.rowIndices);
+    checkUnnamed3527(o.rowIndices);
     checkTableRowProperties(o.tableRowProperties);
   }
   buildCounterUpdateTableRowPropertiesRequest--;
@@ -4517,8 +4517,7 @@
       }), true);
       res
           .batchUpdate(arg_request, arg_presentationId, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.BatchUpdatePresentationResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBatchUpdatePresentationResponse(response);
       })));
     });
@@ -4571,7 +4570,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Presentation response) {
+          .then(unittest.expectAsync1(((response) {
         checkPresentation(response);
       })));
     });
@@ -4622,7 +4621,7 @@
       }), true);
       res
           .get(arg_presentationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Presentation response) {
+          .then(unittest.expectAsync1(((response) {
         checkPresentation(response);
       })));
     });
@@ -4688,7 +4687,7 @@
       }), true);
       res
           .get(arg_presentationId, arg_pageObjectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Page response) {
+          .then(unittest.expectAsync1(((response) {
         checkPage(response);
       })));
     });
@@ -4768,7 +4767,7 @@
               thumbnailProperties_thumbnailSize:
                   arg_thumbnailProperties_thumbnailSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Thumbnail response) {
+          .then(unittest.expectAsync1(((response) {
         checkThumbnail(response);
       })));
     });
diff --git a/generated/googleapis/test/sourcerepo/v1_test.dart b/generated/googleapis/test/sourcerepo/v1_test.dart
index c08f004..d099554 100644
--- a/generated/googleapis/test/sourcerepo/v1_test.dart
+++ b/generated/googleapis/test/sourcerepo/v1_test.dart
@@ -50,27 +50,27 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed212() {
+buildUnnamed1575() {
   var o = new core.List<api.AuditLogConfig>();
   o.add(buildAuditLogConfig());
   o.add(buildAuditLogConfig());
   return o;
 }
 
-checkUnnamed212(core.List<api.AuditLogConfig> o) {
+checkUnnamed1575(core.List<api.AuditLogConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditLogConfig(o[0]);
   checkAuditLogConfig(o[1]);
 }
 
-buildUnnamed213() {
+buildUnnamed1576() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed213(core.List<core.String> o) {
+checkUnnamed1576(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -81,8 +81,8 @@
   var o = new api.AuditConfig();
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    o.auditLogConfigs = buildUnnamed212();
-    o.exemptedMembers = buildUnnamed213();
+    o.auditLogConfigs = buildUnnamed1575();
+    o.exemptedMembers = buildUnnamed1576();
     o.service = "foo";
   }
   buildCounterAuditConfig--;
@@ -92,21 +92,21 @@
 checkAuditConfig(api.AuditConfig o) {
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    checkUnnamed212(o.auditLogConfigs);
-    checkUnnamed213(o.exemptedMembers);
+    checkUnnamed1575(o.auditLogConfigs);
+    checkUnnamed1576(o.exemptedMembers);
     unittest.expect(o.service, unittest.equals('foo'));
   }
   buildCounterAuditConfig--;
 }
 
-buildUnnamed214() {
+buildUnnamed1577() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed214(core.List<core.String> o) {
+checkUnnamed1577(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -117,7 +117,7 @@
   var o = new api.AuditLogConfig();
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    o.exemptedMembers = buildUnnamed214();
+    o.exemptedMembers = buildUnnamed1577();
     o.logType = "foo";
   }
   buildCounterAuditLogConfig--;
@@ -127,20 +127,20 @@
 checkAuditLogConfig(api.AuditLogConfig o) {
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    checkUnnamed214(o.exemptedMembers);
+    checkUnnamed1577(o.exemptedMembers);
     unittest.expect(o.logType, unittest.equals('foo'));
   }
   buildCounterAuditLogConfig--;
 }
 
-buildUnnamed215() {
+buildUnnamed1578() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed215(core.List<core.String> o) {
+checkUnnamed1578(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -152,7 +152,7 @@
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
     o.condition = buildExpr();
-    o.members = buildUnnamed215();
+    o.members = buildUnnamed1578();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -163,7 +163,7 @@
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
     checkExpr(o.condition);
-    checkUnnamed215(o.members);
+    checkUnnamed1578(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
@@ -209,14 +209,14 @@
   buildCounterExpr--;
 }
 
-buildUnnamed216() {
+buildUnnamed1579() {
   var o = new core.List<api.Repo>();
   o.add(buildRepo());
   o.add(buildRepo());
   return o;
 }
 
-checkUnnamed216(core.List<api.Repo> o) {
+checkUnnamed1579(core.List<api.Repo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRepo(o[0]);
   checkRepo(o[1]);
@@ -228,7 +228,7 @@
   buildCounterListReposResponse++;
   if (buildCounterListReposResponse < 3) {
     o.nextPageToken = "foo";
-    o.repos = buildUnnamed216();
+    o.repos = buildUnnamed1579();
   }
   buildCounterListReposResponse--;
   return o;
@@ -238,7 +238,7 @@
   buildCounterListReposResponse++;
   if (buildCounterListReposResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed216(o.repos);
+    checkUnnamed1579(o.repos);
   }
   buildCounterListReposResponse--;
 }
@@ -266,27 +266,27 @@
   buildCounterMirrorConfig--;
 }
 
-buildUnnamed217() {
+buildUnnamed1580() {
   var o = new core.List<api.AuditConfig>();
   o.add(buildAuditConfig());
   o.add(buildAuditConfig());
   return o;
 }
 
-checkUnnamed217(core.List<api.AuditConfig> o) {
+checkUnnamed1580(core.List<api.AuditConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditConfig(o[0]);
   checkAuditConfig(o[1]);
 }
 
-buildUnnamed218() {
+buildUnnamed1581() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed218(core.List<api.Binding> o) {
+checkUnnamed1581(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -297,8 +297,8 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.auditConfigs = buildUnnamed217();
-    o.bindings = buildUnnamed218();
+    o.auditConfigs = buildUnnamed1580();
+    o.bindings = buildUnnamed1581();
     o.etag = "foo";
     o.iamOwned = true;
     o.version = 42;
@@ -310,8 +310,8 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed217(o.auditConfigs);
-    checkUnnamed218(o.bindings);
+    checkUnnamed1580(o.auditConfigs);
+    checkUnnamed1581(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.iamOwned, unittest.isTrue);
     unittest.expect(o.version, unittest.equals(42));
@@ -365,14 +365,14 @@
   buildCounterSetIamPolicyRequest--;
 }
 
-buildUnnamed219() {
+buildUnnamed1582() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed219(core.List<core.String> o) {
+checkUnnamed1582(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -383,7 +383,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed219();
+    o.permissions = buildUnnamed1582();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -392,19 +392,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed219(o.permissions);
+    checkUnnamed1582(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed220() {
+buildUnnamed1583() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed220(core.List<core.String> o) {
+checkUnnamed1583(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -415,7 +415,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed220();
+    o.permissions = buildUnnamed1583();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -424,7 +424,7 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed220(o.permissions);
+    checkUnnamed1583(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
@@ -578,7 +578,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Repo response) {
+          .then(unittest.expectAsync1(((response) {
         checkRepo(response);
       })));
     });
@@ -630,7 +630,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -682,7 +682,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Repo response) {
+          .then(unittest.expectAsync1(((response) {
         checkRepo(response);
       })));
     });
@@ -734,7 +734,7 @@
       }), true);
       res
           .getIamPolicy(arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -795,7 +795,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListReposResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListReposResponse(response);
       })));
     });
@@ -851,7 +851,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -907,8 +907,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/spanner/v1_test.dart b/generated/googleapis/test/spanner/v1_test.dart
index 0e0d1ce..7d63c0f 100644
--- a/generated/googleapis/test/spanner/v1_test.dart
+++ b/generated/googleapis/test/spanner/v1_test.dart
@@ -69,14 +69,14 @@
   buildCounterBeginTransactionRequest--;
 }
 
-buildUnnamed1204() {
+buildUnnamed954() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1204(core.List<core.String> o) {
+checkUnnamed954(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -87,7 +87,7 @@
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed1204();
+    o.members = buildUnnamed954();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -97,7 +97,7 @@
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed1204(o.members);
+    checkUnnamed954(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
@@ -126,14 +126,14 @@
   buildCounterChildLink--;
 }
 
-buildUnnamed1205() {
+buildUnnamed955() {
   var o = new core.List<api.Mutation>();
   o.add(buildMutation());
   o.add(buildMutation());
   return o;
 }
 
-checkUnnamed1205(core.List<api.Mutation> o) {
+checkUnnamed955(core.List<api.Mutation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMutation(o[0]);
   checkMutation(o[1]);
@@ -144,7 +144,7 @@
   var o = new api.CommitRequest();
   buildCounterCommitRequest++;
   if (buildCounterCommitRequest < 3) {
-    o.mutations = buildUnnamed1205();
+    o.mutations = buildUnnamed955();
     o.singleUseTransaction = buildTransactionOptions();
     o.transactionId = "foo";
   }
@@ -155,7 +155,7 @@
 checkCommitRequest(api.CommitRequest o) {
   buildCounterCommitRequest++;
   if (buildCounterCommitRequest < 3) {
-    checkUnnamed1205(o.mutations);
+    checkUnnamed955(o.mutations);
     checkTransactionOptions(o.singleUseTransaction);
     unittest.expect(o.transactionId, unittest.equals('foo'));
   }
@@ -200,14 +200,14 @@
   buildCounterCreateDatabaseMetadata--;
 }
 
-buildUnnamed1206() {
+buildUnnamed956() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1206(core.List<core.String> o) {
+checkUnnamed956(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -219,7 +219,7 @@
   buildCounterCreateDatabaseRequest++;
   if (buildCounterCreateDatabaseRequest < 3) {
     o.createStatement = "foo";
-    o.extraStatements = buildUnnamed1206();
+    o.extraStatements = buildUnnamed956();
   }
   buildCounterCreateDatabaseRequest--;
   return o;
@@ -229,7 +229,7 @@
   buildCounterCreateDatabaseRequest++;
   if (buildCounterCreateDatabaseRequest < 3) {
     unittest.expect(o.createStatement, unittest.equals('foo'));
-    checkUnnamed1206(o.extraStatements);
+    checkUnnamed956(o.extraStatements);
   }
   buildCounterCreateDatabaseRequest--;
 }
@@ -356,20 +356,20 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed1207() {
+buildUnnamed957() {
   var o = new core.Map<core.String, api.Type>();
   o["x"] = buildType();
   o["y"] = buildType();
   return o;
 }
 
-checkUnnamed1207(core.Map<core.String, api.Type> o) {
+checkUnnamed957(core.Map<core.String, api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o["x"]);
   checkType(o["y"]);
 }
 
-buildUnnamed1208() {
+buildUnnamed958() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -384,7 +384,7 @@
   return o;
 }
 
-checkUnnamed1208(core.Map<core.String, core.Object> o) {
+checkUnnamed958(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -403,8 +403,8 @@
   var o = new api.ExecuteSqlRequest();
   buildCounterExecuteSqlRequest++;
   if (buildCounterExecuteSqlRequest < 3) {
-    o.paramTypes = buildUnnamed1207();
-    o.params = buildUnnamed1208();
+    o.paramTypes = buildUnnamed957();
+    o.params = buildUnnamed958();
     o.partitionToken = "foo";
     o.queryMode = "foo";
     o.resumeToken = "foo";
@@ -418,8 +418,8 @@
 checkExecuteSqlRequest(api.ExecuteSqlRequest o) {
   buildCounterExecuteSqlRequest++;
   if (buildCounterExecuteSqlRequest < 3) {
-    checkUnnamed1207(o.paramTypes);
-    checkUnnamed1208(o.params);
+    checkUnnamed957(o.paramTypes);
+    checkUnnamed958(o.params);
     unittest.expect(o.partitionToken, unittest.equals('foo'));
     unittest.expect(o.queryMode, unittest.equals('foo'));
     unittest.expect(o.resumeToken, unittest.equals('foo'));
@@ -450,14 +450,14 @@
   buildCounterField--;
 }
 
-buildUnnamed1209() {
+buildUnnamed959() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1209(core.List<core.String> o) {
+checkUnnamed959(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -468,7 +468,7 @@
   var o = new api.GetDatabaseDdlResponse();
   buildCounterGetDatabaseDdlResponse++;
   if (buildCounterGetDatabaseDdlResponse < 3) {
-    o.statements = buildUnnamed1209();
+    o.statements = buildUnnamed959();
   }
   buildCounterGetDatabaseDdlResponse--;
   return o;
@@ -477,7 +477,7 @@
 checkGetDatabaseDdlResponse(api.GetDatabaseDdlResponse o) {
   buildCounterGetDatabaseDdlResponse++;
   if (buildCounterGetDatabaseDdlResponse < 3) {
-    checkUnnamed1209(o.statements);
+    checkUnnamed959(o.statements);
   }
   buildCounterGetDatabaseDdlResponse--;
 }
@@ -497,14 +497,14 @@
   buildCounterGetIamPolicyRequest--;
 }
 
-buildUnnamed1210() {
+buildUnnamed960() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1210(core.Map<core.String, core.String> o) {
+checkUnnamed960(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -517,7 +517,7 @@
   if (buildCounterInstance < 3) {
     o.config = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed1210();
+    o.labels = buildUnnamed960();
     o.name = "foo";
     o.nodeCount = 42;
     o.state = "foo";
@@ -531,7 +531,7 @@
   if (buildCounterInstance < 3) {
     unittest.expect(o.config, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed1210(o.labels);
+    checkUnnamed960(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.nodeCount, unittest.equals(42));
     unittest.expect(o.state, unittest.equals('foo'));
@@ -560,7 +560,7 @@
   buildCounterInstanceConfig--;
 }
 
-buildUnnamed1211() {
+buildUnnamed961() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -575,7 +575,7 @@
   return o;
 }
 
-checkUnnamed1211(core.List<core.Object> o) {
+checkUnnamed961(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o[0]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -589,7 +589,7 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1212() {
+buildUnnamed962() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -604,7 +604,7 @@
   return o;
 }
 
-checkUnnamed1212(core.List<core.Object> o) {
+checkUnnamed962(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o[0]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -618,7 +618,7 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1213() {
+buildUnnamed963() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -633,7 +633,7 @@
   return o;
 }
 
-checkUnnamed1213(core.List<core.Object> o) {
+checkUnnamed963(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o[0]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -647,7 +647,7 @@
   unittest.expect(casted8["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1214() {
+buildUnnamed964() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -662,7 +662,7 @@
   return o;
 }
 
-checkUnnamed1214(core.List<core.Object> o) {
+checkUnnamed964(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted9 = (o[0]) as core.Map;
   unittest.expect(casted9, unittest.hasLength(3));
@@ -681,10 +681,10 @@
   var o = new api.KeyRange();
   buildCounterKeyRange++;
   if (buildCounterKeyRange < 3) {
-    o.endClosed = buildUnnamed1211();
-    o.endOpen = buildUnnamed1212();
-    o.startClosed = buildUnnamed1213();
-    o.startOpen = buildUnnamed1214();
+    o.endClosed = buildUnnamed961();
+    o.endOpen = buildUnnamed962();
+    o.startClosed = buildUnnamed963();
+    o.startOpen = buildUnnamed964();
   }
   buildCounterKeyRange--;
   return o;
@@ -693,15 +693,15 @@
 checkKeyRange(api.KeyRange o) {
   buildCounterKeyRange++;
   if (buildCounterKeyRange < 3) {
-    checkUnnamed1211(o.endClosed);
-    checkUnnamed1212(o.endOpen);
-    checkUnnamed1213(o.startClosed);
-    checkUnnamed1214(o.startOpen);
+    checkUnnamed961(o.endClosed);
+    checkUnnamed962(o.endOpen);
+    checkUnnamed963(o.startClosed);
+    checkUnnamed964(o.startOpen);
   }
   buildCounterKeyRange--;
 }
 
-buildUnnamed1215() {
+buildUnnamed965() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -716,7 +716,7 @@
   return o;
 }
 
-checkUnnamed1215(core.List<core.Object> o) {
+checkUnnamed965(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted11 = (o[0]) as core.Map;
   unittest.expect(casted11, unittest.hasLength(3));
@@ -730,27 +730,27 @@
   unittest.expect(casted12["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1216() {
+buildUnnamed966() {
   var o = new core.List<core.List<core.Object>>();
-  o.add(buildUnnamed1215());
-  o.add(buildUnnamed1215());
+  o.add(buildUnnamed965());
+  o.add(buildUnnamed965());
   return o;
 }
 
-checkUnnamed1216(core.List<core.List<core.Object>> o) {
+checkUnnamed966(core.List<core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1215(o[0]);
-  checkUnnamed1215(o[1]);
+  checkUnnamed965(o[0]);
+  checkUnnamed965(o[1]);
 }
 
-buildUnnamed1217() {
+buildUnnamed967() {
   var o = new core.List<api.KeyRange>();
   o.add(buildKeyRange());
   o.add(buildKeyRange());
   return o;
 }
 
-checkUnnamed1217(core.List<api.KeyRange> o) {
+checkUnnamed967(core.List<api.KeyRange> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkKeyRange(o[0]);
   checkKeyRange(o[1]);
@@ -762,8 +762,8 @@
   buildCounterKeySet++;
   if (buildCounterKeySet < 3) {
     o.all = true;
-    o.keys = buildUnnamed1216();
-    o.ranges = buildUnnamed1217();
+    o.keys = buildUnnamed966();
+    o.ranges = buildUnnamed967();
   }
   buildCounterKeySet--;
   return o;
@@ -773,20 +773,20 @@
   buildCounterKeySet++;
   if (buildCounterKeySet < 3) {
     unittest.expect(o.all, unittest.isTrue);
-    checkUnnamed1216(o.keys);
-    checkUnnamed1217(o.ranges);
+    checkUnnamed966(o.keys);
+    checkUnnamed967(o.ranges);
   }
   buildCounterKeySet--;
 }
 
-buildUnnamed1218() {
+buildUnnamed968() {
   var o = new core.List<api.Database>();
   o.add(buildDatabase());
   o.add(buildDatabase());
   return o;
 }
 
-checkUnnamed1218(core.List<api.Database> o) {
+checkUnnamed968(core.List<api.Database> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatabase(o[0]);
   checkDatabase(o[1]);
@@ -797,7 +797,7 @@
   var o = new api.ListDatabasesResponse();
   buildCounterListDatabasesResponse++;
   if (buildCounterListDatabasesResponse < 3) {
-    o.databases = buildUnnamed1218();
+    o.databases = buildUnnamed968();
     o.nextPageToken = "foo";
   }
   buildCounterListDatabasesResponse--;
@@ -807,20 +807,20 @@
 checkListDatabasesResponse(api.ListDatabasesResponse o) {
   buildCounterListDatabasesResponse++;
   if (buildCounterListDatabasesResponse < 3) {
-    checkUnnamed1218(o.databases);
+    checkUnnamed968(o.databases);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDatabasesResponse--;
 }
 
-buildUnnamed1219() {
+buildUnnamed969() {
   var o = new core.List<api.InstanceConfig>();
   o.add(buildInstanceConfig());
   o.add(buildInstanceConfig());
   return o;
 }
 
-checkUnnamed1219(core.List<api.InstanceConfig> o) {
+checkUnnamed969(core.List<api.InstanceConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceConfig(o[0]);
   checkInstanceConfig(o[1]);
@@ -831,7 +831,7 @@
   var o = new api.ListInstanceConfigsResponse();
   buildCounterListInstanceConfigsResponse++;
   if (buildCounterListInstanceConfigsResponse < 3) {
-    o.instanceConfigs = buildUnnamed1219();
+    o.instanceConfigs = buildUnnamed969();
     o.nextPageToken = "foo";
   }
   buildCounterListInstanceConfigsResponse--;
@@ -841,20 +841,20 @@
 checkListInstanceConfigsResponse(api.ListInstanceConfigsResponse o) {
   buildCounterListInstanceConfigsResponse++;
   if (buildCounterListInstanceConfigsResponse < 3) {
-    checkUnnamed1219(o.instanceConfigs);
+    checkUnnamed969(o.instanceConfigs);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListInstanceConfigsResponse--;
 }
 
-buildUnnamed1220() {
+buildUnnamed970() {
   var o = new core.List<api.Instance>();
   o.add(buildInstance());
   o.add(buildInstance());
   return o;
 }
 
-checkUnnamed1220(core.List<api.Instance> o) {
+checkUnnamed970(core.List<api.Instance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstance(o[0]);
   checkInstance(o[1]);
@@ -865,7 +865,7 @@
   var o = new api.ListInstancesResponse();
   buildCounterListInstancesResponse++;
   if (buildCounterListInstancesResponse < 3) {
-    o.instances = buildUnnamed1220();
+    o.instances = buildUnnamed970();
     o.nextPageToken = "foo";
   }
   buildCounterListInstancesResponse--;
@@ -875,20 +875,20 @@
 checkListInstancesResponse(api.ListInstancesResponse o) {
   buildCounterListInstancesResponse++;
   if (buildCounterListInstancesResponse < 3) {
-    checkUnnamed1220(o.instances);
+    checkUnnamed970(o.instances);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListInstancesResponse--;
 }
 
-buildUnnamed1221() {
+buildUnnamed971() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed1221(core.List<api.Operation> o) {
+checkUnnamed971(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -900,7 +900,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed1221();
+    o.operations = buildUnnamed971();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -910,19 +910,19 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1221(o.operations);
+    checkUnnamed971(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed1222() {
+buildUnnamed972() {
   var o = new core.List<api.Session>();
   o.add(buildSession());
   o.add(buildSession());
   return o;
 }
 
-checkUnnamed1222(core.List<api.Session> o) {
+checkUnnamed972(core.List<api.Session> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSession(o[0]);
   checkSession(o[1]);
@@ -934,7 +934,7 @@
   buildCounterListSessionsResponse++;
   if (buildCounterListSessionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.sessions = buildUnnamed1222();
+    o.sessions = buildUnnamed972();
   }
   buildCounterListSessionsResponse--;
   return o;
@@ -944,7 +944,7 @@
   buildCounterListSessionsResponse++;
   if (buildCounterListSessionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1222(o.sessions);
+    checkUnnamed972(o.sessions);
   }
   buildCounterListSessionsResponse--;
 }
@@ -976,7 +976,7 @@
   buildCounterMutation--;
 }
 
-buildUnnamed1223() {
+buildUnnamed973() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -991,7 +991,7 @@
   return o;
 }
 
-checkUnnamed1223(core.Map<core.String, core.Object> o) {
+checkUnnamed973(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted13 = (o["x"]) as core.Map;
   unittest.expect(casted13, unittest.hasLength(3));
@@ -1005,7 +1005,7 @@
   unittest.expect(casted14["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1224() {
+buildUnnamed974() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1020,7 +1020,7 @@
   return o;
 }
 
-checkUnnamed1224(core.Map<core.String, core.Object> o) {
+checkUnnamed974(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted15 = (o["x"]) as core.Map;
   unittest.expect(casted15, unittest.hasLength(3));
@@ -1041,9 +1041,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed1223();
+    o.metadata = buildUnnamed973();
     o.name = "foo";
-    o.response = buildUnnamed1224();
+    o.response = buildUnnamed974();
   }
   buildCounterOperation--;
   return o;
@@ -1054,14 +1054,14 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed1223(o.metadata);
+    checkUnnamed973(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1224(o.response);
+    checkUnnamed974(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed1225() {
+buildUnnamed975() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -1076,7 +1076,7 @@
   return o;
 }
 
-checkUnnamed1225(core.List<core.Object> o) {
+checkUnnamed975(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted17 = (o[0]) as core.Map;
   unittest.expect(casted17, unittest.hasLength(3));
@@ -1099,7 +1099,7 @@
     o.metadata = buildResultSetMetadata();
     o.resumeToken = "foo";
     o.stats = buildResultSetStats();
-    o.values = buildUnnamed1225();
+    o.values = buildUnnamed975();
   }
   buildCounterPartialResultSet--;
   return o;
@@ -1112,7 +1112,7 @@
     checkResultSetMetadata(o.metadata);
     unittest.expect(o.resumeToken, unittest.equals('foo'));
     checkResultSetStats(o.stats);
-    checkUnnamed1225(o.values);
+    checkUnnamed975(o.values);
   }
   buildCounterPartialResultSet--;
 }
@@ -1157,20 +1157,20 @@
   buildCounterPartitionOptions--;
 }
 
-buildUnnamed1226() {
+buildUnnamed976() {
   var o = new core.Map<core.String, api.Type>();
   o["x"] = buildType();
   o["y"] = buildType();
   return o;
 }
 
-checkUnnamed1226(core.Map<core.String, api.Type> o) {
+checkUnnamed976(core.Map<core.String, api.Type> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkType(o["x"]);
   checkType(o["y"]);
 }
 
-buildUnnamed1227() {
+buildUnnamed977() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1185,7 +1185,7 @@
   return o;
 }
 
-checkUnnamed1227(core.Map<core.String, core.Object> o) {
+checkUnnamed977(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted19 = (o["x"]) as core.Map;
   unittest.expect(casted19, unittest.hasLength(3));
@@ -1204,8 +1204,8 @@
   var o = new api.PartitionQueryRequest();
   buildCounterPartitionQueryRequest++;
   if (buildCounterPartitionQueryRequest < 3) {
-    o.paramTypes = buildUnnamed1226();
-    o.params = buildUnnamed1227();
+    o.paramTypes = buildUnnamed976();
+    o.params = buildUnnamed977();
     o.partitionOptions = buildPartitionOptions();
     o.sql = "foo";
     o.transaction = buildTransactionSelector();
@@ -1217,8 +1217,8 @@
 checkPartitionQueryRequest(api.PartitionQueryRequest o) {
   buildCounterPartitionQueryRequest++;
   if (buildCounterPartitionQueryRequest < 3) {
-    checkUnnamed1226(o.paramTypes);
-    checkUnnamed1227(o.params);
+    checkUnnamed976(o.paramTypes);
+    checkUnnamed977(o.params);
     checkPartitionOptions(o.partitionOptions);
     unittest.expect(o.sql, unittest.equals('foo'));
     checkTransactionSelector(o.transaction);
@@ -1226,14 +1226,14 @@
   buildCounterPartitionQueryRequest--;
 }
 
-buildUnnamed1228() {
+buildUnnamed978() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1228(core.List<core.String> o) {
+checkUnnamed978(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1244,7 +1244,7 @@
   var o = new api.PartitionReadRequest();
   buildCounterPartitionReadRequest++;
   if (buildCounterPartitionReadRequest < 3) {
-    o.columns = buildUnnamed1228();
+    o.columns = buildUnnamed978();
     o.index = "foo";
     o.keySet = buildKeySet();
     o.partitionOptions = buildPartitionOptions();
@@ -1258,7 +1258,7 @@
 checkPartitionReadRequest(api.PartitionReadRequest o) {
   buildCounterPartitionReadRequest++;
   if (buildCounterPartitionReadRequest < 3) {
-    checkUnnamed1228(o.columns);
+    checkUnnamed978(o.columns);
     unittest.expect(o.index, unittest.equals('foo'));
     checkKeySet(o.keySet);
     checkPartitionOptions(o.partitionOptions);
@@ -1268,14 +1268,14 @@
   buildCounterPartitionReadRequest--;
 }
 
-buildUnnamed1229() {
+buildUnnamed979() {
   var o = new core.List<api.Partition>();
   o.add(buildPartition());
   o.add(buildPartition());
   return o;
 }
 
-checkUnnamed1229(core.List<api.Partition> o) {
+checkUnnamed979(core.List<api.Partition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPartition(o[0]);
   checkPartition(o[1]);
@@ -1286,7 +1286,7 @@
   var o = new api.PartitionResponse();
   buildCounterPartitionResponse++;
   if (buildCounterPartitionResponse < 3) {
-    o.partitions = buildUnnamed1229();
+    o.partitions = buildUnnamed979();
     o.transaction = buildTransaction();
   }
   buildCounterPartitionResponse--;
@@ -1296,26 +1296,26 @@
 checkPartitionResponse(api.PartitionResponse o) {
   buildCounterPartitionResponse++;
   if (buildCounterPartitionResponse < 3) {
-    checkUnnamed1229(o.partitions);
+    checkUnnamed979(o.partitions);
     checkTransaction(o.transaction);
   }
   buildCounterPartitionResponse--;
 }
 
-buildUnnamed1230() {
+buildUnnamed980() {
   var o = new core.List<api.ChildLink>();
   o.add(buildChildLink());
   o.add(buildChildLink());
   return o;
 }
 
-checkUnnamed1230(core.List<api.ChildLink> o) {
+checkUnnamed980(core.List<api.ChildLink> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChildLink(o[0]);
   checkChildLink(o[1]);
 }
 
-buildUnnamed1231() {
+buildUnnamed981() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1330,7 +1330,7 @@
   return o;
 }
 
-checkUnnamed1231(core.Map<core.String, core.Object> o) {
+checkUnnamed981(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted21 = (o["x"]) as core.Map;
   unittest.expect(casted21, unittest.hasLength(3));
@@ -1344,7 +1344,7 @@
   unittest.expect(casted22["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1232() {
+buildUnnamed982() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1359,7 +1359,7 @@
   return o;
 }
 
-checkUnnamed1232(core.Map<core.String, core.Object> o) {
+checkUnnamed982(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted23 = (o["x"]) as core.Map;
   unittest.expect(casted23, unittest.hasLength(3));
@@ -1378,12 +1378,12 @@
   var o = new api.PlanNode();
   buildCounterPlanNode++;
   if (buildCounterPlanNode < 3) {
-    o.childLinks = buildUnnamed1230();
+    o.childLinks = buildUnnamed980();
     o.displayName = "foo";
-    o.executionStats = buildUnnamed1231();
+    o.executionStats = buildUnnamed981();
     o.index = 42;
     o.kind = "foo";
-    o.metadata = buildUnnamed1232();
+    o.metadata = buildUnnamed982();
     o.shortRepresentation = buildShortRepresentation();
   }
   buildCounterPlanNode--;
@@ -1393,25 +1393,25 @@
 checkPlanNode(api.PlanNode o) {
   buildCounterPlanNode++;
   if (buildCounterPlanNode < 3) {
-    checkUnnamed1230(o.childLinks);
+    checkUnnamed980(o.childLinks);
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed1231(o.executionStats);
+    checkUnnamed981(o.executionStats);
     unittest.expect(o.index, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed1232(o.metadata);
+    checkUnnamed982(o.metadata);
     checkShortRepresentation(o.shortRepresentation);
   }
   buildCounterPlanNode--;
 }
 
-buildUnnamed1233() {
+buildUnnamed983() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed1233(core.List<api.Binding> o) {
+checkUnnamed983(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -1422,7 +1422,7 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.bindings = buildUnnamed1233();
+    o.bindings = buildUnnamed983();
     o.etag = "foo";
     o.version = 42;
   }
@@ -1433,21 +1433,21 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed1233(o.bindings);
+    checkUnnamed983(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
   buildCounterPolicy--;
 }
 
-buildUnnamed1234() {
+buildUnnamed984() {
   var o = new core.List<api.PlanNode>();
   o.add(buildPlanNode());
   o.add(buildPlanNode());
   return o;
 }
 
-checkUnnamed1234(core.List<api.PlanNode> o) {
+checkUnnamed984(core.List<api.PlanNode> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlanNode(o[0]);
   checkPlanNode(o[1]);
@@ -1458,7 +1458,7 @@
   var o = new api.QueryPlan();
   buildCounterQueryPlan++;
   if (buildCounterQueryPlan < 3) {
-    o.planNodes = buildUnnamed1234();
+    o.planNodes = buildUnnamed984();
   }
   buildCounterQueryPlan--;
   return o;
@@ -1467,7 +1467,7 @@
 checkQueryPlan(api.QueryPlan o) {
   buildCounterQueryPlan++;
   if (buildCounterQueryPlan < 3) {
-    checkUnnamed1234(o.planNodes);
+    checkUnnamed984(o.planNodes);
   }
   buildCounterQueryPlan--;
 }
@@ -1501,14 +1501,14 @@
   buildCounterReadOnly--;
 }
 
-buildUnnamed1235() {
+buildUnnamed985() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1235(core.List<core.String> o) {
+checkUnnamed985(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1519,7 +1519,7 @@
   var o = new api.ReadRequest();
   buildCounterReadRequest++;
   if (buildCounterReadRequest < 3) {
-    o.columns = buildUnnamed1235();
+    o.columns = buildUnnamed985();
     o.index = "foo";
     o.keySet = buildKeySet();
     o.limit = "foo";
@@ -1535,7 +1535,7 @@
 checkReadRequest(api.ReadRequest o) {
   buildCounterReadRequest++;
   if (buildCounterReadRequest < 3) {
-    checkUnnamed1235(o.columns);
+    checkUnnamed985(o.columns);
     unittest.expect(o.index, unittest.equals('foo'));
     checkKeySet(o.keySet);
     unittest.expect(o.limit, unittest.equals('foo'));
@@ -1562,7 +1562,7 @@
   buildCounterReadWrite--;
 }
 
-buildUnnamed1236() {
+buildUnnamed986() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -1577,7 +1577,7 @@
   return o;
 }
 
-checkUnnamed1236(core.List<core.Object> o) {
+checkUnnamed986(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted25 = (o[0]) as core.Map;
   unittest.expect(casted25, unittest.hasLength(3));
@@ -1591,17 +1591,17 @@
   unittest.expect(casted26["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1237() {
+buildUnnamed987() {
   var o = new core.List<core.List<core.Object>>();
-  o.add(buildUnnamed1236());
-  o.add(buildUnnamed1236());
+  o.add(buildUnnamed986());
+  o.add(buildUnnamed986());
   return o;
 }
 
-checkUnnamed1237(core.List<core.List<core.Object>> o) {
+checkUnnamed987(core.List<core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1236(o[0]);
-  checkUnnamed1236(o[1]);
+  checkUnnamed986(o[0]);
+  checkUnnamed986(o[1]);
 }
 
 core.int buildCounterResultSet = 0;
@@ -1610,7 +1610,7 @@
   buildCounterResultSet++;
   if (buildCounterResultSet < 3) {
     o.metadata = buildResultSetMetadata();
-    o.rows = buildUnnamed1237();
+    o.rows = buildUnnamed987();
     o.stats = buildResultSetStats();
   }
   buildCounterResultSet--;
@@ -1621,7 +1621,7 @@
   buildCounterResultSet++;
   if (buildCounterResultSet < 3) {
     checkResultSetMetadata(o.metadata);
-    checkUnnamed1237(o.rows);
+    checkUnnamed987(o.rows);
     checkResultSetStats(o.stats);
   }
   buildCounterResultSet--;
@@ -1648,7 +1648,7 @@
   buildCounterResultSetMetadata--;
 }
 
-buildUnnamed1238() {
+buildUnnamed988() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1663,7 +1663,7 @@
   return o;
 }
 
-checkUnnamed1238(core.Map<core.String, core.Object> o) {
+checkUnnamed988(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted27 = (o["x"]) as core.Map;
   unittest.expect(casted27, unittest.hasLength(3));
@@ -1683,7 +1683,7 @@
   buildCounterResultSetStats++;
   if (buildCounterResultSetStats < 3) {
     o.queryPlan = buildQueryPlan();
-    o.queryStats = buildUnnamed1238();
+    o.queryStats = buildUnnamed988();
   }
   buildCounterResultSetStats--;
   return o;
@@ -1693,7 +1693,7 @@
   buildCounterResultSetStats++;
   if (buildCounterResultSetStats < 3) {
     checkQueryPlan(o.queryPlan);
-    checkUnnamed1238(o.queryStats);
+    checkUnnamed988(o.queryStats);
   }
   buildCounterResultSetStats--;
 }
@@ -1717,14 +1717,14 @@
   buildCounterRollbackRequest--;
 }
 
-buildUnnamed1239() {
+buildUnnamed989() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed1239(core.Map<core.String, core.String> o) {
+checkUnnamed989(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1737,7 +1737,7 @@
   if (buildCounterSession < 3) {
     o.approximateLastUseTime = "foo";
     o.createTime = "foo";
-    o.labels = buildUnnamed1239();
+    o.labels = buildUnnamed989();
     o.name = "foo";
   }
   buildCounterSession--;
@@ -1749,7 +1749,7 @@
   if (buildCounterSession < 3) {
     unittest.expect(o.approximateLastUseTime, unittest.equals('foo'));
     unittest.expect(o.createTime, unittest.equals('foo'));
-    checkUnnamed1239(o.labels);
+    checkUnnamed989(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterSession--;
@@ -1774,14 +1774,14 @@
   buildCounterSetIamPolicyRequest--;
 }
 
-buildUnnamed1240() {
+buildUnnamed990() {
   var o = new core.Map<core.String, core.int>();
   o["x"] = 42;
   o["y"] = 42;
   return o;
 }
 
-checkUnnamed1240(core.Map<core.String, core.int> o) {
+checkUnnamed990(core.Map<core.String, core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals(42));
   unittest.expect(o["y"], unittest.equals(42));
@@ -1793,7 +1793,7 @@
   buildCounterShortRepresentation++;
   if (buildCounterShortRepresentation < 3) {
     o.description = "foo";
-    o.subqueries = buildUnnamed1240();
+    o.subqueries = buildUnnamed990();
   }
   buildCounterShortRepresentation--;
   return o;
@@ -1803,12 +1803,12 @@
   buildCounterShortRepresentation++;
   if (buildCounterShortRepresentation < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed1240(o.subqueries);
+    checkUnnamed990(o.subqueries);
   }
   buildCounterShortRepresentation--;
 }
 
-buildUnnamed1241() {
+buildUnnamed991() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1823,7 +1823,7 @@
   return o;
 }
 
-checkUnnamed1241(core.Map<core.String, core.Object> o) {
+checkUnnamed991(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted29 = (o["x"]) as core.Map;
   unittest.expect(casted29, unittest.hasLength(3));
@@ -1837,17 +1837,17 @@
   unittest.expect(casted30["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1242() {
+buildUnnamed992() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed1241());
-  o.add(buildUnnamed1241());
+  o.add(buildUnnamed991());
+  o.add(buildUnnamed991());
   return o;
 }
 
-checkUnnamed1242(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed992(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1241(o[0]);
-  checkUnnamed1241(o[1]);
+  checkUnnamed991(o[0]);
+  checkUnnamed991(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1856,7 +1856,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed1242();
+    o.details = buildUnnamed992();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1867,20 +1867,20 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed1242(o.details);
+    checkUnnamed992(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed1243() {
+buildUnnamed993() {
   var o = new core.List<api.Field>();
   o.add(buildField());
   o.add(buildField());
   return o;
 }
 
-checkUnnamed1243(core.List<api.Field> o) {
+checkUnnamed993(core.List<api.Field> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkField(o[0]);
   checkField(o[1]);
@@ -1891,7 +1891,7 @@
   var o = new api.StructType();
   buildCounterStructType++;
   if (buildCounterStructType < 3) {
-    o.fields = buildUnnamed1243();
+    o.fields = buildUnnamed993();
   }
   buildCounterStructType--;
   return o;
@@ -1900,19 +1900,19 @@
 checkStructType(api.StructType o) {
   buildCounterStructType++;
   if (buildCounterStructType < 3) {
-    checkUnnamed1243(o.fields);
+    checkUnnamed993(o.fields);
   }
   buildCounterStructType--;
 }
 
-buildUnnamed1244() {
+buildUnnamed994() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1244(core.List<core.String> o) {
+checkUnnamed994(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1923,7 +1923,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed1244();
+    o.permissions = buildUnnamed994();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -1932,19 +1932,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed1244(o.permissions);
+    checkUnnamed994(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed1245() {
+buildUnnamed995() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1245(core.List<core.String> o) {
+checkUnnamed995(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1955,7 +1955,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed1245();
+    o.permissions = buildUnnamed995();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -1964,7 +1964,7 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed1245(o.permissions);
+    checkUnnamed995(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
@@ -2057,27 +2057,27 @@
   buildCounterType--;
 }
 
-buildUnnamed1246() {
+buildUnnamed996() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1246(core.List<core.String> o) {
+checkUnnamed996(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1247() {
+buildUnnamed997() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1247(core.List<core.String> o) {
+checkUnnamed997(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2088,9 +2088,9 @@
   var o = new api.UpdateDatabaseDdlMetadata();
   buildCounterUpdateDatabaseDdlMetadata++;
   if (buildCounterUpdateDatabaseDdlMetadata < 3) {
-    o.commitTimestamps = buildUnnamed1246();
+    o.commitTimestamps = buildUnnamed996();
     o.database = "foo";
-    o.statements = buildUnnamed1247();
+    o.statements = buildUnnamed997();
   }
   buildCounterUpdateDatabaseDdlMetadata--;
   return o;
@@ -2099,21 +2099,21 @@
 checkUpdateDatabaseDdlMetadata(api.UpdateDatabaseDdlMetadata o) {
   buildCounterUpdateDatabaseDdlMetadata++;
   if (buildCounterUpdateDatabaseDdlMetadata < 3) {
-    checkUnnamed1246(o.commitTimestamps);
+    checkUnnamed996(o.commitTimestamps);
     unittest.expect(o.database, unittest.equals('foo'));
-    checkUnnamed1247(o.statements);
+    checkUnnamed997(o.statements);
   }
   buildCounterUpdateDatabaseDdlMetadata--;
 }
 
-buildUnnamed1248() {
+buildUnnamed998() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1248(core.List<core.String> o) {
+checkUnnamed998(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2125,7 +2125,7 @@
   buildCounterUpdateDatabaseDdlRequest++;
   if (buildCounterUpdateDatabaseDdlRequest < 3) {
     o.operationId = "foo";
-    o.statements = buildUnnamed1248();
+    o.statements = buildUnnamed998();
   }
   buildCounterUpdateDatabaseDdlRequest--;
   return o;
@@ -2135,7 +2135,7 @@
   buildCounterUpdateDatabaseDdlRequest++;
   if (buildCounterUpdateDatabaseDdlRequest < 3) {
     unittest.expect(o.operationId, unittest.equals('foo'));
-    checkUnnamed1248(o.statements);
+    checkUnnamed998(o.statements);
   }
   buildCounterUpdateDatabaseDdlRequest--;
 }
@@ -2186,20 +2186,20 @@
   buildCounterUpdateInstanceRequest--;
 }
 
-buildUnnamed1249() {
+buildUnnamed999() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1249(core.List<core.String> o) {
+checkUnnamed999(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1250() {
+buildUnnamed1000() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -2214,7 +2214,7 @@
   return o;
 }
 
-checkUnnamed1250(core.List<core.Object> o) {
+checkUnnamed1000(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted31 = (o[0]) as core.Map;
   unittest.expect(casted31, unittest.hasLength(3));
@@ -2228,17 +2228,17 @@
   unittest.expect(casted32["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1251() {
+buildUnnamed1001() {
   var o = new core.List<core.List<core.Object>>();
-  o.add(buildUnnamed1250());
-  o.add(buildUnnamed1250());
+  o.add(buildUnnamed1000());
+  o.add(buildUnnamed1000());
   return o;
 }
 
-checkUnnamed1251(core.List<core.List<core.Object>> o) {
+checkUnnamed1001(core.List<core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1250(o[0]);
-  checkUnnamed1250(o[1]);
+  checkUnnamed1000(o[0]);
+  checkUnnamed1000(o[1]);
 }
 
 core.int buildCounterWrite = 0;
@@ -2246,9 +2246,9 @@
   var o = new api.Write();
   buildCounterWrite++;
   if (buildCounterWrite < 3) {
-    o.columns = buildUnnamed1249();
+    o.columns = buildUnnamed999();
     o.table = "foo";
-    o.values = buildUnnamed1251();
+    o.values = buildUnnamed1001();
   }
   buildCounterWrite--;
   return o;
@@ -2257,9 +2257,9 @@
 checkWrite(api.Write o) {
   buildCounterWrite++;
   if (buildCounterWrite < 3) {
-    checkUnnamed1249(o.columns);
+    checkUnnamed999(o.columns);
     unittest.expect(o.table, unittest.equals('foo'));
-    checkUnnamed1251(o.values);
+    checkUnnamed1001(o.values);
   }
   buildCounterWrite--;
 }
@@ -2793,7 +2793,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceConfig(response);
       })));
     });
@@ -2854,8 +2854,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListInstanceConfigsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListInstanceConfigsResponse(response);
       })));
     });
@@ -2913,7 +2912,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2965,7 +2964,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3017,7 +3016,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Instance response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstance(response);
       })));
     });
@@ -3073,7 +3072,7 @@
       }), true);
       res
           .getIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -3137,7 +3136,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListInstancesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListInstancesResponse(response);
       })));
     });
@@ -3193,7 +3192,7 @@
       }), true);
       res
           .patch(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3249,7 +3248,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -3305,8 +3304,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -3364,7 +3362,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3416,7 +3414,7 @@
       }), true);
       res
           .dropDatabase(arg_database, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3468,7 +3466,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Database response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatabase(response);
       })));
     });
@@ -3520,7 +3518,7 @@
       }), true);
       res
           .getDdl(arg_database, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetDatabaseDdlResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetDatabaseDdlResponse(response);
       })));
     });
@@ -3576,7 +3574,7 @@
       }), true);
       res
           .getIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -3637,7 +3635,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDatabasesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDatabasesResponse(response);
       })));
     });
@@ -3693,7 +3691,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -3749,8 +3747,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -3806,7 +3803,7 @@
       }), true);
       res
           .updateDdl(arg_request, arg_database, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3861,7 +3858,7 @@
       }), true);
       res
           .cancel(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3913,7 +3910,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3965,7 +3962,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4029,7 +4026,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -4087,7 +4084,7 @@
       }), true);
       res
           .beginTransaction(arg_request, arg_session, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Transaction response) {
+          .then(unittest.expectAsync1(((response) {
         checkTransaction(response);
       })));
     });
@@ -4143,7 +4140,7 @@
       }), true);
       res
           .commit(arg_request, arg_session, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommitResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommitResponse(response);
       })));
     });
@@ -4199,7 +4196,7 @@
       }), true);
       res
           .create(arg_request, arg_database, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Session response) {
+          .then(unittest.expectAsync1(((response) {
         checkSession(response);
       })));
     });
@@ -4251,7 +4248,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4307,7 +4304,7 @@
       }), true);
       res
           .executeSql(arg_request, arg_session, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ResultSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkResultSet(response);
       })));
     });
@@ -4363,7 +4360,7 @@
       }), true);
       res
           .executeStreamingSql(arg_request, arg_session, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PartialResultSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkPartialResultSet(response);
       })));
     });
@@ -4415,7 +4412,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Session response) {
+          .then(unittest.expectAsync1(((response) {
         checkSession(response);
       })));
     });
@@ -4479,7 +4476,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListSessionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSessionsResponse(response);
       })));
     });
@@ -4535,7 +4532,7 @@
       }), true);
       res
           .partitionQuery(arg_request, arg_session, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PartitionResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPartitionResponse(response);
       })));
     });
@@ -4591,7 +4588,7 @@
       }), true);
       res
           .partitionRead(arg_request, arg_session, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PartitionResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPartitionResponse(response);
       })));
     });
@@ -4647,7 +4644,7 @@
       }), true);
       res
           .read(arg_request, arg_session, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ResultSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkResultSet(response);
       })));
     });
@@ -4703,7 +4700,7 @@
       }), true);
       res
           .rollback(arg_request, arg_session, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4759,7 +4756,7 @@
       }), true);
       res
           .streamingRead(arg_request, arg_session, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PartialResultSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkPartialResultSet(response);
       })));
     });
@@ -4813,7 +4810,7 @@
       }), true);
       res
           .cancel(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4865,7 +4862,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4917,7 +4914,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4981,7 +4978,7 @@
               filter: arg_filter,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/speech/v1_test.dart b/generated/googleapis/test/speech/v1_test.dart
index 2a99618..ec74a6d 100644
--- a/generated/googleapis/test/speech/v1_test.dart
+++ b/generated/googleapis/test/speech/v1_test.dart
@@ -71,7 +71,7 @@
   buildCounterLongRunningRecognizeRequest--;
 }
 
-buildUnnamed1938() {
+buildUnnamed2580() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -86,7 +86,7 @@
   return o;
 }
 
-checkUnnamed1938(core.Map<core.String, core.Object> o) {
+checkUnnamed2580(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -100,7 +100,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1939() {
+buildUnnamed2581() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -115,7 +115,7 @@
   return o;
 }
 
-checkUnnamed1939(core.Map<core.String, core.Object> o) {
+checkUnnamed2581(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -136,9 +136,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed1938();
+    o.metadata = buildUnnamed2580();
     o.name = "foo";
-    o.response = buildUnnamed1939();
+    o.response = buildUnnamed2581();
   }
   buildCounterOperation--;
   return o;
@@ -149,9 +149,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed1938(o.metadata);
+    checkUnnamed2580(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1939(o.response);
+    checkUnnamed2581(o.response);
   }
   buildCounterOperation--;
 }
@@ -177,14 +177,14 @@
   buildCounterRecognitionAudio--;
 }
 
-buildUnnamed1940() {
+buildUnnamed2582() {
   var o = new core.List<api.SpeechContext>();
   o.add(buildSpeechContext());
   o.add(buildSpeechContext());
   return o;
 }
 
-checkUnnamed1940(core.List<api.SpeechContext> o) {
+checkUnnamed2582(core.List<api.SpeechContext> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSpeechContext(o[0]);
   checkSpeechContext(o[1]);
@@ -202,7 +202,7 @@
     o.maxAlternatives = 42;
     o.profanityFilter = true;
     o.sampleRateHertz = 42;
-    o.speechContexts = buildUnnamed1940();
+    o.speechContexts = buildUnnamed2582();
   }
   buildCounterRecognitionConfig--;
   return o;
@@ -218,7 +218,7 @@
     unittest.expect(o.maxAlternatives, unittest.equals(42));
     unittest.expect(o.profanityFilter, unittest.isTrue);
     unittest.expect(o.sampleRateHertz, unittest.equals(42));
-    checkUnnamed1940(o.speechContexts);
+    checkUnnamed2582(o.speechContexts);
   }
   buildCounterRecognitionConfig--;
 }
@@ -244,14 +244,14 @@
   buildCounterRecognizeRequest--;
 }
 
-buildUnnamed1941() {
+buildUnnamed2583() {
   var o = new core.List<api.SpeechRecognitionResult>();
   o.add(buildSpeechRecognitionResult());
   o.add(buildSpeechRecognitionResult());
   return o;
 }
 
-checkUnnamed1941(core.List<api.SpeechRecognitionResult> o) {
+checkUnnamed2583(core.List<api.SpeechRecognitionResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSpeechRecognitionResult(o[0]);
   checkSpeechRecognitionResult(o[1]);
@@ -262,7 +262,7 @@
   var o = new api.RecognizeResponse();
   buildCounterRecognizeResponse++;
   if (buildCounterRecognizeResponse < 3) {
-    o.results = buildUnnamed1941();
+    o.results = buildUnnamed2583();
   }
   buildCounterRecognizeResponse--;
   return o;
@@ -271,19 +271,19 @@
 checkRecognizeResponse(api.RecognizeResponse o) {
   buildCounterRecognizeResponse++;
   if (buildCounterRecognizeResponse < 3) {
-    checkUnnamed1941(o.results);
+    checkUnnamed2583(o.results);
   }
   buildCounterRecognizeResponse--;
 }
 
-buildUnnamed1942() {
+buildUnnamed2584() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1942(core.List<core.String> o) {
+checkUnnamed2584(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -294,7 +294,7 @@
   var o = new api.SpeechContext();
   buildCounterSpeechContext++;
   if (buildCounterSpeechContext < 3) {
-    o.phrases = buildUnnamed1942();
+    o.phrases = buildUnnamed2584();
   }
   buildCounterSpeechContext--;
   return o;
@@ -303,19 +303,19 @@
 checkSpeechContext(api.SpeechContext o) {
   buildCounterSpeechContext++;
   if (buildCounterSpeechContext < 3) {
-    checkUnnamed1942(o.phrases);
+    checkUnnamed2584(o.phrases);
   }
   buildCounterSpeechContext--;
 }
 
-buildUnnamed1943() {
+buildUnnamed2585() {
   var o = new core.List<api.WordInfo>();
   o.add(buildWordInfo());
   o.add(buildWordInfo());
   return o;
 }
 
-checkUnnamed1943(core.List<api.WordInfo> o) {
+checkUnnamed2585(core.List<api.WordInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWordInfo(o[0]);
   checkWordInfo(o[1]);
@@ -328,7 +328,7 @@
   if (buildCounterSpeechRecognitionAlternative < 3) {
     o.confidence = 42.0;
     o.transcript = "foo";
-    o.words = buildUnnamed1943();
+    o.words = buildUnnamed2585();
   }
   buildCounterSpeechRecognitionAlternative--;
   return o;
@@ -339,19 +339,19 @@
   if (buildCounterSpeechRecognitionAlternative < 3) {
     unittest.expect(o.confidence, unittest.equals(42.0));
     unittest.expect(o.transcript, unittest.equals('foo'));
-    checkUnnamed1943(o.words);
+    checkUnnamed2585(o.words);
   }
   buildCounterSpeechRecognitionAlternative--;
 }
 
-buildUnnamed1944() {
+buildUnnamed2586() {
   var o = new core.List<api.SpeechRecognitionAlternative>();
   o.add(buildSpeechRecognitionAlternative());
   o.add(buildSpeechRecognitionAlternative());
   return o;
 }
 
-checkUnnamed1944(core.List<api.SpeechRecognitionAlternative> o) {
+checkUnnamed2586(core.List<api.SpeechRecognitionAlternative> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSpeechRecognitionAlternative(o[0]);
   checkSpeechRecognitionAlternative(o[1]);
@@ -362,7 +362,7 @@
   var o = new api.SpeechRecognitionResult();
   buildCounterSpeechRecognitionResult++;
   if (buildCounterSpeechRecognitionResult < 3) {
-    o.alternatives = buildUnnamed1944();
+    o.alternatives = buildUnnamed2586();
   }
   buildCounterSpeechRecognitionResult--;
   return o;
@@ -371,12 +371,12 @@
 checkSpeechRecognitionResult(api.SpeechRecognitionResult o) {
   buildCounterSpeechRecognitionResult++;
   if (buildCounterSpeechRecognitionResult < 3) {
-    checkUnnamed1944(o.alternatives);
+    checkUnnamed2586(o.alternatives);
   }
   buildCounterSpeechRecognitionResult--;
 }
 
-buildUnnamed1945() {
+buildUnnamed2587() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -391,7 +391,7 @@
   return o;
 }
 
-checkUnnamed1945(core.Map<core.String, core.Object> o) {
+checkUnnamed2587(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -405,17 +405,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1946() {
+buildUnnamed2588() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed1945());
-  o.add(buildUnnamed1945());
+  o.add(buildUnnamed2587());
+  o.add(buildUnnamed2587());
   return o;
 }
 
-checkUnnamed1946(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed2588(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1945(o[0]);
-  checkUnnamed1945(o[1]);
+  checkUnnamed2587(o[0]);
+  checkUnnamed2587(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -424,7 +424,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed1946();
+    o.details = buildUnnamed2588();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -435,7 +435,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed1946(o.details);
+    checkUnnamed2588(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -600,7 +600,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -655,7 +655,7 @@
       }), true);
       res
           .longrunningrecognize(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -708,7 +708,7 @@
       }), true);
       res
           .recognize(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RecognizeResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRecognizeResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/storage/v1_test.dart b/generated/googleapis/test/storage/v1_test.dart
index 127a963..cf13316 100644
--- a/generated/googleapis/test/storage/v1_test.dart
+++ b/generated/googleapis/test/storage/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3102() {
+buildUnnamed2740() {
   var o = new core.List<api.BucketAccessControl>();
   o.add(buildBucketAccessControl());
   o.add(buildBucketAccessControl());
   return o;
 }
 
-checkUnnamed3102(core.List<api.BucketAccessControl> o) {
+checkUnnamed2740(core.List<api.BucketAccessControl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucketAccessControl(o[0]);
   checkBucketAccessControl(o[1]);
@@ -82,40 +82,40 @@
   buildCounterBucketBilling--;
 }
 
-buildUnnamed3103() {
+buildUnnamed2741() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3103(core.List<core.String> o) {
+checkUnnamed2741(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3104() {
+buildUnnamed2742() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3104(core.List<core.String> o) {
+checkUnnamed2742(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3105() {
+buildUnnamed2743() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3105(core.List<core.String> o) {
+checkUnnamed2743(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -127,9 +127,9 @@
   buildCounterBucketCors++;
   if (buildCounterBucketCors < 3) {
     o.maxAgeSeconds = 42;
-    o.method = buildUnnamed3103();
-    o.origin = buildUnnamed3104();
-    o.responseHeader = buildUnnamed3105();
+    o.method = buildUnnamed2741();
+    o.origin = buildUnnamed2742();
+    o.responseHeader = buildUnnamed2743();
   }
   buildCounterBucketCors--;
   return o;
@@ -139,34 +139,34 @@
   buildCounterBucketCors++;
   if (buildCounterBucketCors < 3) {
     unittest.expect(o.maxAgeSeconds, unittest.equals(42));
-    checkUnnamed3103(o.method);
-    checkUnnamed3104(o.origin);
-    checkUnnamed3105(o.responseHeader);
+    checkUnnamed2741(o.method);
+    checkUnnamed2742(o.origin);
+    checkUnnamed2743(o.responseHeader);
   }
   buildCounterBucketCors--;
 }
 
-buildUnnamed3106() {
+buildUnnamed2744() {
   var o = new core.List<api.BucketCors>();
   o.add(buildBucketCors());
   o.add(buildBucketCors());
   return o;
 }
 
-checkUnnamed3106(core.List<api.BucketCors> o) {
+checkUnnamed2744(core.List<api.BucketCors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucketCors(o[0]);
   checkBucketCors(o[1]);
 }
 
-buildUnnamed3107() {
+buildUnnamed2745() {
   var o = new core.List<api.ObjectAccessControl>();
   o.add(buildObjectAccessControl());
   o.add(buildObjectAccessControl());
   return o;
 }
 
-checkUnnamed3107(core.List<api.ObjectAccessControl> o) {
+checkUnnamed2745(core.List<api.ObjectAccessControl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkObjectAccessControl(o[0]);
   checkObjectAccessControl(o[1]);
@@ -191,14 +191,14 @@
   buildCounterBucketEncryption--;
 }
 
-buildUnnamed3108() {
+buildUnnamed2746() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3108(core.Map<core.String, core.String> o) {
+checkUnnamed2746(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -225,14 +225,14 @@
   buildCounterBucketLifecycleRuleAction--;
 }
 
-buildUnnamed3109() {
+buildUnnamed2747() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3109(core.List<core.String> o) {
+checkUnnamed2747(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -246,7 +246,7 @@
     o.age = 42;
     o.createdBefore = core.DateTime.parse("2002-02-27T14:01:02Z");
     o.isLive = true;
-    o.matchesStorageClass = buildUnnamed3109();
+    o.matchesStorageClass = buildUnnamed2747();
     o.numNewerVersions = 42;
   }
   buildCounterBucketLifecycleRuleCondition--;
@@ -260,7 +260,7 @@
     unittest.expect(o.createdBefore,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
     unittest.expect(o.isLive, unittest.isTrue);
-    checkUnnamed3109(o.matchesStorageClass);
+    checkUnnamed2747(o.matchesStorageClass);
     unittest.expect(o.numNewerVersions, unittest.equals(42));
   }
   buildCounterBucketLifecycleRuleCondition--;
@@ -287,14 +287,14 @@
   buildCounterBucketLifecycleRule--;
 }
 
-buildUnnamed3110() {
+buildUnnamed2748() {
   var o = new core.List<api.BucketLifecycleRule>();
   o.add(buildBucketLifecycleRule());
   o.add(buildBucketLifecycleRule());
   return o;
 }
 
-checkUnnamed3110(core.List<api.BucketLifecycleRule> o) {
+checkUnnamed2748(core.List<api.BucketLifecycleRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucketLifecycleRule(o[0]);
   checkBucketLifecycleRule(o[1]);
@@ -305,7 +305,7 @@
   var o = new api.BucketLifecycle();
   buildCounterBucketLifecycle++;
   if (buildCounterBucketLifecycle < 3) {
-    o.rule = buildUnnamed3110();
+    o.rule = buildUnnamed2748();
   }
   buildCounterBucketLifecycle--;
   return o;
@@ -314,7 +314,7 @@
 checkBucketLifecycle(api.BucketLifecycle o) {
   buildCounterBucketLifecycle++;
   if (buildCounterBucketLifecycle < 3) {
-    checkUnnamed3110(o.rule);
+    checkUnnamed2748(o.rule);
   }
   buildCounterBucketLifecycle--;
 }
@@ -430,16 +430,16 @@
   var o = new api.Bucket();
   buildCounterBucket++;
   if (buildCounterBucket < 3) {
-    o.acl = buildUnnamed3102();
+    o.acl = buildUnnamed2740();
     o.billing = buildBucketBilling();
-    o.cors = buildUnnamed3106();
+    o.cors = buildUnnamed2744();
     o.defaultEventBasedHold = true;
-    o.defaultObjectAcl = buildUnnamed3107();
+    o.defaultObjectAcl = buildUnnamed2745();
     o.encryption = buildBucketEncryption();
     o.etag = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed3108();
+    o.labels = buildUnnamed2746();
     o.lifecycle = buildBucketLifecycle();
     o.location = "foo";
     o.logging = buildBucketLogging();
@@ -462,16 +462,16 @@
 checkBucket(api.Bucket o) {
   buildCounterBucket++;
   if (buildCounterBucket < 3) {
-    checkUnnamed3102(o.acl);
+    checkUnnamed2740(o.acl);
     checkBucketBilling(o.billing);
-    checkUnnamed3106(o.cors);
+    checkUnnamed2744(o.cors);
     unittest.expect(o.defaultEventBasedHold, unittest.isTrue);
-    checkUnnamed3107(o.defaultObjectAcl);
+    checkUnnamed2745(o.defaultObjectAcl);
     checkBucketEncryption(o.encryption);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3108(o.labels);
+    checkUnnamed2746(o.labels);
     checkBucketLifecycle(o.lifecycle);
     unittest.expect(o.location, unittest.equals('foo'));
     checkBucketLogging(o.logging);
@@ -552,14 +552,14 @@
   buildCounterBucketAccessControl--;
 }
 
-buildUnnamed3111() {
+buildUnnamed2749() {
   var o = new core.List<api.BucketAccessControl>();
   o.add(buildBucketAccessControl());
   o.add(buildBucketAccessControl());
   return o;
 }
 
-checkUnnamed3111(core.List<api.BucketAccessControl> o) {
+checkUnnamed2749(core.List<api.BucketAccessControl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucketAccessControl(o[0]);
   checkBucketAccessControl(o[1]);
@@ -570,7 +570,7 @@
   var o = new api.BucketAccessControls();
   buildCounterBucketAccessControls++;
   if (buildCounterBucketAccessControls < 3) {
-    o.items = buildUnnamed3111();
+    o.items = buildUnnamed2749();
     o.kind = "foo";
   }
   buildCounterBucketAccessControls--;
@@ -580,20 +580,20 @@
 checkBucketAccessControls(api.BucketAccessControls o) {
   buildCounterBucketAccessControls++;
   if (buildCounterBucketAccessControls < 3) {
-    checkUnnamed3111(o.items);
+    checkUnnamed2749(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterBucketAccessControls--;
 }
 
-buildUnnamed3112() {
+buildUnnamed2750() {
   var o = new core.List<api.Bucket>();
   o.add(buildBucket());
   o.add(buildBucket());
   return o;
 }
 
-checkUnnamed3112(core.List<api.Bucket> o) {
+checkUnnamed2750(core.List<api.Bucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBucket(o[0]);
   checkBucket(o[1]);
@@ -604,7 +604,7 @@
   var o = new api.Buckets();
   buildCounterBuckets++;
   if (buildCounterBuckets < 3) {
-    o.items = buildUnnamed3112();
+    o.items = buildUnnamed2750();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -615,21 +615,21 @@
 checkBuckets(api.Buckets o) {
   buildCounterBuckets++;
   if (buildCounterBuckets < 3) {
-    checkUnnamed3112(o.items);
+    checkUnnamed2750(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterBuckets--;
 }
 
-buildUnnamed3113() {
+buildUnnamed2751() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3113(core.Map<core.String, core.String> o) {
+checkUnnamed2751(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -644,7 +644,7 @@
     o.expiration = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.params = buildUnnamed3113();
+    o.params = buildUnnamed2751();
     o.payload = true;
     o.resourceId = "foo";
     o.resourceUri = "foo";
@@ -662,7 +662,7 @@
     unittest.expect(o.expiration, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3113(o.params);
+    checkUnnamed2751(o.params);
     unittest.expect(o.payload, unittest.isTrue);
     unittest.expect(o.resourceId, unittest.equals('foo'));
     unittest.expect(o.resourceUri, unittest.equals('foo'));
@@ -716,14 +716,14 @@
   buildCounterComposeRequestSourceObjects--;
 }
 
-buildUnnamed3114() {
+buildUnnamed2752() {
   var o = new core.List<api.ComposeRequestSourceObjects>();
   o.add(buildComposeRequestSourceObjects());
   o.add(buildComposeRequestSourceObjects());
   return o;
 }
 
-checkUnnamed3114(core.List<api.ComposeRequestSourceObjects> o) {
+checkUnnamed2752(core.List<api.ComposeRequestSourceObjects> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComposeRequestSourceObjects(o[0]);
   checkComposeRequestSourceObjects(o[1]);
@@ -736,7 +736,7 @@
   if (buildCounterComposeRequest < 3) {
     o.destination = buildObject();
     o.kind = "foo";
-    o.sourceObjects = buildUnnamed3114();
+    o.sourceObjects = buildUnnamed2752();
   }
   buildCounterComposeRequest--;
   return o;
@@ -747,32 +747,32 @@
   if (buildCounterComposeRequest < 3) {
     checkObject(o.destination);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3114(o.sourceObjects);
+    checkUnnamed2752(o.sourceObjects);
   }
   buildCounterComposeRequest--;
 }
 
-buildUnnamed3115() {
+buildUnnamed2753() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3115(core.Map<core.String, core.String> o) {
+checkUnnamed2753(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed3116() {
+buildUnnamed2754() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3116(core.List<core.String> o) {
+checkUnnamed2754(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -783,9 +783,9 @@
   var o = new api.Notification();
   buildCounterNotification++;
   if (buildCounterNotification < 3) {
-    o.customAttributes = buildUnnamed3115();
+    o.customAttributes = buildUnnamed2753();
     o.etag = "foo";
-    o.eventTypes = buildUnnamed3116();
+    o.eventTypes = buildUnnamed2754();
     o.id = "foo";
     o.kind = "foo";
     o.objectNamePrefix = "foo";
@@ -800,9 +800,9 @@
 checkNotification(api.Notification o) {
   buildCounterNotification++;
   if (buildCounterNotification < 3) {
-    checkUnnamed3115(o.customAttributes);
+    checkUnnamed2753(o.customAttributes);
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3116(o.eventTypes);
+    checkUnnamed2754(o.eventTypes);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.objectNamePrefix, unittest.equals('foo'));
@@ -813,14 +813,14 @@
   buildCounterNotification--;
 }
 
-buildUnnamed3117() {
+buildUnnamed2755() {
   var o = new core.List<api.Notification>();
   o.add(buildNotification());
   o.add(buildNotification());
   return o;
 }
 
-checkUnnamed3117(core.List<api.Notification> o) {
+checkUnnamed2755(core.List<api.Notification> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNotification(o[0]);
   checkNotification(o[1]);
@@ -831,7 +831,7 @@
   var o = new api.Notifications();
   buildCounterNotifications++;
   if (buildCounterNotifications < 3) {
-    o.items = buildUnnamed3117();
+    o.items = buildUnnamed2755();
     o.kind = "foo";
   }
   buildCounterNotifications--;
@@ -841,20 +841,20 @@
 checkNotifications(api.Notifications o) {
   buildCounterNotifications++;
   if (buildCounterNotifications < 3) {
-    checkUnnamed3117(o.items);
+    checkUnnamed2755(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterNotifications--;
 }
 
-buildUnnamed3118() {
+buildUnnamed2756() {
   var o = new core.List<api.ObjectAccessControl>();
   o.add(buildObjectAccessControl());
   o.add(buildObjectAccessControl());
   return o;
 }
 
-checkUnnamed3118(core.List<api.ObjectAccessControl> o) {
+checkUnnamed2756(core.List<api.ObjectAccessControl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkObjectAccessControl(o[0]);
   checkObjectAccessControl(o[1]);
@@ -881,14 +881,14 @@
   buildCounterObjectCustomerEncryption--;
 }
 
-buildUnnamed3119() {
+buildUnnamed2757() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3119(core.Map<core.String, core.String> o) {
+checkUnnamed2757(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -920,7 +920,7 @@
   var o = new api.Object();
   buildCounterObject++;
   if (buildCounterObject < 3) {
-    o.acl = buildUnnamed3118();
+    o.acl = buildUnnamed2756();
     o.bucket = "foo";
     o.cacheControl = "foo";
     o.componentCount = 42;
@@ -938,7 +938,7 @@
     o.kmsKeyName = "foo";
     o.md5Hash = "foo";
     o.mediaLink = "foo";
-    o.metadata = buildUnnamed3119();
+    o.metadata = buildUnnamed2757();
     o.metageneration = "foo";
     o.name = "foo";
     o.owner = buildObjectOwner();
@@ -959,7 +959,7 @@
 checkObject(api.Object o) {
   buildCounterObject++;
   if (buildCounterObject < 3) {
-    checkUnnamed3118(o.acl);
+    checkUnnamed2756(o.acl);
     unittest.expect(o.bucket, unittest.equals('foo'));
     unittest.expect(o.cacheControl, unittest.equals('foo'));
     unittest.expect(o.componentCount, unittest.equals(42));
@@ -977,7 +977,7 @@
     unittest.expect(o.kmsKeyName, unittest.equals('foo'));
     unittest.expect(o.md5Hash, unittest.equals('foo'));
     unittest.expect(o.mediaLink, unittest.equals('foo'));
-    checkUnnamed3119(o.metadata);
+    checkUnnamed2757(o.metadata);
     unittest.expect(o.metageneration, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     checkObjectOwner(o.owner);
@@ -1063,14 +1063,14 @@
   buildCounterObjectAccessControl--;
 }
 
-buildUnnamed3120() {
+buildUnnamed2758() {
   var o = new core.List<api.ObjectAccessControl>();
   o.add(buildObjectAccessControl());
   o.add(buildObjectAccessControl());
   return o;
 }
 
-checkUnnamed3120(core.List<api.ObjectAccessControl> o) {
+checkUnnamed2758(core.List<api.ObjectAccessControl> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkObjectAccessControl(o[0]);
   checkObjectAccessControl(o[1]);
@@ -1081,7 +1081,7 @@
   var o = new api.ObjectAccessControls();
   buildCounterObjectAccessControls++;
   if (buildCounterObjectAccessControls < 3) {
-    o.items = buildUnnamed3120();
+    o.items = buildUnnamed2758();
     o.kind = "foo";
   }
   buildCounterObjectAccessControls--;
@@ -1091,33 +1091,33 @@
 checkObjectAccessControls(api.ObjectAccessControls o) {
   buildCounterObjectAccessControls++;
   if (buildCounterObjectAccessControls < 3) {
-    checkUnnamed3120(o.items);
+    checkUnnamed2758(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterObjectAccessControls--;
 }
 
-buildUnnamed3121() {
+buildUnnamed2759() {
   var o = new core.List<api.Object>();
   o.add(buildObject());
   o.add(buildObject());
   return o;
 }
 
-checkUnnamed3121(core.List<api.Object> o) {
+checkUnnamed2759(core.List<api.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkObject(o[0]);
   checkObject(o[1]);
 }
 
-buildUnnamed3122() {
+buildUnnamed2760() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3122(core.List<core.String> o) {
+checkUnnamed2760(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1128,10 +1128,10 @@
   var o = new api.Objects();
   buildCounterObjects++;
   if (buildCounterObjects < 3) {
-    o.items = buildUnnamed3121();
+    o.items = buildUnnamed2759();
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.prefixes = buildUnnamed3122();
+    o.prefixes = buildUnnamed2760();
   }
   buildCounterObjects--;
   return o;
@@ -1140,22 +1140,22 @@
 checkObjects(api.Objects o) {
   buildCounterObjects++;
   if (buildCounterObjects < 3) {
-    checkUnnamed3121(o.items);
+    checkUnnamed2759(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3122(o.prefixes);
+    checkUnnamed2760(o.prefixes);
   }
   buildCounterObjects--;
 }
 
-buildUnnamed3123() {
+buildUnnamed2761() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3123(core.List<core.String> o) {
+checkUnnamed2761(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1171,7 +1171,7 @@
       'bool': true,
       'string': 'foo'
     };
-    o.members = buildUnnamed3123();
+    o.members = buildUnnamed2761();
     o.role = "foo";
   }
   buildCounterPolicyBindings--;
@@ -1186,20 +1186,20 @@
     unittest.expect(casted1["list"], unittest.equals([1, 2, 3]));
     unittest.expect(casted1["bool"], unittest.equals(true));
     unittest.expect(casted1["string"], unittest.equals('foo'));
-    checkUnnamed3123(o.members);
+    checkUnnamed2761(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterPolicyBindings--;
 }
 
-buildUnnamed3124() {
+buildUnnamed2762() {
   var o = new core.List<api.PolicyBindings>();
   o.add(buildPolicyBindings());
   o.add(buildPolicyBindings());
   return o;
 }
 
-checkUnnamed3124(core.List<api.PolicyBindings> o) {
+checkUnnamed2762(core.List<api.PolicyBindings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPolicyBindings(o[0]);
   checkPolicyBindings(o[1]);
@@ -1210,7 +1210,7 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.bindings = buildUnnamed3124();
+    o.bindings = buildUnnamed2762();
     o.etag = "foo";
     o.kind = "foo";
     o.resourceId = "foo";
@@ -1222,7 +1222,7 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed3124(o.bindings);
+    checkUnnamed2762(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.resourceId, unittest.equals('foo'));
@@ -1280,14 +1280,14 @@
   buildCounterServiceAccount--;
 }
 
-buildUnnamed3125() {
+buildUnnamed2763() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3125(core.List<core.String> o) {
+checkUnnamed2763(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1299,7 +1299,7 @@
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
     o.kind = "foo";
-    o.permissions = buildUnnamed3125();
+    o.permissions = buildUnnamed2763();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -1309,32 +1309,32 @@
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3125(o.permissions);
+    checkUnnamed2763(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
 
-buildUnnamed3126() {
+buildUnnamed2764() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3126(core.List<core.String> o) {
+checkUnnamed2764(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3127() {
+buildUnnamed2765() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3127(core.List<core.String> o) {
+checkUnnamed2765(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1759,7 +1759,7 @@
       res
           .get(arg_bucket, arg_entity,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BucketAccessControl response) {
+          .then(unittest.expectAsync1(((response) {
         checkBucketAccessControl(response);
       })));
     });
@@ -1830,7 +1830,7 @@
       res
           .insert(arg_request, arg_bucket,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BucketAccessControl response) {
+          .then(unittest.expectAsync1(((response) {
         checkBucketAccessControl(response);
       })));
     });
@@ -1896,7 +1896,7 @@
       }), true);
       res
           .list(arg_bucket, userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BucketAccessControls response) {
+          .then(unittest.expectAsync1(((response) {
         checkBucketAccessControls(response);
       })));
     });
@@ -1971,7 +1971,7 @@
       res
           .patch(arg_request, arg_bucket, arg_entity,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BucketAccessControl response) {
+          .then(unittest.expectAsync1(((response) {
         checkBucketAccessControl(response);
       })));
     });
@@ -2046,7 +2046,7 @@
       res
           .update(arg_request, arg_bucket, arg_entity,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BucketAccessControl response) {
+          .then(unittest.expectAsync1(((response) {
         checkBucketAccessControl(response);
       })));
     });
@@ -2188,7 +2188,7 @@
               projection: arg_projection,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Bucket response) {
+          .then(unittest.expectAsync1(((response) {
         checkBucket(response);
       })));
     });
@@ -2254,7 +2254,7 @@
       res
           .getIamPolicy(arg_bucket,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -2330,7 +2330,7 @@
               projection: arg_projection,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Bucket response) {
+          .then(unittest.expectAsync1(((response) {
         checkBucket(response);
       })));
     });
@@ -2405,7 +2405,7 @@
               projection: arg_projection,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Buckets response) {
+          .then(unittest.expectAsync1(((response) {
         checkBuckets(response);
       })));
     });
@@ -2474,7 +2474,7 @@
       res
           .lockRetentionPolicy(arg_bucket, arg_ifMetagenerationMatch,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Bucket response) {
+          .then(unittest.expectAsync1(((response) {
         checkBucket(response);
       })));
     });
@@ -2559,7 +2559,7 @@
               projection: arg_projection,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Bucket response) {
+          .then(unittest.expectAsync1(((response) {
         checkBucket(response);
       })));
     });
@@ -2629,7 +2629,7 @@
       res
           .setIamPolicy(arg_request, arg_bucket,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -2638,7 +2638,7 @@
       var mock = new HttpServerMock();
       api.BucketsResourceApi res = new api.StorageApi(mock).buckets;
       var arg_bucket = "foo";
-      var arg_permissions = buildUnnamed3126();
+      var arg_permissions = buildUnnamed2764();
       var arg_userProject = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -2698,8 +2698,7 @@
       res
           .testIamPermissions(arg_bucket, arg_permissions,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -2784,7 +2783,7 @@
               projection: arg_projection,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Bucket response) {
+          .then(unittest.expectAsync1(((response) {
         checkBucket(response);
       })));
     });
@@ -2982,7 +2981,7 @@
       res
           .get(arg_bucket, arg_entity,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ObjectAccessControl response) {
+          .then(unittest.expectAsync1(((response) {
         checkObjectAccessControl(response);
       })));
     });
@@ -3053,7 +3052,7 @@
       res
           .insert(arg_request, arg_bucket,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ObjectAccessControl response) {
+          .then(unittest.expectAsync1(((response) {
         checkObjectAccessControl(response);
       })));
     });
@@ -3129,7 +3128,7 @@
               ifMetagenerationNotMatch: arg_ifMetagenerationNotMatch,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ObjectAccessControls response) {
+          .then(unittest.expectAsync1(((response) {
         checkObjectAccessControls(response);
       })));
     });
@@ -3204,7 +3203,7 @@
       res
           .patch(arg_request, arg_bucket, arg_entity,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ObjectAccessControl response) {
+          .then(unittest.expectAsync1(((response) {
         checkObjectAccessControl(response);
       })));
     });
@@ -3279,7 +3278,7 @@
       res
           .update(arg_request, arg_bucket, arg_entity,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ObjectAccessControl response) {
+          .then(unittest.expectAsync1(((response) {
         checkObjectAccessControl(response);
       })));
     });
@@ -3419,7 +3418,7 @@
       res
           .get(arg_bucket, arg_notification,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Notification response) {
+          .then(unittest.expectAsync1(((response) {
         checkNotification(response);
       })));
     });
@@ -3489,7 +3488,7 @@
       res
           .insert(arg_request, arg_bucket,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Notification response) {
+          .then(unittest.expectAsync1(((response) {
         checkNotification(response);
       })));
     });
@@ -3554,7 +3553,7 @@
       }), true);
       res
           .list(arg_bucket, userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Notifications response) {
+          .then(unittest.expectAsync1(((response) {
         checkNotifications(response);
       })));
     });
@@ -3726,7 +3725,7 @@
               generation: arg_generation,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ObjectAccessControl response) {
+          .then(unittest.expectAsync1(((response) {
         checkObjectAccessControl(response);
       })));
     });
@@ -3812,7 +3811,7 @@
               generation: arg_generation,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ObjectAccessControl response) {
+          .then(unittest.expectAsync1(((response) {
         checkObjectAccessControl(response);
       })));
     });
@@ -3894,7 +3893,7 @@
               generation: arg_generation,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ObjectAccessControls response) {
+          .then(unittest.expectAsync1(((response) {
         checkObjectAccessControls(response);
       })));
     });
@@ -3984,7 +3983,7 @@
               generation: arg_generation,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ObjectAccessControl response) {
+          .then(unittest.expectAsync1(((response) {
         checkObjectAccessControl(response);
       })));
     });
@@ -4074,7 +4073,7 @@
               generation: arg_generation,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ObjectAccessControl response) {
+          .then(unittest.expectAsync1(((response) {
         checkObjectAccessControl(response);
       })));
     });
@@ -4173,7 +4172,7 @@
               kmsKeyName: arg_kmsKeyName,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Object response) {
+          .then(unittest.expectAsync1(((response) {
         checkObject(response);
       })));
     });
@@ -4314,7 +4313,7 @@
               sourceGeneration: arg_sourceGeneration,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Object response) {
+          .then(unittest.expectAsync1(((response) {
         checkObject(response);
       })));
     });
@@ -4501,7 +4500,7 @@
               projection: arg_projection,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Object response) {
+          .then(unittest.expectAsync1(((response) {
         checkObject(response);
       })));
     });
@@ -4582,7 +4581,7 @@
               generation: arg_generation,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -4691,7 +4690,7 @@
               projection: arg_projection,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Object response) {
+          .then(unittest.expectAsync1(((response) {
         checkObject(response);
       })));
     });
@@ -4781,7 +4780,7 @@
               userProject: arg_userProject,
               versions: arg_versions,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Objects response) {
+          .then(unittest.expectAsync1(((response) {
         checkObjects(response);
       })));
     });
@@ -4884,7 +4883,7 @@
               projection: arg_projection,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Object response) {
+          .then(unittest.expectAsync1(((response) {
         checkObject(response);
       })));
     });
@@ -5037,7 +5036,7 @@
               sourceGeneration: arg_sourceGeneration,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RewriteResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRewriteResponse(response);
       })));
     });
@@ -5122,7 +5121,7 @@
               generation: arg_generation,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -5132,7 +5131,7 @@
       api.ObjectsResourceApi res = new api.StorageApi(mock).objects;
       var arg_bucket = "foo";
       var arg_object = "foo";
-      var arg_permissions = buildUnnamed3127();
+      var arg_permissions = buildUnnamed2765();
       var arg_generation = "foo";
       var arg_userProject = "foo";
       var arg_$fields = "foo";
@@ -5206,8 +5205,7 @@
               generation: arg_generation,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -5310,7 +5308,7 @@
               projection: arg_projection,
               userProject: arg_userProject,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Object response) {
+          .then(unittest.expectAsync1(((response) {
         checkObject(response);
       })));
     });
@@ -5404,7 +5402,7 @@
               userProject: arg_userProject,
               versions: arg_versions,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
@@ -5473,7 +5471,7 @@
       res
           .get(arg_projectId,
               userProject: arg_userProject, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ServiceAccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkServiceAccount(response);
       })));
     });
diff --git a/generated/googleapis/test/storagetransfer/v1_test.dart b/generated/googleapis/test/storagetransfer/v1_test.dart
index 50cf9ec..7180576 100644
--- a/generated/googleapis/test/storagetransfer/v1_test.dart
+++ b/generated/googleapis/test/storagetransfer/v1_test.dart
@@ -130,14 +130,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed2642() {
+buildUnnamed1119() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2642(core.List<core.String> o) {
+checkUnnamed1119(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -148,7 +148,7 @@
   var o = new api.ErrorLogEntry();
   buildCounterErrorLogEntry++;
   if (buildCounterErrorLogEntry < 3) {
-    o.errorDetails = buildUnnamed2642();
+    o.errorDetails = buildUnnamed1119();
     o.url = "foo";
   }
   buildCounterErrorLogEntry--;
@@ -158,20 +158,20 @@
 checkErrorLogEntry(api.ErrorLogEntry o) {
   buildCounterErrorLogEntry++;
   if (buildCounterErrorLogEntry < 3) {
-    checkUnnamed2642(o.errorDetails);
+    checkUnnamed1119(o.errorDetails);
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterErrorLogEntry--;
 }
 
-buildUnnamed2643() {
+buildUnnamed1120() {
   var o = new core.List<api.ErrorLogEntry>();
   o.add(buildErrorLogEntry());
   o.add(buildErrorLogEntry());
   return o;
 }
 
-checkUnnamed2643(core.List<api.ErrorLogEntry> o) {
+checkUnnamed1120(core.List<api.ErrorLogEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorLogEntry(o[0]);
   checkErrorLogEntry(o[1]);
@@ -184,7 +184,7 @@
   if (buildCounterErrorSummary < 3) {
     o.errorCode = "foo";
     o.errorCount = "foo";
-    o.errorLogEntries = buildUnnamed2643();
+    o.errorLogEntries = buildUnnamed1120();
   }
   buildCounterErrorSummary--;
   return o;
@@ -195,7 +195,7 @@
   if (buildCounterErrorSummary < 3) {
     unittest.expect(o.errorCode, unittest.equals('foo'));
     unittest.expect(o.errorCount, unittest.equals('foo'));
-    checkUnnamed2643(o.errorLogEntries);
+    checkUnnamed1120(o.errorLogEntries);
   }
   buildCounterErrorSummary--;
 }
@@ -257,14 +257,14 @@
   buildCounterHttpData--;
 }
 
-buildUnnamed2644() {
+buildUnnamed1121() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed2644(core.List<api.Operation> o) {
+checkUnnamed1121(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -276,7 +276,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed2644();
+    o.operations = buildUnnamed1121();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -286,19 +286,19 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2644(o.operations);
+    checkUnnamed1121(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed2645() {
+buildUnnamed1122() {
   var o = new core.List<api.TransferJob>();
   o.add(buildTransferJob());
   o.add(buildTransferJob());
   return o;
 }
 
-checkUnnamed2645(core.List<api.TransferJob> o) {
+checkUnnamed1122(core.List<api.TransferJob> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTransferJob(o[0]);
   checkTransferJob(o[1]);
@@ -310,7 +310,7 @@
   buildCounterListTransferJobsResponse++;
   if (buildCounterListTransferJobsResponse < 3) {
     o.nextPageToken = "foo";
-    o.transferJobs = buildUnnamed2645();
+    o.transferJobs = buildUnnamed1122();
   }
   buildCounterListTransferJobsResponse--;
   return o;
@@ -320,32 +320,32 @@
   buildCounterListTransferJobsResponse++;
   if (buildCounterListTransferJobsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed2645(o.transferJobs);
+    checkUnnamed1122(o.transferJobs);
   }
   buildCounterListTransferJobsResponse--;
 }
 
-buildUnnamed2646() {
+buildUnnamed1123() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2646(core.List<core.String> o) {
+checkUnnamed1123(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2647() {
+buildUnnamed1124() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2647(core.List<core.String> o) {
+checkUnnamed1124(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -356,8 +356,8 @@
   var o = new api.ObjectConditions();
   buildCounterObjectConditions++;
   if (buildCounterObjectConditions < 3) {
-    o.excludePrefixes = buildUnnamed2646();
-    o.includePrefixes = buildUnnamed2647();
+    o.excludePrefixes = buildUnnamed1123();
+    o.includePrefixes = buildUnnamed1124();
     o.maxTimeElapsedSinceLastModification = "foo";
     o.minTimeElapsedSinceLastModification = "foo";
   }
@@ -368,8 +368,8 @@
 checkObjectConditions(api.ObjectConditions o) {
   buildCounterObjectConditions++;
   if (buildCounterObjectConditions < 3) {
-    checkUnnamed2646(o.excludePrefixes);
-    checkUnnamed2647(o.includePrefixes);
+    checkUnnamed1123(o.excludePrefixes);
+    checkUnnamed1124(o.includePrefixes);
     unittest.expect(
         o.maxTimeElapsedSinceLastModification, unittest.equals('foo'));
     unittest.expect(
@@ -378,7 +378,7 @@
   buildCounterObjectConditions--;
 }
 
-buildUnnamed2648() {
+buildUnnamed1125() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -393,7 +393,7 @@
   return o;
 }
 
-checkUnnamed2648(core.Map<core.String, core.Object> o) {
+checkUnnamed1125(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -407,7 +407,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2649() {
+buildUnnamed1126() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -422,7 +422,7 @@
   return o;
 }
 
-checkUnnamed2649(core.Map<core.String, core.Object> o) {
+checkUnnamed1126(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -443,9 +443,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed2648();
+    o.metadata = buildUnnamed1125();
     o.name = "foo";
-    o.response = buildUnnamed2649();
+    o.response = buildUnnamed1126();
   }
   buildCounterOperation--;
   return o;
@@ -456,9 +456,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed2648(o.metadata);
+    checkUnnamed1125(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2649(o.response);
+    checkUnnamed1126(o.response);
   }
   buildCounterOperation--;
 }
@@ -516,7 +516,7 @@
   buildCounterSchedule--;
 }
 
-buildUnnamed2650() {
+buildUnnamed1127() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -531,7 +531,7 @@
   return o;
 }
 
-checkUnnamed2650(core.Map<core.String, core.Object> o) {
+checkUnnamed1127(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -545,17 +545,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed2651() {
+buildUnnamed1128() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed2650());
-  o.add(buildUnnamed2650());
+  o.add(buildUnnamed1127());
+  o.add(buildUnnamed1127());
   return o;
 }
 
-checkUnnamed2651(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1128(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed2650(o[0]);
-  checkUnnamed2650(o[1]);
+  checkUnnamed1127(o[0]);
+  checkUnnamed1127(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -564,7 +564,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed2651();
+    o.details = buildUnnamed1128();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -575,7 +575,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed2651(o.details);
+    checkUnnamed1128(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -690,14 +690,14 @@
   buildCounterTransferJob--;
 }
 
-buildUnnamed2652() {
+buildUnnamed1129() {
   var o = new core.List<api.ErrorSummary>();
   o.add(buildErrorSummary());
   o.add(buildErrorSummary());
   return o;
 }
 
-checkUnnamed2652(core.List<api.ErrorSummary> o) {
+checkUnnamed1129(core.List<api.ErrorSummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorSummary(o[0]);
   checkErrorSummary(o[1]);
@@ -710,7 +710,7 @@
   if (buildCounterTransferOperation < 3) {
     o.counters = buildTransferCounters();
     o.endTime = "foo";
-    o.errorBreakdowns = buildUnnamed2652();
+    o.errorBreakdowns = buildUnnamed1129();
     o.name = "foo";
     o.projectId = "foo";
     o.startTime = "foo";
@@ -727,7 +727,7 @@
   if (buildCounterTransferOperation < 3) {
     checkTransferCounters(o.counters);
     unittest.expect(o.endTime, unittest.equals('foo'));
-    checkUnnamed2652(o.errorBreakdowns);
+    checkUnnamed1129(o.errorBreakdowns);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.projectId, unittest.equals('foo'));
     unittest.expect(o.startTime, unittest.equals('foo'));
@@ -1056,7 +1056,7 @@
       }), true);
       res
           .get(arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleServiceAccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleServiceAccount(response);
       })));
     });
@@ -1112,7 +1112,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TransferJob response) {
+          .then(unittest.expectAsync1(((response) {
         checkTransferJob(response);
       })));
     });
@@ -1167,7 +1167,7 @@
       }), true);
       res
           .get(arg_jobName, projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TransferJob response) {
+          .then(unittest.expectAsync1(((response) {
         checkTransferJob(response);
       })));
     });
@@ -1229,7 +1229,7 @@
               filter: arg_filter,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTransferJobsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTransferJobsResponse(response);
       })));
     });
@@ -1285,7 +1285,7 @@
       }), true);
       res
           .patch(arg_request, arg_jobName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TransferJob response) {
+          .then(unittest.expectAsync1(((response) {
         checkTransferJob(response);
       })));
     });
@@ -1339,7 +1339,7 @@
       }), true);
       res
           .cancel(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1391,7 +1391,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1443,7 +1443,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1507,7 +1507,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -1563,7 +1563,7 @@
       }), true);
       res
           .pause(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1619,7 +1619,7 @@
       }), true);
       res
           .resume(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
diff --git a/generated/googleapis/test/streetviewpublish/v1_test.dart b/generated/googleapis/test/streetviewpublish/v1_test.dart
index dbcd3fe..90587d3 100644
--- a/generated/googleapis/test/streetviewpublish/v1_test.dart
+++ b/generated/googleapis/test/streetviewpublish/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed1168() {
+buildUnnamed2008() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1168(core.List<core.String> o) {
+checkUnnamed2008(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -68,7 +68,7 @@
   var o = new api.BatchDeletePhotosRequest();
   buildCounterBatchDeletePhotosRequest++;
   if (buildCounterBatchDeletePhotosRequest < 3) {
-    o.photoIds = buildUnnamed1168();
+    o.photoIds = buildUnnamed2008();
   }
   buildCounterBatchDeletePhotosRequest--;
   return o;
@@ -77,19 +77,19 @@
 checkBatchDeletePhotosRequest(api.BatchDeletePhotosRequest o) {
   buildCounterBatchDeletePhotosRequest++;
   if (buildCounterBatchDeletePhotosRequest < 3) {
-    checkUnnamed1168(o.photoIds);
+    checkUnnamed2008(o.photoIds);
   }
   buildCounterBatchDeletePhotosRequest--;
 }
 
-buildUnnamed1169() {
+buildUnnamed2009() {
   var o = new core.List<api.Status>();
   o.add(buildStatus());
   o.add(buildStatus());
   return o;
 }
 
-checkUnnamed1169(core.List<api.Status> o) {
+checkUnnamed2009(core.List<api.Status> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStatus(o[0]);
   checkStatus(o[1]);
@@ -100,7 +100,7 @@
   var o = new api.BatchDeletePhotosResponse();
   buildCounterBatchDeletePhotosResponse++;
   if (buildCounterBatchDeletePhotosResponse < 3) {
-    o.status = buildUnnamed1169();
+    o.status = buildUnnamed2009();
   }
   buildCounterBatchDeletePhotosResponse--;
   return o;
@@ -109,19 +109,19 @@
 checkBatchDeletePhotosResponse(api.BatchDeletePhotosResponse o) {
   buildCounterBatchDeletePhotosResponse++;
   if (buildCounterBatchDeletePhotosResponse < 3) {
-    checkUnnamed1169(o.status);
+    checkUnnamed2009(o.status);
   }
   buildCounterBatchDeletePhotosResponse--;
 }
 
-buildUnnamed1170() {
+buildUnnamed2010() {
   var o = new core.List<api.PhotoResponse>();
   o.add(buildPhotoResponse());
   o.add(buildPhotoResponse());
   return o;
 }
 
-checkUnnamed1170(core.List<api.PhotoResponse> o) {
+checkUnnamed2010(core.List<api.PhotoResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPhotoResponse(o[0]);
   checkPhotoResponse(o[1]);
@@ -132,7 +132,7 @@
   var o = new api.BatchGetPhotosResponse();
   buildCounterBatchGetPhotosResponse++;
   if (buildCounterBatchGetPhotosResponse < 3) {
-    o.results = buildUnnamed1170();
+    o.results = buildUnnamed2010();
   }
   buildCounterBatchGetPhotosResponse--;
   return o;
@@ -141,19 +141,19 @@
 checkBatchGetPhotosResponse(api.BatchGetPhotosResponse o) {
   buildCounterBatchGetPhotosResponse++;
   if (buildCounterBatchGetPhotosResponse < 3) {
-    checkUnnamed1170(o.results);
+    checkUnnamed2010(o.results);
   }
   buildCounterBatchGetPhotosResponse--;
 }
 
-buildUnnamed1171() {
+buildUnnamed2011() {
   var o = new core.List<api.UpdatePhotoRequest>();
   o.add(buildUpdatePhotoRequest());
   o.add(buildUpdatePhotoRequest());
   return o;
 }
 
-checkUnnamed1171(core.List<api.UpdatePhotoRequest> o) {
+checkUnnamed2011(core.List<api.UpdatePhotoRequest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUpdatePhotoRequest(o[0]);
   checkUpdatePhotoRequest(o[1]);
@@ -164,7 +164,7 @@
   var o = new api.BatchUpdatePhotosRequest();
   buildCounterBatchUpdatePhotosRequest++;
   if (buildCounterBatchUpdatePhotosRequest < 3) {
-    o.updatePhotoRequests = buildUnnamed1171();
+    o.updatePhotoRequests = buildUnnamed2011();
   }
   buildCounterBatchUpdatePhotosRequest--;
   return o;
@@ -173,19 +173,19 @@
 checkBatchUpdatePhotosRequest(api.BatchUpdatePhotosRequest o) {
   buildCounterBatchUpdatePhotosRequest++;
   if (buildCounterBatchUpdatePhotosRequest < 3) {
-    checkUnnamed1171(o.updatePhotoRequests);
+    checkUnnamed2011(o.updatePhotoRequests);
   }
   buildCounterBatchUpdatePhotosRequest--;
 }
 
-buildUnnamed1172() {
+buildUnnamed2012() {
   var o = new core.List<api.PhotoResponse>();
   o.add(buildPhotoResponse());
   o.add(buildPhotoResponse());
   return o;
 }
 
-checkUnnamed1172(core.List<api.PhotoResponse> o) {
+checkUnnamed2012(core.List<api.PhotoResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPhotoResponse(o[0]);
   checkPhotoResponse(o[1]);
@@ -196,7 +196,7 @@
   var o = new api.BatchUpdatePhotosResponse();
   buildCounterBatchUpdatePhotosResponse++;
   if (buildCounterBatchUpdatePhotosResponse < 3) {
-    o.results = buildUnnamed1172();
+    o.results = buildUnnamed2012();
   }
   buildCounterBatchUpdatePhotosResponse--;
   return o;
@@ -205,7 +205,7 @@
 checkBatchUpdatePhotosResponse(api.BatchUpdatePhotosResponse o) {
   buildCounterBatchUpdatePhotosResponse++;
   if (buildCounterBatchUpdatePhotosResponse < 3) {
-    checkUnnamed1172(o.results);
+    checkUnnamed2012(o.results);
   }
   buildCounterBatchUpdatePhotosResponse--;
 }
@@ -286,14 +286,14 @@
   buildCounterLevel--;
 }
 
-buildUnnamed1173() {
+buildUnnamed2013() {
   var o = new core.List<api.Photo>();
   o.add(buildPhoto());
   o.add(buildPhoto());
   return o;
 }
 
-checkUnnamed1173(core.List<api.Photo> o) {
+checkUnnamed2013(core.List<api.Photo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPhoto(o[0]);
   checkPhoto(o[1]);
@@ -305,7 +305,7 @@
   buildCounterListPhotosResponse++;
   if (buildCounterListPhotosResponse < 3) {
     o.nextPageToken = "foo";
-    o.photos = buildUnnamed1173();
+    o.photos = buildUnnamed2013();
   }
   buildCounterListPhotosResponse--;
   return o;
@@ -315,12 +315,12 @@
   buildCounterListPhotosResponse++;
   if (buildCounterListPhotosResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1173(o.photos);
+    checkUnnamed2013(o.photos);
   }
   buildCounterListPhotosResponse--;
 }
 
-buildUnnamed1174() {
+buildUnnamed2014() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -335,7 +335,7 @@
   return o;
 }
 
-checkUnnamed1174(core.Map<core.String, core.Object> o) {
+checkUnnamed2014(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -349,7 +349,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1175() {
+buildUnnamed2015() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -364,7 +364,7 @@
   return o;
 }
 
-checkUnnamed1175(core.Map<core.String, core.Object> o) {
+checkUnnamed2015(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -385,9 +385,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed1174();
+    o.metadata = buildUnnamed2014();
     o.name = "foo";
-    o.response = buildUnnamed1175();
+    o.response = buildUnnamed2015();
   }
   buildCounterOperation--;
   return o;
@@ -398,34 +398,34 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed1174(o.metadata);
+    checkUnnamed2014(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1175(o.response);
+    checkUnnamed2015(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed1176() {
+buildUnnamed2016() {
   var o = new core.List<api.Connection>();
   o.add(buildConnection());
   o.add(buildConnection());
   return o;
 }
 
-checkUnnamed1176(core.List<api.Connection> o) {
+checkUnnamed2016(core.List<api.Connection> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkConnection(o[0]);
   checkConnection(o[1]);
 }
 
-buildUnnamed1177() {
+buildUnnamed2017() {
   var o = new core.List<api.Place>();
   o.add(buildPlace());
   o.add(buildPlace());
   return o;
 }
 
-checkUnnamed1177(core.List<api.Place> o) {
+checkUnnamed2017(core.List<api.Place> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlace(o[0]);
   checkPlace(o[1]);
@@ -437,10 +437,10 @@
   buildCounterPhoto++;
   if (buildCounterPhoto < 3) {
     o.captureTime = "foo";
-    o.connections = buildUnnamed1176();
+    o.connections = buildUnnamed2016();
     o.downloadUrl = "foo";
     o.photoId = buildPhotoId();
-    o.places = buildUnnamed1177();
+    o.places = buildUnnamed2017();
     o.pose = buildPose();
     o.shareLink = "foo";
     o.thumbnailUrl = "foo";
@@ -455,10 +455,10 @@
   buildCounterPhoto++;
   if (buildCounterPhoto < 3) {
     unittest.expect(o.captureTime, unittest.equals('foo'));
-    checkUnnamed1176(o.connections);
+    checkUnnamed2016(o.connections);
     unittest.expect(o.downloadUrl, unittest.equals('foo'));
     checkPhotoId(o.photoId);
-    checkUnnamed1177(o.places);
+    checkUnnamed2017(o.places);
     checkPose(o.pose);
     unittest.expect(o.shareLink, unittest.equals('foo'));
     unittest.expect(o.thumbnailUrl, unittest.equals('foo'));
@@ -556,7 +556,7 @@
   buildCounterPose--;
 }
 
-buildUnnamed1178() {
+buildUnnamed2018() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -571,7 +571,7 @@
   return o;
 }
 
-checkUnnamed1178(core.Map<core.String, core.Object> o) {
+checkUnnamed2018(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -585,17 +585,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed1179() {
+buildUnnamed2019() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed1178());
-  o.add(buildUnnamed1178());
+  o.add(buildUnnamed2018());
+  o.add(buildUnnamed2018());
   return o;
 }
 
-checkUnnamed1179(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed2019(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed1178(o[0]);
-  checkUnnamed1178(o[1]);
+  checkUnnamed2018(o[0]);
+  checkUnnamed2018(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -604,7 +604,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed1179();
+    o.details = buildUnnamed2019();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -615,7 +615,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed1179(o.details);
+    checkUnnamed2019(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -661,14 +661,14 @@
   buildCounterUploadRef--;
 }
 
-buildUnnamed1180() {
+buildUnnamed2020() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1180(core.List<core.String> o) {
+checkUnnamed2020(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -876,7 +876,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Photo response) {
+          .then(unittest.expectAsync1(((response) {
         checkPhoto(response);
       })));
     });
@@ -929,7 +929,7 @@
       }), true);
       res
           .delete(arg_photoId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -984,7 +984,7 @@
       }), true);
       res
           .get(arg_photoId, view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Photo response) {
+          .then(unittest.expectAsync1(((response) {
         checkPhoto(response);
       })));
     });
@@ -1037,7 +1037,7 @@
       }), true);
       res
           .startUpload(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UploadRef response) {
+          .then(unittest.expectAsync1(((response) {
         checkUploadRef(response);
       })));
     });
@@ -1098,7 +1098,7 @@
       res
           .update(arg_request, arg_id,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Photo response) {
+          .then(unittest.expectAsync1(((response) {
         checkPhoto(response);
       })));
     });
@@ -1151,8 +1151,9 @@
         var resp = convert.JSON.encode(buildBatchDeletePhotosResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchDelete(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.BatchDeletePhotosResponse response) {
+      res
+          .batchDelete(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkBatchDeletePhotosResponse(response);
       })));
     });
@@ -1160,7 +1161,7 @@
     unittest.test("method--batchGet", () {
       var mock = new HttpServerMock();
       api.PhotosResourceApi res = new api.StreetviewpublishApi(mock).photos;
-      var arg_photoIds = buildUnnamed1180();
+      var arg_photoIds = buildUnnamed2020();
       var arg_view = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -1206,7 +1207,7 @@
       res
           .batchGet(
               photoIds: arg_photoIds, view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BatchGetPhotosResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBatchGetPhotosResponse(response);
       })));
     });
@@ -1257,8 +1258,9 @@
         var resp = convert.JSON.encode(buildBatchUpdatePhotosResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchUpdate(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.BatchUpdatePhotosResponse response) {
+      res
+          .batchUpdate(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkBatchUpdatePhotosResponse(response);
       })));
     });
@@ -1322,7 +1324,7 @@
               view: arg_view,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListPhotosResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListPhotosResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/surveys/v2_test.dart b/generated/googleapis/test/surveys/v2_test.dart
index 0178b9f..3794bb6 100644
--- a/generated/googleapis/test/surveys/v2_test.dart
+++ b/generated/googleapis/test/surveys/v2_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3598() {
+buildUnnamed1653() {
   var o = new core.List<api.FieldMask>();
   o.add(buildFieldMask());
   o.add(buildFieldMask());
   return o;
 }
 
-checkUnnamed3598(core.List<api.FieldMask> o) {
+checkUnnamed1653(core.List<api.FieldMask> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFieldMask(o[0]);
   checkFieldMask(o[1]);
@@ -68,7 +68,7 @@
   var o = new api.FieldMask();
   buildCounterFieldMask++;
   if (buildCounterFieldMask < 3) {
-    o.fields = buildUnnamed3598();
+    o.fields = buildUnnamed1653();
     o.id = 42;
   }
   buildCounterFieldMask--;
@@ -78,20 +78,20 @@
 checkFieldMask(api.FieldMask o) {
   buildCounterFieldMask++;
   if (buildCounterFieldMask < 3) {
-    checkUnnamed3598(o.fields);
+    checkUnnamed1653(o.fields);
     unittest.expect(o.id, unittest.equals(42));
   }
   buildCounterFieldMask--;
 }
 
-buildUnnamed3599() {
+buildUnnamed1654() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3599(core.List<core.String> o) {
+checkUnnamed1654(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -107,7 +107,7 @@
     o.language = "foo";
     o.mobileAppPanelId = "foo";
     o.name = "foo";
-    o.owners = buildUnnamed3599();
+    o.owners = buildUnnamed1654();
   }
   buildCounterMobileAppPanel--;
   return o;
@@ -121,19 +121,19 @@
     unittest.expect(o.language, unittest.equals('foo'));
     unittest.expect(o.mobileAppPanelId, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3599(o.owners);
+    checkUnnamed1654(o.owners);
   }
   buildCounterMobileAppPanel--;
 }
 
-buildUnnamed3600() {
+buildUnnamed1655() {
   var o = new core.List<api.MobileAppPanel>();
   o.add(buildMobileAppPanel());
   o.add(buildMobileAppPanel());
   return o;
 }
 
-checkUnnamed3600(core.List<api.MobileAppPanel> o) {
+checkUnnamed1655(core.List<api.MobileAppPanel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMobileAppPanel(o[0]);
   checkMobileAppPanel(o[1]);
@@ -146,7 +146,7 @@
   if (buildCounterMobileAppPanelsListResponse < 3) {
     o.pageInfo = buildPageInfo();
     o.requestId = "foo";
-    o.resources = buildUnnamed3600();
+    o.resources = buildUnnamed1655();
     o.tokenPagination = buildTokenPagination();
   }
   buildCounterMobileAppPanelsListResponse--;
@@ -158,7 +158,7 @@
   if (buildCounterMobileAppPanelsListResponse < 3) {
     checkPageInfo(o.pageInfo);
     unittest.expect(o.requestId, unittest.equals('foo'));
-    checkUnnamed3600(o.resources);
+    checkUnnamed1655(o.resources);
     checkTokenPagination(o.tokenPagination);
   }
   buildCounterMobileAppPanelsListResponse--;
@@ -206,14 +206,14 @@
   buildCounterResultsGetRequest--;
 }
 
-buildUnnamed3601() {
+buildUnnamed1656() {
   var o = new core.List<api.FieldMask>();
   o.add(buildFieldMask());
   o.add(buildFieldMask());
   return o;
 }
 
-checkUnnamed3601(core.List<api.FieldMask> o) {
+checkUnnamed1656(core.List<api.FieldMask> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFieldMask(o[0]);
   checkFieldMask(o[1]);
@@ -224,7 +224,7 @@
   var o = new api.ResultsMask();
   buildCounterResultsMask++;
   if (buildCounterResultsMask < 3) {
-    o.fields = buildUnnamed3601();
+    o.fields = buildUnnamed1656();
     o.projection = "foo";
   }
   buildCounterResultsMask--;
@@ -234,33 +234,33 @@
 checkResultsMask(api.ResultsMask o) {
   buildCounterResultsMask++;
   if (buildCounterResultsMask < 3) {
-    checkUnnamed3601(o.fields);
+    checkUnnamed1656(o.fields);
     unittest.expect(o.projection, unittest.equals('foo'));
   }
   buildCounterResultsMask--;
 }
 
-buildUnnamed3602() {
+buildUnnamed1657() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3602(core.List<core.String> o) {
+checkUnnamed1657(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3603() {
+buildUnnamed1658() {
   var o = new core.List<api.SurveyQuestion>();
   o.add(buildSurveyQuestion());
   o.add(buildSurveyQuestion());
   return o;
 }
 
-checkUnnamed3603(core.List<api.SurveyQuestion> o) {
+checkUnnamed1658(core.List<api.SurveyQuestion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSurveyQuestion(o[0]);
   checkSurveyQuestion(o[1]);
@@ -275,8 +275,8 @@
     o.cost = buildSurveyCost();
     o.customerData = "foo";
     o.description = "foo";
-    o.owners = buildUnnamed3602();
-    o.questions = buildUnnamed3603();
+    o.owners = buildUnnamed1657();
+    o.questions = buildUnnamed1658();
     o.rejectionReason = buildSurveyRejection();
     o.state = "foo";
     o.surveyUrlId = "foo";
@@ -294,8 +294,8 @@
     checkSurveyCost(o.cost);
     unittest.expect(o.customerData, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed3602(o.owners);
-    checkUnnamed3603(o.questions);
+    checkUnnamed1657(o.owners);
+    checkUnnamed1658(o.questions);
     checkSurveyRejection(o.rejectionReason);
     unittest.expect(o.state, unittest.equals('foo'));
     unittest.expect(o.surveyUrlId, unittest.equals('foo'));
@@ -305,27 +305,27 @@
   buildCounterSurvey--;
 }
 
-buildUnnamed3604() {
+buildUnnamed1659() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3604(core.List<core.String> o) {
+checkUnnamed1659(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3605() {
+buildUnnamed1660() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3605(core.List<core.String> o) {
+checkUnnamed1660(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -336,11 +336,11 @@
   var o = new api.SurveyAudience();
   buildCounterSurveyAudience++;
   if (buildCounterSurveyAudience < 3) {
-    o.ages = buildUnnamed3604();
+    o.ages = buildUnnamed1659();
     o.country = "foo";
     o.countrySubdivision = "foo";
     o.gender = "foo";
-    o.languages = buildUnnamed3605();
+    o.languages = buildUnnamed1660();
     o.mobileAppPanelId = "foo";
     o.populationSource = "foo";
   }
@@ -351,11 +351,11 @@
 checkSurveyAudience(api.SurveyAudience o) {
   buildCounterSurveyAudience++;
   if (buildCounterSurveyAudience < 3) {
-    checkUnnamed3604(o.ages);
+    checkUnnamed1659(o.ages);
     unittest.expect(o.country, unittest.equals('foo'));
     unittest.expect(o.countrySubdivision, unittest.equals('foo'));
     unittest.expect(o.gender, unittest.equals('foo'));
-    checkUnnamed3605(o.languages);
+    checkUnnamed1660(o.languages);
     unittest.expect(o.mobileAppPanelId, unittest.equals('foo'));
     unittest.expect(o.populationSource, unittest.equals('foo'));
   }
@@ -387,53 +387,53 @@
   buildCounterSurveyCost--;
 }
 
-buildUnnamed3606() {
+buildUnnamed1661() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3606(core.List<core.String> o) {
+checkUnnamed1661(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3607() {
+buildUnnamed1662() {
   var o = new core.List<api.SurveyQuestionImage>();
   o.add(buildSurveyQuestionImage());
   o.add(buildSurveyQuestionImage());
   return o;
 }
 
-checkUnnamed3607(core.List<api.SurveyQuestionImage> o) {
+checkUnnamed1662(core.List<api.SurveyQuestionImage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSurveyQuestionImage(o[0]);
   checkSurveyQuestionImage(o[1]);
 }
 
-buildUnnamed3608() {
+buildUnnamed1663() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3608(core.List<core.String> o) {
+checkUnnamed1663(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3609() {
+buildUnnamed1664() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3609(core.List<core.String> o) {
+checkUnnamed1664(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -445,20 +445,20 @@
   buildCounterSurveyQuestion++;
   if (buildCounterSurveyQuestion < 3) {
     o.answerOrder = "foo";
-    o.answers = buildUnnamed3606();
+    o.answers = buildUnnamed1661();
     o.hasOther = true;
     o.highValueLabel = "foo";
-    o.images = buildUnnamed3607();
+    o.images = buildUnnamed1662();
     o.lastAnswerPositionPinned = true;
     o.lowValueLabel = "foo";
     o.mustPickSuggestion = true;
     o.numStars = "foo";
     o.openTextPlaceholder = "foo";
-    o.openTextSuggestions = buildUnnamed3608();
+    o.openTextSuggestions = buildUnnamed1663();
     o.question = "foo";
     o.sentimentText = "foo";
     o.singleLineResponse = true;
-    o.thresholdAnswers = buildUnnamed3609();
+    o.thresholdAnswers = buildUnnamed1664();
     o.type = "foo";
     o.unitOfMeasurementLabel = "foo";
     o.videoId = "foo";
@@ -471,20 +471,20 @@
   buildCounterSurveyQuestion++;
   if (buildCounterSurveyQuestion < 3) {
     unittest.expect(o.answerOrder, unittest.equals('foo'));
-    checkUnnamed3606(o.answers);
+    checkUnnamed1661(o.answers);
     unittest.expect(o.hasOther, unittest.isTrue);
     unittest.expect(o.highValueLabel, unittest.equals('foo'));
-    checkUnnamed3607(o.images);
+    checkUnnamed1662(o.images);
     unittest.expect(o.lastAnswerPositionPinned, unittest.isTrue);
     unittest.expect(o.lowValueLabel, unittest.equals('foo'));
     unittest.expect(o.mustPickSuggestion, unittest.isTrue);
     unittest.expect(o.numStars, unittest.equals('foo'));
     unittest.expect(o.openTextPlaceholder, unittest.equals('foo'));
-    checkUnnamed3608(o.openTextSuggestions);
+    checkUnnamed1663(o.openTextSuggestions);
     unittest.expect(o.question, unittest.equals('foo'));
     unittest.expect(o.sentimentText, unittest.equals('foo'));
     unittest.expect(o.singleLineResponse, unittest.isTrue);
-    checkUnnamed3609(o.thresholdAnswers);
+    checkUnnamed1664(o.thresholdAnswers);
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.unitOfMeasurementLabel, unittest.equals('foo'));
     unittest.expect(o.videoId, unittest.equals('foo'));
@@ -576,14 +576,14 @@
   buildCounterSurveysDeleteResponse--;
 }
 
-buildUnnamed3610() {
+buildUnnamed1665() {
   var o = new core.List<api.Survey>();
   o.add(buildSurvey());
   o.add(buildSurvey());
   return o;
 }
 
-checkUnnamed3610(core.List<api.Survey> o) {
+checkUnnamed1665(core.List<api.Survey> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSurvey(o[0]);
   checkSurvey(o[1]);
@@ -596,7 +596,7 @@
   if (buildCounterSurveysListResponse < 3) {
     o.pageInfo = buildPageInfo();
     o.requestId = "foo";
-    o.resources = buildUnnamed3610();
+    o.resources = buildUnnamed1665();
     o.tokenPagination = buildTokenPagination();
   }
   buildCounterSurveysListResponse--;
@@ -608,7 +608,7 @@
   if (buildCounterSurveysListResponse < 3) {
     checkPageInfo(o.pageInfo);
     unittest.expect(o.requestId, unittest.equals('foo'));
-    checkUnnamed3610(o.resources);
+    checkUnnamed1665(o.resources);
     checkTokenPagination(o.tokenPagination);
   }
   buildCounterSurveysListResponse--;
@@ -898,7 +898,7 @@
       }), true);
       res
           .get(arg_panelId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MobileAppPanel response) {
+          .then(unittest.expectAsync1(((response) {
         checkMobileAppPanel(response);
       })));
     });
@@ -963,8 +963,7 @@
               startIndex: arg_startIndex,
               token: arg_token,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.MobileAppPanelsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkMobileAppPanelsListResponse(response);
       })));
     });
@@ -1025,7 +1024,7 @@
       }), true);
       res
           .update(arg_request, arg_panelId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MobileAppPanel response) {
+          .then(unittest.expectAsync1(((response) {
         checkMobileAppPanel(response);
       })));
     });
@@ -1096,7 +1095,7 @@
       }), true);
       res
           .get(arg_request, arg_surveyUrlId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SurveyResults response) {
+          .then(unittest.expectAsync1(((response) {
         checkSurveyResults(response);
       })));
     });
@@ -1154,7 +1153,7 @@
       }), true);
       res
           .delete(arg_surveyUrlId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SurveysDeleteResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSurveysDeleteResponse(response);
       })));
     });
@@ -1210,7 +1209,7 @@
       }), true);
       res
           .get(arg_surveyUrlId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Survey response) {
+          .then(unittest.expectAsync1(((response) {
         checkSurvey(response);
       })));
     });
@@ -1266,7 +1265,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Survey response) {
+          .then(unittest.expectAsync1(((response) {
         checkSurvey(response);
       })));
     });
@@ -1330,7 +1329,7 @@
               startIndex: arg_startIndex,
               token: arg_token,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SurveysListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSurveysListResponse(response);
       })));
     });
@@ -1396,7 +1395,7 @@
       }), true);
       res
           .start(arg_request, arg_resourceId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SurveysStartResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSurveysStartResponse(response);
       })));
     });
@@ -1458,7 +1457,7 @@
       }), true);
       res
           .stop(arg_resourceId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SurveysStopResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSurveysStopResponse(response);
       })));
     });
@@ -1518,7 +1517,7 @@
       }), true);
       res
           .update(arg_request, arg_surveyUrlId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Survey response) {
+          .then(unittest.expectAsync1(((response) {
         checkSurvey(response);
       })));
     });
diff --git a/generated/googleapis/test/tagmanager/v1_test.dart b/generated/googleapis/test/tagmanager/v1_test.dart
index 7f62a9c..056a6f4 100644
--- a/generated/googleapis/test/tagmanager/v1_test.dart
+++ b/generated/googleapis/test/tagmanager/v1_test.dart
@@ -75,14 +75,14 @@
   buildCounterAccount--;
 }
 
-buildUnnamed2288() {
+buildUnnamed2766() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2288(core.List<core.String> o) {
+checkUnnamed2766(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -93,7 +93,7 @@
   var o = new api.AccountAccess();
   buildCounterAccountAccess++;
   if (buildCounterAccountAccess < 3) {
-    o.permission = buildUnnamed2288();
+    o.permission = buildUnnamed2766();
   }
   buildCounterAccountAccess--;
   return o;
@@ -102,19 +102,19 @@
 checkAccountAccess(api.AccountAccess o) {
   buildCounterAccountAccess++;
   if (buildCounterAccountAccess < 3) {
-    checkUnnamed2288(o.permission);
+    checkUnnamed2766(o.permission);
   }
   buildCounterAccountAccess--;
 }
 
-buildUnnamed2289() {
+buildUnnamed2767() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed2289(core.List<api.Parameter> o) {
+checkUnnamed2767(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -125,7 +125,7 @@
   var o = new api.Condition();
   buildCounterCondition++;
   if (buildCounterCondition < 3) {
-    o.parameter = buildUnnamed2289();
+    o.parameter = buildUnnamed2767();
     o.type = "foo";
   }
   buildCounterCondition--;
@@ -135,46 +135,46 @@
 checkCondition(api.Condition o) {
   buildCounterCondition++;
   if (buildCounterCondition < 3) {
-    checkUnnamed2289(o.parameter);
+    checkUnnamed2767(o.parameter);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterCondition--;
 }
 
-buildUnnamed2290() {
+buildUnnamed2768() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2290(core.List<core.String> o) {
+checkUnnamed2768(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2291() {
+buildUnnamed2769() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2291(core.List<core.String> o) {
+checkUnnamed2769(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2292() {
+buildUnnamed2770() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2292(core.List<core.String> o) {
+checkUnnamed2770(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -187,15 +187,15 @@
   if (buildCounterContainer < 3) {
     o.accountId = "foo";
     o.containerId = "foo";
-    o.domainName = buildUnnamed2290();
-    o.enabledBuiltInVariable = buildUnnamed2291();
+    o.domainName = buildUnnamed2768();
+    o.enabledBuiltInVariable = buildUnnamed2769();
     o.fingerprint = "foo";
     o.name = "foo";
     o.notes = "foo";
     o.publicId = "foo";
     o.timeZoneCountryId = "foo";
     o.timeZoneId = "foo";
-    o.usageContext = buildUnnamed2292();
+    o.usageContext = buildUnnamed2770();
   }
   buildCounterContainer--;
   return o;
@@ -206,27 +206,27 @@
   if (buildCounterContainer < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.containerId, unittest.equals('foo'));
-    checkUnnamed2290(o.domainName);
-    checkUnnamed2291(o.enabledBuiltInVariable);
+    checkUnnamed2768(o.domainName);
+    checkUnnamed2769(o.enabledBuiltInVariable);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
     unittest.expect(o.publicId, unittest.equals('foo'));
     unittest.expect(o.timeZoneCountryId, unittest.equals('foo'));
     unittest.expect(o.timeZoneId, unittest.equals('foo'));
-    checkUnnamed2292(o.usageContext);
+    checkUnnamed2770(o.usageContext);
   }
   buildCounterContainer--;
 }
 
-buildUnnamed2293() {
+buildUnnamed2771() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2293(core.List<core.String> o) {
+checkUnnamed2771(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -238,7 +238,7 @@
   buildCounterContainerAccess++;
   if (buildCounterContainerAccess < 3) {
     o.containerId = "foo";
-    o.permission = buildUnnamed2293();
+    o.permission = buildUnnamed2771();
   }
   buildCounterContainerAccess--;
   return o;
@@ -248,84 +248,84 @@
   buildCounterContainerAccess++;
   if (buildCounterContainerAccess < 3) {
     unittest.expect(o.containerId, unittest.equals('foo'));
-    checkUnnamed2293(o.permission);
+    checkUnnamed2771(o.permission);
   }
   buildCounterContainerAccess--;
 }
 
-buildUnnamed2294() {
+buildUnnamed2772() {
   var o = new core.List<api.Folder>();
   o.add(buildFolder());
   o.add(buildFolder());
   return o;
 }
 
-checkUnnamed2294(core.List<api.Folder> o) {
+checkUnnamed2772(core.List<api.Folder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFolder(o[0]);
   checkFolder(o[1]);
 }
 
-buildUnnamed2295() {
+buildUnnamed2773() {
   var o = new core.List<api.Macro>();
   o.add(buildMacro());
   o.add(buildMacro());
   return o;
 }
 
-checkUnnamed2295(core.List<api.Macro> o) {
+checkUnnamed2773(core.List<api.Macro> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMacro(o[0]);
   checkMacro(o[1]);
 }
 
-buildUnnamed2296() {
+buildUnnamed2774() {
   var o = new core.List<api.Rule>();
   o.add(buildRule());
   o.add(buildRule());
   return o;
 }
 
-checkUnnamed2296(core.List<api.Rule> o) {
+checkUnnamed2774(core.List<api.Rule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRule(o[0]);
   checkRule(o[1]);
 }
 
-buildUnnamed2297() {
+buildUnnamed2775() {
   var o = new core.List<api.Tag>();
   o.add(buildTag());
   o.add(buildTag());
   return o;
 }
 
-checkUnnamed2297(core.List<api.Tag> o) {
+checkUnnamed2775(core.List<api.Tag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTag(o[0]);
   checkTag(o[1]);
 }
 
-buildUnnamed2298() {
+buildUnnamed2776() {
   var o = new core.List<api.Trigger>();
   o.add(buildTrigger());
   o.add(buildTrigger());
   return o;
 }
 
-checkUnnamed2298(core.List<api.Trigger> o) {
+checkUnnamed2776(core.List<api.Trigger> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrigger(o[0]);
   checkTrigger(o[1]);
 }
 
-buildUnnamed2299() {
+buildUnnamed2777() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed2299(core.List<api.Variable> o) {
+checkUnnamed2777(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
@@ -342,14 +342,14 @@
     o.containerVersionId = "foo";
     o.deleted = true;
     o.fingerprint = "foo";
-    o.folder = buildUnnamed2294();
-    o.macro = buildUnnamed2295();
+    o.folder = buildUnnamed2772();
+    o.macro = buildUnnamed2773();
     o.name = "foo";
     o.notes = "foo";
-    o.rule = buildUnnamed2296();
-    o.tag = buildUnnamed2297();
-    o.trigger = buildUnnamed2298();
-    o.variable = buildUnnamed2299();
+    o.rule = buildUnnamed2774();
+    o.tag = buildUnnamed2775();
+    o.trigger = buildUnnamed2776();
+    o.variable = buildUnnamed2777();
   }
   buildCounterContainerVersion--;
   return o;
@@ -364,14 +364,14 @@
     unittest.expect(o.containerVersionId, unittest.equals('foo'));
     unittest.expect(o.deleted, unittest.isTrue);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed2294(o.folder);
-    checkUnnamed2295(o.macro);
+    checkUnnamed2772(o.folder);
+    checkUnnamed2773(o.macro);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed2296(o.rule);
-    checkUnnamed2297(o.tag);
-    checkUnnamed2298(o.trigger);
-    checkUnnamed2299(o.variable);
+    checkUnnamed2774(o.rule);
+    checkUnnamed2775(o.tag);
+    checkUnnamed2776(o.trigger);
+    checkUnnamed2777(o.variable);
   }
   buildCounterContainerVersion--;
 }
@@ -526,40 +526,40 @@
   buildCounterFolder--;
 }
 
-buildUnnamed2300() {
+buildUnnamed2778() {
   var o = new core.List<api.Tag>();
   o.add(buildTag());
   o.add(buildTag());
   return o;
 }
 
-checkUnnamed2300(core.List<api.Tag> o) {
+checkUnnamed2778(core.List<api.Tag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTag(o[0]);
   checkTag(o[1]);
 }
 
-buildUnnamed2301() {
+buildUnnamed2779() {
   var o = new core.List<api.Trigger>();
   o.add(buildTrigger());
   o.add(buildTrigger());
   return o;
 }
 
-checkUnnamed2301(core.List<api.Trigger> o) {
+checkUnnamed2779(core.List<api.Trigger> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrigger(o[0]);
   checkTrigger(o[1]);
 }
 
-buildUnnamed2302() {
+buildUnnamed2780() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed2302(core.List<api.Variable> o) {
+checkUnnamed2780(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
@@ -570,9 +570,9 @@
   var o = new api.FolderEntities();
   buildCounterFolderEntities++;
   if (buildCounterFolderEntities < 3) {
-    o.tag = buildUnnamed2300();
-    o.trigger = buildUnnamed2301();
-    o.variable = buildUnnamed2302();
+    o.tag = buildUnnamed2778();
+    o.trigger = buildUnnamed2779();
+    o.variable = buildUnnamed2780();
   }
   buildCounterFolderEntities--;
   return o;
@@ -581,21 +581,21 @@
 checkFolderEntities(api.FolderEntities o) {
   buildCounterFolderEntities++;
   if (buildCounterFolderEntities < 3) {
-    checkUnnamed2300(o.tag);
-    checkUnnamed2301(o.trigger);
-    checkUnnamed2302(o.variable);
+    checkUnnamed2778(o.tag);
+    checkUnnamed2779(o.trigger);
+    checkUnnamed2780(o.variable);
   }
   buildCounterFolderEntities--;
 }
 
-buildUnnamed2303() {
+buildUnnamed2781() {
   var o = new core.List<api.UserAccess>();
   o.add(buildUserAccess());
   o.add(buildUserAccess());
   return o;
 }
 
-checkUnnamed2303(core.List<api.UserAccess> o) {
+checkUnnamed2781(core.List<api.UserAccess> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserAccess(o[0]);
   checkUserAccess(o[1]);
@@ -606,7 +606,7 @@
   var o = new api.ListAccountUsersResponse();
   buildCounterListAccountUsersResponse++;
   if (buildCounterListAccountUsersResponse < 3) {
-    o.userAccess = buildUnnamed2303();
+    o.userAccess = buildUnnamed2781();
   }
   buildCounterListAccountUsersResponse--;
   return o;
@@ -615,19 +615,19 @@
 checkListAccountUsersResponse(api.ListAccountUsersResponse o) {
   buildCounterListAccountUsersResponse++;
   if (buildCounterListAccountUsersResponse < 3) {
-    checkUnnamed2303(o.userAccess);
+    checkUnnamed2781(o.userAccess);
   }
   buildCounterListAccountUsersResponse--;
 }
 
-buildUnnamed2304() {
+buildUnnamed2782() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed2304(core.List<api.Account> o) {
+checkUnnamed2782(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -638,7 +638,7 @@
   var o = new api.ListAccountsResponse();
   buildCounterListAccountsResponse++;
   if (buildCounterListAccountsResponse < 3) {
-    o.accounts = buildUnnamed2304();
+    o.accounts = buildUnnamed2782();
   }
   buildCounterListAccountsResponse--;
   return o;
@@ -647,32 +647,32 @@
 checkListAccountsResponse(api.ListAccountsResponse o) {
   buildCounterListAccountsResponse++;
   if (buildCounterListAccountsResponse < 3) {
-    checkUnnamed2304(o.accounts);
+    checkUnnamed2782(o.accounts);
   }
   buildCounterListAccountsResponse--;
 }
 
-buildUnnamed2305() {
+buildUnnamed2783() {
   var o = new core.List<api.ContainerVersion>();
   o.add(buildContainerVersion());
   o.add(buildContainerVersion());
   return o;
 }
 
-checkUnnamed2305(core.List<api.ContainerVersion> o) {
+checkUnnamed2783(core.List<api.ContainerVersion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContainerVersion(o[0]);
   checkContainerVersion(o[1]);
 }
 
-buildUnnamed2306() {
+buildUnnamed2784() {
   var o = new core.List<api.ContainerVersionHeader>();
   o.add(buildContainerVersionHeader());
   o.add(buildContainerVersionHeader());
   return o;
 }
 
-checkUnnamed2306(core.List<api.ContainerVersionHeader> o) {
+checkUnnamed2784(core.List<api.ContainerVersionHeader> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContainerVersionHeader(o[0]);
   checkContainerVersionHeader(o[1]);
@@ -683,8 +683,8 @@
   var o = new api.ListContainerVersionsResponse();
   buildCounterListContainerVersionsResponse++;
   if (buildCounterListContainerVersionsResponse < 3) {
-    o.containerVersion = buildUnnamed2305();
-    o.containerVersionHeader = buildUnnamed2306();
+    o.containerVersion = buildUnnamed2783();
+    o.containerVersionHeader = buildUnnamed2784();
   }
   buildCounterListContainerVersionsResponse--;
   return o;
@@ -693,20 +693,20 @@
 checkListContainerVersionsResponse(api.ListContainerVersionsResponse o) {
   buildCounterListContainerVersionsResponse++;
   if (buildCounterListContainerVersionsResponse < 3) {
-    checkUnnamed2305(o.containerVersion);
-    checkUnnamed2306(o.containerVersionHeader);
+    checkUnnamed2783(o.containerVersion);
+    checkUnnamed2784(o.containerVersionHeader);
   }
   buildCounterListContainerVersionsResponse--;
 }
 
-buildUnnamed2307() {
+buildUnnamed2785() {
   var o = new core.List<api.Container>();
   o.add(buildContainer());
   o.add(buildContainer());
   return o;
 }
 
-checkUnnamed2307(core.List<api.Container> o) {
+checkUnnamed2785(core.List<api.Container> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContainer(o[0]);
   checkContainer(o[1]);
@@ -717,7 +717,7 @@
   var o = new api.ListContainersResponse();
   buildCounterListContainersResponse++;
   if (buildCounterListContainersResponse < 3) {
-    o.containers = buildUnnamed2307();
+    o.containers = buildUnnamed2785();
   }
   buildCounterListContainersResponse--;
   return o;
@@ -726,19 +726,19 @@
 checkListContainersResponse(api.ListContainersResponse o) {
   buildCounterListContainersResponse++;
   if (buildCounterListContainersResponse < 3) {
-    checkUnnamed2307(o.containers);
+    checkUnnamed2785(o.containers);
   }
   buildCounterListContainersResponse--;
 }
 
-buildUnnamed2308() {
+buildUnnamed2786() {
   var o = new core.List<api.Environment>();
   o.add(buildEnvironment());
   o.add(buildEnvironment());
   return o;
 }
 
-checkUnnamed2308(core.List<api.Environment> o) {
+checkUnnamed2786(core.List<api.Environment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnvironment(o[0]);
   checkEnvironment(o[1]);
@@ -749,7 +749,7 @@
   var o = new api.ListEnvironmentsResponse();
   buildCounterListEnvironmentsResponse++;
   if (buildCounterListEnvironmentsResponse < 3) {
-    o.environments = buildUnnamed2308();
+    o.environments = buildUnnamed2786();
   }
   buildCounterListEnvironmentsResponse--;
   return o;
@@ -758,19 +758,19 @@
 checkListEnvironmentsResponse(api.ListEnvironmentsResponse o) {
   buildCounterListEnvironmentsResponse++;
   if (buildCounterListEnvironmentsResponse < 3) {
-    checkUnnamed2308(o.environments);
+    checkUnnamed2786(o.environments);
   }
   buildCounterListEnvironmentsResponse--;
 }
 
-buildUnnamed2309() {
+buildUnnamed2787() {
   var o = new core.List<api.Folder>();
   o.add(buildFolder());
   o.add(buildFolder());
   return o;
 }
 
-checkUnnamed2309(core.List<api.Folder> o) {
+checkUnnamed2787(core.List<api.Folder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFolder(o[0]);
   checkFolder(o[1]);
@@ -781,7 +781,7 @@
   var o = new api.ListFoldersResponse();
   buildCounterListFoldersResponse++;
   if (buildCounterListFoldersResponse < 3) {
-    o.folders = buildUnnamed2309();
+    o.folders = buildUnnamed2787();
   }
   buildCounterListFoldersResponse--;
   return o;
@@ -790,19 +790,19 @@
 checkListFoldersResponse(api.ListFoldersResponse o) {
   buildCounterListFoldersResponse++;
   if (buildCounterListFoldersResponse < 3) {
-    checkUnnamed2309(o.folders);
+    checkUnnamed2787(o.folders);
   }
   buildCounterListFoldersResponse--;
 }
 
-buildUnnamed2310() {
+buildUnnamed2788() {
   var o = new core.List<api.Tag>();
   o.add(buildTag());
   o.add(buildTag());
   return o;
 }
 
-checkUnnamed2310(core.List<api.Tag> o) {
+checkUnnamed2788(core.List<api.Tag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTag(o[0]);
   checkTag(o[1]);
@@ -813,7 +813,7 @@
   var o = new api.ListTagsResponse();
   buildCounterListTagsResponse++;
   if (buildCounterListTagsResponse < 3) {
-    o.tags = buildUnnamed2310();
+    o.tags = buildUnnamed2788();
   }
   buildCounterListTagsResponse--;
   return o;
@@ -822,19 +822,19 @@
 checkListTagsResponse(api.ListTagsResponse o) {
   buildCounterListTagsResponse++;
   if (buildCounterListTagsResponse < 3) {
-    checkUnnamed2310(o.tags);
+    checkUnnamed2788(o.tags);
   }
   buildCounterListTagsResponse--;
 }
 
-buildUnnamed2311() {
+buildUnnamed2789() {
   var o = new core.List<api.Trigger>();
   o.add(buildTrigger());
   o.add(buildTrigger());
   return o;
 }
 
-checkUnnamed2311(core.List<api.Trigger> o) {
+checkUnnamed2789(core.List<api.Trigger> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrigger(o[0]);
   checkTrigger(o[1]);
@@ -845,7 +845,7 @@
   var o = new api.ListTriggersResponse();
   buildCounterListTriggersResponse++;
   if (buildCounterListTriggersResponse < 3) {
-    o.triggers = buildUnnamed2311();
+    o.triggers = buildUnnamed2789();
   }
   buildCounterListTriggersResponse--;
   return o;
@@ -854,19 +854,19 @@
 checkListTriggersResponse(api.ListTriggersResponse o) {
   buildCounterListTriggersResponse++;
   if (buildCounterListTriggersResponse < 3) {
-    checkUnnamed2311(o.triggers);
+    checkUnnamed2789(o.triggers);
   }
   buildCounterListTriggersResponse--;
 }
 
-buildUnnamed2312() {
+buildUnnamed2790() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed2312(core.List<api.Variable> o) {
+checkUnnamed2790(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
@@ -877,7 +877,7 @@
   var o = new api.ListVariablesResponse();
   buildCounterListVariablesResponse++;
   if (buildCounterListVariablesResponse < 3) {
-    o.variables = buildUnnamed2312();
+    o.variables = buildUnnamed2790();
   }
   buildCounterListVariablesResponse--;
   return o;
@@ -886,45 +886,45 @@
 checkListVariablesResponse(api.ListVariablesResponse o) {
   buildCounterListVariablesResponse++;
   if (buildCounterListVariablesResponse < 3) {
-    checkUnnamed2312(o.variables);
+    checkUnnamed2790(o.variables);
   }
   buildCounterListVariablesResponse--;
 }
 
-buildUnnamed2313() {
+buildUnnamed2791() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2313(core.List<core.String> o) {
+checkUnnamed2791(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2314() {
+buildUnnamed2792() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2314(core.List<core.String> o) {
+checkUnnamed2792(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2315() {
+buildUnnamed2793() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed2315(core.List<api.Parameter> o) {
+checkUnnamed2793(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -937,13 +937,13 @@
   if (buildCounterMacro < 3) {
     o.accountId = "foo";
     o.containerId = "foo";
-    o.disablingRuleId = buildUnnamed2313();
-    o.enablingRuleId = buildUnnamed2314();
+    o.disablingRuleId = buildUnnamed2791();
+    o.enablingRuleId = buildUnnamed2792();
     o.fingerprint = "foo";
     o.macroId = "foo";
     o.name = "foo";
     o.notes = "foo";
-    o.parameter = buildUnnamed2315();
+    o.parameter = buildUnnamed2793();
     o.parentFolderId = "foo";
     o.scheduleEndMs = "foo";
     o.scheduleStartMs = "foo";
@@ -958,13 +958,13 @@
   if (buildCounterMacro < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.containerId, unittest.equals('foo'));
-    checkUnnamed2313(o.disablingRuleId);
-    checkUnnamed2314(o.enablingRuleId);
+    checkUnnamed2791(o.disablingRuleId);
+    checkUnnamed2792(o.enablingRuleId);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.macroId, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed2315(o.parameter);
+    checkUnnamed2793(o.parameter);
     unittest.expect(o.parentFolderId, unittest.equals('foo'));
     unittest.expect(o.scheduleEndMs, unittest.equals('foo'));
     unittest.expect(o.scheduleStartMs, unittest.equals('foo'));
@@ -973,27 +973,27 @@
   buildCounterMacro--;
 }
 
-buildUnnamed2316() {
+buildUnnamed2794() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed2316(core.List<api.Parameter> o) {
+checkUnnamed2794(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
 }
 
-buildUnnamed2317() {
+buildUnnamed2795() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed2317(core.List<api.Parameter> o) {
+checkUnnamed2795(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -1005,8 +1005,8 @@
   buildCounterParameter++;
   if (buildCounterParameter < 3) {
     o.key = "foo";
-    o.list = buildUnnamed2316();
-    o.map = buildUnnamed2317();
+    o.list = buildUnnamed2794();
+    o.map = buildUnnamed2795();
     o.type = "foo";
     o.value = "foo";
   }
@@ -1018,8 +1018,8 @@
   buildCounterParameter++;
   if (buildCounterParameter < 3) {
     unittest.expect(o.key, unittest.equals('foo'));
-    checkUnnamed2316(o.list);
-    checkUnnamed2317(o.map);
+    checkUnnamed2794(o.list);
+    checkUnnamed2795(o.map);
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
   }
@@ -1047,14 +1047,14 @@
   buildCounterPublishContainerVersionResponse--;
 }
 
-buildUnnamed2318() {
+buildUnnamed2796() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed2318(core.List<api.Condition> o) {
+checkUnnamed2796(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
@@ -1066,7 +1066,7 @@
   buildCounterRule++;
   if (buildCounterRule < 3) {
     o.accountId = "foo";
-    o.condition = buildUnnamed2318();
+    o.condition = buildUnnamed2796();
     o.containerId = "foo";
     o.fingerprint = "foo";
     o.name = "foo";
@@ -1081,7 +1081,7 @@
   buildCounterRule++;
   if (buildCounterRule < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed2318(o.condition);
+    checkUnnamed2796(o.condition);
     unittest.expect(o.containerId, unittest.equals('foo'));
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -1112,92 +1112,92 @@
   buildCounterSetupTag--;
 }
 
-buildUnnamed2319() {
+buildUnnamed2797() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2319(core.List<core.String> o) {
+checkUnnamed2797(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2320() {
+buildUnnamed2798() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2320(core.List<core.String> o) {
+checkUnnamed2798(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2321() {
+buildUnnamed2799() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2321(core.List<core.String> o) {
+checkUnnamed2799(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2322() {
+buildUnnamed2800() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2322(core.List<core.String> o) {
+checkUnnamed2800(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2323() {
+buildUnnamed2801() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed2323(core.List<api.Parameter> o) {
+checkUnnamed2801(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
 }
 
-buildUnnamed2324() {
+buildUnnamed2802() {
   var o = new core.List<api.SetupTag>();
   o.add(buildSetupTag());
   o.add(buildSetupTag());
   return o;
 }
 
-checkUnnamed2324(core.List<api.SetupTag> o) {
+checkUnnamed2802(core.List<api.SetupTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSetupTag(o[0]);
   checkSetupTag(o[1]);
 }
 
-buildUnnamed2325() {
+buildUnnamed2803() {
   var o = new core.List<api.TeardownTag>();
   o.add(buildTeardownTag());
   o.add(buildTeardownTag());
   return o;
 }
 
-checkUnnamed2325(core.List<api.TeardownTag> o) {
+checkUnnamed2803(core.List<api.TeardownTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTeardownTag(o[0]);
   checkTeardownTag(o[1]);
@@ -1209,25 +1209,25 @@
   buildCounterTag++;
   if (buildCounterTag < 3) {
     o.accountId = "foo";
-    o.blockingRuleId = buildUnnamed2319();
-    o.blockingTriggerId = buildUnnamed2320();
+    o.blockingRuleId = buildUnnamed2797();
+    o.blockingTriggerId = buildUnnamed2798();
     o.containerId = "foo";
     o.fingerprint = "foo";
-    o.firingRuleId = buildUnnamed2321();
-    o.firingTriggerId = buildUnnamed2322();
+    o.firingRuleId = buildUnnamed2799();
+    o.firingTriggerId = buildUnnamed2800();
     o.liveOnly = true;
     o.name = "foo";
     o.notes = "foo";
-    o.parameter = buildUnnamed2323();
+    o.parameter = buildUnnamed2801();
     o.parentFolderId = "foo";
     o.paused = true;
     o.priority = buildParameter();
     o.scheduleEndMs = "foo";
     o.scheduleStartMs = "foo";
-    o.setupTag = buildUnnamed2324();
+    o.setupTag = buildUnnamed2802();
     o.tagFiringOption = "foo";
     o.tagId = "foo";
-    o.teardownTag = buildUnnamed2325();
+    o.teardownTag = buildUnnamed2803();
     o.type = "foo";
   }
   buildCounterTag--;
@@ -1238,25 +1238,25 @@
   buildCounterTag++;
   if (buildCounterTag < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed2319(o.blockingRuleId);
-    checkUnnamed2320(o.blockingTriggerId);
+    checkUnnamed2797(o.blockingRuleId);
+    checkUnnamed2798(o.blockingTriggerId);
     unittest.expect(o.containerId, unittest.equals('foo'));
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed2321(o.firingRuleId);
-    checkUnnamed2322(o.firingTriggerId);
+    checkUnnamed2799(o.firingRuleId);
+    checkUnnamed2800(o.firingTriggerId);
     unittest.expect(o.liveOnly, unittest.isTrue);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed2323(o.parameter);
+    checkUnnamed2801(o.parameter);
     unittest.expect(o.parentFolderId, unittest.equals('foo'));
     unittest.expect(o.paused, unittest.isTrue);
     checkParameter(o.priority);
     unittest.expect(o.scheduleEndMs, unittest.equals('foo'));
     unittest.expect(o.scheduleStartMs, unittest.equals('foo'));
-    checkUnnamed2324(o.setupTag);
+    checkUnnamed2802(o.setupTag);
     unittest.expect(o.tagFiringOption, unittest.equals('foo'));
     unittest.expect(o.tagId, unittest.equals('foo'));
-    checkUnnamed2325(o.teardownTag);
+    checkUnnamed2803(o.teardownTag);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterTag--;
@@ -1283,53 +1283,53 @@
   buildCounterTeardownTag--;
 }
 
-buildUnnamed2326() {
+buildUnnamed2804() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed2326(core.List<api.Condition> o) {
+checkUnnamed2804(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
 }
 
-buildUnnamed2327() {
+buildUnnamed2805() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed2327(core.List<api.Condition> o) {
+checkUnnamed2805(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
 }
 
-buildUnnamed2328() {
+buildUnnamed2806() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed2328(core.List<api.Condition> o) {
+checkUnnamed2806(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
 }
 
-buildUnnamed2329() {
+buildUnnamed2807() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed2329(core.List<api.Parameter> o) {
+checkUnnamed2807(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -1341,13 +1341,13 @@
   buildCounterTrigger++;
   if (buildCounterTrigger < 3) {
     o.accountId = "foo";
-    o.autoEventFilter = buildUnnamed2326();
+    o.autoEventFilter = buildUnnamed2804();
     o.checkValidation = buildParameter();
     o.containerId = "foo";
     o.continuousTimeMinMilliseconds = buildParameter();
-    o.customEventFilter = buildUnnamed2327();
+    o.customEventFilter = buildUnnamed2805();
     o.eventName = buildParameter();
-    o.filter = buildUnnamed2328();
+    o.filter = buildUnnamed2806();
     o.fingerprint = "foo";
     o.horizontalScrollPercentageList = buildParameter();
     o.interval = buildParameter();
@@ -1355,7 +1355,7 @@
     o.limit = buildParameter();
     o.maxTimerLengthSeconds = buildParameter();
     o.name = "foo";
-    o.parameter = buildUnnamed2329();
+    o.parameter = buildUnnamed2807();
     o.parentFolderId = "foo";
     o.selector = buildParameter();
     o.totalTimeMinMilliseconds = buildParameter();
@@ -1377,13 +1377,13 @@
   buildCounterTrigger++;
   if (buildCounterTrigger < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed2326(o.autoEventFilter);
+    checkUnnamed2804(o.autoEventFilter);
     checkParameter(o.checkValidation);
     unittest.expect(o.containerId, unittest.equals('foo'));
     checkParameter(o.continuousTimeMinMilliseconds);
-    checkUnnamed2327(o.customEventFilter);
+    checkUnnamed2805(o.customEventFilter);
     checkParameter(o.eventName);
-    checkUnnamed2328(o.filter);
+    checkUnnamed2806(o.filter);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     checkParameter(o.horizontalScrollPercentageList);
     checkParameter(o.interval);
@@ -1391,7 +1391,7 @@
     checkParameter(o.limit);
     checkParameter(o.maxTimerLengthSeconds);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed2329(o.parameter);
+    checkUnnamed2807(o.parameter);
     unittest.expect(o.parentFolderId, unittest.equals('foo'));
     checkParameter(o.selector);
     checkParameter(o.totalTimeMinMilliseconds);
@@ -1408,14 +1408,14 @@
   buildCounterTrigger--;
 }
 
-buildUnnamed2330() {
+buildUnnamed2808() {
   var o = new core.List<api.ContainerAccess>();
   o.add(buildContainerAccess());
   o.add(buildContainerAccess());
   return o;
 }
 
-checkUnnamed2330(core.List<api.ContainerAccess> o) {
+checkUnnamed2808(core.List<api.ContainerAccess> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContainerAccess(o[0]);
   checkContainerAccess(o[1]);
@@ -1428,7 +1428,7 @@
   if (buildCounterUserAccess < 3) {
     o.accountAccess = buildAccountAccess();
     o.accountId = "foo";
-    o.containerAccess = buildUnnamed2330();
+    o.containerAccess = buildUnnamed2808();
     o.emailAddress = "foo";
     o.permissionId = "foo";
   }
@@ -1441,47 +1441,47 @@
   if (buildCounterUserAccess < 3) {
     checkAccountAccess(o.accountAccess);
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed2330(o.containerAccess);
+    checkUnnamed2808(o.containerAccess);
     unittest.expect(o.emailAddress, unittest.equals('foo'));
     unittest.expect(o.permissionId, unittest.equals('foo'));
   }
   buildCounterUserAccess--;
 }
 
-buildUnnamed2331() {
+buildUnnamed2809() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2331(core.List<core.String> o) {
+checkUnnamed2809(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2332() {
+buildUnnamed2810() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2332(core.List<core.String> o) {
+checkUnnamed2810(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2333() {
+buildUnnamed2811() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed2333(core.List<api.Parameter> o) {
+checkUnnamed2811(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -1494,12 +1494,12 @@
   if (buildCounterVariable < 3) {
     o.accountId = "foo";
     o.containerId = "foo";
-    o.disablingTriggerId = buildUnnamed2331();
-    o.enablingTriggerId = buildUnnamed2332();
+    o.disablingTriggerId = buildUnnamed2809();
+    o.enablingTriggerId = buildUnnamed2810();
     o.fingerprint = "foo";
     o.name = "foo";
     o.notes = "foo";
-    o.parameter = buildUnnamed2333();
+    o.parameter = buildUnnamed2811();
     o.parentFolderId = "foo";
     o.scheduleEndMs = "foo";
     o.scheduleStartMs = "foo";
@@ -1515,12 +1515,12 @@
   if (buildCounterVariable < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.containerId, unittest.equals('foo'));
-    checkUnnamed2331(o.disablingTriggerId);
-    checkUnnamed2332(o.enablingTriggerId);
+    checkUnnamed2809(o.disablingTriggerId);
+    checkUnnamed2810(o.enablingTriggerId);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed2333(o.parameter);
+    checkUnnamed2811(o.parameter);
     unittest.expect(o.parentFolderId, unittest.equals('foo'));
     unittest.expect(o.scheduleEndMs, unittest.equals('foo'));
     unittest.expect(o.scheduleStartMs, unittest.equals('foo'));
@@ -1530,40 +1530,40 @@
   buildCounterVariable--;
 }
 
-buildUnnamed2334() {
+buildUnnamed2812() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2334(core.List<core.String> o) {
+checkUnnamed2812(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2335() {
+buildUnnamed2813() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2335(core.List<core.String> o) {
+checkUnnamed2813(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2336() {
+buildUnnamed2814() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2336(core.List<core.String> o) {
+checkUnnamed2814(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1871,7 +1871,7 @@
       }), true);
       res
           .get(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -1921,9 +1921,7 @@
         var resp = convert.JSON.encode(buildListAccountsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListAccountsResponse response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkListAccountsResponse(response);
       })));
     });
@@ -1987,7 +1985,7 @@
       res
           .update(arg_request, arg_accountId,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -2056,7 +2054,7 @@
       }), true);
       res
           .create(arg_request, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Container response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainer(response);
       })));
     });
@@ -2188,7 +2186,7 @@
       }), true);
       res
           .get(arg_accountId, arg_containerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Container response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainer(response);
       })));
     });
@@ -2251,7 +2249,7 @@
       }), true);
       res
           .list(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListContainersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListContainersResponse(response);
       })));
     });
@@ -2326,7 +2324,7 @@
       res
           .update(arg_request, arg_accountId, arg_containerId,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Container response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainer(response);
       })));
     });
@@ -2406,7 +2404,7 @@
       res
           .create(arg_request, arg_accountId, arg_containerId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Environment response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnvironment(response);
       })));
     });
@@ -2560,7 +2558,7 @@
       res
           .get(arg_accountId, arg_containerId, arg_environmentId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Environment response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnvironment(response);
       })));
     });
@@ -2633,7 +2631,7 @@
       }), true);
       res
           .list(arg_accountId, arg_containerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListEnvironmentsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListEnvironmentsResponse(response);
       })));
     });
@@ -2718,7 +2716,7 @@
       res
           .patch(arg_request, arg_accountId, arg_containerId, arg_environmentId,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Environment response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnvironment(response);
       })));
     });
@@ -2804,7 +2802,7 @@
           .update(
               arg_request, arg_accountId, arg_containerId, arg_environmentId,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Environment response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnvironment(response);
       })));
     });
@@ -2884,7 +2882,7 @@
       res
           .create(arg_request, arg_accountId, arg_containerId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Folder response) {
+          .then(unittest.expectAsync1(((response) {
         checkFolder(response);
       })));
     });
@@ -3038,7 +3036,7 @@
       res
           .get(arg_accountId, arg_containerId, arg_folderId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Folder response) {
+          .then(unittest.expectAsync1(((response) {
         checkFolder(response);
       })));
     });
@@ -3111,7 +3109,7 @@
       }), true);
       res
           .list(arg_accountId, arg_containerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListFoldersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListFoldersResponse(response);
       })));
     });
@@ -3196,7 +3194,7 @@
       res
           .update(arg_request, arg_accountId, arg_containerId, arg_folderId,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Folder response) {
+          .then(unittest.expectAsync1(((response) {
         checkFolder(response);
       })));
     });
@@ -3282,7 +3280,7 @@
       res
           .list(arg_accountId, arg_containerId, arg_folderId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FolderEntities response) {
+          .then(unittest.expectAsync1(((response) {
         checkFolderEntities(response);
       })));
     });
@@ -3297,9 +3295,9 @@
       var arg_accountId = "foo";
       var arg_containerId = "foo";
       var arg_folderId = "foo";
-      var arg_tagId = buildUnnamed2334();
-      var arg_triggerId = buildUnnamed2335();
-      var arg_variableId = buildUnnamed2336();
+      var arg_tagId = buildUnnamed2812();
+      var arg_triggerId = buildUnnamed2813();
+      var arg_variableId = buildUnnamed2814();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.Folder.fromJson(json);
@@ -3463,7 +3461,7 @@
           .update(
               arg_request, arg_accountId, arg_containerId, arg_environmentId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Environment response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnvironment(response);
       })));
     });
@@ -3543,7 +3541,7 @@
       res
           .create(arg_request, arg_accountId, arg_containerId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Tag response) {
+          .then(unittest.expectAsync1(((response) {
         checkTag(response);
       })));
     });
@@ -3696,7 +3694,7 @@
       }), true);
       res
           .get(arg_accountId, arg_containerId, arg_tagId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Tag response) {
+          .then(unittest.expectAsync1(((response) {
         checkTag(response);
       })));
     });
@@ -3769,7 +3767,7 @@
       }), true);
       res
           .list(arg_accountId, arg_containerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTagsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTagsResponse(response);
       })));
     });
@@ -3854,7 +3852,7 @@
       res
           .update(arg_request, arg_accountId, arg_containerId, arg_tagId,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Tag response) {
+          .then(unittest.expectAsync1(((response) {
         checkTag(response);
       })));
     });
@@ -3934,7 +3932,7 @@
       res
           .create(arg_request, arg_accountId, arg_containerId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Trigger response) {
+          .then(unittest.expectAsync1(((response) {
         checkTrigger(response);
       })));
     });
@@ -4088,7 +4086,7 @@
       res
           .get(arg_accountId, arg_containerId, arg_triggerId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Trigger response) {
+          .then(unittest.expectAsync1(((response) {
         checkTrigger(response);
       })));
     });
@@ -4161,7 +4159,7 @@
       }), true);
       res
           .list(arg_accountId, arg_containerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTriggersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTriggersResponse(response);
       })));
     });
@@ -4246,7 +4244,7 @@
       res
           .update(arg_request, arg_accountId, arg_containerId, arg_triggerId,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Trigger response) {
+          .then(unittest.expectAsync1(((response) {
         checkTrigger(response);
       })));
     });
@@ -4326,7 +4324,7 @@
       res
           .create(arg_request, arg_accountId, arg_containerId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variable response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariable(response);
       })));
     });
@@ -4480,7 +4478,7 @@
       res
           .get(arg_accountId, arg_containerId, arg_variableId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variable response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariable(response);
       })));
     });
@@ -4553,7 +4551,7 @@
       }), true);
       res
           .list(arg_accountId, arg_containerId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListVariablesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListVariablesResponse(response);
       })));
     });
@@ -4638,7 +4636,7 @@
       res
           .update(arg_request, arg_accountId, arg_containerId, arg_variableId,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variable response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariable(response);
       })));
     });
@@ -4719,8 +4717,7 @@
       res
           .create(arg_request, arg_accountId, arg_containerId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.CreateContainerVersionResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreateContainerVersionResponse(response);
       })));
     });
@@ -4874,7 +4871,7 @@
       res
           .get(arg_accountId, arg_containerId, arg_containerVersionId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContainerVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainerVersion(response);
       })));
     });
@@ -4956,8 +4953,7 @@
               headers: arg_headers,
               includeDeleted: arg_includeDeleted,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListContainerVersionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListContainerVersionsResponse(response);
       })));
     });
@@ -5044,8 +5040,7 @@
       res
           .publish(arg_accountId, arg_containerId, arg_containerVersionId,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.PublishContainerVersionResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPublishContainerVersionResponse(response);
       })));
     });
@@ -5129,7 +5124,7 @@
       res
           .restore(arg_accountId, arg_containerId, arg_containerVersionId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContainerVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainerVersion(response);
       })));
     });
@@ -5213,7 +5208,7 @@
       res
           .undelete(arg_accountId, arg_containerId, arg_containerVersionId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContainerVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainerVersion(response);
       })));
     });
@@ -5299,7 +5294,7 @@
           .update(arg_request, arg_accountId, arg_containerId,
               arg_containerVersionId,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContainerVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainerVersion(response);
       })));
     });
@@ -5368,7 +5363,7 @@
       }), true);
       res
           .create(arg_request, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserAccess response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserAccess(response);
       })));
     });
@@ -5500,7 +5495,7 @@
       }), true);
       res
           .get(arg_accountId, arg_permissionId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserAccess response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserAccess(response);
       })));
     });
@@ -5563,7 +5558,7 @@
       }), true);
       res
           .list(arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListAccountUsersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListAccountUsersResponse(response);
       })));
     });
@@ -5635,7 +5630,7 @@
       res
           .update(arg_request, arg_accountId, arg_permissionId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserAccess response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserAccess(response);
       })));
     });
diff --git a/generated/googleapis/test/tagmanager/v2_test.dart b/generated/googleapis/test/tagmanager/v2_test.dart
index bbb200f..4292dfd 100644
--- a/generated/googleapis/test/tagmanager/v2_test.dart
+++ b/generated/googleapis/test/tagmanager/v2_test.dart
@@ -127,14 +127,14 @@
   buildCounterBuiltInVariable--;
 }
 
-buildUnnamed1252() {
+buildUnnamed2322() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed1252(core.List<api.Parameter> o) {
+checkUnnamed2322(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -145,7 +145,7 @@
   var o = new api.Condition();
   buildCounterCondition++;
   if (buildCounterCondition < 3) {
-    o.parameter = buildUnnamed1252();
+    o.parameter = buildUnnamed2322();
     o.type = "foo";
   }
   buildCounterCondition--;
@@ -155,33 +155,33 @@
 checkCondition(api.Condition o) {
   buildCounterCondition++;
   if (buildCounterCondition < 3) {
-    checkUnnamed1252(o.parameter);
+    checkUnnamed2322(o.parameter);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterCondition--;
 }
 
-buildUnnamed1253() {
+buildUnnamed2323() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1253(core.List<core.String> o) {
+checkUnnamed2323(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1254() {
+buildUnnamed2324() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1254(core.List<core.String> o) {
+checkUnnamed2324(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -194,14 +194,14 @@
   if (buildCounterContainer < 3) {
     o.accountId = "foo";
     o.containerId = "foo";
-    o.domainName = buildUnnamed1253();
+    o.domainName = buildUnnamed2323();
     o.fingerprint = "foo";
     o.name = "foo";
     o.notes = "foo";
     o.path = "foo";
     o.publicId = "foo";
     o.tagManagerUrl = "foo";
-    o.usageContext = buildUnnamed1254();
+    o.usageContext = buildUnnamed2324();
   }
   buildCounterContainer--;
   return o;
@@ -212,14 +212,14 @@
   if (buildCounterContainer < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.containerId, unittest.equals('foo'));
-    checkUnnamed1253(o.domainName);
+    checkUnnamed2323(o.domainName);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
     unittest.expect(o.path, unittest.equals('foo'));
     unittest.expect(o.publicId, unittest.equals('foo'));
     unittest.expect(o.tagManagerUrl, unittest.equals('foo'));
-    checkUnnamed1254(o.usageContext);
+    checkUnnamed2324(o.usageContext);
   }
   buildCounterContainer--;
 }
@@ -245,79 +245,79 @@
   buildCounterContainerAccess--;
 }
 
-buildUnnamed1255() {
+buildUnnamed2325() {
   var o = new core.List<api.BuiltInVariable>();
   o.add(buildBuiltInVariable());
   o.add(buildBuiltInVariable());
   return o;
 }
 
-checkUnnamed1255(core.List<api.BuiltInVariable> o) {
+checkUnnamed2325(core.List<api.BuiltInVariable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBuiltInVariable(o[0]);
   checkBuiltInVariable(o[1]);
 }
 
-buildUnnamed1256() {
+buildUnnamed2326() {
   var o = new core.List<api.Folder>();
   o.add(buildFolder());
   o.add(buildFolder());
   return o;
 }
 
-checkUnnamed1256(core.List<api.Folder> o) {
+checkUnnamed2326(core.List<api.Folder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFolder(o[0]);
   checkFolder(o[1]);
 }
 
-buildUnnamed1257() {
+buildUnnamed2327() {
   var o = new core.List<api.Tag>();
   o.add(buildTag());
   o.add(buildTag());
   return o;
 }
 
-checkUnnamed1257(core.List<api.Tag> o) {
+checkUnnamed2327(core.List<api.Tag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTag(o[0]);
   checkTag(o[1]);
 }
 
-buildUnnamed1258() {
+buildUnnamed2328() {
   var o = new core.List<api.Trigger>();
   o.add(buildTrigger());
   o.add(buildTrigger());
   return o;
 }
 
-checkUnnamed1258(core.List<api.Trigger> o) {
+checkUnnamed2328(core.List<api.Trigger> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrigger(o[0]);
   checkTrigger(o[1]);
 }
 
-buildUnnamed1259() {
+buildUnnamed2329() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed1259(core.List<api.Variable> o) {
+checkUnnamed2329(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
 }
 
-buildUnnamed1260() {
+buildUnnamed2330() {
   var o = new core.List<api.Zone>();
   o.add(buildZone());
   o.add(buildZone());
   return o;
 }
 
-checkUnnamed1260(core.List<api.Zone> o) {
+checkUnnamed2330(core.List<api.Zone> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkZone(o[0]);
   checkZone(o[1]);
@@ -329,21 +329,21 @@
   buildCounterContainerVersion++;
   if (buildCounterContainerVersion < 3) {
     o.accountId = "foo";
-    o.builtInVariable = buildUnnamed1255();
+    o.builtInVariable = buildUnnamed2325();
     o.container = buildContainer();
     o.containerId = "foo";
     o.containerVersionId = "foo";
     o.deleted = true;
     o.description = "foo";
     o.fingerprint = "foo";
-    o.folder = buildUnnamed1256();
+    o.folder = buildUnnamed2326();
     o.name = "foo";
     o.path = "foo";
-    o.tag = buildUnnamed1257();
+    o.tag = buildUnnamed2327();
     o.tagManagerUrl = "foo";
-    o.trigger = buildUnnamed1258();
-    o.variable = buildUnnamed1259();
-    o.zone = buildUnnamed1260();
+    o.trigger = buildUnnamed2328();
+    o.variable = buildUnnamed2329();
+    o.zone = buildUnnamed2330();
   }
   buildCounterContainerVersion--;
   return o;
@@ -353,21 +353,21 @@
   buildCounterContainerVersion++;
   if (buildCounterContainerVersion < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed1255(o.builtInVariable);
+    checkUnnamed2325(o.builtInVariable);
     checkContainer(o.container);
     unittest.expect(o.containerId, unittest.equals('foo'));
     unittest.expect(o.containerVersionId, unittest.equals('foo'));
     unittest.expect(o.deleted, unittest.isTrue);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed1256(o.folder);
+    checkUnnamed2326(o.folder);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.path, unittest.equals('foo'));
-    checkUnnamed1257(o.tag);
+    checkUnnamed2327(o.tag);
     unittest.expect(o.tagManagerUrl, unittest.equals('foo'));
-    checkUnnamed1258(o.trigger);
-    checkUnnamed1259(o.variable);
-    checkUnnamed1260(o.zone);
+    checkUnnamed2328(o.trigger);
+    checkUnnamed2329(o.variable);
+    checkUnnamed2330(o.zone);
   }
   buildCounterContainerVersion--;
 }
@@ -413,14 +413,14 @@
   buildCounterContainerVersionHeader--;
 }
 
-buildUnnamed1261() {
+buildUnnamed2331() {
   var o = new core.List<api.BuiltInVariable>();
   o.add(buildBuiltInVariable());
   o.add(buildBuiltInVariable());
   return o;
 }
 
-checkUnnamed1261(core.List<api.BuiltInVariable> o) {
+checkUnnamed2331(core.List<api.BuiltInVariable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBuiltInVariable(o[0]);
   checkBuiltInVariable(o[1]);
@@ -431,7 +431,7 @@
   var o = new api.CreateBuiltInVariableResponse();
   buildCounterCreateBuiltInVariableResponse++;
   if (buildCounterCreateBuiltInVariableResponse < 3) {
-    o.builtInVariable = buildUnnamed1261();
+    o.builtInVariable = buildUnnamed2331();
   }
   buildCounterCreateBuiltInVariableResponse--;
   return o;
@@ -440,7 +440,7 @@
 checkCreateBuiltInVariableResponse(api.CreateBuiltInVariableResponse o) {
   buildCounterCreateBuiltInVariableResponse++;
   if (buildCounterCreateBuiltInVariableResponse < 3) {
-    checkUnnamed1261(o.builtInVariable);
+    checkUnnamed2331(o.builtInVariable);
   }
   buildCounterCreateBuiltInVariableResponse--;
 }
@@ -492,14 +492,14 @@
   buildCounterCreateContainerVersionResponse--;
 }
 
-buildUnnamed1262() {
+buildUnnamed2332() {
   var o = new core.List<api.WorkspaceProposalUser>();
   o.add(buildWorkspaceProposalUser());
   o.add(buildWorkspaceProposalUser());
   return o;
 }
 
-checkUnnamed1262(core.List<api.WorkspaceProposalUser> o) {
+checkUnnamed2332(core.List<api.WorkspaceProposalUser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorkspaceProposalUser(o[0]);
   checkWorkspaceProposalUser(o[1]);
@@ -511,7 +511,7 @@
   buildCounterCreateWorkspaceProposalRequest++;
   if (buildCounterCreateWorkspaceProposalRequest < 3) {
     o.initialComment = buildWorkspaceProposalHistoryComment();
-    o.reviewers = buildUnnamed1262();
+    o.reviewers = buildUnnamed2332();
   }
   buildCounterCreateWorkspaceProposalRequest--;
   return o;
@@ -521,7 +521,7 @@
   buildCounterCreateWorkspaceProposalRequest++;
   if (buildCounterCreateWorkspaceProposalRequest < 3) {
     checkWorkspaceProposalHistoryComment(o.initialComment);
-    checkUnnamed1262(o.reviewers);
+    checkUnnamed2332(o.reviewers);
   }
   buildCounterCreateWorkspaceProposalRequest--;
 }
@@ -635,40 +635,40 @@
   buildCounterFolder--;
 }
 
-buildUnnamed1263() {
+buildUnnamed2333() {
   var o = new core.List<api.Tag>();
   o.add(buildTag());
   o.add(buildTag());
   return o;
 }
 
-checkUnnamed1263(core.List<api.Tag> o) {
+checkUnnamed2333(core.List<api.Tag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTag(o[0]);
   checkTag(o[1]);
 }
 
-buildUnnamed1264() {
+buildUnnamed2334() {
   var o = new core.List<api.Trigger>();
   o.add(buildTrigger());
   o.add(buildTrigger());
   return o;
 }
 
-checkUnnamed1264(core.List<api.Trigger> o) {
+checkUnnamed2334(core.List<api.Trigger> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrigger(o[0]);
   checkTrigger(o[1]);
 }
 
-buildUnnamed1265() {
+buildUnnamed2335() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed1265(core.List<api.Variable> o) {
+checkUnnamed2335(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
@@ -680,9 +680,9 @@
   buildCounterFolderEntities++;
   if (buildCounterFolderEntities < 3) {
     o.nextPageToken = "foo";
-    o.tag = buildUnnamed1263();
-    o.trigger = buildUnnamed1264();
-    o.variable = buildUnnamed1265();
+    o.tag = buildUnnamed2333();
+    o.trigger = buildUnnamed2334();
+    o.variable = buildUnnamed2335();
   }
   buildCounterFolderEntities--;
   return o;
@@ -692,34 +692,34 @@
   buildCounterFolderEntities++;
   if (buildCounterFolderEntities < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1263(o.tag);
-    checkUnnamed1264(o.trigger);
-    checkUnnamed1265(o.variable);
+    checkUnnamed2333(o.tag);
+    checkUnnamed2334(o.trigger);
+    checkUnnamed2335(o.variable);
   }
   buildCounterFolderEntities--;
 }
 
-buildUnnamed1266() {
+buildUnnamed2336() {
   var o = new core.List<api.MergeConflict>();
   o.add(buildMergeConflict());
   o.add(buildMergeConflict());
   return o;
 }
 
-checkUnnamed1266(core.List<api.MergeConflict> o) {
+checkUnnamed2336(core.List<api.MergeConflict> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMergeConflict(o[0]);
   checkMergeConflict(o[1]);
 }
 
-buildUnnamed1267() {
+buildUnnamed2337() {
   var o = new core.List<api.Entity>();
   o.add(buildEntity());
   o.add(buildEntity());
   return o;
 }
 
-checkUnnamed1267(core.List<api.Entity> o) {
+checkUnnamed2337(core.List<api.Entity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntity(o[0]);
   checkEntity(o[1]);
@@ -730,8 +730,8 @@
   var o = new api.GetWorkspaceStatusResponse();
   buildCounterGetWorkspaceStatusResponse++;
   if (buildCounterGetWorkspaceStatusResponse < 3) {
-    o.mergeConflict = buildUnnamed1266();
-    o.workspaceChange = buildUnnamed1267();
+    o.mergeConflict = buildUnnamed2336();
+    o.workspaceChange = buildUnnamed2337();
   }
   buildCounterGetWorkspaceStatusResponse--;
   return o;
@@ -740,20 +740,20 @@
 checkGetWorkspaceStatusResponse(api.GetWorkspaceStatusResponse o) {
   buildCounterGetWorkspaceStatusResponse++;
   if (buildCounterGetWorkspaceStatusResponse < 3) {
-    checkUnnamed1266(o.mergeConflict);
-    checkUnnamed1267(o.workspaceChange);
+    checkUnnamed2336(o.mergeConflict);
+    checkUnnamed2337(o.workspaceChange);
   }
   buildCounterGetWorkspaceStatusResponse--;
 }
 
-buildUnnamed1268() {
+buildUnnamed2338() {
   var o = new core.List<api.Account>();
   o.add(buildAccount());
   o.add(buildAccount());
   return o;
 }
 
-checkUnnamed1268(core.List<api.Account> o) {
+checkUnnamed2338(core.List<api.Account> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAccount(o[0]);
   checkAccount(o[1]);
@@ -764,7 +764,7 @@
   var o = new api.ListAccountsResponse();
   buildCounterListAccountsResponse++;
   if (buildCounterListAccountsResponse < 3) {
-    o.account = buildUnnamed1268();
+    o.account = buildUnnamed2338();
     o.nextPageToken = "foo";
   }
   buildCounterListAccountsResponse--;
@@ -774,20 +774,20 @@
 checkListAccountsResponse(api.ListAccountsResponse o) {
   buildCounterListAccountsResponse++;
   if (buildCounterListAccountsResponse < 3) {
-    checkUnnamed1268(o.account);
+    checkUnnamed2338(o.account);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListAccountsResponse--;
 }
 
-buildUnnamed1269() {
+buildUnnamed2339() {
   var o = new core.List<api.ContainerVersionHeader>();
   o.add(buildContainerVersionHeader());
   o.add(buildContainerVersionHeader());
   return o;
 }
 
-checkUnnamed1269(core.List<api.ContainerVersionHeader> o) {
+checkUnnamed2339(core.List<api.ContainerVersionHeader> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContainerVersionHeader(o[0]);
   checkContainerVersionHeader(o[1]);
@@ -798,7 +798,7 @@
   var o = new api.ListContainerVersionsResponse();
   buildCounterListContainerVersionsResponse++;
   if (buildCounterListContainerVersionsResponse < 3) {
-    o.containerVersionHeader = buildUnnamed1269();
+    o.containerVersionHeader = buildUnnamed2339();
     o.nextPageToken = "foo";
   }
   buildCounterListContainerVersionsResponse--;
@@ -808,20 +808,20 @@
 checkListContainerVersionsResponse(api.ListContainerVersionsResponse o) {
   buildCounterListContainerVersionsResponse++;
   if (buildCounterListContainerVersionsResponse < 3) {
-    checkUnnamed1269(o.containerVersionHeader);
+    checkUnnamed2339(o.containerVersionHeader);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListContainerVersionsResponse--;
 }
 
-buildUnnamed1270() {
+buildUnnamed2340() {
   var o = new core.List<api.Container>();
   o.add(buildContainer());
   o.add(buildContainer());
   return o;
 }
 
-checkUnnamed1270(core.List<api.Container> o) {
+checkUnnamed2340(core.List<api.Container> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContainer(o[0]);
   checkContainer(o[1]);
@@ -832,7 +832,7 @@
   var o = new api.ListContainersResponse();
   buildCounterListContainersResponse++;
   if (buildCounterListContainersResponse < 3) {
-    o.container = buildUnnamed1270();
+    o.container = buildUnnamed2340();
     o.nextPageToken = "foo";
   }
   buildCounterListContainersResponse--;
@@ -842,20 +842,20 @@
 checkListContainersResponse(api.ListContainersResponse o) {
   buildCounterListContainersResponse++;
   if (buildCounterListContainersResponse < 3) {
-    checkUnnamed1270(o.container);
+    checkUnnamed2340(o.container);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListContainersResponse--;
 }
 
-buildUnnamed1271() {
+buildUnnamed2341() {
   var o = new core.List<api.BuiltInVariable>();
   o.add(buildBuiltInVariable());
   o.add(buildBuiltInVariable());
   return o;
 }
 
-checkUnnamed1271(core.List<api.BuiltInVariable> o) {
+checkUnnamed2341(core.List<api.BuiltInVariable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBuiltInVariable(o[0]);
   checkBuiltInVariable(o[1]);
@@ -866,7 +866,7 @@
   var o = new api.ListEnabledBuiltInVariablesResponse();
   buildCounterListEnabledBuiltInVariablesResponse++;
   if (buildCounterListEnabledBuiltInVariablesResponse < 3) {
-    o.builtInVariable = buildUnnamed1271();
+    o.builtInVariable = buildUnnamed2341();
     o.nextPageToken = "foo";
   }
   buildCounterListEnabledBuiltInVariablesResponse--;
@@ -877,20 +877,20 @@
     api.ListEnabledBuiltInVariablesResponse o) {
   buildCounterListEnabledBuiltInVariablesResponse++;
   if (buildCounterListEnabledBuiltInVariablesResponse < 3) {
-    checkUnnamed1271(o.builtInVariable);
+    checkUnnamed2341(o.builtInVariable);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListEnabledBuiltInVariablesResponse--;
 }
 
-buildUnnamed1272() {
+buildUnnamed2342() {
   var o = new core.List<api.Environment>();
   o.add(buildEnvironment());
   o.add(buildEnvironment());
   return o;
 }
 
-checkUnnamed1272(core.List<api.Environment> o) {
+checkUnnamed2342(core.List<api.Environment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnvironment(o[0]);
   checkEnvironment(o[1]);
@@ -901,7 +901,7 @@
   var o = new api.ListEnvironmentsResponse();
   buildCounterListEnvironmentsResponse++;
   if (buildCounterListEnvironmentsResponse < 3) {
-    o.environment = buildUnnamed1272();
+    o.environment = buildUnnamed2342();
     o.nextPageToken = "foo";
   }
   buildCounterListEnvironmentsResponse--;
@@ -911,20 +911,20 @@
 checkListEnvironmentsResponse(api.ListEnvironmentsResponse o) {
   buildCounterListEnvironmentsResponse++;
   if (buildCounterListEnvironmentsResponse < 3) {
-    checkUnnamed1272(o.environment);
+    checkUnnamed2342(o.environment);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListEnvironmentsResponse--;
 }
 
-buildUnnamed1273() {
+buildUnnamed2343() {
   var o = new core.List<api.Folder>();
   o.add(buildFolder());
   o.add(buildFolder());
   return o;
 }
 
-checkUnnamed1273(core.List<api.Folder> o) {
+checkUnnamed2343(core.List<api.Folder> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFolder(o[0]);
   checkFolder(o[1]);
@@ -935,7 +935,7 @@
   var o = new api.ListFoldersResponse();
   buildCounterListFoldersResponse++;
   if (buildCounterListFoldersResponse < 3) {
-    o.folder = buildUnnamed1273();
+    o.folder = buildUnnamed2343();
     o.nextPageToken = "foo";
   }
   buildCounterListFoldersResponse--;
@@ -945,20 +945,20 @@
 checkListFoldersResponse(api.ListFoldersResponse o) {
   buildCounterListFoldersResponse++;
   if (buildCounterListFoldersResponse < 3) {
-    checkUnnamed1273(o.folder);
+    checkUnnamed2343(o.folder);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListFoldersResponse--;
 }
 
-buildUnnamed1274() {
+buildUnnamed2344() {
   var o = new core.List<api.Tag>();
   o.add(buildTag());
   o.add(buildTag());
   return o;
 }
 
-checkUnnamed1274(core.List<api.Tag> o) {
+checkUnnamed2344(core.List<api.Tag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTag(o[0]);
   checkTag(o[1]);
@@ -970,7 +970,7 @@
   buildCounterListTagsResponse++;
   if (buildCounterListTagsResponse < 3) {
     o.nextPageToken = "foo";
-    o.tag = buildUnnamed1274();
+    o.tag = buildUnnamed2344();
   }
   buildCounterListTagsResponse--;
   return o;
@@ -980,19 +980,19 @@
   buildCounterListTagsResponse++;
   if (buildCounterListTagsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1274(o.tag);
+    checkUnnamed2344(o.tag);
   }
   buildCounterListTagsResponse--;
 }
 
-buildUnnamed1275() {
+buildUnnamed2345() {
   var o = new core.List<api.Trigger>();
   o.add(buildTrigger());
   o.add(buildTrigger());
   return o;
 }
 
-checkUnnamed1275(core.List<api.Trigger> o) {
+checkUnnamed2345(core.List<api.Trigger> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrigger(o[0]);
   checkTrigger(o[1]);
@@ -1004,7 +1004,7 @@
   buildCounterListTriggersResponse++;
   if (buildCounterListTriggersResponse < 3) {
     o.nextPageToken = "foo";
-    o.trigger = buildUnnamed1275();
+    o.trigger = buildUnnamed2345();
   }
   buildCounterListTriggersResponse--;
   return o;
@@ -1014,19 +1014,19 @@
   buildCounterListTriggersResponse++;
   if (buildCounterListTriggersResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1275(o.trigger);
+    checkUnnamed2345(o.trigger);
   }
   buildCounterListTriggersResponse--;
 }
 
-buildUnnamed1276() {
+buildUnnamed2346() {
   var o = new core.List<api.UserPermission>();
   o.add(buildUserPermission());
   o.add(buildUserPermission());
   return o;
 }
 
-checkUnnamed1276(core.List<api.UserPermission> o) {
+checkUnnamed2346(core.List<api.UserPermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUserPermission(o[0]);
   checkUserPermission(o[1]);
@@ -1038,7 +1038,7 @@
   buildCounterListUserPermissionsResponse++;
   if (buildCounterListUserPermissionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.userPermission = buildUnnamed1276();
+    o.userPermission = buildUnnamed2346();
   }
   buildCounterListUserPermissionsResponse--;
   return o;
@@ -1048,19 +1048,19 @@
   buildCounterListUserPermissionsResponse++;
   if (buildCounterListUserPermissionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1276(o.userPermission);
+    checkUnnamed2346(o.userPermission);
   }
   buildCounterListUserPermissionsResponse--;
 }
 
-buildUnnamed1277() {
+buildUnnamed2347() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed1277(core.List<api.Variable> o) {
+checkUnnamed2347(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
@@ -1072,7 +1072,7 @@
   buildCounterListVariablesResponse++;
   if (buildCounterListVariablesResponse < 3) {
     o.nextPageToken = "foo";
-    o.variable = buildUnnamed1277();
+    o.variable = buildUnnamed2347();
   }
   buildCounterListVariablesResponse--;
   return o;
@@ -1082,19 +1082,19 @@
   buildCounterListVariablesResponse++;
   if (buildCounterListVariablesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1277(o.variable);
+    checkUnnamed2347(o.variable);
   }
   buildCounterListVariablesResponse--;
 }
 
-buildUnnamed1278() {
+buildUnnamed2348() {
   var o = new core.List<api.Workspace>();
   o.add(buildWorkspace());
   o.add(buildWorkspace());
   return o;
 }
 
-checkUnnamed1278(core.List<api.Workspace> o) {
+checkUnnamed2348(core.List<api.Workspace> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorkspace(o[0]);
   checkWorkspace(o[1]);
@@ -1106,7 +1106,7 @@
   buildCounterListWorkspacesResponse++;
   if (buildCounterListWorkspacesResponse < 3) {
     o.nextPageToken = "foo";
-    o.workspace = buildUnnamed1278();
+    o.workspace = buildUnnamed2348();
   }
   buildCounterListWorkspacesResponse--;
   return o;
@@ -1116,7 +1116,7 @@
   buildCounterListWorkspacesResponse++;
   if (buildCounterListWorkspacesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed1278(o.workspace);
+    checkUnnamed2348(o.workspace);
   }
   buildCounterListWorkspacesResponse--;
 }
@@ -1142,27 +1142,27 @@
   buildCounterMergeConflict--;
 }
 
-buildUnnamed1279() {
+buildUnnamed2349() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed1279(core.List<api.Parameter> o) {
+checkUnnamed2349(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
 }
 
-buildUnnamed1280() {
+buildUnnamed2350() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed1280(core.List<api.Parameter> o) {
+checkUnnamed2350(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -1174,8 +1174,8 @@
   buildCounterParameter++;
   if (buildCounterParameter < 3) {
     o.key = "foo";
-    o.list = buildUnnamed1279();
-    o.map = buildUnnamed1280();
+    o.list = buildUnnamed2349();
+    o.map = buildUnnamed2350();
     o.type = "foo";
     o.value = "foo";
   }
@@ -1187,8 +1187,8 @@
   buildCounterParameter++;
   if (buildCounterParameter < 3) {
     unittest.expect(o.key, unittest.equals('foo'));
-    checkUnnamed1279(o.list);
-    checkUnnamed1280(o.map);
+    checkUnnamed2349(o.list);
+    checkUnnamed2350(o.map);
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.value, unittest.equals('foo'));
   }
@@ -1376,14 +1376,14 @@
   buildCounterSyncStatus--;
 }
 
-buildUnnamed1281() {
+buildUnnamed2351() {
   var o = new core.List<api.MergeConflict>();
   o.add(buildMergeConflict());
   o.add(buildMergeConflict());
   return o;
 }
 
-checkUnnamed1281(core.List<api.MergeConflict> o) {
+checkUnnamed2351(core.List<api.MergeConflict> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMergeConflict(o[0]);
   checkMergeConflict(o[1]);
@@ -1394,7 +1394,7 @@
   var o = new api.SyncWorkspaceResponse();
   buildCounterSyncWorkspaceResponse++;
   if (buildCounterSyncWorkspaceResponse < 3) {
-    o.mergeConflict = buildUnnamed1281();
+    o.mergeConflict = buildUnnamed2351();
     o.syncStatus = buildSyncStatus();
   }
   buildCounterSyncWorkspaceResponse--;
@@ -1404,98 +1404,98 @@
 checkSyncWorkspaceResponse(api.SyncWorkspaceResponse o) {
   buildCounterSyncWorkspaceResponse++;
   if (buildCounterSyncWorkspaceResponse < 3) {
-    checkUnnamed1281(o.mergeConflict);
+    checkUnnamed2351(o.mergeConflict);
     checkSyncStatus(o.syncStatus);
   }
   buildCounterSyncWorkspaceResponse--;
 }
 
-buildUnnamed1282() {
+buildUnnamed2352() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1282(core.List<core.String> o) {
+checkUnnamed2352(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1283() {
+buildUnnamed2353() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1283(core.List<core.String> o) {
+checkUnnamed2353(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1284() {
+buildUnnamed2354() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1284(core.List<core.String> o) {
+checkUnnamed2354(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1285() {
+buildUnnamed2355() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1285(core.List<core.String> o) {
+checkUnnamed2355(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1286() {
+buildUnnamed2356() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed1286(core.List<api.Parameter> o) {
+checkUnnamed2356(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
 }
 
-buildUnnamed1287() {
+buildUnnamed2357() {
   var o = new core.List<api.SetupTag>();
   o.add(buildSetupTag());
   o.add(buildSetupTag());
   return o;
 }
 
-checkUnnamed1287(core.List<api.SetupTag> o) {
+checkUnnamed2357(core.List<api.SetupTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSetupTag(o[0]);
   checkSetupTag(o[1]);
 }
 
-buildUnnamed1288() {
+buildUnnamed2358() {
   var o = new core.List<api.TeardownTag>();
   o.add(buildTeardownTag());
   o.add(buildTeardownTag());
   return o;
 }
 
-checkUnnamed1288(core.List<api.TeardownTag> o) {
+checkUnnamed2358(core.List<api.TeardownTag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTeardownTag(o[0]);
   checkTeardownTag(o[1]);
@@ -1507,27 +1507,27 @@
   buildCounterTag++;
   if (buildCounterTag < 3) {
     o.accountId = "foo";
-    o.blockingRuleId = buildUnnamed1282();
-    o.blockingTriggerId = buildUnnamed1283();
+    o.blockingRuleId = buildUnnamed2352();
+    o.blockingTriggerId = buildUnnamed2353();
     o.containerId = "foo";
     o.fingerprint = "foo";
-    o.firingRuleId = buildUnnamed1284();
-    o.firingTriggerId = buildUnnamed1285();
+    o.firingRuleId = buildUnnamed2354();
+    o.firingTriggerId = buildUnnamed2355();
     o.liveOnly = true;
     o.name = "foo";
     o.notes = "foo";
-    o.parameter = buildUnnamed1286();
+    o.parameter = buildUnnamed2356();
     o.parentFolderId = "foo";
     o.path = "foo";
     o.paused = true;
     o.priority = buildParameter();
     o.scheduleEndMs = "foo";
     o.scheduleStartMs = "foo";
-    o.setupTag = buildUnnamed1287();
+    o.setupTag = buildUnnamed2357();
     o.tagFiringOption = "foo";
     o.tagId = "foo";
     o.tagManagerUrl = "foo";
-    o.teardownTag = buildUnnamed1288();
+    o.teardownTag = buildUnnamed2358();
     o.type = "foo";
     o.workspaceId = "foo";
   }
@@ -1539,27 +1539,27 @@
   buildCounterTag++;
   if (buildCounterTag < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed1282(o.blockingRuleId);
-    checkUnnamed1283(o.blockingTriggerId);
+    checkUnnamed2352(o.blockingRuleId);
+    checkUnnamed2353(o.blockingTriggerId);
     unittest.expect(o.containerId, unittest.equals('foo'));
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed1284(o.firingRuleId);
-    checkUnnamed1285(o.firingTriggerId);
+    checkUnnamed2354(o.firingRuleId);
+    checkUnnamed2355(o.firingTriggerId);
     unittest.expect(o.liveOnly, unittest.isTrue);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed1286(o.parameter);
+    checkUnnamed2356(o.parameter);
     unittest.expect(o.parentFolderId, unittest.equals('foo'));
     unittest.expect(o.path, unittest.equals('foo'));
     unittest.expect(o.paused, unittest.isTrue);
     checkParameter(o.priority);
     unittest.expect(o.scheduleEndMs, unittest.equals('foo'));
     unittest.expect(o.scheduleStartMs, unittest.equals('foo'));
-    checkUnnamed1287(o.setupTag);
+    checkUnnamed2357(o.setupTag);
     unittest.expect(o.tagFiringOption, unittest.equals('foo'));
     unittest.expect(o.tagId, unittest.equals('foo'));
     unittest.expect(o.tagManagerUrl, unittest.equals('foo'));
-    checkUnnamed1288(o.teardownTag);
+    checkUnnamed2358(o.teardownTag);
     unittest.expect(o.type, unittest.equals('foo'));
     unittest.expect(o.workspaceId, unittest.equals('foo'));
   }
@@ -1608,53 +1608,53 @@
   buildCounterTimestamp--;
 }
 
-buildUnnamed1289() {
+buildUnnamed2359() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed1289(core.List<api.Condition> o) {
+checkUnnamed2359(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
 }
 
-buildUnnamed1290() {
+buildUnnamed2360() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed1290(core.List<api.Condition> o) {
+checkUnnamed2360(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
 }
 
-buildUnnamed1291() {
+buildUnnamed2361() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed1291(core.List<api.Condition> o) {
+checkUnnamed2361(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
 }
 
-buildUnnamed1292() {
+buildUnnamed2362() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed1292(core.List<api.Parameter> o) {
+checkUnnamed2362(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -1666,13 +1666,13 @@
   buildCounterTrigger++;
   if (buildCounterTrigger < 3) {
     o.accountId = "foo";
-    o.autoEventFilter = buildUnnamed1289();
+    o.autoEventFilter = buildUnnamed2359();
     o.checkValidation = buildParameter();
     o.containerId = "foo";
     o.continuousTimeMinMilliseconds = buildParameter();
-    o.customEventFilter = buildUnnamed1290();
+    o.customEventFilter = buildUnnamed2360();
     o.eventName = buildParameter();
-    o.filter = buildUnnamed1291();
+    o.filter = buildUnnamed2361();
     o.fingerprint = "foo";
     o.horizontalScrollPercentageList = buildParameter();
     o.interval = buildParameter();
@@ -1681,7 +1681,7 @@
     o.maxTimerLengthSeconds = buildParameter();
     o.name = "foo";
     o.notes = "foo";
-    o.parameter = buildUnnamed1292();
+    o.parameter = buildUnnamed2362();
     o.parentFolderId = "foo";
     o.path = "foo";
     o.selector = buildParameter();
@@ -1706,13 +1706,13 @@
   buildCounterTrigger++;
   if (buildCounterTrigger < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed1289(o.autoEventFilter);
+    checkUnnamed2359(o.autoEventFilter);
     checkParameter(o.checkValidation);
     unittest.expect(o.containerId, unittest.equals('foo'));
     checkParameter(o.continuousTimeMinMilliseconds);
-    checkUnnamed1290(o.customEventFilter);
+    checkUnnamed2360(o.customEventFilter);
     checkParameter(o.eventName);
-    checkUnnamed1291(o.filter);
+    checkUnnamed2361(o.filter);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     checkParameter(o.horizontalScrollPercentageList);
     checkParameter(o.interval);
@@ -1721,7 +1721,7 @@
     checkParameter(o.maxTimerLengthSeconds);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed1292(o.parameter);
+    checkUnnamed2362(o.parameter);
     unittest.expect(o.parentFolderId, unittest.equals('foo'));
     unittest.expect(o.path, unittest.equals('foo'));
     checkParameter(o.selector);
@@ -1741,14 +1741,14 @@
   buildCounterTrigger--;
 }
 
-buildUnnamed1293() {
+buildUnnamed2363() {
   var o = new core.List<api.WorkspaceProposalUser>();
   o.add(buildWorkspaceProposalUser());
   o.add(buildWorkspaceProposalUser());
   return o;
 }
 
-checkUnnamed1293(core.List<api.WorkspaceProposalUser> o) {
+checkUnnamed2363(core.List<api.WorkspaceProposalUser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorkspaceProposalUser(o[0]);
   checkWorkspaceProposalUser(o[1]);
@@ -1761,7 +1761,7 @@
   if (buildCounterUpdateWorkspaceProposalRequest < 3) {
     o.fingerprint = "foo";
     o.newComment = buildWorkspaceProposalHistoryComment();
-    o.reviewers = buildUnnamed1293();
+    o.reviewers = buildUnnamed2363();
     o.status = "foo";
   }
   buildCounterUpdateWorkspaceProposalRequest--;
@@ -1773,20 +1773,20 @@
   if (buildCounterUpdateWorkspaceProposalRequest < 3) {
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     checkWorkspaceProposalHistoryComment(o.newComment);
-    checkUnnamed1293(o.reviewers);
+    checkUnnamed2363(o.reviewers);
     unittest.expect(o.status, unittest.equals('foo'));
   }
   buildCounterUpdateWorkspaceProposalRequest--;
 }
 
-buildUnnamed1294() {
+buildUnnamed2364() {
   var o = new core.List<api.ContainerAccess>();
   o.add(buildContainerAccess());
   o.add(buildContainerAccess());
   return o;
 }
 
-checkUnnamed1294(core.List<api.ContainerAccess> o) {
+checkUnnamed2364(core.List<api.ContainerAccess> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkContainerAccess(o[0]);
   checkContainerAccess(o[1]);
@@ -1799,7 +1799,7 @@
   if (buildCounterUserPermission < 3) {
     o.accountAccess = buildAccountAccess();
     o.accountId = "foo";
-    o.containerAccess = buildUnnamed1294();
+    o.containerAccess = buildUnnamed2364();
     o.emailAddress = "foo";
     o.path = "foo";
   }
@@ -1812,47 +1812,47 @@
   if (buildCounterUserPermission < 3) {
     checkAccountAccess(o.accountAccess);
     unittest.expect(o.accountId, unittest.equals('foo'));
-    checkUnnamed1294(o.containerAccess);
+    checkUnnamed2364(o.containerAccess);
     unittest.expect(o.emailAddress, unittest.equals('foo'));
     unittest.expect(o.path, unittest.equals('foo'));
   }
   buildCounterUserPermission--;
 }
 
-buildUnnamed1295() {
+buildUnnamed2365() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1295(core.List<core.String> o) {
+checkUnnamed2365(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1296() {
+buildUnnamed2366() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1296(core.List<core.String> o) {
+checkUnnamed2366(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1297() {
+buildUnnamed2367() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed1297(core.List<api.Parameter> o) {
+checkUnnamed2367(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -1865,12 +1865,12 @@
   if (buildCounterVariable < 3) {
     o.accountId = "foo";
     o.containerId = "foo";
-    o.disablingTriggerId = buildUnnamed1295();
-    o.enablingTriggerId = buildUnnamed1296();
+    o.disablingTriggerId = buildUnnamed2365();
+    o.enablingTriggerId = buildUnnamed2366();
     o.fingerprint = "foo";
     o.name = "foo";
     o.notes = "foo";
-    o.parameter = buildUnnamed1297();
+    o.parameter = buildUnnamed2367();
     o.parentFolderId = "foo";
     o.path = "foo";
     o.scheduleEndMs = "foo";
@@ -1889,12 +1889,12 @@
   if (buildCounterVariable < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     unittest.expect(o.containerId, unittest.equals('foo'));
-    checkUnnamed1295(o.disablingTriggerId);
-    checkUnnamed1296(o.enablingTriggerId);
+    checkUnnamed2365(o.disablingTriggerId);
+    checkUnnamed2366(o.enablingTriggerId);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.notes, unittest.equals('foo'));
-    checkUnnamed1297(o.parameter);
+    checkUnnamed2367(o.parameter);
     unittest.expect(o.parentFolderId, unittest.equals('foo'));
     unittest.expect(o.path, unittest.equals('foo'));
     unittest.expect(o.scheduleEndMs, unittest.equals('foo'));
@@ -1940,40 +1940,40 @@
   buildCounterWorkspace--;
 }
 
-buildUnnamed1298() {
+buildUnnamed2368() {
   var o = new core.List<api.WorkspaceProposalUser>();
   o.add(buildWorkspaceProposalUser());
   o.add(buildWorkspaceProposalUser());
   return o;
 }
 
-checkUnnamed1298(core.List<api.WorkspaceProposalUser> o) {
+checkUnnamed2368(core.List<api.WorkspaceProposalUser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorkspaceProposalUser(o[0]);
   checkWorkspaceProposalUser(o[1]);
 }
 
-buildUnnamed1299() {
+buildUnnamed2369() {
   var o = new core.List<api.WorkspaceProposalHistory>();
   o.add(buildWorkspaceProposalHistory());
   o.add(buildWorkspaceProposalHistory());
   return o;
 }
 
-checkUnnamed1299(core.List<api.WorkspaceProposalHistory> o) {
+checkUnnamed2369(core.List<api.WorkspaceProposalHistory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorkspaceProposalHistory(o[0]);
   checkWorkspaceProposalHistory(o[1]);
 }
 
-buildUnnamed1300() {
+buildUnnamed2370() {
   var o = new core.List<api.WorkspaceProposalUser>();
   o.add(buildWorkspaceProposalUser());
   o.add(buildWorkspaceProposalUser());
   return o;
 }
 
-checkUnnamed1300(core.List<api.WorkspaceProposalUser> o) {
+checkUnnamed2370(core.List<api.WorkspaceProposalUser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorkspaceProposalUser(o[0]);
   checkWorkspaceProposalUser(o[1]);
@@ -1984,11 +1984,11 @@
   var o = new api.WorkspaceProposal();
   buildCounterWorkspaceProposal++;
   if (buildCounterWorkspaceProposal < 3) {
-    o.authors = buildUnnamed1298();
+    o.authors = buildUnnamed2368();
     o.fingerprint = "foo";
-    o.history = buildUnnamed1299();
+    o.history = buildUnnamed2369();
     o.path = "foo";
-    o.reviewers = buildUnnamed1300();
+    o.reviewers = buildUnnamed2370();
     o.status = "foo";
   }
   buildCounterWorkspaceProposal--;
@@ -1998,11 +1998,11 @@
 checkWorkspaceProposal(api.WorkspaceProposal o) {
   buildCounterWorkspaceProposal++;
   if (buildCounterWorkspaceProposal < 3) {
-    checkUnnamed1298(o.authors);
+    checkUnnamed2368(o.authors);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed1299(o.history);
+    checkUnnamed2369(o.history);
     unittest.expect(o.path, unittest.equals('foo'));
-    checkUnnamed1300(o.reviewers);
+    checkUnnamed2370(o.reviewers);
     unittest.expect(o.status, unittest.equals('foo'));
   }
   buildCounterWorkspaceProposal--;
@@ -2097,14 +2097,14 @@
   buildCounterWorkspaceProposalUser--;
 }
 
-buildUnnamed1301() {
+buildUnnamed2371() {
   var o = new core.List<api.ZoneChildContainer>();
   o.add(buildZoneChildContainer());
   o.add(buildZoneChildContainer());
   return o;
 }
 
-checkUnnamed1301(core.List<api.ZoneChildContainer> o) {
+checkUnnamed2371(core.List<api.ZoneChildContainer> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkZoneChildContainer(o[0]);
   checkZoneChildContainer(o[1]);
@@ -2117,7 +2117,7 @@
   if (buildCounterZone < 3) {
     o.accountId = "foo";
     o.boundary = buildZoneBoundary();
-    o.childContainer = buildUnnamed1301();
+    o.childContainer = buildUnnamed2371();
     o.containerId = "foo";
     o.fingerprint = "foo";
     o.name = "foo";
@@ -2137,7 +2137,7 @@
   if (buildCounterZone < 3) {
     unittest.expect(o.accountId, unittest.equals('foo'));
     checkZoneBoundary(o.boundary);
-    checkUnnamed1301(o.childContainer);
+    checkUnnamed2371(o.childContainer);
     unittest.expect(o.containerId, unittest.equals('foo'));
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -2151,27 +2151,27 @@
   buildCounterZone--;
 }
 
-buildUnnamed1302() {
+buildUnnamed2372() {
   var o = new core.List<api.Condition>();
   o.add(buildCondition());
   o.add(buildCondition());
   return o;
 }
 
-checkUnnamed1302(core.List<api.Condition> o) {
+checkUnnamed2372(core.List<api.Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCondition(o[0]);
   checkCondition(o[1]);
 }
 
-buildUnnamed1303() {
+buildUnnamed2373() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1303(core.List<core.String> o) {
+checkUnnamed2373(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2182,8 +2182,8 @@
   var o = new api.ZoneBoundary();
   buildCounterZoneBoundary++;
   if (buildCounterZoneBoundary < 3) {
-    o.condition = buildUnnamed1302();
-    o.customEvaluationTriggerId = buildUnnamed1303();
+    o.condition = buildUnnamed2372();
+    o.customEvaluationTriggerId = buildUnnamed2373();
   }
   buildCounterZoneBoundary--;
   return o;
@@ -2192,8 +2192,8 @@
 checkZoneBoundary(api.ZoneBoundary o) {
   buildCounterZoneBoundary++;
   if (buildCounterZoneBoundary < 3) {
-    checkUnnamed1302(o.condition);
-    checkUnnamed1303(o.customEvaluationTriggerId);
+    checkUnnamed2372(o.condition);
+    checkUnnamed2373(o.customEvaluationTriggerId);
   }
   buildCounterZoneBoundary--;
 }
@@ -2219,14 +2219,14 @@
   buildCounterZoneChildContainer--;
 }
 
-buildUnnamed1304() {
+buildUnnamed2374() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1304(core.List<core.String> o) {
+checkUnnamed2374(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2238,7 +2238,7 @@
   buildCounterZoneTypeRestriction++;
   if (buildCounterZoneTypeRestriction < 3) {
     o.enable = true;
-    o.whitelistedTypeId = buildUnnamed1304();
+    o.whitelistedTypeId = buildUnnamed2374();
   }
   buildCounterZoneTypeRestriction--;
   return o;
@@ -2248,71 +2248,71 @@
   buildCounterZoneTypeRestriction++;
   if (buildCounterZoneTypeRestriction < 3) {
     unittest.expect(o.enable, unittest.isTrue);
-    checkUnnamed1304(o.whitelistedTypeId);
+    checkUnnamed2374(o.whitelistedTypeId);
   }
   buildCounterZoneTypeRestriction--;
 }
 
-buildUnnamed1305() {
+buildUnnamed2375() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1305(core.List<core.String> o) {
+checkUnnamed2375(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1306() {
+buildUnnamed2376() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1306(core.List<core.String> o) {
+checkUnnamed2376(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1307() {
+buildUnnamed2377() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1307(core.List<core.String> o) {
+checkUnnamed2377(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1308() {
+buildUnnamed2378() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1308(core.List<core.String> o) {
+checkUnnamed2378(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1309() {
+buildUnnamed2379() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1309(core.List<core.String> o) {
+checkUnnamed2379(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2820,7 +2820,7 @@
       }), true);
       res
           .get(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -2875,7 +2875,7 @@
       }), true);
       res
           .list(pageToken: arg_pageToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListAccountsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListAccountsResponse(response);
       })));
     });
@@ -2930,7 +2930,7 @@
       res
           .update(arg_request, arg_path,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Account response) {
+          .then(unittest.expectAsync1(((response) {
         checkAccount(response);
       })));
     });
@@ -2984,7 +2984,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Container response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainer(response);
       })));
     });
@@ -3078,7 +3078,7 @@
       }), true);
       res
           .get(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Container response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainer(response);
       })));
     });
@@ -3129,7 +3129,7 @@
       }), true);
       res
           .list(arg_parent, pageToken: arg_pageToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListContainersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListContainersResponse(response);
       })));
     });
@@ -3185,7 +3185,7 @@
       res
           .update(arg_request, arg_path,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Container response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainer(response);
       })));
     });
@@ -3239,7 +3239,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Environment response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnvironment(response);
       })));
     });
@@ -3333,7 +3333,7 @@
       }), true);
       res
           .get(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Environment response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnvironment(response);
       })));
     });
@@ -3384,7 +3384,7 @@
       }), true);
       res
           .list(arg_parent, pageToken: arg_pageToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListEnvironmentsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListEnvironmentsResponse(response);
       })));
     });
@@ -3440,7 +3440,7 @@
       res
           .patch(arg_request, arg_path,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Environment response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnvironment(response);
       })));
     });
@@ -3492,7 +3492,7 @@
       }), true);
       res
           .reauthorize(arg_request, arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Environment response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnvironment(response);
       })));
     });
@@ -3548,7 +3548,7 @@
       res
           .update(arg_request, arg_path,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Environment response) {
+          .then(unittest.expectAsync1(((response) {
         checkEnvironment(response);
       })));
     });
@@ -3598,7 +3598,7 @@
       }), true);
       res
           .latest(arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContainerVersionHeader response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainerVersionHeader(response);
       })));
     });
@@ -3655,8 +3655,7 @@
               includeDeleted: arg_includeDeleted,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListContainerVersionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListContainerVersionsResponse(response);
       })));
     });
@@ -3756,7 +3755,7 @@
       res
           .get(arg_path,
               containerVersionId: arg_containerVersionId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContainerVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainerVersion(response);
       })));
     });
@@ -3804,7 +3803,7 @@
       }), true);
       res
           .live(arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContainerVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainerVersion(response);
       })));
     });
@@ -3855,8 +3854,7 @@
       }), true);
       res
           .publish(arg_path, fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.PublishContainerVersionResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPublishContainerVersionResponse(response);
       })));
     });
@@ -3904,7 +3902,7 @@
       }), true);
       res
           .setLatest(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContainerVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainerVersion(response);
       })));
     });
@@ -3952,7 +3950,7 @@
       }), true);
       res
           .undelete(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContainerVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainerVersion(response);
       })));
     });
@@ -4008,7 +4006,7 @@
       res
           .update(arg_request, arg_path,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ContainerVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkContainerVersion(response);
       })));
     });
@@ -4062,7 +4060,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Workspace response) {
+          .then(unittest.expectAsync1(((response) {
         checkWorkspace(response);
       })));
     });
@@ -4113,8 +4111,9 @@
         var resp = convert.JSON.encode(buildCreateContainerVersionResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.createVersion(arg_request, arg_path, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.CreateContainerVersionResponse response) {
+      res
+          .createVersion(arg_request, arg_path, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkCreateContainerVersionResponse(response);
       })));
     });
@@ -4208,7 +4207,7 @@
       }), true);
       res
           .get(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Workspace response) {
+          .then(unittest.expectAsync1(((response) {
         checkWorkspace(response);
       })));
     });
@@ -4256,7 +4255,7 @@
       }), true);
       res
           .getProposal(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WorkspaceProposal response) {
+          .then(unittest.expectAsync1(((response) {
         checkWorkspaceProposal(response);
       })));
     });
@@ -4302,8 +4301,9 @@
         var resp = convert.JSON.encode(buildGetWorkspaceStatusResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getStatus(arg_path, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GetWorkspaceStatusResponse response) {
+      res
+          .getStatus(arg_path, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGetWorkspaceStatusResponse(response);
       })));
     });
@@ -4354,7 +4354,7 @@
       }), true);
       res
           .list(arg_parent, pageToken: arg_pageToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListWorkspacesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListWorkspacesResponse(response);
       })));
     });
@@ -4402,7 +4402,7 @@
       }), true);
       res
           .quickPreview(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.QuickPreviewResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkQuickPreviewResponse(response);
       })));
     });
@@ -4504,7 +4504,7 @@
       }), true);
       res
           .sync(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SyncWorkspaceResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSyncWorkspaceResponse(response);
       })));
     });
@@ -4560,7 +4560,7 @@
       res
           .update(arg_request, arg_path,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Workspace response) {
+          .then(unittest.expectAsync1(((response) {
         checkWorkspace(response);
       })));
     });
@@ -4612,7 +4612,7 @@
       }), true);
       res
           .updateProposal(arg_request, arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WorkspaceProposal response) {
+          .then(unittest.expectAsync1(((response) {
         checkWorkspaceProposal(response);
       })));
     });
@@ -4629,7 +4629,7 @@
               .workspaces
               .builtInVariables;
       var arg_parent = "foo";
-      var arg_type = buildUnnamed1305();
+      var arg_type = buildUnnamed2375();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -4667,8 +4667,9 @@
         var resp = convert.JSON.encode(buildCreateBuiltInVariableResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_parent, type: arg_type, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.CreateBuiltInVariableResponse response) {
+      res
+          .create(arg_parent, type: arg_type, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkCreateBuiltInVariableResponse(response);
       })));
     });
@@ -4682,7 +4683,7 @@
               .workspaces
               .builtInVariables;
       var arg_path = "foo";
-      var arg_type = buildUnnamed1306();
+      var arg_type = buildUnnamed2376();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -4774,9 +4775,9 @@
             convert.JSON.encode(buildListEnabledBuiltInVariablesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_parent, pageToken: arg_pageToken, $fields: arg_$fields).then(
-          unittest.expectAsync1(
-              ((api.ListEnabledBuiltInVariablesResponse response) {
+      res
+          .list(arg_parent, pageToken: arg_pageToken, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkListEnabledBuiltInVariablesResponse(response);
       })));
     });
@@ -4828,8 +4829,9 @@
         var resp = convert.JSON.encode(buildRevertBuiltInVariableResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.revert(arg_path, type: arg_type, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.RevertBuiltInVariableResponse response) {
+      res
+          .revert(arg_path, type: arg_type, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkRevertBuiltInVariableResponse(response);
       })));
     });
@@ -4883,7 +4885,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Folder response) {
+          .then(unittest.expectAsync1(((response) {
         checkFolder(response);
       })));
     });
@@ -4980,7 +4982,7 @@
       }), true);
       res
           .entities(arg_path, pageToken: arg_pageToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FolderEntities response) {
+          .then(unittest.expectAsync1(((response) {
         checkFolderEntities(response);
       })));
     });
@@ -5028,7 +5030,7 @@
       }), true);
       res
           .get(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Folder response) {
+          .then(unittest.expectAsync1(((response) {
         checkFolder(response);
       })));
     });
@@ -5079,7 +5081,7 @@
       }), true);
       res
           .list(arg_parent, pageToken: arg_pageToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListFoldersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListFoldersResponse(response);
       })));
     });
@@ -5090,9 +5092,9 @@
           new api.TagmanagerApi(mock).accounts.containers.workspaces.folders;
       var arg_request = buildFolder();
       var arg_path = "foo";
-      var arg_tagId = buildUnnamed1307();
-      var arg_triggerId = buildUnnamed1308();
-      var arg_variableId = buildUnnamed1309();
+      var arg_tagId = buildUnnamed2377();
+      var arg_triggerId = buildUnnamed2378();
+      var arg_variableId = buildUnnamed2379();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.Folder.fromJson(json);
@@ -5191,7 +5193,7 @@
       }), true);
       res
           .revert(arg_path, fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RevertFolderResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRevertFolderResponse(response);
       })));
     });
@@ -5247,7 +5249,7 @@
       res
           .update(arg_request, arg_path,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Folder response) {
+          .then(unittest.expectAsync1(((response) {
         checkFolder(response);
       })));
     });
@@ -5302,7 +5304,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WorkspaceProposal response) {
+          .then(unittest.expectAsync1(((response) {
         checkWorkspaceProposal(response);
       })));
     });
@@ -5402,7 +5404,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Tag response) {
+          .then(unittest.expectAsync1(((response) {
         checkTag(response);
       })));
     });
@@ -5496,7 +5498,7 @@
       }), true);
       res
           .get(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Tag response) {
+          .then(unittest.expectAsync1(((response) {
         checkTag(response);
       })));
     });
@@ -5547,7 +5549,7 @@
       }), true);
       res
           .list(arg_parent, pageToken: arg_pageToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTagsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTagsResponse(response);
       })));
     });
@@ -5598,7 +5600,7 @@
       }), true);
       res
           .revert(arg_path, fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RevertTagResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRevertTagResponse(response);
       })));
     });
@@ -5654,7 +5656,7 @@
       res
           .update(arg_request, arg_path,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Tag response) {
+          .then(unittest.expectAsync1(((response) {
         checkTag(response);
       })));
     });
@@ -5709,7 +5711,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Trigger response) {
+          .then(unittest.expectAsync1(((response) {
         checkTrigger(response);
       })));
     });
@@ -5803,7 +5805,7 @@
       }), true);
       res
           .get(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Trigger response) {
+          .then(unittest.expectAsync1(((response) {
         checkTrigger(response);
       })));
     });
@@ -5854,7 +5856,7 @@
       }), true);
       res
           .list(arg_parent, pageToken: arg_pageToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTriggersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTriggersResponse(response);
       })));
     });
@@ -5905,7 +5907,7 @@
       }), true);
       res
           .revert(arg_path, fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RevertTriggerResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRevertTriggerResponse(response);
       })));
     });
@@ -5961,7 +5963,7 @@
       res
           .update(arg_request, arg_path,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Trigger response) {
+          .then(unittest.expectAsync1(((response) {
         checkTrigger(response);
       })));
     });
@@ -6016,7 +6018,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variable response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariable(response);
       })));
     });
@@ -6110,7 +6112,7 @@
       }), true);
       res
           .get(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variable response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariable(response);
       })));
     });
@@ -6161,7 +6163,7 @@
       }), true);
       res
           .list(arg_parent, pageToken: arg_pageToken, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListVariablesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListVariablesResponse(response);
       })));
     });
@@ -6212,7 +6214,7 @@
       }), true);
       res
           .revert(arg_path, fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RevertVariableResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRevertVariableResponse(response);
       })));
     });
@@ -6268,7 +6270,7 @@
       res
           .update(arg_request, arg_path,
               fingerprint: arg_fingerprint, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variable response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariable(response);
       })));
     });
@@ -6322,7 +6324,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserPermission response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserPermission(response);
       })));
     });
@@ -6416,7 +6418,7 @@
       }), true);
       res
           .get(arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserPermission response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserPermission(response);
       })));
     });
@@ -6465,8 +6467,9 @@
         var resp = convert.JSON.encode(buildListUserPermissionsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_parent, pageToken: arg_pageToken, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ListUserPermissionsResponse response) {
+      res
+          .list(arg_parent, pageToken: arg_pageToken, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkListUserPermissionsResponse(response);
       })));
     });
@@ -6518,7 +6521,7 @@
       }), true);
       res
           .update(arg_request, arg_path, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserPermission response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserPermission(response);
       })));
     });
diff --git a/generated/googleapis/test/tasks/v1_test.dart b/generated/googleapis/test/tasks/v1_test.dart
index b330486..319a2d1 100644
--- a/generated/googleapis/test/tasks/v1_test.dart
+++ b/generated/googleapis/test/tasks/v1_test.dart
@@ -73,14 +73,14 @@
   buildCounterTaskLinks--;
 }
 
-buildUnnamed2959() {
+buildUnnamed3739() {
   var o = new core.List<api.TaskLinks>();
   o.add(buildTaskLinks());
   o.add(buildTaskLinks());
   return o;
 }
 
-checkUnnamed2959(core.List<api.TaskLinks> o) {
+checkUnnamed3739(core.List<api.TaskLinks> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTaskLinks(o[0]);
   checkTaskLinks(o[1]);
@@ -98,7 +98,7 @@
     o.hidden = true;
     o.id = "foo";
     o.kind = "foo";
-    o.links = buildUnnamed2959();
+    o.links = buildUnnamed3739();
     o.notes = "foo";
     o.parent = "foo";
     o.position = "foo";
@@ -123,7 +123,7 @@
     unittest.expect(o.hidden, unittest.isTrue);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2959(o.links);
+    checkUnnamed3739(o.links);
     unittest.expect(o.notes, unittest.equals('foo'));
     unittest.expect(o.parent, unittest.equals('foo'));
     unittest.expect(o.position, unittest.equals('foo'));
@@ -166,14 +166,14 @@
   buildCounterTaskList--;
 }
 
-buildUnnamed2960() {
+buildUnnamed3740() {
   var o = new core.List<api.TaskList>();
   o.add(buildTaskList());
   o.add(buildTaskList());
   return o;
 }
 
-checkUnnamed2960(core.List<api.TaskList> o) {
+checkUnnamed3740(core.List<api.TaskList> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTaskList(o[0]);
   checkTaskList(o[1]);
@@ -185,7 +185,7 @@
   buildCounterTaskLists++;
   if (buildCounterTaskLists < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2960();
+    o.items = buildUnnamed3740();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -197,21 +197,21 @@
   buildCounterTaskLists++;
   if (buildCounterTaskLists < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2960(o.items);
+    checkUnnamed3740(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterTaskLists--;
 }
 
-buildUnnamed2961() {
+buildUnnamed3741() {
   var o = new core.List<api.Task>();
   o.add(buildTask());
   o.add(buildTask());
   return o;
 }
 
-checkUnnamed2961(core.List<api.Task> o) {
+checkUnnamed3741(core.List<api.Task> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTask(o[0]);
   checkTask(o[1]);
@@ -223,7 +223,7 @@
   buildCounterTasks++;
   if (buildCounterTasks < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed2961();
+    o.items = buildUnnamed3741();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -235,7 +235,7 @@
   buildCounterTasks++;
   if (buildCounterTasks < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed2961(o.items);
+    checkUnnamed3741(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -389,7 +389,7 @@
       }), true);
       res
           .get(arg_tasklist, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TaskList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTaskList(response);
       })));
     });
@@ -445,7 +445,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TaskList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTaskList(response);
       })));
     });
@@ -506,7 +506,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TaskLists response) {
+          .then(unittest.expectAsync1(((response) {
         checkTaskLists(response);
       })));
     });
@@ -566,7 +566,7 @@
       }), true);
       res
           .patch(arg_request, arg_tasklist, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TaskList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTaskList(response);
       })));
     });
@@ -626,7 +626,7 @@
       }), true);
       res
           .update(arg_request, arg_tasklist, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TaskList response) {
+          .then(unittest.expectAsync1(((response) {
         checkTaskList(response);
       })));
     });
@@ -818,7 +818,7 @@
       }), true);
       res
           .get(arg_tasklist, arg_task, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -890,7 +890,7 @@
       res
           .insert(arg_request, arg_tasklist,
               parent: arg_parent, previous: arg_previous, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -991,7 +991,7 @@
               showHidden: arg_showHidden,
               updatedMin: arg_updatedMin,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Tasks response) {
+          .then(unittest.expectAsync1(((response) {
         checkTasks(response);
       })));
     });
@@ -1069,7 +1069,7 @@
       res
           .move(arg_tasklist, arg_task,
               parent: arg_parent, previous: arg_previous, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -1139,7 +1139,7 @@
       }), true);
       res
           .patch(arg_request, arg_tasklist, arg_task, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -1209,7 +1209,7 @@
       }), true);
       res
           .update(arg_request, arg_tasklist, arg_task, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
diff --git a/generated/googleapis/test/testing/v1_test.dart b/generated/googleapis/test/testing/v1_test.dart
index 2ef7683..eaaae1d 100644
--- a/generated/googleapis/test/testing/v1_test.dart
+++ b/generated/googleapis/test/testing/v1_test.dart
@@ -94,27 +94,27 @@
   buildCounterAndroidDevice--;
 }
 
-buildUnnamed1842() {
+buildUnnamed1879() {
   var o = new core.List<api.AndroidModel>();
   o.add(buildAndroidModel());
   o.add(buildAndroidModel());
   return o;
 }
 
-checkUnnamed1842(core.List<api.AndroidModel> o) {
+checkUnnamed1879(core.List<api.AndroidModel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAndroidModel(o[0]);
   checkAndroidModel(o[1]);
 }
 
-buildUnnamed1843() {
+buildUnnamed1880() {
   var o = new core.List<api.AndroidVersion>();
   o.add(buildAndroidVersion());
   o.add(buildAndroidVersion());
   return o;
 }
 
-checkUnnamed1843(core.List<api.AndroidVersion> o) {
+checkUnnamed1880(core.List<api.AndroidVersion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAndroidVersion(o[0]);
   checkAndroidVersion(o[1]);
@@ -125,9 +125,9 @@
   var o = new api.AndroidDeviceCatalog();
   buildCounterAndroidDeviceCatalog++;
   if (buildCounterAndroidDeviceCatalog < 3) {
-    o.models = buildUnnamed1842();
+    o.models = buildUnnamed1879();
     o.runtimeConfiguration = buildAndroidRuntimeConfiguration();
-    o.versions = buildUnnamed1843();
+    o.versions = buildUnnamed1880();
   }
   buildCounterAndroidDeviceCatalog--;
   return o;
@@ -136,21 +136,21 @@
 checkAndroidDeviceCatalog(api.AndroidDeviceCatalog o) {
   buildCounterAndroidDeviceCatalog++;
   if (buildCounterAndroidDeviceCatalog < 3) {
-    checkUnnamed1842(o.models);
+    checkUnnamed1879(o.models);
     checkAndroidRuntimeConfiguration(o.runtimeConfiguration);
-    checkUnnamed1843(o.versions);
+    checkUnnamed1880(o.versions);
   }
   buildCounterAndroidDeviceCatalog--;
 }
 
-buildUnnamed1844() {
+buildUnnamed1881() {
   var o = new core.List<api.AndroidDevice>();
   o.add(buildAndroidDevice());
   o.add(buildAndroidDevice());
   return o;
 }
 
-checkUnnamed1844(core.List<api.AndroidDevice> o) {
+checkUnnamed1881(core.List<api.AndroidDevice> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAndroidDevice(o[0]);
   checkAndroidDevice(o[1]);
@@ -161,7 +161,7 @@
   var o = new api.AndroidDeviceList();
   buildCounterAndroidDeviceList++;
   if (buildCounterAndroidDeviceList < 3) {
-    o.androidDevices = buildUnnamed1844();
+    o.androidDevices = buildUnnamed1881();
   }
   buildCounterAndroidDeviceList--;
   return o;
@@ -170,19 +170,19 @@
 checkAndroidDeviceList(api.AndroidDeviceList o) {
   buildCounterAndroidDeviceList++;
   if (buildCounterAndroidDeviceList < 3) {
-    checkUnnamed1844(o.androidDevices);
+    checkUnnamed1881(o.androidDevices);
   }
   buildCounterAndroidDeviceList--;
 }
 
-buildUnnamed1845() {
+buildUnnamed1882() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1845(core.List<core.String> o) {
+checkUnnamed1882(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -199,7 +199,7 @@
     o.testApk = buildFileReference();
     o.testPackageId = "foo";
     o.testRunnerClass = "foo";
-    o.testTargets = buildUnnamed1845();
+    o.testTargets = buildUnnamed1882();
   }
   buildCounterAndroidInstrumentationTest--;
   return o;
@@ -214,58 +214,58 @@
     checkFileReference(o.testApk);
     unittest.expect(o.testPackageId, unittest.equals('foo'));
     unittest.expect(o.testRunnerClass, unittest.equals('foo'));
-    checkUnnamed1845(o.testTargets);
+    checkUnnamed1882(o.testTargets);
   }
   buildCounterAndroidInstrumentationTest--;
 }
 
-buildUnnamed1846() {
+buildUnnamed1883() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1846(core.List<core.String> o) {
+checkUnnamed1883(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1847() {
+buildUnnamed1884() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1847(core.List<core.String> o) {
+checkUnnamed1884(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1848() {
+buildUnnamed1885() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1848(core.List<core.String> o) {
+checkUnnamed1885(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1849() {
+buildUnnamed1886() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1849(core.List<core.String> o) {
+checkUnnamed1886(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -276,10 +276,10 @@
   var o = new api.AndroidMatrix();
   buildCounterAndroidMatrix++;
   if (buildCounterAndroidMatrix < 3) {
-    o.androidModelIds = buildUnnamed1846();
-    o.androidVersionIds = buildUnnamed1847();
-    o.locales = buildUnnamed1848();
-    o.orientations = buildUnnamed1849();
+    o.androidModelIds = buildUnnamed1883();
+    o.androidVersionIds = buildUnnamed1884();
+    o.locales = buildUnnamed1885();
+    o.orientations = buildUnnamed1886();
   }
   buildCounterAndroidMatrix--;
   return o;
@@ -288,48 +288,48 @@
 checkAndroidMatrix(api.AndroidMatrix o) {
   buildCounterAndroidMatrix++;
   if (buildCounterAndroidMatrix < 3) {
-    checkUnnamed1846(o.androidModelIds);
-    checkUnnamed1847(o.androidVersionIds);
-    checkUnnamed1848(o.locales);
-    checkUnnamed1849(o.orientations);
+    checkUnnamed1883(o.androidModelIds);
+    checkUnnamed1884(o.androidVersionIds);
+    checkUnnamed1885(o.locales);
+    checkUnnamed1886(o.orientations);
   }
   buildCounterAndroidMatrix--;
 }
 
-buildUnnamed1850() {
+buildUnnamed1887() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1850(core.List<core.String> o) {
+checkUnnamed1887(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1851() {
+buildUnnamed1888() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1851(core.List<core.String> o) {
+checkUnnamed1888(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1852() {
+buildUnnamed1889() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1852(core.List<core.String> o) {
+checkUnnamed1889(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -349,9 +349,9 @@
     o.screenDensity = 42;
     o.screenX = 42;
     o.screenY = 42;
-    o.supportedAbis = buildUnnamed1850();
-    o.supportedVersionIds = buildUnnamed1851();
-    o.tags = buildUnnamed1852();
+    o.supportedAbis = buildUnnamed1887();
+    o.supportedVersionIds = buildUnnamed1888();
+    o.tags = buildUnnamed1889();
   }
   buildCounterAndroidModel--;
   return o;
@@ -369,34 +369,34 @@
     unittest.expect(o.screenDensity, unittest.equals(42));
     unittest.expect(o.screenX, unittest.equals(42));
     unittest.expect(o.screenY, unittest.equals(42));
-    checkUnnamed1850(o.supportedAbis);
-    checkUnnamed1851(o.supportedVersionIds);
-    checkUnnamed1852(o.tags);
+    checkUnnamed1887(o.supportedAbis);
+    checkUnnamed1888(o.supportedVersionIds);
+    checkUnnamed1889(o.tags);
   }
   buildCounterAndroidModel--;
 }
 
-buildUnnamed1853() {
+buildUnnamed1890() {
   var o = new core.List<api.RoboDirective>();
   o.add(buildRoboDirective());
   o.add(buildRoboDirective());
   return o;
 }
 
-checkUnnamed1853(core.List<api.RoboDirective> o) {
+checkUnnamed1890(core.List<api.RoboDirective> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoboDirective(o[0]);
   checkRoboDirective(o[1]);
 }
 
-buildUnnamed1854() {
+buildUnnamed1891() {
   var o = new core.List<api.RoboStartingIntent>();
   o.add(buildRoboStartingIntent());
   o.add(buildRoboStartingIntent());
   return o;
 }
 
-checkUnnamed1854(core.List<api.RoboStartingIntent> o) {
+checkUnnamed1891(core.List<api.RoboStartingIntent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRoboStartingIntent(o[0]);
   checkRoboStartingIntent(o[1]);
@@ -412,8 +412,8 @@
     o.appPackageId = "foo";
     o.maxDepth = 42;
     o.maxSteps = 42;
-    o.roboDirectives = buildUnnamed1853();
-    o.startingIntents = buildUnnamed1854();
+    o.roboDirectives = buildUnnamed1890();
+    o.startingIntents = buildUnnamed1891();
   }
   buildCounterAndroidRoboTest--;
   return o;
@@ -427,33 +427,33 @@
     unittest.expect(o.appPackageId, unittest.equals('foo'));
     unittest.expect(o.maxDepth, unittest.equals(42));
     unittest.expect(o.maxSteps, unittest.equals(42));
-    checkUnnamed1853(o.roboDirectives);
-    checkUnnamed1854(o.startingIntents);
+    checkUnnamed1890(o.roboDirectives);
+    checkUnnamed1891(o.startingIntents);
   }
   buildCounterAndroidRoboTest--;
 }
 
-buildUnnamed1855() {
+buildUnnamed1892() {
   var o = new core.List<api.Locale>();
   o.add(buildLocale());
   o.add(buildLocale());
   return o;
 }
 
-checkUnnamed1855(core.List<api.Locale> o) {
+checkUnnamed1892(core.List<api.Locale> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocale(o[0]);
   checkLocale(o[1]);
 }
 
-buildUnnamed1856() {
+buildUnnamed1893() {
   var o = new core.List<api.Orientation>();
   o.add(buildOrientation());
   o.add(buildOrientation());
   return o;
 }
 
-checkUnnamed1856(core.List<api.Orientation> o) {
+checkUnnamed1893(core.List<api.Orientation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrientation(o[0]);
   checkOrientation(o[1]);
@@ -464,8 +464,8 @@
   var o = new api.AndroidRuntimeConfiguration();
   buildCounterAndroidRuntimeConfiguration++;
   if (buildCounterAndroidRuntimeConfiguration < 3) {
-    o.locales = buildUnnamed1855();
-    o.orientations = buildUnnamed1856();
+    o.locales = buildUnnamed1892();
+    o.orientations = buildUnnamed1893();
   }
   buildCounterAndroidRuntimeConfiguration--;
   return o;
@@ -474,33 +474,33 @@
 checkAndroidRuntimeConfiguration(api.AndroidRuntimeConfiguration o) {
   buildCounterAndroidRuntimeConfiguration++;
   if (buildCounterAndroidRuntimeConfiguration < 3) {
-    checkUnnamed1855(o.locales);
-    checkUnnamed1856(o.orientations);
+    checkUnnamed1892(o.locales);
+    checkUnnamed1893(o.orientations);
   }
   buildCounterAndroidRuntimeConfiguration--;
 }
 
-buildUnnamed1857() {
+buildUnnamed1894() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1857(core.List<core.String> o) {
+checkUnnamed1894(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1858() {
+buildUnnamed1895() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed1858(core.List<core.int> o) {
+checkUnnamed1895(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -513,8 +513,8 @@
   if (buildCounterAndroidTestLoop < 3) {
     o.appApk = buildFileReference();
     o.appPackageId = "foo";
-    o.scenarioLabels = buildUnnamed1857();
-    o.scenarios = buildUnnamed1858();
+    o.scenarioLabels = buildUnnamed1894();
+    o.scenarios = buildUnnamed1895();
   }
   buildCounterAndroidTestLoop--;
   return o;
@@ -525,20 +525,20 @@
   if (buildCounterAndroidTestLoop < 3) {
     checkFileReference(o.appApk);
     unittest.expect(o.appPackageId, unittest.equals('foo'));
-    checkUnnamed1857(o.scenarioLabels);
-    checkUnnamed1858(o.scenarios);
+    checkUnnamed1894(o.scenarioLabels);
+    checkUnnamed1895(o.scenarios);
   }
   buildCounterAndroidTestLoop--;
 }
 
-buildUnnamed1859() {
+buildUnnamed1896() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1859(core.List<core.String> o) {
+checkUnnamed1896(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -554,7 +554,7 @@
     o.distribution = buildDistribution();
     o.id = "foo";
     o.releaseDate = buildDate();
-    o.tags = buildUnnamed1859();
+    o.tags = buildUnnamed1896();
     o.versionString = "foo";
   }
   buildCounterAndroidVersion--;
@@ -569,7 +569,7 @@
     checkDistribution(o.distribution);
     unittest.expect(o.id, unittest.equals('foo'));
     checkDate(o.releaseDate);
-    checkUnnamed1859(o.tags);
+    checkUnnamed1896(o.tags);
     unittest.expect(o.versionString, unittest.equals('foo'));
   }
   buildCounterAndroidVersion--;
@@ -594,14 +594,14 @@
   buildCounterApkDetail--;
 }
 
-buildUnnamed1860() {
+buildUnnamed1897() {
   var o = new core.List<api.IntentFilter>();
   o.add(buildIntentFilter());
   o.add(buildIntentFilter());
   return o;
 }
 
-checkUnnamed1860(core.List<api.IntentFilter> o) {
+checkUnnamed1897(core.List<api.IntentFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkIntentFilter(o[0]);
   checkIntentFilter(o[1]);
@@ -613,7 +613,7 @@
   buildCounterApkManifest++;
   if (buildCounterApkManifest < 3) {
     o.applicationLabel = "foo";
-    o.intentFilters = buildUnnamed1860();
+    o.intentFilters = buildUnnamed1897();
     o.maxSdkVersion = 42;
     o.minSdkVersion = 42;
     o.packageName = "foo";
@@ -626,7 +626,7 @@
   buildCounterApkManifest++;
   if (buildCounterApkManifest < 3) {
     unittest.expect(o.applicationLabel, unittest.equals('foo'));
-    checkUnnamed1860(o.intentFilters);
+    checkUnnamed1897(o.intentFilters);
     unittest.expect(o.maxSdkVersion, unittest.equals(42));
     unittest.expect(o.minSdkVersion, unittest.equals(42));
     unittest.expect(o.packageName, unittest.equals('foo'));
@@ -653,14 +653,14 @@
   buildCounterCancelTestMatrixResponse--;
 }
 
-buildUnnamed1861() {
+buildUnnamed1898() {
   var o = new core.List<api.ClientInfoDetail>();
   o.add(buildClientInfoDetail());
   o.add(buildClientInfoDetail());
   return o;
 }
 
-checkUnnamed1861(core.List<api.ClientInfoDetail> o) {
+checkUnnamed1898(core.List<api.ClientInfoDetail> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClientInfoDetail(o[0]);
   checkClientInfoDetail(o[1]);
@@ -671,7 +671,7 @@
   var o = new api.ClientInfo();
   buildCounterClientInfo++;
   if (buildCounterClientInfo < 3) {
-    o.clientInfoDetails = buildUnnamed1861();
+    o.clientInfoDetails = buildUnnamed1898();
     o.name = "foo";
   }
   buildCounterClientInfo--;
@@ -681,7 +681,7 @@
 checkClientInfo(api.ClientInfo o) {
   buildCounterClientInfo++;
   if (buildCounterClientInfo < 3) {
-    checkUnnamed1861(o.clientInfoDetails);
+    checkUnnamed1898(o.clientInfoDetails);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterClientInfo--;
@@ -904,27 +904,27 @@
   buildCounterGoogleCloudStorage--;
 }
 
-buildUnnamed1862() {
+buildUnnamed1899() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1862(core.List<core.String> o) {
+checkUnnamed1899(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1863() {
+buildUnnamed1900() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1863(core.List<core.String> o) {
+checkUnnamed1900(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -935,8 +935,8 @@
   var o = new api.IntentFilter();
   buildCounterIntentFilter++;
   if (buildCounterIntentFilter < 3) {
-    o.actionNames = buildUnnamed1862();
-    o.categoryNames = buildUnnamed1863();
+    o.actionNames = buildUnnamed1899();
+    o.categoryNames = buildUnnamed1900();
     o.mimeType = "foo";
   }
   buildCounterIntentFilter--;
@@ -946,8 +946,8 @@
 checkIntentFilter(api.IntentFilter o) {
   buildCounterIntentFilter++;
   if (buildCounterIntentFilter < 3) {
-    checkUnnamed1862(o.actionNames);
-    checkUnnamed1863(o.categoryNames);
+    checkUnnamed1899(o.actionNames);
+    checkUnnamed1900(o.categoryNames);
     unittest.expect(o.mimeType, unittest.equals('foo'));
   }
   buildCounterIntentFilter--;
@@ -968,14 +968,14 @@
   buildCounterLauncherActivityIntent--;
 }
 
-buildUnnamed1864() {
+buildUnnamed1901() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1864(core.List<core.String> o) {
+checkUnnamed1901(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -989,7 +989,7 @@
     o.id = "foo";
     o.name = "foo";
     o.region = "foo";
-    o.tags = buildUnnamed1864();
+    o.tags = buildUnnamed1901();
   }
   buildCounterLocale--;
   return o;
@@ -1001,7 +1001,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.region, unittest.equals('foo'));
-    checkUnnamed1864(o.tags);
+    checkUnnamed1901(o.tags);
   }
   buildCounterLocale--;
 }
@@ -1029,14 +1029,14 @@
   buildCounterNetworkConfiguration--;
 }
 
-buildUnnamed1865() {
+buildUnnamed1902() {
   var o = new core.List<api.NetworkConfiguration>();
   o.add(buildNetworkConfiguration());
   o.add(buildNetworkConfiguration());
   return o;
 }
 
-checkUnnamed1865(core.List<api.NetworkConfiguration> o) {
+checkUnnamed1902(core.List<api.NetworkConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNetworkConfiguration(o[0]);
   checkNetworkConfiguration(o[1]);
@@ -1047,7 +1047,7 @@
   var o = new api.NetworkConfigurationCatalog();
   buildCounterNetworkConfigurationCatalog++;
   if (buildCounterNetworkConfigurationCatalog < 3) {
-    o.configurations = buildUnnamed1865();
+    o.configurations = buildUnnamed1902();
   }
   buildCounterNetworkConfigurationCatalog--;
   return o;
@@ -1056,7 +1056,7 @@
 checkNetworkConfigurationCatalog(api.NetworkConfigurationCatalog o) {
   buildCounterNetworkConfigurationCatalog++;
   if (buildCounterNetworkConfigurationCatalog < 3) {
-    checkUnnamed1865(o.configurations);
+    checkUnnamed1902(o.configurations);
   }
   buildCounterNetworkConfigurationCatalog--;
 }
@@ -1082,14 +1082,14 @@
   buildCounterObbFile--;
 }
 
-buildUnnamed1866() {
+buildUnnamed1903() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1866(core.List<core.String> o) {
+checkUnnamed1903(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1102,7 +1102,7 @@
   if (buildCounterOrientation < 3) {
     o.id = "foo";
     o.name = "foo";
-    o.tags = buildUnnamed1866();
+    o.tags = buildUnnamed1903();
   }
   buildCounterOrientation--;
   return o;
@@ -1113,7 +1113,7 @@
   if (buildCounterOrientation < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed1866(o.tags);
+    checkUnnamed1903(o.tags);
   }
   buildCounterOrientation--;
 }
@@ -1185,14 +1185,14 @@
   buildCounterRoboStartingIntent--;
 }
 
-buildUnnamed1867() {
+buildUnnamed1904() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1867(core.List<core.String> o) {
+checkUnnamed1904(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1204,7 +1204,7 @@
   buildCounterStartActivityIntent++;
   if (buildCounterStartActivityIntent < 3) {
     o.action = "foo";
-    o.categories = buildUnnamed1867();
+    o.categories = buildUnnamed1904();
     o.uri = "foo";
   }
   buildCounterStartActivityIntent--;
@@ -1215,20 +1215,20 @@
   buildCounterStartActivityIntent++;
   if (buildCounterStartActivityIntent < 3) {
     unittest.expect(o.action, unittest.equals('foo'));
-    checkUnnamed1867(o.categories);
+    checkUnnamed1904(o.categories);
     unittest.expect(o.uri, unittest.equals('foo'));
   }
   buildCounterStartActivityIntent--;
 }
 
-buildUnnamed1868() {
+buildUnnamed1905() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1868(core.List<core.String> o) {
+checkUnnamed1905(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1240,7 +1240,7 @@
   buildCounterTestDetails++;
   if (buildCounterTestDetails < 3) {
     o.errorMessage = "foo";
-    o.progressMessages = buildUnnamed1868();
+    o.progressMessages = buildUnnamed1905();
   }
   buildCounterTestDetails--;
   return o;
@@ -1250,7 +1250,7 @@
   buildCounterTestDetails++;
   if (buildCounterTestDetails < 3) {
     unittest.expect(o.errorMessage, unittest.equals('foo'));
-    checkUnnamed1868(o.progressMessages);
+    checkUnnamed1905(o.progressMessages);
   }
   buildCounterTestDetails--;
 }
@@ -1311,14 +1311,14 @@
   buildCounterTestExecution--;
 }
 
-buildUnnamed1869() {
+buildUnnamed1906() {
   var o = new core.List<api.TestExecution>();
   o.add(buildTestExecution());
   o.add(buildTestExecution());
   return o;
 }
 
-checkUnnamed1869(core.List<api.TestExecution> o) {
+checkUnnamed1906(core.List<api.TestExecution> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTestExecution(o[0]);
   checkTestExecution(o[1]);
@@ -1335,7 +1335,7 @@
     o.projectId = "foo";
     o.resultStorage = buildResultStorage();
     o.state = "foo";
-    o.testExecutions = buildUnnamed1869();
+    o.testExecutions = buildUnnamed1906();
     o.testMatrixId = "foo";
     o.testSpecification = buildTestSpecification();
     o.timestamp = "foo";
@@ -1353,7 +1353,7 @@
     unittest.expect(o.projectId, unittest.equals('foo'));
     checkResultStorage(o.resultStorage);
     unittest.expect(o.state, unittest.equals('foo'));
-    checkUnnamed1869(o.testExecutions);
+    checkUnnamed1906(o.testExecutions);
     unittest.expect(o.testMatrixId, unittest.equals('foo'));
     checkTestSpecification(o.testSpecification);
     unittest.expect(o.timestamp, unittest.equals('foo'));
@@ -1361,40 +1361,40 @@
   buildCounterTestMatrix--;
 }
 
-buildUnnamed1870() {
+buildUnnamed1907() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1870(core.List<core.String> o) {
+checkUnnamed1907(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1871() {
+buildUnnamed1908() {
   var o = new core.List<api.EnvironmentVariable>();
   o.add(buildEnvironmentVariable());
   o.add(buildEnvironmentVariable());
   return o;
 }
 
-checkUnnamed1871(core.List<api.EnvironmentVariable> o) {
+checkUnnamed1908(core.List<api.EnvironmentVariable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEnvironmentVariable(o[0]);
   checkEnvironmentVariable(o[1]);
 }
 
-buildUnnamed1872() {
+buildUnnamed1909() {
   var o = new core.List<api.DeviceFile>();
   o.add(buildDeviceFile());
   o.add(buildDeviceFile());
   return o;
 }
 
-checkUnnamed1872(core.List<api.DeviceFile> o) {
+checkUnnamed1909(core.List<api.DeviceFile> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDeviceFile(o[0]);
   checkDeviceFile(o[1]);
@@ -1406,9 +1406,9 @@
   buildCounterTestSetup++;
   if (buildCounterTestSetup < 3) {
     o.account = buildAccount();
-    o.directoriesToPull = buildUnnamed1870();
-    o.environmentVariables = buildUnnamed1871();
-    o.filesToPush = buildUnnamed1872();
+    o.directoriesToPull = buildUnnamed1907();
+    o.environmentVariables = buildUnnamed1908();
+    o.filesToPush = buildUnnamed1909();
     o.networkProfile = "foo";
   }
   buildCounterTestSetup--;
@@ -1419,9 +1419,9 @@
   buildCounterTestSetup++;
   if (buildCounterTestSetup < 3) {
     checkAccount(o.account);
-    checkUnnamed1870(o.directoriesToPull);
-    checkUnnamed1871(o.environmentVariables);
-    checkUnnamed1872(o.filesToPush);
+    checkUnnamed1907(o.directoriesToPull);
+    checkUnnamed1908(o.environmentVariables);
+    checkUnnamed1909(o.filesToPush);
     unittest.expect(o.networkProfile, unittest.equals('foo'));
   }
   buildCounterTestSetup--;
@@ -1983,7 +1983,7 @@
       }), true);
       res
           .getApkDetails(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetApkDetailsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetApkDetailsResponse(response);
       })));
     });
@@ -2055,7 +2055,7 @@
       }), true);
       res
           .cancel(arg_projectId, arg_testMatrixId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CancelTestMatrixResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCancelTestMatrixResponse(response);
       })));
     });
@@ -2123,7 +2123,7 @@
       res
           .create(arg_request, arg_projectId,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TestMatrix response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestMatrix(response);
       })));
     });
@@ -2187,7 +2187,7 @@
       }), true);
       res
           .get(arg_projectId, arg_testMatrixId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TestMatrix response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestMatrix(response);
       })));
     });
@@ -2247,7 +2247,7 @@
       res
           .get(arg_environmentType,
               projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TestEnvironmentCatalog response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestEnvironmentCatalog(response);
       })));
     });
diff --git a/generated/googleapis/test/translate/v2_test.dart b/generated/googleapis/test/translate/v2_test.dart
index c7acdab..40d0940 100644
--- a/generated/googleapis/test/translate/v2_test.dart
+++ b/generated/googleapis/test/translate/v2_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3734() {
+buildUnnamed81() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3734(core.List<core.String> o) {
+checkUnnamed81(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -68,7 +68,7 @@
   var o = new api.DetectLanguageRequest();
   buildCounterDetectLanguageRequest++;
   if (buildCounterDetectLanguageRequest < 3) {
-    o.q = buildUnnamed3734();
+    o.q = buildUnnamed81();
   }
   buildCounterDetectLanguageRequest--;
   return o;
@@ -77,19 +77,19 @@
 checkDetectLanguageRequest(api.DetectLanguageRequest o) {
   buildCounterDetectLanguageRequest++;
   if (buildCounterDetectLanguageRequest < 3) {
-    checkUnnamed3734(o.q);
+    checkUnnamed81(o.q);
   }
   buildCounterDetectLanguageRequest--;
 }
 
-buildUnnamed3735() {
+buildUnnamed82() {
   var o = new core.List<api.DetectionsResource>();
   o.add(buildDetectionsResource());
   o.add(buildDetectionsResource());
   return o;
 }
 
-checkUnnamed3735(core.List<api.DetectionsResource> o) {
+checkUnnamed82(core.List<api.DetectionsResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDetectionsResource(o[0]);
   checkDetectionsResource(o[1]);
@@ -100,7 +100,7 @@
   var o = new api.DetectionsListResponse();
   buildCounterDetectionsListResponse++;
   if (buildCounterDetectionsListResponse < 3) {
-    o.detections = buildUnnamed3735();
+    o.detections = buildUnnamed82();
   }
   buildCounterDetectionsListResponse--;
   return o;
@@ -109,7 +109,7 @@
 checkDetectionsListResponse(api.DetectionsListResponse o) {
   buildCounterDetectionsListResponse++;
   if (buildCounterDetectionsListResponse < 3) {
-    checkUnnamed3735(o.detections);
+    checkUnnamed82(o.detections);
   }
   buildCounterDetectionsListResponse--;
 }
@@ -169,14 +169,14 @@
   buildCounterGetSupportedLanguagesRequest--;
 }
 
-buildUnnamed3736() {
+buildUnnamed83() {
   var o = new core.List<api.LanguagesResource>();
   o.add(buildLanguagesResource());
   o.add(buildLanguagesResource());
   return o;
 }
 
-checkUnnamed3736(core.List<api.LanguagesResource> o) {
+checkUnnamed83(core.List<api.LanguagesResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLanguagesResource(o[0]);
   checkLanguagesResource(o[1]);
@@ -187,7 +187,7 @@
   var o = new api.LanguagesListResponse();
   buildCounterLanguagesListResponse++;
   if (buildCounterLanguagesListResponse < 3) {
-    o.languages = buildUnnamed3736();
+    o.languages = buildUnnamed83();
   }
   buildCounterLanguagesListResponse--;
   return o;
@@ -196,7 +196,7 @@
 checkLanguagesListResponse(api.LanguagesListResponse o) {
   buildCounterLanguagesListResponse++;
   if (buildCounterLanguagesListResponse < 3) {
-    checkUnnamed3736(o.languages);
+    checkUnnamed83(o.languages);
   }
   buildCounterLanguagesListResponse--;
 }
@@ -222,14 +222,14 @@
   buildCounterLanguagesResource--;
 }
 
-buildUnnamed3737() {
+buildUnnamed84() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3737(core.List<core.String> o) {
+checkUnnamed84(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -242,7 +242,7 @@
   if (buildCounterTranslateTextRequest < 3) {
     o.format = "foo";
     o.model = "foo";
-    o.q = buildUnnamed3737();
+    o.q = buildUnnamed84();
     o.source = "foo";
     o.target = "foo";
   }
@@ -255,21 +255,21 @@
   if (buildCounterTranslateTextRequest < 3) {
     unittest.expect(o.format, unittest.equals('foo'));
     unittest.expect(o.model, unittest.equals('foo'));
-    checkUnnamed3737(o.q);
+    checkUnnamed84(o.q);
     unittest.expect(o.source, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
   }
   buildCounterTranslateTextRequest--;
 }
 
-buildUnnamed3738() {
+buildUnnamed85() {
   var o = new core.List<api.TranslationsResource>();
   o.add(buildTranslationsResource());
   o.add(buildTranslationsResource());
   return o;
 }
 
-checkUnnamed3738(core.List<api.TranslationsResource> o) {
+checkUnnamed85(core.List<api.TranslationsResource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTranslationsResource(o[0]);
   checkTranslationsResource(o[1]);
@@ -280,7 +280,7 @@
   var o = new api.TranslationsListResponse();
   buildCounterTranslationsListResponse++;
   if (buildCounterTranslationsListResponse < 3) {
-    o.translations = buildUnnamed3738();
+    o.translations = buildUnnamed85();
   }
   buildCounterTranslationsListResponse--;
   return o;
@@ -289,7 +289,7 @@
 checkTranslationsListResponse(api.TranslationsListResponse o) {
   buildCounterTranslationsListResponse++;
   if (buildCounterTranslationsListResponse < 3) {
-    checkUnnamed3738(o.translations);
+    checkUnnamed85(o.translations);
   }
   buildCounterTranslationsListResponse--;
 }
@@ -317,40 +317,40 @@
   buildCounterTranslationsResource--;
 }
 
-buildUnnamed3739() {
+buildUnnamed86() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3739(core.List<core.String> o) {
+checkUnnamed86(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3740() {
+buildUnnamed87() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3740(core.List<core.String> o) {
+checkUnnamed87(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3741() {
+buildUnnamed88() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3741(core.List<core.String> o) {
+checkUnnamed88(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -489,7 +489,7 @@
       }), true);
       res
           .detect(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DetectionsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDetectionsListResponse(response);
       })));
     });
@@ -497,7 +497,7 @@
     unittest.test("method--list", () {
       var mock = new HttpServerMock();
       api.DetectionsResourceApi res = new api.TranslateApi(mock).detections;
-      var arg_q = buildUnnamed3739();
+      var arg_q = buildUnnamed86();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -543,7 +543,7 @@
       }), true);
       res
           .list(arg_q, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DetectionsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDetectionsListResponse(response);
       })));
     });
@@ -601,7 +601,7 @@
       }), true);
       res
           .list(target: arg_target, model: arg_model, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LanguagesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLanguagesListResponse(response);
       })));
     });
@@ -611,9 +611,9 @@
     unittest.test("method--list", () {
       var mock = new HttpServerMock();
       api.TranslationsResourceApi res = new api.TranslateApi(mock).translations;
-      var arg_q = buildUnnamed3740();
+      var arg_q = buildUnnamed87();
       var arg_target = "foo";
-      var arg_cid = buildUnnamed3741();
+      var arg_cid = buildUnnamed88();
       var arg_format = "foo";
       var arg_model = "foo";
       var arg_source = "foo";
@@ -672,7 +672,7 @@
               model: arg_model,
               source: arg_source,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TranslationsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTranslationsListResponse(response);
       })));
     });
@@ -728,7 +728,7 @@
       }), true);
       res
           .translate(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TranslationsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTranslationsListResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/urlshortener/v1_test.dart b/generated/googleapis/test/urlshortener/v1_test.dart
index 8b105dc..043cca2 100644
--- a/generated/googleapis/test/urlshortener/v1_test.dart
+++ b/generated/googleapis/test/urlshortener/v1_test.dart
@@ -50,53 +50,53 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2() {
+buildUnnamed199() {
   var o = new core.List<api.StringCount>();
   o.add(buildStringCount());
   o.add(buildStringCount());
   return o;
 }
 
-checkUnnamed2(core.List<api.StringCount> o) {
+checkUnnamed199(core.List<api.StringCount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStringCount(o[0]);
   checkStringCount(o[1]);
 }
 
-buildUnnamed3() {
+buildUnnamed200() {
   var o = new core.List<api.StringCount>();
   o.add(buildStringCount());
   o.add(buildStringCount());
   return o;
 }
 
-checkUnnamed3(core.List<api.StringCount> o) {
+checkUnnamed200(core.List<api.StringCount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStringCount(o[0]);
   checkStringCount(o[1]);
 }
 
-buildUnnamed4() {
+buildUnnamed201() {
   var o = new core.List<api.StringCount>();
   o.add(buildStringCount());
   o.add(buildStringCount());
   return o;
 }
 
-checkUnnamed4(core.List<api.StringCount> o) {
+checkUnnamed201(core.List<api.StringCount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStringCount(o[0]);
   checkStringCount(o[1]);
 }
 
-buildUnnamed5() {
+buildUnnamed202() {
   var o = new core.List<api.StringCount>();
   o.add(buildStringCount());
   o.add(buildStringCount());
   return o;
 }
 
-checkUnnamed5(core.List<api.StringCount> o) {
+checkUnnamed202(core.List<api.StringCount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStringCount(o[0]);
   checkStringCount(o[1]);
@@ -107,11 +107,11 @@
   var o = new api.AnalyticsSnapshot();
   buildCounterAnalyticsSnapshot++;
   if (buildCounterAnalyticsSnapshot < 3) {
-    o.browsers = buildUnnamed2();
-    o.countries = buildUnnamed3();
+    o.browsers = buildUnnamed199();
+    o.countries = buildUnnamed200();
     o.longUrlClicks = "foo";
-    o.platforms = buildUnnamed4();
-    o.referrers = buildUnnamed5();
+    o.platforms = buildUnnamed201();
+    o.referrers = buildUnnamed202();
     o.shortUrlClicks = "foo";
   }
   buildCounterAnalyticsSnapshot--;
@@ -121,11 +121,11 @@
 checkAnalyticsSnapshot(api.AnalyticsSnapshot o) {
   buildCounterAnalyticsSnapshot++;
   if (buildCounterAnalyticsSnapshot < 3) {
-    checkUnnamed2(o.browsers);
-    checkUnnamed3(o.countries);
+    checkUnnamed199(o.browsers);
+    checkUnnamed200(o.countries);
     unittest.expect(o.longUrlClicks, unittest.equals('foo'));
-    checkUnnamed4(o.platforms);
-    checkUnnamed5(o.referrers);
+    checkUnnamed201(o.platforms);
+    checkUnnamed202(o.referrers);
     unittest.expect(o.shortUrlClicks, unittest.equals('foo'));
   }
   buildCounterAnalyticsSnapshot--;
@@ -208,14 +208,14 @@
   buildCounterUrl--;
 }
 
-buildUnnamed6() {
+buildUnnamed203() {
   var o = new core.List<api.Url>();
   o.add(buildUrl());
   o.add(buildUrl());
   return o;
 }
 
-checkUnnamed6(core.List<api.Url> o) {
+checkUnnamed203(core.List<api.Url> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrl(o[0]);
   checkUrl(o[1]);
@@ -226,7 +226,7 @@
   var o = new api.UrlHistory();
   buildCounterUrlHistory++;
   if (buildCounterUrlHistory < 3) {
-    o.items = buildUnnamed6();
+    o.items = buildUnnamed203();
     o.itemsPerPage = 42;
     o.kind = "foo";
     o.nextPageToken = "foo";
@@ -239,7 +239,7 @@
 checkUrlHistory(api.UrlHistory o) {
   buildCounterUrlHistory++;
   if (buildCounterUrlHistory < 3) {
-    checkUnnamed6(o.items);
+    checkUnnamed203(o.items);
     unittest.expect(o.itemsPerPage, unittest.equals(42));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -343,7 +343,7 @@
       }), true);
       res
           .get(arg_shortUrl, projection: arg_projection, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Url response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrl(response);
       })));
     });
@@ -399,7 +399,7 @@
       }), true);
       res
           .insert(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Url response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrl(response);
       })));
     });
@@ -460,7 +460,7 @@
               projection: arg_projection,
               start_token: arg_start_token,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UrlHistory response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlHistory(response);
       })));
     });
diff --git a/generated/googleapis/test/vault/v1_test.dart b/generated/googleapis/test/vault/v1_test.dart
index e65ae42..ba21079 100644
--- a/generated/googleapis/test/vault/v1_test.dart
+++ b/generated/googleapis/test/vault/v1_test.dart
@@ -252,14 +252,14 @@
   buildCounterHeldOrgUnit--;
 }
 
-buildUnnamed207() {
+buildUnnamed2451() {
   var o = new core.List<api.HeldAccount>();
   o.add(buildHeldAccount());
   o.add(buildHeldAccount());
   return o;
 }
 
-checkUnnamed207(core.List<api.HeldAccount> o) {
+checkUnnamed2451(core.List<api.HeldAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHeldAccount(o[0]);
   checkHeldAccount(o[1]);
@@ -270,7 +270,7 @@
   var o = new api.Hold();
   buildCounterHold++;
   if (buildCounterHold < 3) {
-    o.accounts = buildUnnamed207();
+    o.accounts = buildUnnamed2451();
     o.corpus = "foo";
     o.holdId = "foo";
     o.name = "foo";
@@ -285,7 +285,7 @@
 checkHold(api.Hold o) {
   buildCounterHold++;
   if (buildCounterHold < 3) {
-    checkUnnamed207(o.accounts);
+    checkUnnamed2451(o.accounts);
     unittest.expect(o.corpus, unittest.equals('foo'));
     unittest.expect(o.holdId, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -296,14 +296,14 @@
   buildCounterHold--;
 }
 
-buildUnnamed208() {
+buildUnnamed2452() {
   var o = new core.List<api.HeldAccount>();
   o.add(buildHeldAccount());
   o.add(buildHeldAccount());
   return o;
 }
 
-checkUnnamed208(core.List<api.HeldAccount> o) {
+checkUnnamed2452(core.List<api.HeldAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHeldAccount(o[0]);
   checkHeldAccount(o[1]);
@@ -314,7 +314,7 @@
   var o = new api.ListHeldAccountsResponse();
   buildCounterListHeldAccountsResponse++;
   if (buildCounterListHeldAccountsResponse < 3) {
-    o.accounts = buildUnnamed208();
+    o.accounts = buildUnnamed2452();
   }
   buildCounterListHeldAccountsResponse--;
   return o;
@@ -323,19 +323,19 @@
 checkListHeldAccountsResponse(api.ListHeldAccountsResponse o) {
   buildCounterListHeldAccountsResponse++;
   if (buildCounterListHeldAccountsResponse < 3) {
-    checkUnnamed208(o.accounts);
+    checkUnnamed2452(o.accounts);
   }
   buildCounterListHeldAccountsResponse--;
 }
 
-buildUnnamed209() {
+buildUnnamed2453() {
   var o = new core.List<api.Hold>();
   o.add(buildHold());
   o.add(buildHold());
   return o;
 }
 
-checkUnnamed209(core.List<api.Hold> o) {
+checkUnnamed2453(core.List<api.Hold> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHold(o[0]);
   checkHold(o[1]);
@@ -346,7 +346,7 @@
   var o = new api.ListHoldsResponse();
   buildCounterListHoldsResponse++;
   if (buildCounterListHoldsResponse < 3) {
-    o.holds = buildUnnamed209();
+    o.holds = buildUnnamed2453();
     o.nextPageToken = "foo";
   }
   buildCounterListHoldsResponse--;
@@ -356,20 +356,20 @@
 checkListHoldsResponse(api.ListHoldsResponse o) {
   buildCounterListHoldsResponse++;
   if (buildCounterListHoldsResponse < 3) {
-    checkUnnamed209(o.holds);
+    checkUnnamed2453(o.holds);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListHoldsResponse--;
 }
 
-buildUnnamed210() {
+buildUnnamed2454() {
   var o = new core.List<api.Matter>();
   o.add(buildMatter());
   o.add(buildMatter());
   return o;
 }
 
-checkUnnamed210(core.List<api.Matter> o) {
+checkUnnamed2454(core.List<api.Matter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMatter(o[0]);
   checkMatter(o[1]);
@@ -380,7 +380,7 @@
   var o = new api.ListMattersResponse();
   buildCounterListMattersResponse++;
   if (buildCounterListMattersResponse < 3) {
-    o.matters = buildUnnamed210();
+    o.matters = buildUnnamed2454();
     o.nextPageToken = "foo";
   }
   buildCounterListMattersResponse--;
@@ -390,20 +390,20 @@
 checkListMattersResponse(api.ListMattersResponse o) {
   buildCounterListMattersResponse++;
   if (buildCounterListMattersResponse < 3) {
-    checkUnnamed210(o.matters);
+    checkUnnamed2454(o.matters);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListMattersResponse--;
 }
 
-buildUnnamed211() {
+buildUnnamed2455() {
   var o = new core.List<api.MatterPermission>();
   o.add(buildMatterPermission());
   o.add(buildMatterPermission());
   return o;
 }
 
-checkUnnamed211(core.List<api.MatterPermission> o) {
+checkUnnamed2455(core.List<api.MatterPermission> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMatterPermission(o[0]);
   checkMatterPermission(o[1]);
@@ -416,7 +416,7 @@
   if (buildCounterMatter < 3) {
     o.description = "foo";
     o.matterId = "foo";
-    o.matterPermissions = buildUnnamed211();
+    o.matterPermissions = buildUnnamed2455();
     o.name = "foo";
     o.state = "foo";
   }
@@ -429,7 +429,7 @@
   if (buildCounterMatter < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.matterId, unittest.equals('foo'));
-    checkUnnamed211(o.matterPermissions);
+    checkUnnamed2455(o.matterPermissions);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
   }
@@ -745,7 +745,7 @@
       }), true);
       res
           .addPermissions(arg_request, arg_matterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.MatterPermission response) {
+          .then(unittest.expectAsync1(((response) {
         checkMatterPermission(response);
       })));
     });
@@ -808,7 +808,7 @@
       }), true);
       res
           .close(arg_request, arg_matterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CloseMatterResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCloseMatterResponse(response);
       })));
     });
@@ -861,7 +861,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Matter response) {
+          .then(unittest.expectAsync1(((response) {
         checkMatter(response);
       })));
     });
@@ -914,7 +914,7 @@
       }), true);
       res
           .delete(arg_matterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Matter response) {
+          .then(unittest.expectAsync1(((response) {
         checkMatter(response);
       })));
     });
@@ -969,7 +969,7 @@
       }), true);
       res
           .get(arg_matterId, view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Matter response) {
+          .then(unittest.expectAsync1(((response) {
         checkMatter(response);
       })));
     });
@@ -1033,7 +1033,7 @@
               pageSize: arg_pageSize,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListMattersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListMattersResponse(response);
       })));
     });
@@ -1096,7 +1096,7 @@
       }), true);
       res
           .removePermissions(arg_request, arg_matterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1159,7 +1159,7 @@
       }), true);
       res
           .reopen(arg_request, arg_matterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReopenMatterResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkReopenMatterResponse(response);
       })));
     });
@@ -1222,7 +1222,7 @@
       }), true);
       res
           .undelete(arg_request, arg_matterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Matter response) {
+          .then(unittest.expectAsync1(((response) {
         checkMatter(response);
       })));
     });
@@ -1279,7 +1279,7 @@
       }), true);
       res
           .update(arg_request, arg_matterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Matter response) {
+          .then(unittest.expectAsync1(((response) {
         checkMatter(response);
       })));
     });
@@ -1344,7 +1344,7 @@
       }), true);
       res
           .create(arg_request, arg_matterId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Hold response) {
+          .then(unittest.expectAsync1(((response) {
         checkHold(response);
       })));
     });
@@ -1407,7 +1407,7 @@
       }), true);
       res
           .delete(arg_matterId, arg_holdId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1470,7 +1470,7 @@
       }), true);
       res
           .get(arg_matterId, arg_holdId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Hold response) {
+          .then(unittest.expectAsync1(((response) {
         checkHold(response);
       })));
     });
@@ -1538,7 +1538,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListHoldsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListHoldsResponse(response);
       })));
     });
@@ -1605,7 +1605,7 @@
       }), true);
       res
           .update(arg_request, arg_matterId, arg_holdId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Hold response) {
+          .then(unittest.expectAsync1(((response) {
         checkHold(response);
       })));
     });
@@ -1681,7 +1681,7 @@
       }), true);
       res
           .create(arg_request, arg_matterId, arg_holdId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.HeldAccount response) {
+          .then(unittest.expectAsync1(((response) {
         checkHeldAccount(response);
       })));
     });
@@ -1755,7 +1755,7 @@
       }), true);
       res
           .delete(arg_matterId, arg_holdId, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1825,7 +1825,7 @@
       }), true);
       res
           .list(arg_matterId, arg_holdId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListHeldAccountsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListHeldAccountsResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/vision/v1_test.dart b/generated/googleapis/test/vision/v1_test.dart
index 6e53214..1d5d744 100644
--- a/generated/googleapis/test/vision/v1_test.dart
+++ b/generated/googleapis/test/vision/v1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3443() {
+buildUnnamed1186() {
   var o = new core.List<api.Feature>();
   o.add(buildFeature());
   o.add(buildFeature());
   return o;
 }
 
-checkUnnamed3443(core.List<api.Feature> o) {
+checkUnnamed1186(core.List<api.Feature> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFeature(o[0]);
   checkFeature(o[1]);
@@ -68,7 +68,7 @@
   var o = new api.AnnotateImageRequest();
   buildCounterAnnotateImageRequest++;
   if (buildCounterAnnotateImageRequest < 3) {
-    o.features = buildUnnamed3443();
+    o.features = buildUnnamed1186();
     o.image = buildImage();
     o.imageContext = buildImageContext();
   }
@@ -79,73 +79,73 @@
 checkAnnotateImageRequest(api.AnnotateImageRequest o) {
   buildCounterAnnotateImageRequest++;
   if (buildCounterAnnotateImageRequest < 3) {
-    checkUnnamed3443(o.features);
+    checkUnnamed1186(o.features);
     checkImage(o.image);
     checkImageContext(o.imageContext);
   }
   buildCounterAnnotateImageRequest--;
 }
 
-buildUnnamed3444() {
+buildUnnamed1187() {
   var o = new core.List<api.FaceAnnotation>();
   o.add(buildFaceAnnotation());
   o.add(buildFaceAnnotation());
   return o;
 }
 
-checkUnnamed3444(core.List<api.FaceAnnotation> o) {
+checkUnnamed1187(core.List<api.FaceAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFaceAnnotation(o[0]);
   checkFaceAnnotation(o[1]);
 }
 
-buildUnnamed3445() {
+buildUnnamed1188() {
   var o = new core.List<api.EntityAnnotation>();
   o.add(buildEntityAnnotation());
   o.add(buildEntityAnnotation());
   return o;
 }
 
-checkUnnamed3445(core.List<api.EntityAnnotation> o) {
+checkUnnamed1188(core.List<api.EntityAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityAnnotation(o[0]);
   checkEntityAnnotation(o[1]);
 }
 
-buildUnnamed3446() {
+buildUnnamed1189() {
   var o = new core.List<api.EntityAnnotation>();
   o.add(buildEntityAnnotation());
   o.add(buildEntityAnnotation());
   return o;
 }
 
-checkUnnamed3446(core.List<api.EntityAnnotation> o) {
+checkUnnamed1189(core.List<api.EntityAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityAnnotation(o[0]);
   checkEntityAnnotation(o[1]);
 }
 
-buildUnnamed3447() {
+buildUnnamed1190() {
   var o = new core.List<api.EntityAnnotation>();
   o.add(buildEntityAnnotation());
   o.add(buildEntityAnnotation());
   return o;
 }
 
-checkUnnamed3447(core.List<api.EntityAnnotation> o) {
+checkUnnamed1190(core.List<api.EntityAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityAnnotation(o[0]);
   checkEntityAnnotation(o[1]);
 }
 
-buildUnnamed3448() {
+buildUnnamed1191() {
   var o = new core.List<api.EntityAnnotation>();
   o.add(buildEntityAnnotation());
   o.add(buildEntityAnnotation());
   return o;
 }
 
-checkUnnamed3448(core.List<api.EntityAnnotation> o) {
+checkUnnamed1191(core.List<api.EntityAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityAnnotation(o[0]);
   checkEntityAnnotation(o[1]);
@@ -158,14 +158,14 @@
   if (buildCounterAnnotateImageResponse < 3) {
     o.cropHintsAnnotation = buildCropHintsAnnotation();
     o.error = buildStatus();
-    o.faceAnnotations = buildUnnamed3444();
+    o.faceAnnotations = buildUnnamed1187();
     o.fullTextAnnotation = buildTextAnnotation();
     o.imagePropertiesAnnotation = buildImageProperties();
-    o.labelAnnotations = buildUnnamed3445();
-    o.landmarkAnnotations = buildUnnamed3446();
-    o.logoAnnotations = buildUnnamed3447();
+    o.labelAnnotations = buildUnnamed1188();
+    o.landmarkAnnotations = buildUnnamed1189();
+    o.logoAnnotations = buildUnnamed1190();
     o.safeSearchAnnotation = buildSafeSearchAnnotation();
-    o.textAnnotations = buildUnnamed3448();
+    o.textAnnotations = buildUnnamed1191();
     o.webDetection = buildWebDetection();
   }
   buildCounterAnnotateImageResponse--;
@@ -177,27 +177,27 @@
   if (buildCounterAnnotateImageResponse < 3) {
     checkCropHintsAnnotation(o.cropHintsAnnotation);
     checkStatus(o.error);
-    checkUnnamed3444(o.faceAnnotations);
+    checkUnnamed1187(o.faceAnnotations);
     checkTextAnnotation(o.fullTextAnnotation);
     checkImageProperties(o.imagePropertiesAnnotation);
-    checkUnnamed3445(o.labelAnnotations);
-    checkUnnamed3446(o.landmarkAnnotations);
-    checkUnnamed3447(o.logoAnnotations);
+    checkUnnamed1188(o.labelAnnotations);
+    checkUnnamed1189(o.landmarkAnnotations);
+    checkUnnamed1190(o.logoAnnotations);
     checkSafeSearchAnnotation(o.safeSearchAnnotation);
-    checkUnnamed3448(o.textAnnotations);
+    checkUnnamed1191(o.textAnnotations);
     checkWebDetection(o.webDetection);
   }
   buildCounterAnnotateImageResponse--;
 }
 
-buildUnnamed3449() {
+buildUnnamed1192() {
   var o = new core.List<api.AnnotateImageRequest>();
   o.add(buildAnnotateImageRequest());
   o.add(buildAnnotateImageRequest());
   return o;
 }
 
-checkUnnamed3449(core.List<api.AnnotateImageRequest> o) {
+checkUnnamed1192(core.List<api.AnnotateImageRequest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnnotateImageRequest(o[0]);
   checkAnnotateImageRequest(o[1]);
@@ -208,7 +208,7 @@
   var o = new api.BatchAnnotateImagesRequest();
   buildCounterBatchAnnotateImagesRequest++;
   if (buildCounterBatchAnnotateImagesRequest < 3) {
-    o.requests = buildUnnamed3449();
+    o.requests = buildUnnamed1192();
   }
   buildCounterBatchAnnotateImagesRequest--;
   return o;
@@ -217,19 +217,19 @@
 checkBatchAnnotateImagesRequest(api.BatchAnnotateImagesRequest o) {
   buildCounterBatchAnnotateImagesRequest++;
   if (buildCounterBatchAnnotateImagesRequest < 3) {
-    checkUnnamed3449(o.requests);
+    checkUnnamed1192(o.requests);
   }
   buildCounterBatchAnnotateImagesRequest--;
 }
 
-buildUnnamed3450() {
+buildUnnamed1193() {
   var o = new core.List<api.AnnotateImageResponse>();
   o.add(buildAnnotateImageResponse());
   o.add(buildAnnotateImageResponse());
   return o;
 }
 
-checkUnnamed3450(core.List<api.AnnotateImageResponse> o) {
+checkUnnamed1193(core.List<api.AnnotateImageResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAnnotateImageResponse(o[0]);
   checkAnnotateImageResponse(o[1]);
@@ -240,7 +240,7 @@
   var o = new api.BatchAnnotateImagesResponse();
   buildCounterBatchAnnotateImagesResponse++;
   if (buildCounterBatchAnnotateImagesResponse < 3) {
-    o.responses = buildUnnamed3450();
+    o.responses = buildUnnamed1193();
   }
   buildCounterBatchAnnotateImagesResponse--;
   return o;
@@ -249,19 +249,19 @@
 checkBatchAnnotateImagesResponse(api.BatchAnnotateImagesResponse o) {
   buildCounterBatchAnnotateImagesResponse++;
   if (buildCounterBatchAnnotateImagesResponse < 3) {
-    checkUnnamed3450(o.responses);
+    checkUnnamed1193(o.responses);
   }
   buildCounterBatchAnnotateImagesResponse--;
 }
 
-buildUnnamed3451() {
+buildUnnamed1194() {
   var o = new core.List<api.Paragraph>();
   o.add(buildParagraph());
   o.add(buildParagraph());
   return o;
 }
 
-checkUnnamed3451(core.List<api.Paragraph> o) {
+checkUnnamed1194(core.List<api.Paragraph> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParagraph(o[0]);
   checkParagraph(o[1]);
@@ -275,7 +275,7 @@
     o.blockType = "foo";
     o.boundingBox = buildBoundingPoly();
     o.confidence = 42.0;
-    o.paragraphs = buildUnnamed3451();
+    o.paragraphs = buildUnnamed1194();
     o.property = buildTextProperty();
   }
   buildCounterBlock--;
@@ -288,20 +288,20 @@
     unittest.expect(o.blockType, unittest.equals('foo'));
     checkBoundingPoly(o.boundingBox);
     unittest.expect(o.confidence, unittest.equals(42.0));
-    checkUnnamed3451(o.paragraphs);
+    checkUnnamed1194(o.paragraphs);
     checkTextProperty(o.property);
   }
   buildCounterBlock--;
 }
 
-buildUnnamed3452() {
+buildUnnamed1195() {
   var o = new core.List<api.Vertex>();
   o.add(buildVertex());
   o.add(buildVertex());
   return o;
 }
 
-checkUnnamed3452(core.List<api.Vertex> o) {
+checkUnnamed1195(core.List<api.Vertex> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVertex(o[0]);
   checkVertex(o[1]);
@@ -312,7 +312,7 @@
   var o = new api.BoundingPoly();
   buildCounterBoundingPoly++;
   if (buildCounterBoundingPoly < 3) {
-    o.vertices = buildUnnamed3452();
+    o.vertices = buildUnnamed1195();
   }
   buildCounterBoundingPoly--;
   return o;
@@ -321,7 +321,7 @@
 checkBoundingPoly(api.BoundingPoly o) {
   buildCounterBoundingPoly++;
   if (buildCounterBoundingPoly < 3) {
-    checkUnnamed3452(o.vertices);
+    checkUnnamed1195(o.vertices);
   }
   buildCounterBoundingPoly--;
 }
@@ -397,14 +397,14 @@
   buildCounterCropHint--;
 }
 
-buildUnnamed3453() {
+buildUnnamed1196() {
   var o = new core.List<api.CropHint>();
   o.add(buildCropHint());
   o.add(buildCropHint());
   return o;
 }
 
-checkUnnamed3453(core.List<api.CropHint> o) {
+checkUnnamed1196(core.List<api.CropHint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCropHint(o[0]);
   checkCropHint(o[1]);
@@ -415,7 +415,7 @@
   var o = new api.CropHintsAnnotation();
   buildCounterCropHintsAnnotation++;
   if (buildCounterCropHintsAnnotation < 3) {
-    o.cropHints = buildUnnamed3453();
+    o.cropHints = buildUnnamed1196();
   }
   buildCounterCropHintsAnnotation--;
   return o;
@@ -424,19 +424,19 @@
 checkCropHintsAnnotation(api.CropHintsAnnotation o) {
   buildCounterCropHintsAnnotation++;
   if (buildCounterCropHintsAnnotation < 3) {
-    checkUnnamed3453(o.cropHints);
+    checkUnnamed1196(o.cropHints);
   }
   buildCounterCropHintsAnnotation--;
 }
 
-buildUnnamed3454() {
+buildUnnamed1197() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed3454(core.List<core.double> o) {
+checkUnnamed1197(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -447,7 +447,7 @@
   var o = new api.CropHintsParams();
   buildCounterCropHintsParams++;
   if (buildCounterCropHintsParams < 3) {
-    o.aspectRatios = buildUnnamed3454();
+    o.aspectRatios = buildUnnamed1197();
   }
   buildCounterCropHintsParams--;
   return o;
@@ -456,7 +456,7 @@
 checkCropHintsParams(api.CropHintsParams o) {
   buildCounterCropHintsParams++;
   if (buildCounterCropHintsParams < 3) {
-    checkUnnamed3454(o.aspectRatios);
+    checkUnnamed1197(o.aspectRatios);
   }
   buildCounterCropHintsParams--;
 }
@@ -503,14 +503,14 @@
   buildCounterDetectedLanguage--;
 }
 
-buildUnnamed3455() {
+buildUnnamed1198() {
   var o = new core.List<api.ColorInfo>();
   o.add(buildColorInfo());
   o.add(buildColorInfo());
   return o;
 }
 
-checkUnnamed3455(core.List<api.ColorInfo> o) {
+checkUnnamed1198(core.List<api.ColorInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkColorInfo(o[0]);
   checkColorInfo(o[1]);
@@ -521,7 +521,7 @@
   var o = new api.DominantColorsAnnotation();
   buildCounterDominantColorsAnnotation++;
   if (buildCounterDominantColorsAnnotation < 3) {
-    o.colors = buildUnnamed3455();
+    o.colors = buildUnnamed1198();
   }
   buildCounterDominantColorsAnnotation--;
   return o;
@@ -530,32 +530,32 @@
 checkDominantColorsAnnotation(api.DominantColorsAnnotation o) {
   buildCounterDominantColorsAnnotation++;
   if (buildCounterDominantColorsAnnotation < 3) {
-    checkUnnamed3455(o.colors);
+    checkUnnamed1198(o.colors);
   }
   buildCounterDominantColorsAnnotation--;
 }
 
-buildUnnamed3456() {
+buildUnnamed1199() {
   var o = new core.List<api.LocationInfo>();
   o.add(buildLocationInfo());
   o.add(buildLocationInfo());
   return o;
 }
 
-checkUnnamed3456(core.List<api.LocationInfo> o) {
+checkUnnamed1199(core.List<api.LocationInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocationInfo(o[0]);
   checkLocationInfo(o[1]);
 }
 
-buildUnnamed3457() {
+buildUnnamed1200() {
   var o = new core.List<api.Property>();
   o.add(buildProperty());
   o.add(buildProperty());
   return o;
 }
 
-checkUnnamed3457(core.List<api.Property> o) {
+checkUnnamed1200(core.List<api.Property> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProperty(o[0]);
   checkProperty(o[1]);
@@ -570,9 +570,9 @@
     o.confidence = 42.0;
     o.description = "foo";
     o.locale = "foo";
-    o.locations = buildUnnamed3456();
+    o.locations = buildUnnamed1199();
     o.mid = "foo";
-    o.properties = buildUnnamed3457();
+    o.properties = buildUnnamed1200();
     o.score = 42.0;
     o.topicality = 42.0;
   }
@@ -587,23 +587,23 @@
     unittest.expect(o.confidence, unittest.equals(42.0));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.locale, unittest.equals('foo'));
-    checkUnnamed3456(o.locations);
+    checkUnnamed1199(o.locations);
     unittest.expect(o.mid, unittest.equals('foo'));
-    checkUnnamed3457(o.properties);
+    checkUnnamed1200(o.properties);
     unittest.expect(o.score, unittest.equals(42.0));
     unittest.expect(o.topicality, unittest.equals(42.0));
   }
   buildCounterEntityAnnotation--;
 }
 
-buildUnnamed3458() {
+buildUnnamed1201() {
   var o = new core.List<api.Landmark>();
   o.add(buildLandmark());
   o.add(buildLandmark());
   return o;
 }
 
-checkUnnamed3458(core.List<api.Landmark> o) {
+checkUnnamed1201(core.List<api.Landmark> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLandmark(o[0]);
   checkLandmark(o[1]);
@@ -622,7 +622,7 @@
     o.headwearLikelihood = "foo";
     o.joyLikelihood = "foo";
     o.landmarkingConfidence = 42.0;
-    o.landmarks = buildUnnamed3458();
+    o.landmarks = buildUnnamed1201();
     o.panAngle = 42.0;
     o.rollAngle = 42.0;
     o.sorrowLikelihood = "foo";
@@ -645,7 +645,7 @@
     unittest.expect(o.headwearLikelihood, unittest.equals('foo'));
     unittest.expect(o.joyLikelihood, unittest.equals('foo'));
     unittest.expect(o.landmarkingConfidence, unittest.equals(42.0));
-    checkUnnamed3458(o.landmarks);
+    checkUnnamed1201(o.landmarks);
     unittest.expect(o.panAngle, unittest.equals(42.0));
     unittest.expect(o.rollAngle, unittest.equals(42.0));
     unittest.expect(o.sorrowLikelihood, unittest.equals('foo'));
@@ -700,14 +700,14 @@
   buildCounterImage--;
 }
 
-buildUnnamed3459() {
+buildUnnamed1202() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3459(core.List<core.String> o) {
+checkUnnamed1202(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -719,7 +719,7 @@
   buildCounterImageContext++;
   if (buildCounterImageContext < 3) {
     o.cropHintsParams = buildCropHintsParams();
-    o.languageHints = buildUnnamed3459();
+    o.languageHints = buildUnnamed1202();
     o.latLongRect = buildLatLongRect();
     o.webDetectionParams = buildWebDetectionParams();
   }
@@ -731,7 +731,7 @@
   buildCounterImageContext++;
   if (buildCounterImageContext < 3) {
     checkCropHintsParams(o.cropHintsParams);
-    checkUnnamed3459(o.languageHints);
+    checkUnnamed1202(o.languageHints);
     checkLatLongRect(o.latLongRect);
     checkWebDetectionParams(o.webDetectionParams);
   }
@@ -860,14 +860,14 @@
   buildCounterLocationInfo--;
 }
 
-buildUnnamed3460() {
+buildUnnamed1203() {
   var o = new core.List<api.Block>();
   o.add(buildBlock());
   o.add(buildBlock());
   return o;
 }
 
-checkUnnamed3460(core.List<api.Block> o) {
+checkUnnamed1203(core.List<api.Block> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBlock(o[0]);
   checkBlock(o[1]);
@@ -878,7 +878,7 @@
   var o = new api.Page();
   buildCounterPage++;
   if (buildCounterPage < 3) {
-    o.blocks = buildUnnamed3460();
+    o.blocks = buildUnnamed1203();
     o.confidence = 42.0;
     o.height = 42;
     o.property = buildTextProperty();
@@ -891,7 +891,7 @@
 checkPage(api.Page o) {
   buildCounterPage++;
   if (buildCounterPage < 3) {
-    checkUnnamed3460(o.blocks);
+    checkUnnamed1203(o.blocks);
     unittest.expect(o.confidence, unittest.equals(42.0));
     unittest.expect(o.height, unittest.equals(42));
     checkTextProperty(o.property);
@@ -900,14 +900,14 @@
   buildCounterPage--;
 }
 
-buildUnnamed3461() {
+buildUnnamed1204() {
   var o = new core.List<api.Word>();
   o.add(buildWord());
   o.add(buildWord());
   return o;
 }
 
-checkUnnamed3461(core.List<api.Word> o) {
+checkUnnamed1204(core.List<api.Word> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWord(o[0]);
   checkWord(o[1]);
@@ -921,7 +921,7 @@
     o.boundingBox = buildBoundingPoly();
     o.confidence = 42.0;
     o.property = buildTextProperty();
-    o.words = buildUnnamed3461();
+    o.words = buildUnnamed1204();
   }
   buildCounterParagraph--;
   return o;
@@ -933,7 +933,7 @@
     checkBoundingPoly(o.boundingBox);
     unittest.expect(o.confidence, unittest.equals(42.0));
     checkTextProperty(o.property);
-    checkUnnamed3461(o.words);
+    checkUnnamed1204(o.words);
   }
   buildCounterParagraph--;
 }
@@ -1011,7 +1011,7 @@
   buildCounterSafeSearchAnnotation--;
 }
 
-buildUnnamed3462() {
+buildUnnamed1205() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1026,7 +1026,7 @@
   return o;
 }
 
-checkUnnamed3462(core.Map<core.String, core.Object> o) {
+checkUnnamed1205(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1040,17 +1040,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3463() {
+buildUnnamed1206() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3462());
-  o.add(buildUnnamed3462());
+  o.add(buildUnnamed1205());
+  o.add(buildUnnamed1205());
   return o;
 }
 
-checkUnnamed3463(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed1206(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3462(o[0]);
-  checkUnnamed3462(o[1]);
+  checkUnnamed1205(o[0]);
+  checkUnnamed1205(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1059,7 +1059,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed3463();
+    o.details = buildUnnamed1206();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1070,7 +1070,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed3463(o.details);
+    checkUnnamed1206(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -1101,14 +1101,14 @@
   buildCounterSymbol--;
 }
 
-buildUnnamed3464() {
+buildUnnamed1207() {
   var o = new core.List<api.Page>();
   o.add(buildPage());
   o.add(buildPage());
   return o;
 }
 
-checkUnnamed3464(core.List<api.Page> o) {
+checkUnnamed1207(core.List<api.Page> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPage(o[0]);
   checkPage(o[1]);
@@ -1119,7 +1119,7 @@
   var o = new api.TextAnnotation();
   buildCounterTextAnnotation++;
   if (buildCounterTextAnnotation < 3) {
-    o.pages = buildUnnamed3464();
+    o.pages = buildUnnamed1207();
     o.text = "foo";
   }
   buildCounterTextAnnotation--;
@@ -1129,20 +1129,20 @@
 checkTextAnnotation(api.TextAnnotation o) {
   buildCounterTextAnnotation++;
   if (buildCounterTextAnnotation < 3) {
-    checkUnnamed3464(o.pages);
+    checkUnnamed1207(o.pages);
     unittest.expect(o.text, unittest.equals('foo'));
   }
   buildCounterTextAnnotation--;
 }
 
-buildUnnamed3465() {
+buildUnnamed1208() {
   var o = new core.List<api.DetectedLanguage>();
   o.add(buildDetectedLanguage());
   o.add(buildDetectedLanguage());
   return o;
 }
 
-checkUnnamed3465(core.List<api.DetectedLanguage> o) {
+checkUnnamed1208(core.List<api.DetectedLanguage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDetectedLanguage(o[0]);
   checkDetectedLanguage(o[1]);
@@ -1154,7 +1154,7 @@
   buildCounterTextProperty++;
   if (buildCounterTextProperty < 3) {
     o.detectedBreak = buildDetectedBreak();
-    o.detectedLanguages = buildUnnamed3465();
+    o.detectedLanguages = buildUnnamed1208();
   }
   buildCounterTextProperty--;
   return o;
@@ -1164,7 +1164,7 @@
   buildCounterTextProperty++;
   if (buildCounterTextProperty < 3) {
     checkDetectedBreak(o.detectedBreak);
-    checkUnnamed3465(o.detectedLanguages);
+    checkUnnamed1208(o.detectedLanguages);
   }
   buildCounterTextProperty--;
 }
@@ -1190,79 +1190,79 @@
   buildCounterVertex--;
 }
 
-buildUnnamed3466() {
+buildUnnamed1209() {
   var o = new core.List<api.WebLabel>();
   o.add(buildWebLabel());
   o.add(buildWebLabel());
   return o;
 }
 
-checkUnnamed3466(core.List<api.WebLabel> o) {
+checkUnnamed1209(core.List<api.WebLabel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebLabel(o[0]);
   checkWebLabel(o[1]);
 }
 
-buildUnnamed3467() {
+buildUnnamed1210() {
   var o = new core.List<api.WebImage>();
   o.add(buildWebImage());
   o.add(buildWebImage());
   return o;
 }
 
-checkUnnamed3467(core.List<api.WebImage> o) {
+checkUnnamed1210(core.List<api.WebImage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebImage(o[0]);
   checkWebImage(o[1]);
 }
 
-buildUnnamed3468() {
+buildUnnamed1211() {
   var o = new core.List<api.WebPage>();
   o.add(buildWebPage());
   o.add(buildWebPage());
   return o;
 }
 
-checkUnnamed3468(core.List<api.WebPage> o) {
+checkUnnamed1211(core.List<api.WebPage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebPage(o[0]);
   checkWebPage(o[1]);
 }
 
-buildUnnamed3469() {
+buildUnnamed1212() {
   var o = new core.List<api.WebImage>();
   o.add(buildWebImage());
   o.add(buildWebImage());
   return o;
 }
 
-checkUnnamed3469(core.List<api.WebImage> o) {
+checkUnnamed1212(core.List<api.WebImage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebImage(o[0]);
   checkWebImage(o[1]);
 }
 
-buildUnnamed3470() {
+buildUnnamed1213() {
   var o = new core.List<api.WebImage>();
   o.add(buildWebImage());
   o.add(buildWebImage());
   return o;
 }
 
-checkUnnamed3470(core.List<api.WebImage> o) {
+checkUnnamed1213(core.List<api.WebImage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebImage(o[0]);
   checkWebImage(o[1]);
 }
 
-buildUnnamed3471() {
+buildUnnamed1214() {
   var o = new core.List<api.WebEntity>();
   o.add(buildWebEntity());
   o.add(buildWebEntity());
   return o;
 }
 
-checkUnnamed3471(core.List<api.WebEntity> o) {
+checkUnnamed1214(core.List<api.WebEntity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebEntity(o[0]);
   checkWebEntity(o[1]);
@@ -1273,12 +1273,12 @@
   var o = new api.WebDetection();
   buildCounterWebDetection++;
   if (buildCounterWebDetection < 3) {
-    o.bestGuessLabels = buildUnnamed3466();
-    o.fullMatchingImages = buildUnnamed3467();
-    o.pagesWithMatchingImages = buildUnnamed3468();
-    o.partialMatchingImages = buildUnnamed3469();
-    o.visuallySimilarImages = buildUnnamed3470();
-    o.webEntities = buildUnnamed3471();
+    o.bestGuessLabels = buildUnnamed1209();
+    o.fullMatchingImages = buildUnnamed1210();
+    o.pagesWithMatchingImages = buildUnnamed1211();
+    o.partialMatchingImages = buildUnnamed1212();
+    o.visuallySimilarImages = buildUnnamed1213();
+    o.webEntities = buildUnnamed1214();
   }
   buildCounterWebDetection--;
   return o;
@@ -1287,12 +1287,12 @@
 checkWebDetection(api.WebDetection o) {
   buildCounterWebDetection++;
   if (buildCounterWebDetection < 3) {
-    checkUnnamed3466(o.bestGuessLabels);
-    checkUnnamed3467(o.fullMatchingImages);
-    checkUnnamed3468(o.pagesWithMatchingImages);
-    checkUnnamed3469(o.partialMatchingImages);
-    checkUnnamed3470(o.visuallySimilarImages);
-    checkUnnamed3471(o.webEntities);
+    checkUnnamed1209(o.bestGuessLabels);
+    checkUnnamed1210(o.fullMatchingImages);
+    checkUnnamed1211(o.pagesWithMatchingImages);
+    checkUnnamed1212(o.partialMatchingImages);
+    checkUnnamed1213(o.visuallySimilarImages);
+    checkUnnamed1214(o.webEntities);
   }
   buildCounterWebDetection--;
 }
@@ -1381,27 +1381,27 @@
   buildCounterWebLabel--;
 }
 
-buildUnnamed3472() {
+buildUnnamed1215() {
   var o = new core.List<api.WebImage>();
   o.add(buildWebImage());
   o.add(buildWebImage());
   return o;
 }
 
-checkUnnamed3472(core.List<api.WebImage> o) {
+checkUnnamed1215(core.List<api.WebImage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebImage(o[0]);
   checkWebImage(o[1]);
 }
 
-buildUnnamed3473() {
+buildUnnamed1216() {
   var o = new core.List<api.WebImage>();
   o.add(buildWebImage());
   o.add(buildWebImage());
   return o;
 }
 
-checkUnnamed3473(core.List<api.WebImage> o) {
+checkUnnamed1216(core.List<api.WebImage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebImage(o[0]);
   checkWebImage(o[1]);
@@ -1412,9 +1412,9 @@
   var o = new api.WebPage();
   buildCounterWebPage++;
   if (buildCounterWebPage < 3) {
-    o.fullMatchingImages = buildUnnamed3472();
+    o.fullMatchingImages = buildUnnamed1215();
     o.pageTitle = "foo";
-    o.partialMatchingImages = buildUnnamed3473();
+    o.partialMatchingImages = buildUnnamed1216();
     o.score = 42.0;
     o.url = "foo";
   }
@@ -1425,23 +1425,23 @@
 checkWebPage(api.WebPage o) {
   buildCounterWebPage++;
   if (buildCounterWebPage < 3) {
-    checkUnnamed3472(o.fullMatchingImages);
+    checkUnnamed1215(o.fullMatchingImages);
     unittest.expect(o.pageTitle, unittest.equals('foo'));
-    checkUnnamed3473(o.partialMatchingImages);
+    checkUnnamed1216(o.partialMatchingImages);
     unittest.expect(o.score, unittest.equals(42.0));
     unittest.expect(o.url, unittest.equals('foo'));
   }
   buildCounterWebPage--;
 }
 
-buildUnnamed3474() {
+buildUnnamed1217() {
   var o = new core.List<api.Symbol>();
   o.add(buildSymbol());
   o.add(buildSymbol());
   return o;
 }
 
-checkUnnamed3474(core.List<api.Symbol> o) {
+checkUnnamed1217(core.List<api.Symbol> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSymbol(o[0]);
   checkSymbol(o[1]);
@@ -1455,7 +1455,7 @@
     o.boundingBox = buildBoundingPoly();
     o.confidence = 42.0;
     o.property = buildTextProperty();
-    o.symbols = buildUnnamed3474();
+    o.symbols = buildUnnamed1217();
   }
   buildCounterWord--;
   return o;
@@ -1467,7 +1467,7 @@
     checkBoundingPoly(o.boundingBox);
     unittest.expect(o.confidence, unittest.equals(42.0));
     checkTextProperty(o.property);
-    checkUnnamed3474(o.symbols);
+    checkUnnamed1217(o.symbols);
   }
   buildCounterWord--;
 }
@@ -1856,8 +1856,9 @@
         var resp = convert.JSON.encode(buildBatchAnnotateImagesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.annotate(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.BatchAnnotateImagesResponse response) {
+      res
+          .annotate(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkBatchAnnotateImagesResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/webfonts/v1_test.dart b/generated/googleapis/test/webfonts/v1_test.dart
index 2c7acf6..b5f8c12 100644
--- a/generated/googleapis/test/webfonts/v1_test.dart
+++ b/generated/googleapis/test/webfonts/v1_test.dart
@@ -50,40 +50,40 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed997() {
+buildUnnamed1647() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed997(core.Map<core.String, core.String> o) {
+checkUnnamed1647(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed998() {
+buildUnnamed1648() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed998(core.List<core.String> o) {
+checkUnnamed1648(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed999() {
+buildUnnamed1649() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed999(core.List<core.String> o) {
+checkUnnamed1649(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -96,11 +96,11 @@
   if (buildCounterWebfont < 3) {
     o.category = "foo";
     o.family = "foo";
-    o.files = buildUnnamed997();
+    o.files = buildUnnamed1647();
     o.kind = "foo";
     o.lastModified = core.DateTime.parse("2002-02-27T14:01:02Z");
-    o.subsets = buildUnnamed998();
-    o.variants = buildUnnamed999();
+    o.subsets = buildUnnamed1648();
+    o.variants = buildUnnamed1649();
     o.version = "foo";
   }
   buildCounterWebfont--;
@@ -112,25 +112,25 @@
   if (buildCounterWebfont < 3) {
     unittest.expect(o.category, unittest.equals('foo'));
     unittest.expect(o.family, unittest.equals('foo'));
-    checkUnnamed997(o.files);
+    checkUnnamed1647(o.files);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.lastModified,
         unittest.equals(core.DateTime.parse("2002-02-27T00:00:00")));
-    checkUnnamed998(o.subsets);
-    checkUnnamed999(o.variants);
+    checkUnnamed1648(o.subsets);
+    checkUnnamed1649(o.variants);
     unittest.expect(o.version, unittest.equals('foo'));
   }
   buildCounterWebfont--;
 }
 
-buildUnnamed1000() {
+buildUnnamed1650() {
   var o = new core.List<api.Webfont>();
   o.add(buildWebfont());
   o.add(buildWebfont());
   return o;
 }
 
-checkUnnamed1000(core.List<api.Webfont> o) {
+checkUnnamed1650(core.List<api.Webfont> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWebfont(o[0]);
   checkWebfont(o[1]);
@@ -141,7 +141,7 @@
   var o = new api.WebfontList();
   buildCounterWebfontList++;
   if (buildCounterWebfontList < 3) {
-    o.items = buildUnnamed1000();
+    o.items = buildUnnamed1650();
     o.kind = "foo";
   }
   buildCounterWebfontList--;
@@ -151,7 +151,7 @@
 checkWebfontList(api.WebfontList o) {
   buildCounterWebfontList++;
   if (buildCounterWebfontList < 3) {
-    checkUnnamed1000(o.items);
+    checkUnnamed1650(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterWebfontList--;
@@ -224,7 +224,7 @@
       }), true);
       res
           .list(sort: arg_sort, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WebfontList response) {
+          .then(unittest.expectAsync1(((response) {
         checkWebfontList(response);
       })));
     });
diff --git a/generated/googleapis/test/webmasters/v3_test.dart b/generated/googleapis/test/webmasters/v3_test.dart
index 5d37043..88bc36b 100644
--- a/generated/googleapis/test/webmasters/v3_test.dart
+++ b/generated/googleapis/test/webmasters/v3_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed1146() {
+buildUnnamed3413() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1146(core.List<core.String> o) {
+checkUnnamed3413(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -71,7 +71,7 @@
     o.clicks = 42.0;
     o.ctr = 42.0;
     o.impressions = 42.0;
-    o.keys = buildUnnamed1146();
+    o.keys = buildUnnamed3413();
     o.position = 42.0;
   }
   buildCounterApiDataRow--;
@@ -84,7 +84,7 @@
     unittest.expect(o.clicks, unittest.equals(42.0));
     unittest.expect(o.ctr, unittest.equals(42.0));
     unittest.expect(o.impressions, unittest.equals(42.0));
-    checkUnnamed1146(o.keys);
+    checkUnnamed3413(o.keys);
     unittest.expect(o.position, unittest.equals(42.0));
   }
   buildCounterApiDataRow--;
@@ -113,14 +113,14 @@
   buildCounterApiDimensionFilter--;
 }
 
-buildUnnamed1147() {
+buildUnnamed3414() {
   var o = new core.List<api.ApiDimensionFilter>();
   o.add(buildApiDimensionFilter());
   o.add(buildApiDimensionFilter());
   return o;
 }
 
-checkUnnamed1147(core.List<api.ApiDimensionFilter> o) {
+checkUnnamed3414(core.List<api.ApiDimensionFilter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApiDimensionFilter(o[0]);
   checkApiDimensionFilter(o[1]);
@@ -131,7 +131,7 @@
   var o = new api.ApiDimensionFilterGroup();
   buildCounterApiDimensionFilterGroup++;
   if (buildCounterApiDimensionFilterGroup < 3) {
-    o.filters = buildUnnamed1147();
+    o.filters = buildUnnamed3414();
     o.groupType = "foo";
   }
   buildCounterApiDimensionFilterGroup--;
@@ -141,33 +141,33 @@
 checkApiDimensionFilterGroup(api.ApiDimensionFilterGroup o) {
   buildCounterApiDimensionFilterGroup++;
   if (buildCounterApiDimensionFilterGroup < 3) {
-    checkUnnamed1147(o.filters);
+    checkUnnamed3414(o.filters);
     unittest.expect(o.groupType, unittest.equals('foo'));
   }
   buildCounterApiDimensionFilterGroup--;
 }
 
-buildUnnamed1148() {
+buildUnnamed3415() {
   var o = new core.List<api.ApiDimensionFilterGroup>();
   o.add(buildApiDimensionFilterGroup());
   o.add(buildApiDimensionFilterGroup());
   return o;
 }
 
-checkUnnamed1148(core.List<api.ApiDimensionFilterGroup> o) {
+checkUnnamed3415(core.List<api.ApiDimensionFilterGroup> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApiDimensionFilterGroup(o[0]);
   checkApiDimensionFilterGroup(o[1]);
 }
 
-buildUnnamed1149() {
+buildUnnamed3416() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1149(core.List<core.String> o) {
+checkUnnamed3416(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -179,8 +179,8 @@
   buildCounterSearchAnalyticsQueryRequest++;
   if (buildCounterSearchAnalyticsQueryRequest < 3) {
     o.aggregationType = "foo";
-    o.dimensionFilterGroups = buildUnnamed1148();
-    o.dimensions = buildUnnamed1149();
+    o.dimensionFilterGroups = buildUnnamed3415();
+    o.dimensions = buildUnnamed3416();
     o.endDate = "foo";
     o.rowLimit = 42;
     o.searchType = "foo";
@@ -195,8 +195,8 @@
   buildCounterSearchAnalyticsQueryRequest++;
   if (buildCounterSearchAnalyticsQueryRequest < 3) {
     unittest.expect(o.aggregationType, unittest.equals('foo'));
-    checkUnnamed1148(o.dimensionFilterGroups);
-    checkUnnamed1149(o.dimensions);
+    checkUnnamed3415(o.dimensionFilterGroups);
+    checkUnnamed3416(o.dimensions);
     unittest.expect(o.endDate, unittest.equals('foo'));
     unittest.expect(o.rowLimit, unittest.equals(42));
     unittest.expect(o.searchType, unittest.equals('foo'));
@@ -206,14 +206,14 @@
   buildCounterSearchAnalyticsQueryRequest--;
 }
 
-buildUnnamed1150() {
+buildUnnamed3417() {
   var o = new core.List<api.ApiDataRow>();
   o.add(buildApiDataRow());
   o.add(buildApiDataRow());
   return o;
 }
 
-checkUnnamed1150(core.List<api.ApiDataRow> o) {
+checkUnnamed3417(core.List<api.ApiDataRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkApiDataRow(o[0]);
   checkApiDataRow(o[1]);
@@ -225,7 +225,7 @@
   buildCounterSearchAnalyticsQueryResponse++;
   if (buildCounterSearchAnalyticsQueryResponse < 3) {
     o.responseAggregationType = "foo";
-    o.rows = buildUnnamed1150();
+    o.rows = buildUnnamed3417();
   }
   buildCounterSearchAnalyticsQueryResponse--;
   return o;
@@ -235,19 +235,19 @@
   buildCounterSearchAnalyticsQueryResponse++;
   if (buildCounterSearchAnalyticsQueryResponse < 3) {
     unittest.expect(o.responseAggregationType, unittest.equals('foo'));
-    checkUnnamed1150(o.rows);
+    checkUnnamed3417(o.rows);
   }
   buildCounterSearchAnalyticsQueryResponse--;
 }
 
-buildUnnamed1151() {
+buildUnnamed3418() {
   var o = new core.List<api.WmxSitemap>();
   o.add(buildWmxSitemap());
   o.add(buildWmxSitemap());
   return o;
 }
 
-checkUnnamed1151(core.List<api.WmxSitemap> o) {
+checkUnnamed3418(core.List<api.WmxSitemap> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWmxSitemap(o[0]);
   checkWmxSitemap(o[1]);
@@ -258,7 +258,7 @@
   var o = new api.SitemapsListResponse();
   buildCounterSitemapsListResponse++;
   if (buildCounterSitemapsListResponse < 3) {
-    o.sitemap = buildUnnamed1151();
+    o.sitemap = buildUnnamed3418();
   }
   buildCounterSitemapsListResponse--;
   return o;
@@ -267,19 +267,19 @@
 checkSitemapsListResponse(api.SitemapsListResponse o) {
   buildCounterSitemapsListResponse++;
   if (buildCounterSitemapsListResponse < 3) {
-    checkUnnamed1151(o.sitemap);
+    checkUnnamed3418(o.sitemap);
   }
   buildCounterSitemapsListResponse--;
 }
 
-buildUnnamed1152() {
+buildUnnamed3419() {
   var o = new core.List<api.WmxSite>();
   o.add(buildWmxSite());
   o.add(buildWmxSite());
   return o;
 }
 
-checkUnnamed1152(core.List<api.WmxSite> o) {
+checkUnnamed3419(core.List<api.WmxSite> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWmxSite(o[0]);
   checkWmxSite(o[1]);
@@ -290,7 +290,7 @@
   var o = new api.SitesListResponse();
   buildCounterSitesListResponse++;
   if (buildCounterSitesListResponse < 3) {
-    o.siteEntry = buildUnnamed1152();
+    o.siteEntry = buildUnnamed3419();
   }
   buildCounterSitesListResponse--;
   return o;
@@ -299,7 +299,7 @@
 checkSitesListResponse(api.SitesListResponse o) {
   buildCounterSitesListResponse++;
   if (buildCounterSitesListResponse < 3) {
-    checkUnnamed1152(o.siteEntry);
+    checkUnnamed3419(o.siteEntry);
   }
   buildCounterSitesListResponse--;
 }
@@ -326,14 +326,14 @@
   buildCounterUrlCrawlErrorCount--;
 }
 
-buildUnnamed1153() {
+buildUnnamed3420() {
   var o = new core.List<api.UrlCrawlErrorCount>();
   o.add(buildUrlCrawlErrorCount());
   o.add(buildUrlCrawlErrorCount());
   return o;
 }
 
-checkUnnamed1153(core.List<api.UrlCrawlErrorCount> o) {
+checkUnnamed3420(core.List<api.UrlCrawlErrorCount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlCrawlErrorCount(o[0]);
   checkUrlCrawlErrorCount(o[1]);
@@ -345,7 +345,7 @@
   buildCounterUrlCrawlErrorCountsPerType++;
   if (buildCounterUrlCrawlErrorCountsPerType < 3) {
     o.category = "foo";
-    o.entries = buildUnnamed1153();
+    o.entries = buildUnnamed3420();
     o.platform = "foo";
   }
   buildCounterUrlCrawlErrorCountsPerType--;
@@ -356,20 +356,20 @@
   buildCounterUrlCrawlErrorCountsPerType++;
   if (buildCounterUrlCrawlErrorCountsPerType < 3) {
     unittest.expect(o.category, unittest.equals('foo'));
-    checkUnnamed1153(o.entries);
+    checkUnnamed3420(o.entries);
     unittest.expect(o.platform, unittest.equals('foo'));
   }
   buildCounterUrlCrawlErrorCountsPerType--;
 }
 
-buildUnnamed1154() {
+buildUnnamed3421() {
   var o = new core.List<api.UrlCrawlErrorCountsPerType>();
   o.add(buildUrlCrawlErrorCountsPerType());
   o.add(buildUrlCrawlErrorCountsPerType());
   return o;
 }
 
-checkUnnamed1154(core.List<api.UrlCrawlErrorCountsPerType> o) {
+checkUnnamed3421(core.List<api.UrlCrawlErrorCountsPerType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlCrawlErrorCountsPerType(o[0]);
   checkUrlCrawlErrorCountsPerType(o[1]);
@@ -380,7 +380,7 @@
   var o = new api.UrlCrawlErrorsCountsQueryResponse();
   buildCounterUrlCrawlErrorsCountsQueryResponse++;
   if (buildCounterUrlCrawlErrorsCountsQueryResponse < 3) {
-    o.countPerTypes = buildUnnamed1154();
+    o.countPerTypes = buildUnnamed3421();
   }
   buildCounterUrlCrawlErrorsCountsQueryResponse--;
   return o;
@@ -390,7 +390,7 @@
     api.UrlCrawlErrorsCountsQueryResponse o) {
   buildCounterUrlCrawlErrorsCountsQueryResponse++;
   if (buildCounterUrlCrawlErrorsCountsQueryResponse < 3) {
-    checkUnnamed1154(o.countPerTypes);
+    checkUnnamed3421(o.countPerTypes);
   }
   buildCounterUrlCrawlErrorsCountsQueryResponse--;
 }
@@ -424,14 +424,14 @@
   buildCounterUrlCrawlErrorsSample--;
 }
 
-buildUnnamed1155() {
+buildUnnamed3422() {
   var o = new core.List<api.UrlCrawlErrorsSample>();
   o.add(buildUrlCrawlErrorsSample());
   o.add(buildUrlCrawlErrorsSample());
   return o;
 }
 
-checkUnnamed1155(core.List<api.UrlCrawlErrorsSample> o) {
+checkUnnamed3422(core.List<api.UrlCrawlErrorsSample> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlCrawlErrorsSample(o[0]);
   checkUrlCrawlErrorsSample(o[1]);
@@ -442,7 +442,7 @@
   var o = new api.UrlCrawlErrorsSamplesListResponse();
   buildCounterUrlCrawlErrorsSamplesListResponse++;
   if (buildCounterUrlCrawlErrorsSamplesListResponse < 3) {
-    o.urlCrawlErrorSample = buildUnnamed1155();
+    o.urlCrawlErrorSample = buildUnnamed3422();
   }
   buildCounterUrlCrawlErrorsSamplesListResponse--;
   return o;
@@ -452,32 +452,32 @@
     api.UrlCrawlErrorsSamplesListResponse o) {
   buildCounterUrlCrawlErrorsSamplesListResponse++;
   if (buildCounterUrlCrawlErrorsSamplesListResponse < 3) {
-    checkUnnamed1155(o.urlCrawlErrorSample);
+    checkUnnamed3422(o.urlCrawlErrorSample);
   }
   buildCounterUrlCrawlErrorsSamplesListResponse--;
 }
 
-buildUnnamed1156() {
+buildUnnamed3423() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1156(core.List<core.String> o) {
+checkUnnamed3423(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed1157() {
+buildUnnamed3424() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed1157(core.List<core.String> o) {
+checkUnnamed3424(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -488,8 +488,8 @@
   var o = new api.UrlSampleDetails();
   buildCounterUrlSampleDetails++;
   if (buildCounterUrlSampleDetails < 3) {
-    o.containingSitemaps = buildUnnamed1156();
-    o.linkedFromUrls = buildUnnamed1157();
+    o.containingSitemaps = buildUnnamed3423();
+    o.linkedFromUrls = buildUnnamed3424();
   }
   buildCounterUrlSampleDetails--;
   return o;
@@ -498,8 +498,8 @@
 checkUrlSampleDetails(api.UrlSampleDetails o) {
   buildCounterUrlSampleDetails++;
   if (buildCounterUrlSampleDetails < 3) {
-    checkUnnamed1156(o.containingSitemaps);
-    checkUnnamed1157(o.linkedFromUrls);
+    checkUnnamed3423(o.containingSitemaps);
+    checkUnnamed3424(o.linkedFromUrls);
   }
   buildCounterUrlSampleDetails--;
 }
@@ -525,14 +525,14 @@
   buildCounterWmxSite--;
 }
 
-buildUnnamed1158() {
+buildUnnamed3425() {
   var o = new core.List<api.WmxSitemapContent>();
   o.add(buildWmxSitemapContent());
   o.add(buildWmxSitemapContent());
   return o;
 }
 
-checkUnnamed1158(core.List<api.WmxSitemapContent> o) {
+checkUnnamed3425(core.List<api.WmxSitemapContent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWmxSitemapContent(o[0]);
   checkWmxSitemapContent(o[1]);
@@ -543,7 +543,7 @@
   var o = new api.WmxSitemap();
   buildCounterWmxSitemap++;
   if (buildCounterWmxSitemap < 3) {
-    o.contents = buildUnnamed1158();
+    o.contents = buildUnnamed3425();
     o.errors = "foo";
     o.isPending = true;
     o.isSitemapsIndex = true;
@@ -560,7 +560,7 @@
 checkWmxSitemap(api.WmxSitemap o) {
   buildCounterWmxSitemap++;
   if (buildCounterWmxSitemap < 3) {
-    checkUnnamed1158(o.contents);
+    checkUnnamed3425(o.contents);
     unittest.expect(o.errors, unittest.equals('foo'));
     unittest.expect(o.isPending, unittest.isTrue);
     unittest.expect(o.isSitemapsIndex, unittest.isTrue);
@@ -788,8 +788,9 @@
         var resp = convert.JSON.encode(buildSearchAnalyticsQueryResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.query(arg_request, arg_siteUrl, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.SearchAnalyticsQueryResponse response) {
+      res
+          .query(arg_request, arg_siteUrl, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSearchAnalyticsQueryResponse(response);
       })));
     });
@@ -921,7 +922,7 @@
       }), true);
       res
           .get(arg_siteUrl, arg_feedpath, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WmxSitemap response) {
+          .then(unittest.expectAsync1(((response) {
         checkWmxSitemap(response);
       })));
     });
@@ -987,7 +988,7 @@
       res
           .list(arg_siteUrl,
               sitemapIndex: arg_sitemapIndex, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SitemapsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSitemapsListResponse(response);
       })));
     });
@@ -1217,7 +1218,7 @@
       }), true);
       res
           .get(arg_siteUrl, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WmxSite response) {
+          .then(unittest.expectAsync1(((response) {
         checkWmxSite(response);
       })));
     });
@@ -1267,9 +1268,7 @@
         var resp = convert.JSON.encode(buildSitesListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SitesListResponse response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkSitesListResponse(response);
       })));
     });
@@ -1348,8 +1347,7 @@
               latestCountsOnly: arg_latestCountsOnly,
               platform: arg_platform,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.UrlCrawlErrorsCountsQueryResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlCrawlErrorsCountsQueryResponse(response);
       })));
     });
@@ -1425,7 +1423,7 @@
       res
           .get(arg_siteUrl, arg_url, arg_category, arg_platform,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UrlCrawlErrorsSample response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlCrawlErrorsSample(response);
       })));
     });
@@ -1495,8 +1493,7 @@
       }), true);
       res
           .list(arg_siteUrl, arg_category, arg_platform, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.UrlCrawlErrorsSamplesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkUrlCrawlErrorsSamplesListResponse(response);
       })));
     });
diff --git a/generated/googleapis/test/youtube/v3_test.dart b/generated/googleapis/test/youtube/v3_test.dart
index d9e1030..b51e785 100644
--- a/generated/googleapis/test/youtube/v3_test.dart
+++ b/generated/googleapis/test/youtube/v3_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed2537() {
+buildUnnamed437() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2537(core.List<core.String> o) {
+checkUnnamed437(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -69,7 +69,7 @@
   buildCounterAccessPolicy++;
   if (buildCounterAccessPolicy < 3) {
     o.allowed = true;
-    o.exception = buildUnnamed2537();
+    o.exception = buildUnnamed437();
   }
   buildCounterAccessPolicy--;
   return o;
@@ -79,7 +79,7 @@
   buildCounterAccessPolicy++;
   if (buildCounterAccessPolicy < 3) {
     unittest.expect(o.allowed, unittest.isTrue);
-    checkUnnamed2537(o.exception);
+    checkUnnamed437(o.exception);
   }
   buildCounterAccessPolicy--;
 }
@@ -270,27 +270,27 @@
   buildCounterActivityContentDetailsPlaylistItem--;
 }
 
-buildUnnamed2538() {
+buildUnnamed438() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2538(core.List<core.String> o) {
+checkUnnamed438(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2539() {
+buildUnnamed439() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2539(core.List<core.String> o) {
+checkUnnamed439(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -308,8 +308,8 @@
     o.customCtaButtonText = "foo";
     o.descriptionText = "foo";
     o.destinationUrl = "foo";
-    o.forecastingUrl = buildUnnamed2538();
-    o.impressionUrl = buildUnnamed2539();
+    o.forecastingUrl = buildUnnamed438();
+    o.impressionUrl = buildUnnamed439();
     o.videoId = "foo";
   }
   buildCounterActivityContentDetailsPromotedItem--;
@@ -327,8 +327,8 @@
     unittest.expect(o.customCtaButtonText, unittest.equals('foo'));
     unittest.expect(o.descriptionText, unittest.equals('foo'));
     unittest.expect(o.destinationUrl, unittest.equals('foo'));
-    checkUnnamed2538(o.forecastingUrl);
-    checkUnnamed2539(o.impressionUrl);
+    checkUnnamed438(o.forecastingUrl);
+    checkUnnamed439(o.impressionUrl);
     unittest.expect(o.videoId, unittest.equals('foo'));
   }
   buildCounterActivityContentDetailsPromotedItem--;
@@ -424,14 +424,14 @@
   buildCounterActivityContentDetailsUpload--;
 }
 
-buildUnnamed2540() {
+buildUnnamed440() {
   var o = new core.List<api.Activity>();
   o.add(buildActivity());
   o.add(buildActivity());
   return o;
 }
 
-checkUnnamed2540(core.List<api.Activity> o) {
+checkUnnamed440(core.List<api.Activity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkActivity(o[0]);
   checkActivity(o[1]);
@@ -444,7 +444,7 @@
   if (buildCounterActivityListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2540();
+    o.items = buildUnnamed440();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -461,7 +461,7 @@
   if (buildCounterActivityListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2540(o.items);
+    checkUnnamed440(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -531,14 +531,14 @@
   buildCounterCaption--;
 }
 
-buildUnnamed2541() {
+buildUnnamed441() {
   var o = new core.List<api.Caption>();
   o.add(buildCaption());
   o.add(buildCaption());
   return o;
 }
 
-checkUnnamed2541(core.List<api.Caption> o) {
+checkUnnamed441(core.List<api.Caption> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCaption(o[0]);
   checkCaption(o[1]);
@@ -551,7 +551,7 @@
   if (buildCounterCaptionListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2541();
+    o.items = buildUnnamed441();
     o.kind = "foo";
     o.visitorId = "foo";
   }
@@ -564,7 +564,7 @@
   if (buildCounterCaptionListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2541(o.items);
+    checkUnnamed441(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visitorId, unittest.equals('foo'));
   }
@@ -642,14 +642,14 @@
   buildCounterCdnSettings--;
 }
 
-buildUnnamed2542() {
+buildUnnamed442() {
   var o = new core.Map<core.String, api.ChannelLocalization>();
   o["x"] = buildChannelLocalization();
   o["y"] = buildChannelLocalization();
   return o;
 }
 
-checkUnnamed2542(core.Map<core.String, api.ChannelLocalization> o) {
+checkUnnamed442(core.Map<core.String, api.ChannelLocalization> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannelLocalization(o["x"]);
   checkChannelLocalization(o["y"]);
@@ -669,7 +669,7 @@
     o.id = "foo";
     o.invideoPromotion = buildInvideoPromotion();
     o.kind = "foo";
-    o.localizations = buildUnnamed2542();
+    o.localizations = buildUnnamed442();
     o.snippet = buildChannelSnippet();
     o.statistics = buildChannelStatistics();
     o.status = buildChannelStatus();
@@ -691,7 +691,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     checkInvideoPromotion(o.invideoPromotion);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2542(o.localizations);
+    checkUnnamed442(o.localizations);
     checkChannelSnippet(o.snippet);
     checkChannelStatistics(o.statistics);
     checkChannelStatus(o.status);
@@ -748,14 +748,14 @@
   buildCounterChannelBannerResource--;
 }
 
-buildUnnamed2543() {
+buildUnnamed443() {
   var o = new core.List<api.PropertyValue>();
   o.add(buildPropertyValue());
   o.add(buildPropertyValue());
   return o;
 }
 
-checkUnnamed2543(core.List<api.PropertyValue> o) {
+checkUnnamed443(core.List<api.PropertyValue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPropertyValue(o[0]);
   checkPropertyValue(o[1]);
@@ -767,7 +767,7 @@
   buildCounterChannelBrandingSettings++;
   if (buildCounterChannelBrandingSettings < 3) {
     o.channel = buildChannelSettings();
-    o.hints = buildUnnamed2543();
+    o.hints = buildUnnamed443();
     o.image = buildImageSettings();
     o.watch = buildWatchSettings();
   }
@@ -779,7 +779,7 @@
   buildCounterChannelBrandingSettings++;
   if (buildCounterChannelBrandingSettings < 3) {
     checkChannelSettings(o.channel);
-    checkUnnamed2543(o.hints);
+    checkUnnamed443(o.hints);
     checkImageSettings(o.image);
     checkWatchSettings(o.watch);
   }
@@ -876,14 +876,14 @@
   buildCounterChannelConversionPing--;
 }
 
-buildUnnamed2544() {
+buildUnnamed444() {
   var o = new core.List<api.ChannelConversionPing>();
   o.add(buildChannelConversionPing());
   o.add(buildChannelConversionPing());
   return o;
 }
 
-checkUnnamed2544(core.List<api.ChannelConversionPing> o) {
+checkUnnamed444(core.List<api.ChannelConversionPing> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannelConversionPing(o[0]);
   checkChannelConversionPing(o[1]);
@@ -894,7 +894,7 @@
   var o = new api.ChannelConversionPings();
   buildCounterChannelConversionPings++;
   if (buildCounterChannelConversionPings < 3) {
-    o.pings = buildUnnamed2544();
+    o.pings = buildUnnamed444();
   }
   buildCounterChannelConversionPings--;
   return o;
@@ -903,19 +903,19 @@
 checkChannelConversionPings(api.ChannelConversionPings o) {
   buildCounterChannelConversionPings++;
   if (buildCounterChannelConversionPings < 3) {
-    checkUnnamed2544(o.pings);
+    checkUnnamed444(o.pings);
   }
   buildCounterChannelConversionPings--;
 }
 
-buildUnnamed2545() {
+buildUnnamed445() {
   var o = new core.List<api.Channel>();
   o.add(buildChannel());
   o.add(buildChannel());
   return o;
 }
 
-checkUnnamed2545(core.List<api.Channel> o) {
+checkUnnamed445(core.List<api.Channel> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannel(o[0]);
   checkChannel(o[1]);
@@ -928,7 +928,7 @@
   if (buildCounterChannelListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2545();
+    o.items = buildUnnamed445();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -945,7 +945,7 @@
   if (buildCounterChannelListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2545(o.items);
+    checkUnnamed445(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -1002,14 +1002,14 @@
   buildCounterChannelProfileDetails--;
 }
 
-buildUnnamed2546() {
+buildUnnamed446() {
   var o = new core.Map<core.String, api.ChannelSectionLocalization>();
   o["x"] = buildChannelSectionLocalization();
   o["y"] = buildChannelSectionLocalization();
   return o;
 }
 
-checkUnnamed2546(core.Map<core.String, api.ChannelSectionLocalization> o) {
+checkUnnamed446(core.Map<core.String, api.ChannelSectionLocalization> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannelSectionLocalization(o["x"]);
   checkChannelSectionLocalization(o["y"]);
@@ -1024,7 +1024,7 @@
     o.etag = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.localizations = buildUnnamed2546();
+    o.localizations = buildUnnamed446();
     o.snippet = buildChannelSectionSnippet();
     o.targeting = buildChannelSectionTargeting();
   }
@@ -1039,34 +1039,34 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2546(o.localizations);
+    checkUnnamed446(o.localizations);
     checkChannelSectionSnippet(o.snippet);
     checkChannelSectionTargeting(o.targeting);
   }
   buildCounterChannelSection--;
 }
 
-buildUnnamed2547() {
+buildUnnamed447() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2547(core.List<core.String> o) {
+checkUnnamed447(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2548() {
+buildUnnamed448() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2548(core.List<core.String> o) {
+checkUnnamed448(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1077,8 +1077,8 @@
   var o = new api.ChannelSectionContentDetails();
   buildCounterChannelSectionContentDetails++;
   if (buildCounterChannelSectionContentDetails < 3) {
-    o.channels = buildUnnamed2547();
-    o.playlists = buildUnnamed2548();
+    o.channels = buildUnnamed447();
+    o.playlists = buildUnnamed448();
   }
   buildCounterChannelSectionContentDetails--;
   return o;
@@ -1087,20 +1087,20 @@
 checkChannelSectionContentDetails(api.ChannelSectionContentDetails o) {
   buildCounterChannelSectionContentDetails++;
   if (buildCounterChannelSectionContentDetails < 3) {
-    checkUnnamed2547(o.channels);
-    checkUnnamed2548(o.playlists);
+    checkUnnamed447(o.channels);
+    checkUnnamed448(o.playlists);
   }
   buildCounterChannelSectionContentDetails--;
 }
 
-buildUnnamed2549() {
+buildUnnamed449() {
   var o = new core.List<api.ChannelSection>();
   o.add(buildChannelSection());
   o.add(buildChannelSection());
   return o;
 }
 
-checkUnnamed2549(core.List<api.ChannelSection> o) {
+checkUnnamed449(core.List<api.ChannelSection> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChannelSection(o[0]);
   checkChannelSection(o[1]);
@@ -1113,7 +1113,7 @@
   if (buildCounterChannelSectionListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2549();
+    o.items = buildUnnamed449();
     o.kind = "foo";
     o.visitorId = "foo";
   }
@@ -1126,7 +1126,7 @@
   if (buildCounterChannelSectionListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2549(o.items);
+    checkUnnamed449(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visitorId, unittest.equals('foo'));
   }
@@ -1183,40 +1183,40 @@
   buildCounterChannelSectionSnippet--;
 }
 
-buildUnnamed2550() {
+buildUnnamed450() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2550(core.List<core.String> o) {
+checkUnnamed450(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2551() {
+buildUnnamed451() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2551(core.List<core.String> o) {
+checkUnnamed451(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2552() {
+buildUnnamed452() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2552(core.List<core.String> o) {
+checkUnnamed452(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1227,9 +1227,9 @@
   var o = new api.ChannelSectionTargeting();
   buildCounterChannelSectionTargeting++;
   if (buildCounterChannelSectionTargeting < 3) {
-    o.countries = buildUnnamed2550();
-    o.languages = buildUnnamed2551();
-    o.regions = buildUnnamed2552();
+    o.countries = buildUnnamed450();
+    o.languages = buildUnnamed451();
+    o.regions = buildUnnamed452();
   }
   buildCounterChannelSectionTargeting--;
   return o;
@@ -1238,21 +1238,21 @@
 checkChannelSectionTargeting(api.ChannelSectionTargeting o) {
   buildCounterChannelSectionTargeting++;
   if (buildCounterChannelSectionTargeting < 3) {
-    checkUnnamed2550(o.countries);
-    checkUnnamed2551(o.languages);
-    checkUnnamed2552(o.regions);
+    checkUnnamed450(o.countries);
+    checkUnnamed451(o.languages);
+    checkUnnamed452(o.regions);
   }
   buildCounterChannelSectionTargeting--;
 }
 
-buildUnnamed2553() {
+buildUnnamed453() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2553(core.List<core.String> o) {
+checkUnnamed453(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1268,7 +1268,7 @@
     o.defaultTab = "foo";
     o.description = "foo";
     o.featuredChannelsTitle = "foo";
-    o.featuredChannelsUrls = buildUnnamed2553();
+    o.featuredChannelsUrls = buildUnnamed453();
     o.keywords = "foo";
     o.moderateComments = true;
     o.profileColor = "foo";
@@ -1290,7 +1290,7 @@
     unittest.expect(o.defaultTab, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.featuredChannelsTitle, unittest.equals('foo'));
-    checkUnnamed2553(o.featuredChannelsUrls);
+    checkUnnamed453(o.featuredChannelsUrls);
     unittest.expect(o.keywords, unittest.equals('foo'));
     unittest.expect(o.moderateComments, unittest.isTrue);
     unittest.expect(o.profileColor, unittest.equals('foo'));
@@ -1387,27 +1387,27 @@
   buildCounterChannelStatus--;
 }
 
-buildUnnamed2554() {
+buildUnnamed454() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2554(core.List<core.String> o) {
+checkUnnamed454(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2555() {
+buildUnnamed455() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2555(core.List<core.String> o) {
+checkUnnamed455(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1418,8 +1418,8 @@
   var o = new api.ChannelTopicDetails();
   buildCounterChannelTopicDetails++;
   if (buildCounterChannelTopicDetails < 3) {
-    o.topicCategories = buildUnnamed2554();
-    o.topicIds = buildUnnamed2555();
+    o.topicCategories = buildUnnamed454();
+    o.topicIds = buildUnnamed455();
   }
   buildCounterChannelTopicDetails--;
   return o;
@@ -1428,8 +1428,8 @@
 checkChannelTopicDetails(api.ChannelTopicDetails o) {
   buildCounterChannelTopicDetails++;
   if (buildCounterChannelTopicDetails < 3) {
-    checkUnnamed2554(o.topicCategories);
-    checkUnnamed2555(o.topicIds);
+    checkUnnamed454(o.topicCategories);
+    checkUnnamed455(o.topicIds);
   }
   buildCounterChannelTopicDetails--;
 }
@@ -1459,14 +1459,14 @@
   buildCounterComment--;
 }
 
-buildUnnamed2556() {
+buildUnnamed456() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed2556(core.List<api.Comment> o) {
+checkUnnamed456(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -1479,7 +1479,7 @@
   if (buildCounterCommentListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2556();
+    o.items = buildUnnamed456();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -1495,7 +1495,7 @@
   if (buildCounterCommentListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2556(o.items);
+    checkUnnamed456(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -1589,14 +1589,14 @@
   buildCounterCommentThread--;
 }
 
-buildUnnamed2557() {
+buildUnnamed457() {
   var o = new core.List<api.CommentThread>();
   o.add(buildCommentThread());
   o.add(buildCommentThread());
   return o;
 }
 
-checkUnnamed2557(core.List<api.CommentThread> o) {
+checkUnnamed457(core.List<api.CommentThread> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCommentThread(o[0]);
   checkCommentThread(o[1]);
@@ -1609,7 +1609,7 @@
   if (buildCounterCommentThreadListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2557();
+    o.items = buildUnnamed457();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -1625,7 +1625,7 @@
   if (buildCounterCommentThreadListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2557(o.items);
+    checkUnnamed457(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -1635,14 +1635,14 @@
   buildCounterCommentThreadListResponse--;
 }
 
-buildUnnamed2558() {
+buildUnnamed458() {
   var o = new core.List<api.Comment>();
   o.add(buildComment());
   o.add(buildComment());
   return o;
 }
 
-checkUnnamed2558(core.List<api.Comment> o) {
+checkUnnamed458(core.List<api.Comment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComment(o[0]);
   checkComment(o[1]);
@@ -1653,7 +1653,7 @@
   var o = new api.CommentThreadReplies();
   buildCounterCommentThreadReplies++;
   if (buildCounterCommentThreadReplies < 3) {
-    o.comments = buildUnnamed2558();
+    o.comments = buildUnnamed458();
   }
   buildCounterCommentThreadReplies--;
   return o;
@@ -1662,7 +1662,7 @@
 checkCommentThreadReplies(api.CommentThreadReplies o) {
   buildCounterCommentThreadReplies++;
   if (buildCounterCommentThreadReplies < 3) {
-    checkUnnamed2558(o.comments);
+    checkUnnamed458(o.comments);
   }
   buildCounterCommentThreadReplies--;
 }
@@ -1696,27 +1696,27 @@
   buildCounterCommentThreadSnippet--;
 }
 
-buildUnnamed2559() {
+buildUnnamed459() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2559(core.List<core.String> o) {
+checkUnnamed459(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2560() {
+buildUnnamed460() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2560(core.List<core.String> o) {
+checkUnnamed460(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1747,7 +1747,7 @@
     o.cscfRating = "foo";
     o.czfilmRating = "foo";
     o.djctqRating = "foo";
-    o.djctqRatingReasons = buildUnnamed2559();
+    o.djctqRatingReasons = buildUnnamed459();
     o.ecbmctRating = "foo";
     o.eefilmRating = "foo";
     o.egfilmRating = "foo";
@@ -1756,7 +1756,7 @@
     o.fcoRating = "foo";
     o.fmocRating = "foo";
     o.fpbRating = "foo";
-    o.fpbRatingReasons = buildUnnamed2560();
+    o.fpbRatingReasons = buildUnnamed460();
     o.fskRating = "foo";
     o.grfilmRating = "foo";
     o.icaaRating = "foo";
@@ -1825,7 +1825,7 @@
     unittest.expect(o.cscfRating, unittest.equals('foo'));
     unittest.expect(o.czfilmRating, unittest.equals('foo'));
     unittest.expect(o.djctqRating, unittest.equals('foo'));
-    checkUnnamed2559(o.djctqRatingReasons);
+    checkUnnamed459(o.djctqRatingReasons);
     unittest.expect(o.ecbmctRating, unittest.equals('foo'));
     unittest.expect(o.eefilmRating, unittest.equals('foo'));
     unittest.expect(o.egfilmRating, unittest.equals('foo'));
@@ -1834,7 +1834,7 @@
     unittest.expect(o.fcoRating, unittest.equals('foo'));
     unittest.expect(o.fmocRating, unittest.equals('foo'));
     unittest.expect(o.fpbRating, unittest.equals('foo'));
-    checkUnnamed2560(o.fpbRatingReasons);
+    checkUnnamed460(o.fpbRatingReasons);
     unittest.expect(o.fskRating, unittest.equals('foo'));
     unittest.expect(o.grfilmRating, unittest.equals('foo'));
     unittest.expect(o.icaaRating, unittest.equals('foo'));
@@ -1904,14 +1904,14 @@
   buildCounterFanFundingEvent--;
 }
 
-buildUnnamed2561() {
+buildUnnamed461() {
   var o = new core.List<api.FanFundingEvent>();
   o.add(buildFanFundingEvent());
   o.add(buildFanFundingEvent());
   return o;
 }
 
-checkUnnamed2561(core.List<api.FanFundingEvent> o) {
+checkUnnamed461(core.List<api.FanFundingEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFanFundingEvent(o[0]);
   checkFanFundingEvent(o[1]);
@@ -1924,7 +1924,7 @@
   if (buildCounterFanFundingEventListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2561();
+    o.items = buildUnnamed461();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -1940,7 +1940,7 @@
   if (buildCounterFanFundingEventListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2561(o.items);
+    checkUnnamed461(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -2030,14 +2030,14 @@
   buildCounterGuideCategory--;
 }
 
-buildUnnamed2562() {
+buildUnnamed462() {
   var o = new core.List<api.GuideCategory>();
   o.add(buildGuideCategory());
   o.add(buildGuideCategory());
   return o;
 }
 
-checkUnnamed2562(core.List<api.GuideCategory> o) {
+checkUnnamed462(core.List<api.GuideCategory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGuideCategory(o[0]);
   checkGuideCategory(o[1]);
@@ -2050,7 +2050,7 @@
   if (buildCounterGuideCategoryListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2562();
+    o.items = buildUnnamed462();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -2067,7 +2067,7 @@
   if (buildCounterGuideCategoryListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2562(o.items);
+    checkUnnamed462(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -2124,14 +2124,14 @@
   buildCounterI18nLanguage--;
 }
 
-buildUnnamed2563() {
+buildUnnamed463() {
   var o = new core.List<api.I18nLanguage>();
   o.add(buildI18nLanguage());
   o.add(buildI18nLanguage());
   return o;
 }
 
-checkUnnamed2563(core.List<api.I18nLanguage> o) {
+checkUnnamed463(core.List<api.I18nLanguage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkI18nLanguage(o[0]);
   checkI18nLanguage(o[1]);
@@ -2144,7 +2144,7 @@
   if (buildCounterI18nLanguageListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2563();
+    o.items = buildUnnamed463();
     o.kind = "foo";
     o.visitorId = "foo";
   }
@@ -2157,7 +2157,7 @@
   if (buildCounterI18nLanguageListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2563(o.items);
+    checkUnnamed463(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visitorId, unittest.equals('foo'));
   }
@@ -2210,14 +2210,14 @@
   buildCounterI18nRegion--;
 }
 
-buildUnnamed2564() {
+buildUnnamed464() {
   var o = new core.List<api.I18nRegion>();
   o.add(buildI18nRegion());
   o.add(buildI18nRegion());
   return o;
 }
 
-checkUnnamed2564(core.List<api.I18nRegion> o) {
+checkUnnamed464(core.List<api.I18nRegion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkI18nRegion(o[0]);
   checkI18nRegion(o[1]);
@@ -2230,7 +2230,7 @@
   if (buildCounterI18nRegionListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2564();
+    o.items = buildUnnamed464();
     o.kind = "foo";
     o.visitorId = "foo";
   }
@@ -2243,7 +2243,7 @@
   if (buildCounterI18nRegionListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2564(o.items);
+    checkUnnamed464(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visitorId, unittest.equals('foo'));
   }
@@ -2403,14 +2403,14 @@
   buildCounterInvideoPosition--;
 }
 
-buildUnnamed2565() {
+buildUnnamed465() {
   var o = new core.List<api.PromotedItem>();
   o.add(buildPromotedItem());
   o.add(buildPromotedItem());
   return o;
 }
 
-checkUnnamed2565(core.List<api.PromotedItem> o) {
+checkUnnamed465(core.List<api.PromotedItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPromotedItem(o[0]);
   checkPromotedItem(o[1]);
@@ -2422,7 +2422,7 @@
   buildCounterInvideoPromotion++;
   if (buildCounterInvideoPromotion < 3) {
     o.defaultTiming = buildInvideoTiming();
-    o.items = buildUnnamed2565();
+    o.items = buildUnnamed465();
     o.position = buildInvideoPosition();
     o.useSmartTiming = true;
   }
@@ -2434,7 +2434,7 @@
   buildCounterInvideoPromotion++;
   if (buildCounterInvideoPromotion < 3) {
     checkInvideoTiming(o.defaultTiming);
-    checkUnnamed2565(o.items);
+    checkUnnamed465(o.items);
     checkInvideoPosition(o.position);
     unittest.expect(o.useSmartTiming, unittest.isTrue);
   }
@@ -2562,14 +2562,14 @@
   buildCounterLiveBroadcastContentDetails--;
 }
 
-buildUnnamed2566() {
+buildUnnamed466() {
   var o = new core.List<api.LiveBroadcast>();
   o.add(buildLiveBroadcast());
   o.add(buildLiveBroadcast());
   return o;
 }
 
-checkUnnamed2566(core.List<api.LiveBroadcast> o) {
+checkUnnamed466(core.List<api.LiveBroadcast> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLiveBroadcast(o[0]);
   checkLiveBroadcast(o[1]);
@@ -2582,7 +2582,7 @@
   if (buildCounterLiveBroadcastListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2566();
+    o.items = buildUnnamed466();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -2599,7 +2599,7 @@
   if (buildCounterLiveBroadcastListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2566(o.items);
+    checkUnnamed466(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -2854,14 +2854,14 @@
   buildCounterLiveChatMessageDeletedDetails--;
 }
 
-buildUnnamed2567() {
+buildUnnamed467() {
   var o = new core.List<api.LiveChatMessage>();
   o.add(buildLiveChatMessage());
   o.add(buildLiveChatMessage());
   return o;
 }
 
-checkUnnamed2567(core.List<api.LiveChatMessage> o) {
+checkUnnamed467(core.List<api.LiveChatMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLiveChatMessage(o[0]);
   checkLiveChatMessage(o[1]);
@@ -2874,7 +2874,7 @@
   if (buildCounterLiveChatMessageListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2567();
+    o.items = buildUnnamed467();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.offlineAt = core.DateTime.parse("2002-02-27T14:01:02");
@@ -2892,7 +2892,7 @@
   if (buildCounterLiveChatMessageListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2567(o.items);
+    checkUnnamed467(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.offlineAt,
@@ -2999,14 +2999,14 @@
   buildCounterLiveChatModerator--;
 }
 
-buildUnnamed2568() {
+buildUnnamed468() {
   var o = new core.List<api.LiveChatModerator>();
   o.add(buildLiveChatModerator());
   o.add(buildLiveChatModerator());
   return o;
 }
 
-checkUnnamed2568(core.List<api.LiveChatModerator> o) {
+checkUnnamed468(core.List<api.LiveChatModerator> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLiveChatModerator(o[0]);
   checkLiveChatModerator(o[1]);
@@ -3019,7 +3019,7 @@
   if (buildCounterLiveChatModeratorListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2568();
+    o.items = buildUnnamed468();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -3036,7 +3036,7 @@
   if (buildCounterLiveChatModeratorListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2568(o.items);
+    checkUnnamed468(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -3087,14 +3087,14 @@
   buildCounterLiveChatPollClosedDetails--;
 }
 
-buildUnnamed2569() {
+buildUnnamed469() {
   var o = new core.List<api.LiveChatPollItem>();
   o.add(buildLiveChatPollItem());
   o.add(buildLiveChatPollItem());
   return o;
 }
 
-checkUnnamed2569(core.List<api.LiveChatPollItem> o) {
+checkUnnamed469(core.List<api.LiveChatPollItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLiveChatPollItem(o[0]);
   checkLiveChatPollItem(o[1]);
@@ -3106,7 +3106,7 @@
   buildCounterLiveChatPollEditedDetails++;
   if (buildCounterLiveChatPollEditedDetails < 3) {
     o.id = "foo";
-    o.items = buildUnnamed2569();
+    o.items = buildUnnamed469();
     o.prompt = "foo";
   }
   buildCounterLiveChatPollEditedDetails--;
@@ -3117,7 +3117,7 @@
   buildCounterLiveChatPollEditedDetails++;
   if (buildCounterLiveChatPollEditedDetails < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2569(o.items);
+    checkUnnamed469(o.items);
     unittest.expect(o.prompt, unittest.equals('foo'));
   }
   buildCounterLiveChatPollEditedDetails--;
@@ -3144,14 +3144,14 @@
   buildCounterLiveChatPollItem--;
 }
 
-buildUnnamed2570() {
+buildUnnamed470() {
   var o = new core.List<api.LiveChatPollItem>();
   o.add(buildLiveChatPollItem());
   o.add(buildLiveChatPollItem());
   return o;
 }
 
-checkUnnamed2570(core.List<api.LiveChatPollItem> o) {
+checkUnnamed470(core.List<api.LiveChatPollItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLiveChatPollItem(o[0]);
   checkLiveChatPollItem(o[1]);
@@ -3163,7 +3163,7 @@
   buildCounterLiveChatPollOpenedDetails++;
   if (buildCounterLiveChatPollOpenedDetails < 3) {
     o.id = "foo";
-    o.items = buildUnnamed2570();
+    o.items = buildUnnamed470();
     o.prompt = "foo";
   }
   buildCounterLiveChatPollOpenedDetails--;
@@ -3174,7 +3174,7 @@
   buildCounterLiveChatPollOpenedDetails++;
   if (buildCounterLiveChatPollOpenedDetails < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed2570(o.items);
+    checkUnnamed470(o.items);
     unittest.expect(o.prompt, unittest.equals('foo'));
   }
   buildCounterLiveChatPollOpenedDetails--;
@@ -3347,14 +3347,14 @@
   buildCounterLiveStreamContentDetails--;
 }
 
-buildUnnamed2571() {
+buildUnnamed471() {
   var o = new core.List<api.LiveStreamConfigurationIssue>();
   o.add(buildLiveStreamConfigurationIssue());
   o.add(buildLiveStreamConfigurationIssue());
   return o;
 }
 
-checkUnnamed2571(core.List<api.LiveStreamConfigurationIssue> o) {
+checkUnnamed471(core.List<api.LiveStreamConfigurationIssue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLiveStreamConfigurationIssue(o[0]);
   checkLiveStreamConfigurationIssue(o[1]);
@@ -3365,7 +3365,7 @@
   var o = new api.LiveStreamHealthStatus();
   buildCounterLiveStreamHealthStatus++;
   if (buildCounterLiveStreamHealthStatus < 3) {
-    o.configurationIssues = buildUnnamed2571();
+    o.configurationIssues = buildUnnamed471();
     o.lastUpdateTimeSeconds = "foo";
     o.status = "foo";
   }
@@ -3376,21 +3376,21 @@
 checkLiveStreamHealthStatus(api.LiveStreamHealthStatus o) {
   buildCounterLiveStreamHealthStatus++;
   if (buildCounterLiveStreamHealthStatus < 3) {
-    checkUnnamed2571(o.configurationIssues);
+    checkUnnamed471(o.configurationIssues);
     unittest.expect(o.lastUpdateTimeSeconds, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
   }
   buildCounterLiveStreamHealthStatus--;
 }
 
-buildUnnamed2572() {
+buildUnnamed472() {
   var o = new core.List<api.LiveStream>();
   o.add(buildLiveStream());
   o.add(buildLiveStream());
   return o;
 }
 
-checkUnnamed2572(core.List<api.LiveStream> o) {
+checkUnnamed472(core.List<api.LiveStream> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLiveStream(o[0]);
   checkLiveStream(o[1]);
@@ -3403,7 +3403,7 @@
   if (buildCounterLiveStreamListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2572();
+    o.items = buildUnnamed472();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -3420,7 +3420,7 @@
   if (buildCounterLiveStreamListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2572(o.items);
+    checkUnnamed472(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -3480,14 +3480,14 @@
   buildCounterLiveStreamStatus--;
 }
 
-buildUnnamed2573() {
+buildUnnamed473() {
   var o = new core.List<api.LocalizedString>();
   o.add(buildLocalizedString());
   o.add(buildLocalizedString());
   return o;
 }
 
-checkUnnamed2573(core.List<api.LocalizedString> o) {
+checkUnnamed473(core.List<api.LocalizedString> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocalizedString(o[0]);
   checkLocalizedString(o[1]);
@@ -3500,7 +3500,7 @@
   if (buildCounterLocalizedProperty < 3) {
     o.default_ = "foo";
     o.defaultLanguage = buildLanguageTag();
-    o.localized = buildUnnamed2573();
+    o.localized = buildUnnamed473();
   }
   buildCounterLocalizedProperty--;
   return o;
@@ -3511,7 +3511,7 @@
   if (buildCounterLocalizedProperty < 3) {
     unittest.expect(o.default_, unittest.equals('foo'));
     checkLanguageTag(o.defaultLanguage);
-    checkUnnamed2573(o.localized);
+    checkUnnamed473(o.localized);
   }
   buildCounterLocalizedProperty--;
 }
@@ -3621,14 +3621,14 @@
   buildCounterPageInfo--;
 }
 
-buildUnnamed2574() {
+buildUnnamed474() {
   var o = new core.Map<core.String, api.PlaylistLocalization>();
   o["x"] = buildPlaylistLocalization();
   o["y"] = buildPlaylistLocalization();
   return o;
 }
 
-checkUnnamed2574(core.Map<core.String, api.PlaylistLocalization> o) {
+checkUnnamed474(core.Map<core.String, api.PlaylistLocalization> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlaylistLocalization(o["x"]);
   checkPlaylistLocalization(o["y"]);
@@ -3643,7 +3643,7 @@
     o.etag = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.localizations = buildUnnamed2574();
+    o.localizations = buildUnnamed474();
     o.player = buildPlaylistPlayer();
     o.snippet = buildPlaylistSnippet();
     o.status = buildPlaylistStatus();
@@ -3659,7 +3659,7 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed2574(o.localizations);
+    checkUnnamed474(o.localizations);
     checkPlaylistPlayer(o.player);
     checkPlaylistSnippet(o.snippet);
     checkPlaylistStatus(o.status);
@@ -3743,14 +3743,14 @@
   buildCounterPlaylistItemContentDetails--;
 }
 
-buildUnnamed2575() {
+buildUnnamed475() {
   var o = new core.List<api.PlaylistItem>();
   o.add(buildPlaylistItem());
   o.add(buildPlaylistItem());
   return o;
 }
 
-checkUnnamed2575(core.List<api.PlaylistItem> o) {
+checkUnnamed475(core.List<api.PlaylistItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlaylistItem(o[0]);
   checkPlaylistItem(o[1]);
@@ -3763,7 +3763,7 @@
   if (buildCounterPlaylistItemListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2575();
+    o.items = buildUnnamed475();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -3780,7 +3780,7 @@
   if (buildCounterPlaylistItemListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2575(o.items);
+    checkUnnamed475(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -3846,14 +3846,14 @@
   buildCounterPlaylistItemStatus--;
 }
 
-buildUnnamed2576() {
+buildUnnamed476() {
   var o = new core.List<api.Playlist>();
   o.add(buildPlaylist());
   o.add(buildPlaylist());
   return o;
 }
 
-checkUnnamed2576(core.List<api.Playlist> o) {
+checkUnnamed476(core.List<api.Playlist> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPlaylist(o[0]);
   checkPlaylist(o[1]);
@@ -3866,7 +3866,7 @@
   if (buildCounterPlaylistListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2576();
+    o.items = buildUnnamed476();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -3883,7 +3883,7 @@
   if (buildCounterPlaylistListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2576(o.items);
+    checkUnnamed476(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -3934,14 +3934,14 @@
   buildCounterPlaylistPlayer--;
 }
 
-buildUnnamed2577() {
+buildUnnamed477() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2577(core.List<core.String> o) {
+checkUnnamed477(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3958,7 +3958,7 @@
     o.description = "foo";
     o.localized = buildPlaylistLocalization();
     o.publishedAt = core.DateTime.parse("2002-02-27T14:01:02");
-    o.tags = buildUnnamed2577();
+    o.tags = buildUnnamed477();
     o.thumbnails = buildThumbnailDetails();
     o.title = "foo";
   }
@@ -3976,7 +3976,7 @@
     checkPlaylistLocalization(o.localized);
     unittest.expect(o.publishedAt,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed2577(o.tags);
+    checkUnnamed477(o.tags);
     checkThumbnailDetails(o.thumbnails);
     unittest.expect(o.title, unittest.equals('foo'));
   }
@@ -4098,14 +4098,14 @@
   buildCounterResourceId--;
 }
 
-buildUnnamed2578() {
+buildUnnamed478() {
   var o = new core.List<api.SearchResult>();
   o.add(buildSearchResult());
   o.add(buildSearchResult());
   return o;
 }
 
-checkUnnamed2578(core.List<api.SearchResult> o) {
+checkUnnamed478(core.List<api.SearchResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSearchResult(o[0]);
   checkSearchResult(o[1]);
@@ -4118,7 +4118,7 @@
   if (buildCounterSearchListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2578();
+    o.items = buildUnnamed478();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -4136,7 +4136,7 @@
   if (buildCounterSearchListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2578(o.items);
+    checkUnnamed478(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -4230,14 +4230,14 @@
   buildCounterSponsor--;
 }
 
-buildUnnamed2579() {
+buildUnnamed479() {
   var o = new core.List<api.Sponsor>();
   o.add(buildSponsor());
   o.add(buildSponsor());
   return o;
 }
 
-checkUnnamed2579(core.List<api.Sponsor> o) {
+checkUnnamed479(core.List<api.Sponsor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSponsor(o[0]);
   checkSponsor(o[1]);
@@ -4250,7 +4250,7 @@
   if (buildCounterSponsorListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2579();
+    o.items = buildUnnamed479();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -4266,7 +4266,7 @@
   if (buildCounterSponsorListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2579(o.items);
+    checkUnnamed479(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -4352,14 +4352,14 @@
   buildCounterSubscriptionContentDetails--;
 }
 
-buildUnnamed2580() {
+buildUnnamed480() {
   var o = new core.List<api.Subscription>();
   o.add(buildSubscription());
   o.add(buildSubscription());
   return o;
 }
 
-checkUnnamed2580(core.List<api.Subscription> o) {
+checkUnnamed480(core.List<api.Subscription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubscription(o[0]);
   checkSubscription(o[1]);
@@ -4372,7 +4372,7 @@
   if (buildCounterSubscriptionListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2580();
+    o.items = buildUnnamed480();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -4389,7 +4389,7 @@
   if (buildCounterSubscriptionListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2580(o.items);
+    checkUnnamed480(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -4482,14 +4482,14 @@
   buildCounterSuperChatEvent--;
 }
 
-buildUnnamed2581() {
+buildUnnamed481() {
   var o = new core.List<api.SuperChatEvent>();
   o.add(buildSuperChatEvent());
   o.add(buildSuperChatEvent());
   return o;
 }
 
-checkUnnamed2581(core.List<api.SuperChatEvent> o) {
+checkUnnamed481(core.List<api.SuperChatEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSuperChatEvent(o[0]);
   checkSuperChatEvent(o[1]);
@@ -4502,7 +4502,7 @@
   if (buildCounterSuperChatEventListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2581();
+    o.items = buildUnnamed481();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -4518,7 +4518,7 @@
   if (buildCounterSuperChatEventListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2581(o.items);
+    checkUnnamed481(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -4616,14 +4616,14 @@
   buildCounterThumbnailDetails--;
 }
 
-buildUnnamed2582() {
+buildUnnamed482() {
   var o = new core.List<api.ThumbnailDetails>();
   o.add(buildThumbnailDetails());
   o.add(buildThumbnailDetails());
   return o;
 }
 
-checkUnnamed2582(core.List<api.ThumbnailDetails> o) {
+checkUnnamed482(core.List<api.ThumbnailDetails> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkThumbnailDetails(o[0]);
   checkThumbnailDetails(o[1]);
@@ -4636,7 +4636,7 @@
   if (buildCounterThumbnailSetResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2582();
+    o.items = buildUnnamed482();
     o.kind = "foo";
     o.visitorId = "foo";
   }
@@ -4649,7 +4649,7 @@
   if (buildCounterThumbnailSetResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2582(o.items);
+    checkUnnamed482(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visitorId, unittest.equals('foo'));
   }
@@ -4671,14 +4671,14 @@
   buildCounterTokenPagination--;
 }
 
-buildUnnamed2583() {
+buildUnnamed483() {
   var o = new core.Map<core.String, api.VideoLocalization>();
   o["x"] = buildVideoLocalization();
   o["y"] = buildVideoLocalization();
   return o;
 }
 
-checkUnnamed2583(core.Map<core.String, api.VideoLocalization> o) {
+checkUnnamed483(core.Map<core.String, api.VideoLocalization> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoLocalization(o["x"]);
   checkVideoLocalization(o["y"]);
@@ -4696,7 +4696,7 @@
     o.id = "foo";
     o.kind = "foo";
     o.liveStreamingDetails = buildVideoLiveStreamingDetails();
-    o.localizations = buildUnnamed2583();
+    o.localizations = buildUnnamed483();
     o.monetizationDetails = buildVideoMonetizationDetails();
     o.player = buildVideoPlayer();
     o.processingDetails = buildVideoProcessingDetails();
@@ -4722,7 +4722,7 @@
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkVideoLiveStreamingDetails(o.liveStreamingDetails);
-    checkUnnamed2583(o.localizations);
+    checkUnnamed483(o.localizations);
     checkVideoMonetizationDetails(o.monetizationDetails);
     checkVideoPlayer(o.player);
     checkVideoProcessingDetails(o.processingDetails);
@@ -4789,14 +4789,14 @@
   buildCounterVideoAbuseReportReason--;
 }
 
-buildUnnamed2584() {
+buildUnnamed484() {
   var o = new core.List<api.VideoAbuseReportReason>();
   o.add(buildVideoAbuseReportReason());
   o.add(buildVideoAbuseReportReason());
   return o;
 }
 
-checkUnnamed2584(core.List<api.VideoAbuseReportReason> o) {
+checkUnnamed484(core.List<api.VideoAbuseReportReason> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoAbuseReportReason(o[0]);
   checkVideoAbuseReportReason(o[1]);
@@ -4809,7 +4809,7 @@
   if (buildCounterVideoAbuseReportReasonListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2584();
+    o.items = buildUnnamed484();
     o.kind = "foo";
     o.visitorId = "foo";
   }
@@ -4823,21 +4823,21 @@
   if (buildCounterVideoAbuseReportReasonListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2584(o.items);
+    checkUnnamed484(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visitorId, unittest.equals('foo'));
   }
   buildCounterVideoAbuseReportReasonListResponse--;
 }
 
-buildUnnamed2585() {
+buildUnnamed485() {
   var o = new core.List<api.VideoAbuseReportSecondaryReason>();
   o.add(buildVideoAbuseReportSecondaryReason());
   o.add(buildVideoAbuseReportSecondaryReason());
   return o;
 }
 
-checkUnnamed2585(core.List<api.VideoAbuseReportSecondaryReason> o) {
+checkUnnamed485(core.List<api.VideoAbuseReportSecondaryReason> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoAbuseReportSecondaryReason(o[0]);
   checkVideoAbuseReportSecondaryReason(o[1]);
@@ -4849,7 +4849,7 @@
   buildCounterVideoAbuseReportReasonSnippet++;
   if (buildCounterVideoAbuseReportReasonSnippet < 3) {
     o.label = "foo";
-    o.secondaryReasons = buildUnnamed2585();
+    o.secondaryReasons = buildUnnamed485();
   }
   buildCounterVideoAbuseReportReasonSnippet--;
   return o;
@@ -4859,7 +4859,7 @@
   buildCounterVideoAbuseReportReasonSnippet++;
   if (buildCounterVideoAbuseReportReasonSnippet < 3) {
     unittest.expect(o.label, unittest.equals('foo'));
-    checkUnnamed2585(o.secondaryReasons);
+    checkUnnamed485(o.secondaryReasons);
   }
   buildCounterVideoAbuseReportReasonSnippet--;
 }
@@ -4933,14 +4933,14 @@
   buildCounterVideoCategory--;
 }
 
-buildUnnamed2586() {
+buildUnnamed486() {
   var o = new core.List<api.VideoCategory>();
   o.add(buildVideoCategory());
   o.add(buildVideoCategory());
   return o;
 }
 
-checkUnnamed2586(core.List<api.VideoCategory> o) {
+checkUnnamed486(core.List<api.VideoCategory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoCategory(o[0]);
   checkVideoCategory(o[1]);
@@ -4953,7 +4953,7 @@
   if (buildCounterVideoCategoryListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2586();
+    o.items = buildUnnamed486();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -4970,7 +4970,7 @@
   if (buildCounterVideoCategoryListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2586(o.items);
+    checkUnnamed486(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -5041,27 +5041,27 @@
   buildCounterVideoContentDetails--;
 }
 
-buildUnnamed2587() {
+buildUnnamed487() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2587(core.List<core.String> o) {
+checkUnnamed487(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2588() {
+buildUnnamed488() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2588(core.List<core.String> o) {
+checkUnnamed488(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5072,8 +5072,8 @@
   var o = new api.VideoContentDetailsRegionRestriction();
   buildCounterVideoContentDetailsRegionRestriction++;
   if (buildCounterVideoContentDetailsRegionRestriction < 3) {
-    o.allowed = buildUnnamed2587();
-    o.blocked = buildUnnamed2588();
+    o.allowed = buildUnnamed487();
+    o.blocked = buildUnnamed488();
   }
   buildCounterVideoContentDetailsRegionRestriction--;
   return o;
@@ -5083,33 +5083,33 @@
     api.VideoContentDetailsRegionRestriction o) {
   buildCounterVideoContentDetailsRegionRestriction++;
   if (buildCounterVideoContentDetailsRegionRestriction < 3) {
-    checkUnnamed2587(o.allowed);
-    checkUnnamed2588(o.blocked);
+    checkUnnamed487(o.allowed);
+    checkUnnamed488(o.blocked);
   }
   buildCounterVideoContentDetailsRegionRestriction--;
 }
 
-buildUnnamed2589() {
+buildUnnamed489() {
   var o = new core.List<api.VideoFileDetailsAudioStream>();
   o.add(buildVideoFileDetailsAudioStream());
   o.add(buildVideoFileDetailsAudioStream());
   return o;
 }
 
-checkUnnamed2589(core.List<api.VideoFileDetailsAudioStream> o) {
+checkUnnamed489(core.List<api.VideoFileDetailsAudioStream> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoFileDetailsAudioStream(o[0]);
   checkVideoFileDetailsAudioStream(o[1]);
 }
 
-buildUnnamed2590() {
+buildUnnamed490() {
   var o = new core.List<api.VideoFileDetailsVideoStream>();
   o.add(buildVideoFileDetailsVideoStream());
   o.add(buildVideoFileDetailsVideoStream());
   return o;
 }
 
-checkUnnamed2590(core.List<api.VideoFileDetailsVideoStream> o) {
+checkUnnamed490(core.List<api.VideoFileDetailsVideoStream> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoFileDetailsVideoStream(o[0]);
   checkVideoFileDetailsVideoStream(o[1]);
@@ -5120,7 +5120,7 @@
   var o = new api.VideoFileDetails();
   buildCounterVideoFileDetails++;
   if (buildCounterVideoFileDetails < 3) {
-    o.audioStreams = buildUnnamed2589();
+    o.audioStreams = buildUnnamed489();
     o.bitrateBps = "foo";
     o.container = "foo";
     o.creationTime = "foo";
@@ -5128,7 +5128,7 @@
     o.fileName = "foo";
     o.fileSize = "foo";
     o.fileType = "foo";
-    o.videoStreams = buildUnnamed2590();
+    o.videoStreams = buildUnnamed490();
   }
   buildCounterVideoFileDetails--;
   return o;
@@ -5137,7 +5137,7 @@
 checkVideoFileDetails(api.VideoFileDetails o) {
   buildCounterVideoFileDetails++;
   if (buildCounterVideoFileDetails < 3) {
-    checkUnnamed2589(o.audioStreams);
+    checkUnnamed489(o.audioStreams);
     unittest.expect(o.bitrateBps, unittest.equals('foo'));
     unittest.expect(o.container, unittest.equals('foo'));
     unittest.expect(o.creationTime, unittest.equals('foo'));
@@ -5145,7 +5145,7 @@
     unittest.expect(o.fileName, unittest.equals('foo'));
     unittest.expect(o.fileSize, unittest.equals('foo'));
     unittest.expect(o.fileType, unittest.equals('foo'));
-    checkUnnamed2590(o.videoStreams);
+    checkUnnamed490(o.videoStreams);
   }
   buildCounterVideoFileDetails--;
 }
@@ -5208,14 +5208,14 @@
   buildCounterVideoFileDetailsVideoStream--;
 }
 
-buildUnnamed2591() {
+buildUnnamed491() {
   var o = new core.List<api.VideoRating>();
   o.add(buildVideoRating());
   o.add(buildVideoRating());
   return o;
 }
 
-checkUnnamed2591(core.List<api.VideoRating> o) {
+checkUnnamed491(core.List<api.VideoRating> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoRating(o[0]);
   checkVideoRating(o[1]);
@@ -5228,7 +5228,7 @@
   if (buildCounterVideoGetRatingResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2591();
+    o.items = buildUnnamed491();
     o.kind = "foo";
     o.visitorId = "foo";
   }
@@ -5241,21 +5241,21 @@
   if (buildCounterVideoGetRatingResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2591(o.items);
+    checkUnnamed491(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.visitorId, unittest.equals('foo'));
   }
   buildCounterVideoGetRatingResponse--;
 }
 
-buildUnnamed2592() {
+buildUnnamed492() {
   var o = new core.List<api.Video>();
   o.add(buildVideo());
   o.add(buildVideo());
   return o;
 }
 
-checkUnnamed2592(core.List<api.Video> o) {
+checkUnnamed492(core.List<api.Video> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideo(o[0]);
   checkVideo(o[1]);
@@ -5268,7 +5268,7 @@
   if (buildCounterVideoListResponse < 3) {
     o.etag = "foo";
     o.eventId = "foo";
-    o.items = buildUnnamed2592();
+    o.items = buildUnnamed492();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.pageInfo = buildPageInfo();
@@ -5285,7 +5285,7 @@
   if (buildCounterVideoListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.eventId, unittest.equals('foo'));
-    checkUnnamed2592(o.items);
+    checkUnnamed492(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     checkPageInfo(o.pageInfo);
@@ -5449,14 +5449,14 @@
   buildCounterVideoProcessingDetailsProcessingProgress--;
 }
 
-buildUnnamed2593() {
+buildUnnamed493() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2593(core.List<core.String> o) {
+checkUnnamed493(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5467,7 +5467,7 @@
   var o = new api.VideoProjectDetails();
   buildCounterVideoProjectDetails++;
   if (buildCounterVideoProjectDetails < 3) {
-    o.tags = buildUnnamed2593();
+    o.tags = buildUnnamed493();
   }
   buildCounterVideoProjectDetails--;
   return o;
@@ -5476,7 +5476,7 @@
 checkVideoProjectDetails(api.VideoProjectDetails o) {
   buildCounterVideoProjectDetails++;
   if (buildCounterVideoProjectDetails < 3) {
-    checkUnnamed2593(o.tags);
+    checkUnnamed493(o.tags);
   }
   buildCounterVideoProjectDetails--;
 }
@@ -5526,14 +5526,14 @@
   buildCounterVideoRecordingDetails--;
 }
 
-buildUnnamed2594() {
+buildUnnamed494() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2594(core.List<core.String> o) {
+checkUnnamed494(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5553,7 +5553,7 @@
     o.liveBroadcastContent = "foo";
     o.localized = buildVideoLocalization();
     o.publishedAt = core.DateTime.parse("2002-02-27T14:01:02");
-    o.tags = buildUnnamed2594();
+    o.tags = buildUnnamed494();
     o.thumbnails = buildThumbnailDetails();
     o.title = "foo";
   }
@@ -5574,7 +5574,7 @@
     checkVideoLocalization(o.localized);
     unittest.expect(o.publishedAt,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed2594(o.tags);
+    checkUnnamed494(o.tags);
     checkThumbnailDetails(o.thumbnails);
     unittest.expect(o.title, unittest.equals('foo'));
   }
@@ -5642,66 +5642,66 @@
   buildCounterVideoStatus--;
 }
 
-buildUnnamed2595() {
+buildUnnamed495() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2595(core.List<core.String> o) {
+checkUnnamed495(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2596() {
+buildUnnamed496() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2596(core.List<core.String> o) {
+checkUnnamed496(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2597() {
+buildUnnamed497() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2597(core.List<core.String> o) {
+checkUnnamed497(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2598() {
+buildUnnamed498() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2598(core.List<core.String> o) {
+checkUnnamed498(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2599() {
+buildUnnamed499() {
   var o = new core.List<api.VideoSuggestionsTagSuggestion>();
   o.add(buildVideoSuggestionsTagSuggestion());
   o.add(buildVideoSuggestionsTagSuggestion());
   return o;
 }
 
-checkUnnamed2599(core.List<api.VideoSuggestionsTagSuggestion> o) {
+checkUnnamed499(core.List<api.VideoSuggestionsTagSuggestion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVideoSuggestionsTagSuggestion(o[0]);
   checkVideoSuggestionsTagSuggestion(o[1]);
@@ -5712,11 +5712,11 @@
   var o = new api.VideoSuggestions();
   buildCounterVideoSuggestions++;
   if (buildCounterVideoSuggestions < 3) {
-    o.editorSuggestions = buildUnnamed2595();
-    o.processingErrors = buildUnnamed2596();
-    o.processingHints = buildUnnamed2597();
-    o.processingWarnings = buildUnnamed2598();
-    o.tagSuggestions = buildUnnamed2599();
+    o.editorSuggestions = buildUnnamed495();
+    o.processingErrors = buildUnnamed496();
+    o.processingHints = buildUnnamed497();
+    o.processingWarnings = buildUnnamed498();
+    o.tagSuggestions = buildUnnamed499();
   }
   buildCounterVideoSuggestions--;
   return o;
@@ -5725,23 +5725,23 @@
 checkVideoSuggestions(api.VideoSuggestions o) {
   buildCounterVideoSuggestions++;
   if (buildCounterVideoSuggestions < 3) {
-    checkUnnamed2595(o.editorSuggestions);
-    checkUnnamed2596(o.processingErrors);
-    checkUnnamed2597(o.processingHints);
-    checkUnnamed2598(o.processingWarnings);
-    checkUnnamed2599(o.tagSuggestions);
+    checkUnnamed495(o.editorSuggestions);
+    checkUnnamed496(o.processingErrors);
+    checkUnnamed497(o.processingHints);
+    checkUnnamed498(o.processingWarnings);
+    checkUnnamed499(o.tagSuggestions);
   }
   buildCounterVideoSuggestions--;
 }
 
-buildUnnamed2600() {
+buildUnnamed500() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2600(core.List<core.String> o) {
+checkUnnamed500(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5752,7 +5752,7 @@
   var o = new api.VideoSuggestionsTagSuggestion();
   buildCounterVideoSuggestionsTagSuggestion++;
   if (buildCounterVideoSuggestionsTagSuggestion < 3) {
-    o.categoryRestricts = buildUnnamed2600();
+    o.categoryRestricts = buildUnnamed500();
     o.tag = "foo";
   }
   buildCounterVideoSuggestionsTagSuggestion--;
@@ -5762,46 +5762,46 @@
 checkVideoSuggestionsTagSuggestion(api.VideoSuggestionsTagSuggestion o) {
   buildCounterVideoSuggestionsTagSuggestion++;
   if (buildCounterVideoSuggestionsTagSuggestion < 3) {
-    checkUnnamed2600(o.categoryRestricts);
+    checkUnnamed500(o.categoryRestricts);
     unittest.expect(o.tag, unittest.equals('foo'));
   }
   buildCounterVideoSuggestionsTagSuggestion--;
 }
 
-buildUnnamed2601() {
+buildUnnamed501() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2601(core.List<core.String> o) {
+checkUnnamed501(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2602() {
+buildUnnamed502() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2602(core.List<core.String> o) {
+checkUnnamed502(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed2603() {
+buildUnnamed503() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed2603(core.List<core.String> o) {
+checkUnnamed503(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5812,9 +5812,9 @@
   var o = new api.VideoTopicDetails();
   buildCounterVideoTopicDetails++;
   if (buildCounterVideoTopicDetails < 3) {
-    o.relevantTopicIds = buildUnnamed2601();
-    o.topicCategories = buildUnnamed2602();
-    o.topicIds = buildUnnamed2603();
+    o.relevantTopicIds = buildUnnamed501();
+    o.topicCategories = buildUnnamed502();
+    o.topicIds = buildUnnamed503();
   }
   buildCounterVideoTopicDetails--;
   return o;
@@ -5823,9 +5823,9 @@
 checkVideoTopicDetails(api.VideoTopicDetails o) {
   buildCounterVideoTopicDetails++;
   if (buildCounterVideoTopicDetails < 3) {
-    checkUnnamed2601(o.relevantTopicIds);
-    checkUnnamed2602(o.topicCategories);
-    checkUnnamed2603(o.topicIds);
+    checkUnnamed501(o.relevantTopicIds);
+    checkUnnamed502(o.topicCategories);
+    checkUnnamed503(o.topicIds);
   }
   buildCounterVideoTopicDetails--;
 }
@@ -7328,7 +7328,7 @@
       }), true);
       res
           .insert(arg_request, arg_part, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Activity response) {
+          .then(unittest.expectAsync1(((response) {
         checkActivity(response);
       })));
     });
@@ -7413,7 +7413,7 @@
               publishedBefore: arg_publishedBefore,
               regionCode: arg_regionCode,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ActivityListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkActivityListResponse(response);
       })));
     });
@@ -7621,7 +7621,7 @@
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               sync: arg_sync,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Caption response) {
+          .then(unittest.expectAsync1(((response) {
         checkCaption(response);
       })));
     });
@@ -7690,7 +7690,7 @@
               onBehalfOf: arg_onBehalfOf,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CaptionListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCaptionListResponse(response);
       })));
     });
@@ -7763,7 +7763,7 @@
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               sync: arg_sync,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Caption response) {
+          .then(unittest.expectAsync1(((response) {
         checkCaption(response);
       })));
     });
@@ -7834,7 +7834,7 @@
               channelId: arg_channelId,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChannelBannerResource response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannelBannerResource(response);
       })));
     });
@@ -7962,7 +7962,7 @@
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChannelSection response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannelSection(response);
       })));
     });
@@ -8035,8 +8035,7 @@
               mine: arg_mine,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ChannelSectionListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannelSectionListResponse(response);
       })));
     });
@@ -8100,7 +8099,7 @@
           .update(arg_request, arg_part,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChannelSection response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannelSection(response);
       })));
     });
@@ -8194,7 +8193,7 @@
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChannelListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannelListResponse(response);
       })));
     });
@@ -8257,7 +8256,7 @@
           .update(arg_request, arg_part,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Channel response) {
+          .then(unittest.expectAsync1(((response) {
         checkChannel(response);
       })));
     });
@@ -8318,7 +8317,7 @@
       }), true);
       res
           .insert(arg_request, arg_part, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentThread response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentThread(response);
       })));
     });
@@ -8412,8 +8411,7 @@
               textFormat: arg_textFormat,
               videoId: arg_videoId,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.CommentThreadListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentThreadListResponse(response);
       })));
     });
@@ -8472,7 +8470,7 @@
       }), true);
       res
           .update(arg_request, arg_part, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentThread response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentThread(response);
       })));
     });
@@ -8584,7 +8582,7 @@
       }), true);
       res
           .insert(arg_request, arg_part, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -8658,7 +8656,7 @@
               parentId: arg_parentId,
               textFormat: arg_textFormat,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommentListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommentListResponse(response);
       })));
     });
@@ -8827,7 +8825,7 @@
       }), true);
       res
           .update(arg_request, arg_part, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Comment response) {
+          .then(unittest.expectAsync1(((response) {
         checkComment(response);
       })));
     });
@@ -8896,8 +8894,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.FanFundingEventListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFanFundingEventListResponse(response);
       })));
     });
@@ -8965,8 +8962,7 @@
               id: arg_id,
               regionCode: arg_regionCode,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.GuideCategoryListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGuideCategoryListResponse(response);
       })));
     });
@@ -9024,7 +9020,7 @@
       }), true);
       res
           .list(arg_part, hl: arg_hl, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.I18nLanguageListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkI18nLanguageListResponse(response);
       })));
     });
@@ -9082,7 +9078,7 @@
       }), true);
       res
           .list(arg_part, hl: arg_hl, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.I18nRegionListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkI18nRegionListResponse(response);
       })));
     });
@@ -9154,7 +9150,7 @@
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               streamId: arg_streamId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LiveBroadcast response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveBroadcast(response);
       })));
     });
@@ -9232,7 +9228,7 @@
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               walltime: arg_walltime,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LiveBroadcast response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveBroadcast(response);
       })));
     });
@@ -9362,7 +9358,7 @@
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LiveBroadcast response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveBroadcast(response);
       })));
     });
@@ -9448,8 +9444,7 @@
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.LiveBroadcastListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveBroadcastListResponse(response);
       })));
     });
@@ -9518,7 +9513,7 @@
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LiveBroadcast response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveBroadcast(response);
       })));
     });
@@ -9586,7 +9581,7 @@
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LiveBroadcast response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveBroadcast(response);
       })));
     });
@@ -9698,7 +9693,7 @@
       }), true);
       res
           .insert(arg_request, arg_part, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LiveChatBan response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveChatBan(response);
       })));
     });
@@ -9812,7 +9807,7 @@
       }), true);
       res
           .insert(arg_request, arg_part, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LiveChatMessage response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveChatMessage(response);
       })));
     });
@@ -9886,8 +9881,7 @@
               pageToken: arg_pageToken,
               profileImageSize: arg_profileImageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.LiveChatMessageListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveChatMessageListResponse(response);
       })));
     });
@@ -10001,7 +9995,7 @@
       }), true);
       res
           .insert(arg_request, arg_part, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LiveChatModerator response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveChatModerator(response);
       })));
     });
@@ -10068,8 +10062,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.LiveChatModeratorListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveChatModeratorListResponse(response);
       })));
     });
@@ -10199,7 +10192,7 @@
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LiveStream response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveStream(response);
       })));
     });
@@ -10276,7 +10269,7 @@
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LiveStreamListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveStreamListResponse(response);
       })));
     });
@@ -10343,7 +10336,7 @@
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LiveStream response) {
+          .then(unittest.expectAsync1(((response) {
         checkLiveStream(response);
       })));
     });
@@ -10465,7 +10458,7 @@
           .insert(arg_request, arg_part,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlaylistItem response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlaylistItem(response);
       })));
     });
@@ -10543,7 +10536,7 @@
               playlistId: arg_playlistId,
               videoId: arg_videoId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlaylistItemListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlaylistItemListResponse(response);
       })));
     });
@@ -10606,7 +10599,7 @@
           .update(arg_request, arg_part,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlaylistItem response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlaylistItem(response);
       })));
     });
@@ -10732,7 +10725,7 @@
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Playlist response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlaylist(response);
       })));
     });
@@ -10816,7 +10809,7 @@
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PlaylistListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlaylistListResponse(response);
       })));
     });
@@ -10879,7 +10872,7 @@
           .update(arg_request, arg_part,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Playlist response) {
+          .then(unittest.expectAsync1(((response) {
         checkPlaylist(response);
       })));
     });
@@ -11053,7 +11046,7 @@
               videoSyndicated: arg_videoSyndicated,
               videoType: arg_videoType,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SearchListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSearchListResponse(response);
       })));
     });
@@ -11121,7 +11114,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SponsorListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSponsorListResponse(response);
       })));
     });
@@ -11233,7 +11226,7 @@
       }), true);
       res
           .insert(arg_request, arg_part, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -11329,7 +11322,7 @@
               order: arg_order,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SubscriptionListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscriptionListResponse(response);
       })));
     });
@@ -11398,8 +11391,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.SuperChatEventListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSuperChatEventListResponse(response);
       })));
     });
@@ -11464,7 +11456,7 @@
           .set(arg_videoId,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ThumbnailSetResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkThumbnailSetResponse(response);
       })));
     });
@@ -11522,8 +11514,9 @@
             convert.JSON.encode(buildVideoAbuseReportReasonListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(arg_part, hl: arg_hl, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.VideoAbuseReportReasonListResponse response) {
+      res
+          .list(arg_part, hl: arg_hl, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkVideoAbuseReportReasonListResponse(response);
       })));
     });
@@ -11591,8 +11584,7 @@
               id: arg_id,
               regionCode: arg_regionCode,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.VideoCategoryListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkVideoCategoryListResponse(response);
       })));
     });
@@ -11710,7 +11702,7 @@
           .getRating(arg_id,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VideoGetRatingResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkVideoGetRatingResponse(response);
       })));
     });
@@ -11792,7 +11784,7 @@
               onBehalfOfContentOwnerChannel: arg_onBehalfOfContentOwnerChannel,
               stabilize: arg_stabilize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Video response) {
+          .then(unittest.expectAsync1(((response) {
         checkVideo(response);
       })));
     });
@@ -11891,7 +11883,7 @@
               regionCode: arg_regionCode,
               videoCategoryId: arg_videoCategoryId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.VideoListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkVideoListResponse(response);
       })));
     });
@@ -12067,7 +12059,7 @@
           .update(arg_request, arg_part,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Video response) {
+          .then(unittest.expectAsync1(((response) {
         checkVideo(response);
       })));
     });
diff --git a/generated/googleapis/test/youtubeanalytics/v1_test.dart b/generated/googleapis/test/youtubeanalytics/v1_test.dart
index 40cf4b5..5d6cdd8 100644
--- a/generated/googleapis/test/youtubeanalytics/v1_test.dart
+++ b/generated/googleapis/test/youtubeanalytics/v1_test.dart
@@ -168,14 +168,14 @@
   buildCounterGroupItem--;
 }
 
-buildUnnamed3391() {
+buildUnnamed1914() {
   var o = new core.List<api.GroupItem>();
   o.add(buildGroupItem());
   o.add(buildGroupItem());
   return o;
 }
 
-checkUnnamed3391(core.List<api.GroupItem> o) {
+checkUnnamed1914(core.List<api.GroupItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGroupItem(o[0]);
   checkGroupItem(o[1]);
@@ -187,7 +187,7 @@
   buildCounterGroupItemListResponse++;
   if (buildCounterGroupItemListResponse < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3391();
+    o.items = buildUnnamed1914();
     o.kind = "foo";
   }
   buildCounterGroupItemListResponse--;
@@ -198,20 +198,20 @@
   buildCounterGroupItemListResponse++;
   if (buildCounterGroupItemListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3391(o.items);
+    checkUnnamed1914(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterGroupItemListResponse--;
 }
 
-buildUnnamed3392() {
+buildUnnamed1915() {
   var o = new core.List<api.Group>();
   o.add(buildGroup());
   o.add(buildGroup());
   return o;
 }
 
-checkUnnamed3392(core.List<api.Group> o) {
+checkUnnamed1915(core.List<api.Group> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGroup(o[0]);
   checkGroup(o[1]);
@@ -223,7 +223,7 @@
   buildCounterGroupListResponse++;
   if (buildCounterGroupListResponse < 3) {
     o.etag = "foo";
-    o.items = buildUnnamed3392();
+    o.items = buildUnnamed1915();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -235,7 +235,7 @@
   buildCounterGroupListResponse++;
   if (buildCounterGroupListResponse < 3) {
     unittest.expect(o.etag, unittest.equals('foo'));
-    checkUnnamed3392(o.items);
+    checkUnnamed1915(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -265,20 +265,20 @@
   buildCounterResultTableColumnHeaders--;
 }
 
-buildUnnamed3393() {
+buildUnnamed1916() {
   var o = new core.List<api.ResultTableColumnHeaders>();
   o.add(buildResultTableColumnHeaders());
   o.add(buildResultTableColumnHeaders());
   return o;
 }
 
-checkUnnamed3393(core.List<api.ResultTableColumnHeaders> o) {
+checkUnnamed1916(core.List<api.ResultTableColumnHeaders> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResultTableColumnHeaders(o[0]);
   checkResultTableColumnHeaders(o[1]);
 }
 
-buildUnnamed3394() {
+buildUnnamed1917() {
   var o = new core.List<core.Object>();
   o.add({
     'list': [1, 2, 3],
@@ -293,7 +293,7 @@
   return o;
 }
 
-checkUnnamed3394(core.List<core.Object> o) {
+checkUnnamed1917(core.List<core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o[0]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -307,17 +307,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3395() {
+buildUnnamed1918() {
   var o = new core.List<core.List<core.Object>>();
-  o.add(buildUnnamed3394());
-  o.add(buildUnnamed3394());
+  o.add(buildUnnamed1917());
+  o.add(buildUnnamed1917());
   return o;
 }
 
-checkUnnamed3395(core.List<core.List<core.Object>> o) {
+checkUnnamed1918(core.List<core.List<core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3394(o[0]);
-  checkUnnamed3394(o[1]);
+  checkUnnamed1917(o[0]);
+  checkUnnamed1917(o[1]);
 }
 
 core.int buildCounterResultTable = 0;
@@ -325,9 +325,9 @@
   var o = new api.ResultTable();
   buildCounterResultTable++;
   if (buildCounterResultTable < 3) {
-    o.columnHeaders = buildUnnamed3393();
+    o.columnHeaders = buildUnnamed1916();
     o.kind = "foo";
-    o.rows = buildUnnamed3395();
+    o.rows = buildUnnamed1918();
   }
   buildCounterResultTable--;
   return o;
@@ -336,9 +336,9 @@
 checkResultTable(api.ResultTable o) {
   buildCounterResultTable++;
   if (buildCounterResultTable < 3) {
-    checkUnnamed3393(o.columnHeaders);
+    checkUnnamed1916(o.columnHeaders);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3395(o.rows);
+    checkUnnamed1918(o.rows);
   }
   buildCounterResultTable--;
 }
@@ -532,7 +532,7 @@
           .insert(arg_request,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GroupItem response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroupItem(response);
       })));
     });
@@ -593,7 +593,7 @@
           .list(arg_groupId,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GroupItemListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroupItemListResponse(response);
       })));
     });
@@ -713,7 +713,7 @@
           .insert(arg_request,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Group response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroup(response);
       })));
     });
@@ -780,7 +780,7 @@
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GroupListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroupListResponse(response);
       })));
     });
@@ -841,7 +841,7 @@
           .update(arg_request,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Group response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroup(response);
       })));
     });
@@ -935,7 +935,7 @@
               sort: arg_sort,
               start_index: arg_start_index,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ResultTable response) {
+          .then(unittest.expectAsync1(((response) {
         checkResultTable(response);
       })));
     });
diff --git a/generated/googleapis/test/youtubereporting/v1_test.dart b/generated/googleapis/test/youtubereporting/v1_test.dart
index 39160ff..dc7026c 100644
--- a/generated/googleapis/test/youtubereporting/v1_test.dart
+++ b/generated/googleapis/test/youtubereporting/v1_test.dart
@@ -290,14 +290,14 @@
   buildCounterGdataDownloadParameters--;
 }
 
-buildUnnamed3594() {
+buildUnnamed2318() {
   var o = new core.List<api.GdataCompositeMedia>();
   o.add(buildGdataCompositeMedia());
   o.add(buildGdataCompositeMedia());
   return o;
 }
 
-checkUnnamed3594(core.List<api.GdataCompositeMedia> o) {
+checkUnnamed2318(core.List<api.GdataCompositeMedia> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGdataCompositeMedia(o[0]);
   checkGdataCompositeMedia(o[1]);
@@ -312,7 +312,7 @@
     o.bigstoreObjectRef = "foo";
     o.blobRef = "foo";
     o.blobstore2Info = buildGdataBlobstore2Info();
-    o.compositeMedia = buildUnnamed3594();
+    o.compositeMedia = buildUnnamed2318();
     o.contentType = "foo";
     o.contentTypeInfo = buildGdataContentTypeInfo();
     o.cosmoBinaryReference = "foo";
@@ -350,7 +350,7 @@
     unittest.expect(o.bigstoreObjectRef, unittest.equals('foo'));
     unittest.expect(o.blobRef, unittest.equals('foo'));
     checkGdataBlobstore2Info(o.blobstore2Info);
-    checkUnnamed3594(o.compositeMedia);
+    checkUnnamed2318(o.compositeMedia);
     unittest.expect(o.contentType, unittest.equals('foo'));
     checkGdataContentTypeInfo(o.contentTypeInfo);
     unittest.expect(o.cosmoBinaryReference, unittest.equals('foo'));
@@ -432,14 +432,14 @@
   buildCounterJob--;
 }
 
-buildUnnamed3595() {
+buildUnnamed2319() {
   var o = new core.List<api.Job>();
   o.add(buildJob());
   o.add(buildJob());
   return o;
 }
 
-checkUnnamed3595(core.List<api.Job> o) {
+checkUnnamed2319(core.List<api.Job> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJob(o[0]);
   checkJob(o[1]);
@@ -450,7 +450,7 @@
   var o = new api.ListJobsResponse();
   buildCounterListJobsResponse++;
   if (buildCounterListJobsResponse < 3) {
-    o.jobs = buildUnnamed3595();
+    o.jobs = buildUnnamed2319();
     o.nextPageToken = "foo";
   }
   buildCounterListJobsResponse--;
@@ -460,20 +460,20 @@
 checkListJobsResponse(api.ListJobsResponse o) {
   buildCounterListJobsResponse++;
   if (buildCounterListJobsResponse < 3) {
-    checkUnnamed3595(o.jobs);
+    checkUnnamed2319(o.jobs);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListJobsResponse--;
 }
 
-buildUnnamed3596() {
+buildUnnamed2320() {
   var o = new core.List<api.ReportType>();
   o.add(buildReportType());
   o.add(buildReportType());
   return o;
 }
 
-checkUnnamed3596(core.List<api.ReportType> o) {
+checkUnnamed2320(core.List<api.ReportType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReportType(o[0]);
   checkReportType(o[1]);
@@ -485,7 +485,7 @@
   buildCounterListReportTypesResponse++;
   if (buildCounterListReportTypesResponse < 3) {
     o.nextPageToken = "foo";
-    o.reportTypes = buildUnnamed3596();
+    o.reportTypes = buildUnnamed2320();
   }
   buildCounterListReportTypesResponse--;
   return o;
@@ -495,19 +495,19 @@
   buildCounterListReportTypesResponse++;
   if (buildCounterListReportTypesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3596(o.reportTypes);
+    checkUnnamed2320(o.reportTypes);
   }
   buildCounterListReportTypesResponse--;
 }
 
-buildUnnamed3597() {
+buildUnnamed2321() {
   var o = new core.List<api.Report>();
   o.add(buildReport());
   o.add(buildReport());
   return o;
 }
 
-checkUnnamed3597(core.List<api.Report> o) {
+checkUnnamed2321(core.List<api.Report> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReport(o[0]);
   checkReport(o[1]);
@@ -519,7 +519,7 @@
   buildCounterListReportsResponse++;
   if (buildCounterListReportsResponse < 3) {
     o.nextPageToken = "foo";
-    o.reports = buildUnnamed3597();
+    o.reports = buildUnnamed2321();
   }
   buildCounterListReportsResponse--;
   return o;
@@ -529,7 +529,7 @@
   buildCounterListReportsResponse++;
   if (buildCounterListReportsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3597(o.reports);
+    checkUnnamed2321(o.reports);
   }
   buildCounterListReportsResponse--;
 }
@@ -789,7 +789,7 @@
           .create(arg_request,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -847,7 +847,7 @@
           .delete(arg_jobId,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -905,7 +905,7 @@
           .get(arg_jobId,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -971,7 +971,7 @@
               includeSystemManaged: arg_includeSystemManaged,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListJobsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListJobsResponse(response);
       })));
     });
@@ -1042,7 +1042,7 @@
           .get(arg_jobId, arg_reportId,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Report response) {
+          .then(unittest.expectAsync1(((response) {
         checkReport(response);
       })));
     });
@@ -1127,7 +1127,7 @@
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               startTimeBefore: arg_startTimeBefore,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListReportsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListReportsResponse(response);
       })));
     });
@@ -1183,7 +1183,7 @@
       }), true);
       res
           .download(arg_resourceName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GdataMedia response) {
+          .then(unittest.expectAsync1(((response) {
         checkGdataMedia(response);
       })));
     });
@@ -1252,7 +1252,7 @@
               pageSize: arg_pageSize,
               onBehalfOfContentOwner: arg_onBehalfOfContentOwner,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListReportTypesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListReportTypesResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/CHANGELOG.md b/generated/googleapis_beta/CHANGELOG.md
index 4f137f1..171ccc3 100644
--- a/generated/googleapis_beta/CHANGELOG.md
+++ b/generated/googleapis_beta/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.45.1
+
+* Re-generated with updated code generator to support Dart 2.
+
 ## 0.45.0
 
 * [api] dlp:v2beta2
diff --git a/generated/googleapis_beta/lib/adexchangebuyer2/v2beta1.dart b/generated/googleapis_beta/lib/adexchangebuyer2/v2beta1.dart
index 21dfc46..8302297 100644
--- a/generated/googleapis_beta/lib/adexchangebuyer2/v2beta1.dart
+++ b/generated/googleapis_beta/lib/adexchangebuyer2/v2beta1.dart
@@ -78,7 +78,7 @@
   async.Future<Client> create(Client request, core.String accountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -130,7 +130,7 @@
   async.Future<Client> get(core.String accountId, core.String clientAccountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -199,7 +199,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -261,7 +261,7 @@
       Client request, core.String accountId, core.String clientAccountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -328,7 +328,7 @@
       core.String accountId, core.String clientAccountId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -390,7 +390,7 @@
       core.String clientAccountId, core.String invitationId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -467,7 +467,7 @@
       core.String accountId, core.String clientAccountId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -538,7 +538,7 @@
       core.String accountId, core.String clientAccountId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -614,7 +614,7 @@
       core.String accountId, core.String clientAccountId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -681,7 +681,7 @@
       core.String clientAccountId, core.String userId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -764,7 +764,7 @@
       core.String duplicateIdMode,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -820,7 +820,7 @@
   async.Future<Creative> get(core.String accountId, core.String creativeId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -903,7 +903,7 @@
       core.String query,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -964,7 +964,7 @@
       core.String accountId, core.String creativeId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1030,7 +1030,7 @@
       Creative request, core.String accountId, core.String creativeId,
       {core.String accountId1, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1095,7 +1095,7 @@
       core.String creativeId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1160,7 +1160,7 @@
       core.String accountId, core.String creativeId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1246,7 +1246,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1311,7 +1311,7 @@
       core.String accountId, core.String creativeId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1434,7 +1434,7 @@
   async.Future<FilterSet> create(FilterSet request, core.String ownerName,
       {core.bool isTransient, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1497,7 +1497,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1552,7 +1552,7 @@
   /// this method will complete with the same error.
   async.Future<FilterSet> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1619,7 +1619,7 @@
   async.Future<ListFilterSetsResponse> list(core.String ownerName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1701,7 +1701,7 @@
   async.Future<ListBidMetricsResponse> list(core.String filterSetName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1785,7 +1785,7 @@
   async.Future<ListBidResponseErrorsResponse> list(core.String filterSetName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1874,7 +1874,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1959,7 +1959,7 @@
   async.Future<ListFilteredBidRequestsResponse> list(core.String filterSetName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2048,7 +2048,7 @@
   async.Future<ListFilteredBidsResponse> list(core.String filterSetName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2140,7 +2140,7 @@
       core.String filterSetName, core.int creativeStatusId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2238,7 +2238,7 @@
       core.String filterSetName, core.int creativeStatusId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2327,7 +2327,7 @@
   async.Future<ListImpressionMetricsResponse> list(core.String filterSetName,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2411,7 +2411,7 @@
   async.Future<ListLosingBidsResponse> list(core.String filterSetName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2498,7 +2498,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2596,7 +2596,7 @@
   async.Future<FilterSet> create(FilterSet request, core.String ownerName,
       {core.bool isTransient, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2659,7 +2659,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2714,7 +2714,7 @@
   /// this method will complete with the same error.
   async.Future<FilterSet> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2781,7 +2781,7 @@
   async.Future<ListFilterSetsResponse> list(core.String ownerName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2863,7 +2863,7 @@
   async.Future<ListBidMetricsResponse> list(core.String filterSetName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2946,7 +2946,7 @@
   async.Future<ListBidResponseErrorsResponse> list(core.String filterSetName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3035,7 +3035,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3119,7 +3119,7 @@
   async.Future<ListFilteredBidRequestsResponse> list(core.String filterSetName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3208,7 +3208,7 @@
   async.Future<ListFilteredBidsResponse> list(core.String filterSetName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3299,7 +3299,7 @@
       core.String filterSetName, core.int creativeStatusId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3396,7 +3396,7 @@
       core.String filterSetName, core.int creativeStatusId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3484,7 +3484,7 @@
   async.Future<ListImpressionMetricsResponse> list(core.String filterSetName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3568,7 +3568,7 @@
   async.Future<ListLosingBidsResponse> list(core.String filterSetName,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -3655,7 +3655,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -4318,7 +4318,7 @@
   Correction.fromJson(core.Map _json) {
     if (_json.containsKey("contexts")) {
       contexts = _json["contexts"]
-          .map((value) => new ServingContext.fromJson(value))
+          .map<ServingContext>((value) => new ServingContext.fromJson(value))
           .toList();
     }
     if (_json.containsKey("details")) {
@@ -4504,7 +4504,7 @@
     }
     if (_json.containsKey("corrections")) {
       corrections = _json["corrections"]
-          .map((value) => new Correction.fromJson(value))
+          .map<Correction>((value) => new Correction.fromJson(value))
           .toList();
     }
     if (_json.containsKey("creativeId")) {
@@ -4548,7 +4548,8 @@
     }
     if (_json.containsKey("servingRestrictions")) {
       servingRestrictions = _json["servingRestrictions"]
-          .map((value) => new ServingRestriction.fromJson(value))
+          .map<ServingRestriction>(
+              (value) => new ServingRestriction.fromJson(value))
           .toList();
     }
     if (_json.containsKey("vendorIds")) {
@@ -5283,8 +5284,9 @@
       date = new Date.fromJson(_json["date"]);
     }
     if (_json.containsKey("reasons")) {
-      reasons =
-          _json["reasons"].map((value) => new Reason.fromJson(value)).toList();
+      reasons = _json["reasons"]
+          .map<Reason>((value) => new Reason.fromJson(value))
+          .toList();
     }
   }
 
@@ -5478,7 +5480,7 @@
   ListBidMetricsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("bidMetricsRows")) {
       bidMetricsRows = _json["bidMetricsRows"]
-          .map((value) => new BidMetricsRow.fromJson(value))
+          .map<BidMetricsRow>((value) => new BidMetricsRow.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5518,7 +5520,8 @@
   ListBidResponseErrorsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("calloutStatusRows")) {
       calloutStatusRows = _json["calloutStatusRows"]
-          .map((value) => new CalloutStatusRow.fromJson(value))
+          .map<CalloutStatusRow>(
+              (value) => new CalloutStatusRow.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5558,10 +5561,11 @@
 
   ListBidResponsesWithoutBidsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("bidResponseWithoutBidsStatusRows")) {
-      bidResponseWithoutBidsStatusRows = _json[
-              "bidResponseWithoutBidsStatusRows"]
-          .map((value) => new BidResponseWithoutBidsStatusRow.fromJson(value))
-          .toList();
+      bidResponseWithoutBidsStatusRows =
+          _json["bidResponseWithoutBidsStatusRows"]
+              .map<BidResponseWithoutBidsStatusRow>((value) =>
+                  new BidResponseWithoutBidsStatusRow.fromJson(value))
+              .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -5602,7 +5606,8 @@
   ListClientUserInvitationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("invitations")) {
       invitations = _json["invitations"]
-          .map((value) => new ClientUserInvitation.fromJson(value))
+          .map<ClientUserInvitation>(
+              (value) => new ClientUserInvitation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5645,7 +5650,7 @@
     }
     if (_json.containsKey("users")) {
       users = _json["users"]
-          .map((value) => new ClientUser.fromJson(value))
+          .map<ClientUser>((value) => new ClientUser.fromJson(value))
           .toList();
     }
   }
@@ -5679,8 +5684,9 @@
 
   ListClientsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("clients")) {
-      clients =
-          _json["clients"].map((value) => new Client.fromJson(value)).toList();
+      clients = _json["clients"]
+          .map<Client>((value) => new Client.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -5719,7 +5725,8 @@
   ListCreativeStatusBreakdownByCreativeResponse.fromJson(core.Map _json) {
     if (_json.containsKey("filteredBidCreativeRows")) {
       filteredBidCreativeRows = _json["filteredBidCreativeRows"]
-          .map((value) => new FilteredBidCreativeRow.fromJson(value))
+          .map<FilteredBidCreativeRow>(
+              (value) => new FilteredBidCreativeRow.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5785,7 +5792,8 @@
     }
     if (_json.containsKey("filteredBidDetailRows")) {
       filteredBidDetailRows = _json["filteredBidDetailRows"]
-          .map((value) => new FilteredBidDetailRow.fromJson(value))
+          .map<FilteredBidDetailRow>(
+              (value) => new FilteredBidDetailRow.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5828,7 +5836,7 @@
   ListCreativesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("creatives")) {
       creatives = _json["creatives"]
-          .map((value) => new Creative.fromJson(value))
+          .map<Creative>((value) => new Creative.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5866,7 +5874,8 @@
   ListDealAssociationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("associations")) {
       associations = _json["associations"]
-          .map((value) => new CreativeDealAssociation.fromJson(value))
+          .map<CreativeDealAssociation>(
+              (value) => new CreativeDealAssociation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5906,7 +5915,7 @@
   ListFilterSetsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("filterSets")) {
       filterSets = _json["filterSets"]
-          .map((value) => new FilterSet.fromJson(value))
+          .map<FilterSet>((value) => new FilterSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5947,7 +5956,8 @@
   ListFilteredBidRequestsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("calloutStatusRows")) {
       calloutStatusRows = _json["calloutStatusRows"]
-          .map((value) => new CalloutStatusRow.fromJson(value))
+          .map<CalloutStatusRow>(
+              (value) => new CalloutStatusRow.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5988,7 +5998,8 @@
   ListFilteredBidsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("creativeStatusRows")) {
       creativeStatusRows = _json["creativeStatusRows"]
-          .map((value) => new CreativeStatusRow.fromJson(value))
+          .map<CreativeStatusRow>(
+              (value) => new CreativeStatusRow.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -6028,7 +6039,8 @@
   ListImpressionMetricsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("impressionMetricsRows")) {
       impressionMetricsRows = _json["impressionMetricsRows"]
-          .map((value) => new ImpressionMetricsRow.fromJson(value))
+          .map<ImpressionMetricsRow>(
+              (value) => new ImpressionMetricsRow.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -6068,7 +6080,8 @@
   ListLosingBidsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("creativeStatusRows")) {
       creativeStatusRows = _json["creativeStatusRows"]
-          .map((value) => new CreativeStatusRow.fromJson(value))
+          .map<CreativeStatusRow>(
+              (value) => new CreativeStatusRow.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -6112,7 +6125,8 @@
     }
     if (_json.containsKey("nonBillableWinningBidStatusRows")) {
       nonBillableWinningBidStatusRows = _json["nonBillableWinningBidStatusRows"]
-          .map((value) => new NonBillableWinningBidStatusRow.fromJson(value))
+          .map<NonBillableWinningBidStatusRow>(
+              (value) => new NonBillableWinningBidStatusRow.fromJson(value))
           .toList();
     }
   }
@@ -6674,12 +6688,12 @@
   ServingRestriction.fromJson(core.Map _json) {
     if (_json.containsKey("contexts")) {
       contexts = _json["contexts"]
-          .map((value) => new ServingContext.fromJson(value))
+          .map<ServingContext>((value) => new ServingContext.fromJson(value))
           .toList();
     }
     if (_json.containsKey("disapprovalReasons")) {
       disapprovalReasons = _json["disapprovalReasons"]
-          .map((value) => new Disapproval.fromJson(value))
+          .map<Disapproval>((value) => new Disapproval.fromJson(value))
           .toList();
     }
     if (_json.containsKey("status")) {
diff --git a/generated/googleapis_beta/lib/appengine/v1beta.dart b/generated/googleapis_beta/lib/appengine/v1beta.dart
index e08ccfd..21d8e28 100644
--- a/generated/googleapis_beta/lib/appengine/v1beta.dart
+++ b/generated/googleapis_beta/lib/appengine/v1beta.dart
@@ -85,7 +85,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> create(Application request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -128,7 +128,7 @@
   /// this method will complete with the same error.
   async.Future<Application> get(core.String appsId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -180,7 +180,7 @@
   async.Future<Operation> patch(Application request, core.String appsId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -236,7 +236,7 @@
       RepairApplicationRequest request, core.String appsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -294,7 +294,7 @@
       AuthorizedCertificate request, core.String appsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -347,7 +347,7 @@
       core.String appsId, core.String authorizedCertificatesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -407,7 +407,7 @@
       core.String appsId, core.String authorizedCertificatesId,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -473,7 +473,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -543,7 +543,7 @@
       core.String appsId, core.String authorizedCertificatesId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -611,7 +611,7 @@
   async.Future<ListAuthorizedDomainsResponse> list(core.String appsId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -683,7 +683,7 @@
   async.Future<Operation> create(DomainMapping request, core.String appsId,
       {core.String overrideStrategy, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -740,7 +740,7 @@
       core.String appsId, core.String domainMappingsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -793,7 +793,7 @@
       core.String appsId, core.String domainMappingsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -847,7 +847,7 @@
   async.Future<ListDomainMappingsResponse> list(core.String appsId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -910,7 +910,7 @@
       DomainMapping request, core.String appsId, core.String domainMappingsId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -988,7 +988,7 @@
       BatchUpdateIngressRulesRequest request, core.String appsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1040,7 +1040,7 @@
   async.Future<FirewallRule> create(FirewallRule request, core.String appsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1091,7 +1091,7 @@
   async.Future<Empty> delete(core.String appsId, core.String ingressRulesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1143,7 +1143,7 @@
   async.Future<FirewallRule> get(core.String appsId, core.String ingressRulesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1204,7 +1204,7 @@
       core.String matchingAddress,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1267,7 +1267,7 @@
       FirewallRule request, core.String appsId, core.String ingressRulesId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1330,7 +1330,7 @@
   async.Future<Location> get(core.String appsId, core.String locationsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1389,7 +1389,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1453,7 +1453,7 @@
   async.Future<Operation> get(core.String appsId, core.String operationsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1519,7 +1519,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1585,7 +1585,7 @@
   async.Future<Operation> delete(core.String appsId, core.String servicesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1637,7 +1637,7 @@
   async.Future<Service> get(core.String appsId, core.String servicesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1691,7 +1691,7 @@
   async.Future<ListServicesResponse> list(core.String appsId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1763,7 +1763,7 @@
       Service request, core.String appsId, core.String servicesId,
       {core.bool migrateTraffic, core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1837,7 +1837,7 @@
       Version request, core.String appsId, core.String servicesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1896,7 +1896,7 @@
       core.String appsId, core.String servicesId, core.String versionsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1962,7 +1962,7 @@
       core.String appsId, core.String servicesId, core.String versionsId,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2035,7 +2035,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2137,7 +2137,7 @@
       core.String servicesId, core.String versionsId,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2223,7 +2223,7 @@
       core.String instancesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2294,7 +2294,7 @@
       core.String versionsId, core.String instancesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2361,7 +2361,7 @@
       core.String versionsId, core.String instancesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2432,7 +2432,7 @@
       core.String appsId, core.String servicesId, core.String versionsId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2670,7 +2670,7 @@
     }
     if (_json.containsKey("dispatchRules")) {
       dispatchRules = _json["dispatchRules"]
-          .map((value) => new UrlDispatchRule.fromJson(value))
+          .map<UrlDispatchRule>((value) => new UrlDispatchRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("featureSettings")) {
@@ -2964,7 +2964,7 @@
     }
     if (_json.containsKey("customMetrics")) {
       customMetrics = _json["customMetrics"]
-          .map((value) => new CustomMetric.fromJson(value))
+          .map<CustomMetric>((value) => new CustomMetric.fromJson(value))
           .toList();
     }
     if (_json.containsKey("diskUtilization")) {
@@ -3101,7 +3101,7 @@
   BatchUpdateIngressRulesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("ingressRules")) {
       ingressRules = _json["ingressRules"]
-          .map((value) => new FirewallRule.fromJson(value))
+          .map<FirewallRule>((value) => new FirewallRule.fromJson(value))
           .toList();
     }
   }
@@ -3127,7 +3127,7 @@
   BatchUpdateIngressRulesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("ingressRules")) {
       ingressRules = _json["ingressRules"]
-          .map((value) => new FirewallRule.fromJson(value))
+          .map<FirewallRule>((value) => new FirewallRule.fromJson(value))
           .toList();
     }
   }
@@ -3599,7 +3599,7 @@
     }
     if (_json.containsKey("resourceRecords")) {
       resourceRecords = _json["resourceRecords"]
-          .map((value) => new ResourceRecord.fromJson(value))
+          .map<ResourceRecord>((value) => new ResourceRecord.fromJson(value))
           .toList();
     }
     if (_json.containsKey("sslSettings")) {
@@ -4239,7 +4239,8 @@
   ListAuthorizedCertificatesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("certificates")) {
       certificates = _json["certificates"]
-          .map((value) => new AuthorizedCertificate.fromJson(value))
+          .map<AuthorizedCertificate>(
+              (value) => new AuthorizedCertificate.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4274,7 +4275,8 @@
   ListAuthorizedDomainsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("domains")) {
       domains = _json["domains"]
-          .map((value) => new AuthorizedDomain.fromJson(value))
+          .map<AuthorizedDomain>(
+              (value) => new AuthorizedDomain.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4308,7 +4310,7 @@
   ListDomainMappingsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("domainMappings")) {
       domainMappings = _json["domainMappings"]
-          .map((value) => new DomainMapping.fromJson(value))
+          .map<DomainMapping>((value) => new DomainMapping.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4343,7 +4345,7 @@
   ListIngressRulesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("ingressRules")) {
       ingressRules = _json["ingressRules"]
-          .map((value) => new FirewallRule.fromJson(value))
+          .map<FirewallRule>((value) => new FirewallRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4378,7 +4380,7 @@
   ListInstancesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("instances")) {
       instances = _json["instances"]
-          .map((value) => new Instance.fromJson(value))
+          .map<Instance>((value) => new Instance.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4412,7 +4414,7 @@
   ListLocationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new Location.fromJson(value))
+          .map<Location>((value) => new Location.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -4449,7 +4451,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -4484,7 +4486,7 @@
     }
     if (_json.containsKey("services")) {
       services = _json["services"]
-          .map((value) => new Service.fromJson(value))
+          .map<Service>((value) => new Service.fromJson(value))
           .toList();
     }
   }
@@ -4518,7 +4520,7 @@
     }
     if (_json.containsKey("versions")) {
       versions = _json["versions"]
-          .map((value) => new Version.fromJson(value))
+          .map<Version>((value) => new Version.fromJson(value))
           .toList();
     }
   }
@@ -5590,8 +5592,9 @@
       memoryGb = _json["memoryGb"];
     }
     if (_json.containsKey("volumes")) {
-      volumes =
-          _json["volumes"].map((value) => new Volume.fromJson(value)).toList();
+      volumes = _json["volumes"]
+          .map<Volume>((value) => new Volume.fromJson(value))
+          .toList();
     }
   }
 
@@ -6398,12 +6401,13 @@
     }
     if (_json.containsKey("errorHandlers")) {
       errorHandlers = _json["errorHandlers"]
-          .map((value) => new ErrorHandler.fromJson(value))
+          .map<ErrorHandler>((value) => new ErrorHandler.fromJson(value))
           .toList();
     }
     if (_json.containsKey("handlers")) {
-      handlers =
-          _json["handlers"].map((value) => new UrlMap.fromJson(value)).toList();
+      handlers = _json["handlers"]
+          .map<UrlMap>((value) => new UrlMap.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("healthCheck")) {
       healthCheck = new HealthCheck.fromJson(_json["healthCheck"]);
@@ -6419,7 +6423,7 @@
     }
     if (_json.containsKey("libraries")) {
       libraries = _json["libraries"]
-          .map((value) => new Library.fromJson(value))
+          .map<Library>((value) => new Library.fromJson(value))
           .toList();
     }
     if (_json.containsKey("livenessCheck")) {
diff --git a/generated/googleapis_beta/lib/appengine/v1beta4.dart b/generated/googleapis_beta/lib/appengine/v1beta4.dart
index e05620e..2a3470c 100644
--- a/generated/googleapis_beta/lib/appengine/v1beta4.dart
+++ b/generated/googleapis_beta/lib/appengine/v1beta4.dart
@@ -75,7 +75,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> create(Application request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -125,7 +125,7 @@
   async.Future<Application> get(core.String appsId,
       {core.bool ensureResourcesExist, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -181,7 +181,7 @@
   async.Future<Operation> patch(Application request, core.String appsId,
       {core.String mask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -238,7 +238,7 @@
   async.Future<Location> get(core.String appsId, core.String locationsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -297,7 +297,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -363,7 +363,7 @@
   async.Future<Operation> delete(core.String appsId, core.String modulesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -415,7 +415,7 @@
   async.Future<Module> get(core.String appsId, core.String modulesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -469,7 +469,7 @@
   async.Future<ListModulesResponse> list(core.String appsId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -541,7 +541,7 @@
       Module request, core.String appsId, core.String modulesId,
       {core.bool migrateTraffic, core.String mask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -615,7 +615,7 @@
       Version request, core.String appsId, core.String modulesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -674,7 +674,7 @@
       core.String appsId, core.String modulesId, core.String versionsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -740,7 +740,7 @@
       core.String appsId, core.String modulesId, core.String versionsId,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -813,7 +813,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -899,7 +899,7 @@
       core.String modulesId, core.String versionsId,
       {core.String mask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -985,7 +985,7 @@
       core.String instancesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1056,7 +1056,7 @@
       core.String versionsId, core.String instancesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1123,7 +1123,7 @@
       core.String versionsId, core.String instancesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1194,7 +1194,7 @@
       core.String appsId, core.String modulesId, core.String versionsId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1265,7 +1265,7 @@
   async.Future<Operation> get(core.String appsId, core.String operationsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1331,7 +1331,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1547,7 +1547,7 @@
     }
     if (_json.containsKey("dispatchRules")) {
       dispatchRules = _json["dispatchRules"]
-          .map((value) => new UrlDispatchRule.fromJson(value))
+          .map<UrlDispatchRule>((value) => new UrlDispatchRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("iap")) {
@@ -1940,7 +1940,7 @@
     }
     if (_json.containsKey("sourceReferences")) {
       sourceReferences = _json["sourceReferences"]
-          .map((value) => new SourceReference.fromJson(value))
+          .map<SourceReference>((value) => new SourceReference.fromJson(value))
           .toList();
     }
   }
@@ -2500,7 +2500,7 @@
   ListInstancesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("instances")) {
       instances = _json["instances"]
-          .map((value) => new Instance.fromJson(value))
+          .map<Instance>((value) => new Instance.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2534,7 +2534,7 @@
   ListLocationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new Location.fromJson(value))
+          .map<Location>((value) => new Location.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2567,8 +2567,9 @@
 
   ListModulesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("modules")) {
-      modules =
-          _json["modules"].map((value) => new Module.fromJson(value)).toList();
+      modules = _json["modules"]
+          .map<Module>((value) => new Module.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -2604,7 +2605,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -2639,7 +2640,7 @@
     }
     if (_json.containsKey("versions")) {
       versions = _json["versions"]
-          .map((value) => new Version.fromJson(value))
+          .map<Version>((value) => new Version.fromJson(value))
           .toList();
     }
   }
@@ -3444,8 +3445,9 @@
       memoryGb = _json["memoryGb"];
     }
     if (_json.containsKey("volumes")) {
-      volumes =
-          _json["volumes"].map((value) => new Volume.fromJson(value)).toList();
+      volumes = _json["volumes"]
+          .map<Volume>((value) => new Volume.fromJson(value))
+          .toList();
     }
   }
 
@@ -4182,12 +4184,13 @@
     }
     if (_json.containsKey("errorHandlers")) {
       errorHandlers = _json["errorHandlers"]
-          .map((value) => new ErrorHandler.fromJson(value))
+          .map<ErrorHandler>((value) => new ErrorHandler.fromJson(value))
           .toList();
     }
     if (_json.containsKey("handlers")) {
-      handlers =
-          _json["handlers"].map((value) => new UrlMap.fromJson(value)).toList();
+      handlers = _json["handlers"]
+          .map<UrlMap>((value) => new UrlMap.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("healthCheck")) {
       healthCheck = new HealthCheck.fromJson(_json["healthCheck"]);
@@ -4203,7 +4206,7 @@
     }
     if (_json.containsKey("libraries")) {
       libraries = _json["libraries"]
-          .map((value) => new Library.fromJson(value))
+          .map<Library>((value) => new Library.fromJson(value))
           .toList();
     }
     if (_json.containsKey("manualScaling")) {
diff --git a/generated/googleapis_beta/lib/appengine/v1beta5.dart b/generated/googleapis_beta/lib/appengine/v1beta5.dart
index 1cecd40..825b389 100644
--- a/generated/googleapis_beta/lib/appengine/v1beta5.dart
+++ b/generated/googleapis_beta/lib/appengine/v1beta5.dart
@@ -76,7 +76,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> create(Application request, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -127,7 +127,7 @@
   async.Future<Application> get(core.String appsId,
       {core.bool ensureResourcesExist, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -183,7 +183,7 @@
   async.Future<Operation> patch(Application request, core.String appsId,
       {core.String mask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -240,7 +240,7 @@
   async.Future<Location> get(core.String appsId, core.String locationsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -299,7 +299,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -363,7 +363,7 @@
   async.Future<Operation> get(core.String appsId, core.String operationsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -429,7 +429,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -495,7 +495,7 @@
   async.Future<Operation> delete(core.String appsId, core.String servicesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -547,7 +547,7 @@
   async.Future<Service> get(core.String appsId, core.String servicesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -601,7 +601,7 @@
   async.Future<ListServicesResponse> list(core.String appsId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -674,7 +674,7 @@
       Service request, core.String appsId, core.String servicesId,
       {core.bool migrateTraffic, core.String mask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -748,7 +748,7 @@
       Version request, core.String appsId, core.String servicesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -807,7 +807,7 @@
       core.String appsId, core.String servicesId, core.String versionsId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -873,7 +873,7 @@
       core.String appsId, core.String servicesId, core.String versionsId,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -946,7 +946,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1032,7 +1032,7 @@
       core.String servicesId, core.String versionsId,
       {core.String mask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1118,7 +1118,7 @@
       core.String instancesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1189,7 +1189,7 @@
       core.String versionsId, core.String instancesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1256,7 +1256,7 @@
       core.String versionsId, core.String instancesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1327,7 +1327,7 @@
       core.String appsId, core.String servicesId, core.String versionsId,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1550,7 +1550,7 @@
     }
     if (_json.containsKey("dispatchRules")) {
       dispatchRules = _json["dispatchRules"]
-          .map((value) => new UrlDispatchRule.fromJson(value))
+          .map<UrlDispatchRule>((value) => new UrlDispatchRule.fromJson(value))
           .toList();
     }
     if (_json.containsKey("iap")) {
@@ -1943,7 +1943,7 @@
     }
     if (_json.containsKey("sourceReferences")) {
       sourceReferences = _json["sourceReferences"]
-          .map((value) => new SourceReference.fromJson(value))
+          .map<SourceReference>((value) => new SourceReference.fromJson(value))
           .toList();
     }
   }
@@ -2503,7 +2503,7 @@
   ListInstancesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("instances")) {
       instances = _json["instances"]
-          .map((value) => new Instance.fromJson(value))
+          .map<Instance>((value) => new Instance.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2537,7 +2537,7 @@
   ListLocationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new Location.fromJson(value))
+          .map<Location>((value) => new Location.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2574,7 +2574,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -2609,7 +2609,7 @@
     }
     if (_json.containsKey("services")) {
       services = _json["services"]
-          .map((value) => new Service.fromJson(value))
+          .map<Service>((value) => new Service.fromJson(value))
           .toList();
     }
   }
@@ -2643,7 +2643,7 @@
     }
     if (_json.containsKey("versions")) {
       versions = _json["versions"]
-          .map((value) => new Version.fromJson(value))
+          .map<Version>((value) => new Version.fromJson(value))
           .toList();
     }
   }
@@ -3421,8 +3421,9 @@
       memoryGb = _json["memoryGb"];
     }
     if (_json.containsKey("volumes")) {
-      volumes =
-          _json["volumes"].map((value) => new Volume.fromJson(value)).toList();
+      volumes = _json["volumes"]
+          .map<Volume>((value) => new Volume.fromJson(value))
+          .toList();
     }
   }
 
@@ -4124,12 +4125,13 @@
     }
     if (_json.containsKey("errorHandlers")) {
       errorHandlers = _json["errorHandlers"]
-          .map((value) => new ErrorHandler.fromJson(value))
+          .map<ErrorHandler>((value) => new ErrorHandler.fromJson(value))
           .toList();
     }
     if (_json.containsKey("handlers")) {
-      handlers =
-          _json["handlers"].map((value) => new UrlMap.fromJson(value)).toList();
+      handlers = _json["handlers"]
+          .map<UrlMap>((value) => new UrlMap.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("healthCheck")) {
       healthCheck = new HealthCheck.fromJson(_json["healthCheck"]);
@@ -4145,7 +4147,7 @@
     }
     if (_json.containsKey("libraries")) {
       libraries = _json["libraries"]
-          .map((value) => new Library.fromJson(value))
+          .map<Library>((value) => new Library.fromJson(value))
           .toList();
     }
     if (_json.containsKey("manualScaling")) {
diff --git a/generated/googleapis_beta/lib/clouderrorreporting/v1beta1.dart b/generated/googleapis_beta/lib/clouderrorreporting/v1beta1.dart
index acc1629..edad255 100644
--- a/generated/googleapis_beta/lib/clouderrorreporting/v1beta1.dart
+++ b/generated/googleapis_beta/lib/clouderrorreporting/v1beta1.dart
@@ -70,7 +70,7 @@
   async.Future<DeleteEventsResponse> deleteEvents(core.String projectName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -160,7 +160,7 @@
       core.String timeRange_period,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -244,7 +244,7 @@
       ReportedErrorEvent request, core.String projectName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -373,7 +373,7 @@
       core.String timeRange_period,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -465,7 +465,7 @@
   /// this method will complete with the same error.
   async.Future<ErrorGroup> get(core.String groupName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -513,7 +513,7 @@
   async.Future<ErrorGroup> update(ErrorGroup request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -595,7 +595,7 @@
     }
     if (_json.containsKey("sourceReferences")) {
       sourceReferences = _json["sourceReferences"]
-          .map((value) => new SourceReference.fromJson(value))
+          .map<SourceReference>((value) => new SourceReference.fromJson(value))
           .toList();
     }
     if (_json.containsKey("user")) {
@@ -699,7 +699,7 @@
     }
     if (_json.containsKey("trackingIssues")) {
       trackingIssues = _json["trackingIssues"]
-          .map((value) => new TrackingIssue.fromJson(value))
+          .map<TrackingIssue>((value) => new TrackingIssue.fromJson(value))
           .toList();
     }
   }
@@ -784,7 +784,7 @@
   ErrorGroupStats.fromJson(core.Map _json) {
     if (_json.containsKey("affectedServices")) {
       affectedServices = _json["affectedServices"]
-          .map((value) => new ServiceContext.fromJson(value))
+          .map<ServiceContext>((value) => new ServiceContext.fromJson(value))
           .toList();
     }
     if (_json.containsKey("affectedUsersCount")) {
@@ -810,7 +810,7 @@
     }
     if (_json.containsKey("timedCounts")) {
       timedCounts = _json["timedCounts"]
-          .map((value) => new TimedCount.fromJson(value))
+          .map<TimedCount>((value) => new TimedCount.fromJson(value))
           .toList();
     }
   }
@@ -944,7 +944,7 @@
   ListEventsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("errorEvents")) {
       errorEvents = _json["errorEvents"]
-          .map((value) => new ErrorEvent.fromJson(value))
+          .map<ErrorEvent>((value) => new ErrorEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -995,7 +995,7 @@
   ListGroupStatsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("errorGroupStats")) {
       errorGroupStats = _json["errorGroupStats"]
-          .map((value) => new ErrorGroupStats.fromJson(value))
+          .map<ErrorGroupStats>((value) => new ErrorGroupStats.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
diff --git a/generated/googleapis_beta/lib/cloudresourcemanager/v1beta1.dart b/generated/googleapis_beta/lib/cloudresourcemanager/v1beta1.dart
index 4a4b88f..8154118 100644
--- a/generated/googleapis_beta/lib/cloudresourcemanager/v1beta1.dart
+++ b/generated/googleapis_beta/lib/cloudresourcemanager/v1beta1.dart
@@ -68,7 +68,7 @@
   async.Future<Organization> get(core.String name,
       {core.String organizationId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -122,7 +122,7 @@
       GetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -199,7 +199,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -258,7 +258,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -314,7 +314,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -369,7 +369,7 @@
   async.Future<Organization> update(Organization request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -431,7 +431,7 @@
   async.Future<Project> create(Project request,
       {core.bool useLegacyStack, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -502,7 +502,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String projectId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -549,7 +549,7 @@
   /// this method will complete with the same error.
   async.Future<Project> get(core.String projectId, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -600,7 +600,7 @@
       GetAncestryRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -657,7 +657,7 @@
       GetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -756,7 +756,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -848,7 +848,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -901,7 +901,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -961,7 +961,7 @@
       UndeleteProjectRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1016,7 +1016,7 @@
   async.Future<Project> update(Project request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1133,7 +1133,7 @@
   AuditConfig.fromJson(core.Map _json) {
     if (_json.containsKey("auditLogConfigs")) {
       auditLogConfigs = _json["auditLogConfigs"]
-          .map((value) => new AuditLogConfig.fromJson(value))
+          .map<AuditLogConfig>((value) => new AuditLogConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("service")) {
@@ -1417,7 +1417,7 @@
   GetAncestryResponse.fromJson(core.Map _json) {
     if (_json.containsKey("ancestor")) {
       ancestor = _json["ancestor"]
-          .map((value) => new Ancestor.fromJson(value))
+          .map<Ancestor>((value) => new Ancestor.fromJson(value))
           .toList();
     }
   }
@@ -1466,7 +1466,7 @@
     }
     if (_json.containsKey("organizations")) {
       organizations = _json["organizations"]
-          .map((value) => new Organization.fromJson(value))
+          .map<Organization>((value) => new Organization.fromJson(value))
           .toList();
     }
   }
@@ -1518,7 +1518,7 @@
     }
     if (_json.containsKey("projects")) {
       projects = _json["projects"]
-          .map((value) => new Project.fromJson(value))
+          .map<Project>((value) => new Project.fromJson(value))
           .toList();
     }
   }
@@ -1720,12 +1720,12 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("auditConfigs")) {
       auditConfigs = _json["auditConfigs"]
-          .map((value) => new AuditConfig.fromJson(value))
+          .map<AuditConfig>((value) => new AuditConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
diff --git a/generated/googleapis_beta/lib/cloudtasks/v2beta2.dart b/generated/googleapis_beta/lib/cloudtasks/v2beta2.dart
index a812787..70495bf 100644
--- a/generated/googleapis_beta/lib/cloudtasks/v2beta2.dart
+++ b/generated/googleapis_beta/lib/cloudtasks/v2beta2.dart
@@ -69,7 +69,7 @@
   /// this method will complete with the same error.
   async.Future<Location> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -122,7 +122,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -209,7 +209,7 @@
   async.Future<Queue> create(Queue request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -273,7 +273,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -319,7 +319,7 @@
   /// this method will complete with the same error.
   async.Future<Queue> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -375,7 +375,7 @@
       GetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -461,7 +461,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -557,7 +557,7 @@
   async.Future<Queue> patch(Queue request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -618,7 +618,7 @@
   async.Future<Queue> pause(PauseQueueRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -677,7 +677,7 @@
   async.Future<Queue> purge(PurgeQueueRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -742,7 +742,7 @@
   async.Future<Queue> resume(ResumeQueueRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -804,7 +804,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -864,7 +864,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -945,7 +945,7 @@
       AcknowledgeTaskRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1005,7 +1005,7 @@
   async.Future<Task> cancelLease(CancelLeaseRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1073,7 +1073,7 @@
   async.Future<Task> create(CreateTaskRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1129,7 +1129,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1195,7 +1195,7 @@
   async.Future<Task> get(core.String name,
       {core.String responseView, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1269,7 +1269,7 @@
       LeaseTasksRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1373,7 +1373,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1441,7 +1441,7 @@
   async.Future<Task> renewLease(RenewLeaseRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1524,7 +1524,7 @@
   async.Future<Task> run(RunTaskRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2406,7 +2406,9 @@
 
   LeaseTasksResponse.fromJson(core.Map _json) {
     if (_json.containsKey("tasks")) {
-      tasks = _json["tasks"].map((value) => new Task.fromJson(value)).toList();
+      tasks = _json["tasks"]
+          .map<Task>((value) => new Task.fromJson(value))
+          .toList();
     }
   }
 
@@ -2433,7 +2435,7 @@
   ListLocationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new Location.fromJson(value))
+          .map<Location>((value) => new Location.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2477,8 +2479,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("queues")) {
-      queues =
-          _json["queues"].map((value) => new Queue.fromJson(value)).toList();
+      queues = _json["queues"]
+          .map<Queue>((value) => new Queue.fromJson(value))
+          .toList();
     }
   }
 
@@ -2516,7 +2519,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("tasks")) {
-      tasks = _json["tasks"].map((value) => new Task.fromJson(value)).toList();
+      tasks = _json["tasks"]
+          .map<Task>((value) => new Task.fromJson(value))
+          .toList();
     }
   }
 
@@ -2670,7 +2675,7 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
diff --git a/generated/googleapis_beta/lib/clouduseraccounts/beta.dart b/generated/googleapis_beta/lib/clouduseraccounts/beta.dart
index 81c1d33..e46a289 100644
--- a/generated/googleapis_beta/lib/clouduseraccounts/beta.dart
+++ b/generated/googleapis_beta/lib/clouduseraccounts/beta.dart
@@ -76,7 +76,7 @@
   async.Future delete(core.String project, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -131,7 +131,7 @@
   async.Future<Operation> get(core.String project, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -234,7 +234,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -303,7 +303,7 @@
       core.String project, core.String groupName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -360,7 +360,7 @@
   async.Future<Operation> delete(core.String project, core.String groupName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -413,7 +413,7 @@
   async.Future<Group> get(core.String project, core.String groupName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -466,7 +466,7 @@
   async.Future<Operation> insert(Group request, core.String project,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -566,7 +566,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -629,7 +629,7 @@
       core.String project, core.String groupName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -707,7 +707,7 @@
       {core.bool login,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -830,7 +830,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -911,7 +911,7 @@
       PublicKey request, core.String project, core.String user,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -968,7 +968,7 @@
   async.Future<Operation> delete(core.String project, core.String user,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1021,7 +1021,7 @@
   async.Future<User> get(core.String project, core.String user,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1074,7 +1074,7 @@
   async.Future<Operation> insert(User request, core.String project,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1174,7 +1174,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1240,7 +1240,7 @@
       core.String project, core.String user, core.String fingerprint,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1412,7 +1412,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Group.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Group>((value) => new Group.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1511,7 +1513,7 @@
   LinuxAccountViews.fromJson(core.Map _json) {
     if (_json.containsKey("groupViews")) {
       groupViews = _json["groupViews"]
-          .map((value) => new LinuxGroupView.fromJson(value))
+          .map<LinuxGroupView>((value) => new LinuxGroupView.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1519,7 +1521,7 @@
     }
     if (_json.containsKey("userViews")) {
       userViews = _json["userViews"]
-          .map((value) => new LinuxUserView.fromJson(value))
+          .map<LinuxUserView>((value) => new LinuxUserView.fromJson(value))
           .toList();
     }
   }
@@ -1747,7 +1749,8 @@
   OperationError.fromJson(core.Map _json) {
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new OperationErrorErrors.fromJson(value))
+          .map<OperationErrorErrors>(
+              (value) => new OperationErrorErrors.fromJson(value))
           .toList();
     }
   }
@@ -1836,7 +1839,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new OperationWarningsData.fromJson(value))
+          .map<OperationWarningsData>(
+              (value) => new OperationWarningsData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -2025,7 +2029,8 @@
     }
     if (_json.containsKey("warnings")) {
       warnings = _json["warnings"]
-          .map((value) => new OperationWarnings.fromJson(value))
+          .map<OperationWarnings>(
+              (value) => new OperationWarnings.fromJson(value))
           .toList();
     }
     if (_json.containsKey("zone")) {
@@ -2139,8 +2144,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Operation.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Operation>((value) => new Operation.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2297,7 +2303,7 @@
     }
     if (_json.containsKey("publicKeys")) {
       publicKeys = _json["publicKeys"]
-          .map((value) => new PublicKey.fromJson(value))
+          .map<PublicKey>((value) => new PublicKey.fromJson(value))
           .toList();
     }
     if (_json.containsKey("selfLink")) {
@@ -2364,7 +2370,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new User.fromJson(value)).toList();
+      items = _json["items"]
+          .map<User>((value) => new User.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
diff --git a/generated/googleapis_beta/lib/dataflow/v1b3.dart b/generated/googleapis_beta/lib/dataflow/v1b3.dart
index daef809..0e88f47 100644
--- a/generated/googleapis_beta/lib/dataflow/v1b3.dart
+++ b/generated/googleapis_beta/lib/dataflow/v1b3.dart
@@ -75,7 +75,7 @@
       SendWorkerMessagesRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -167,7 +167,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -244,7 +244,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -313,7 +313,7 @@
   async.Future<Job> get(core.String projectId, core.String jobId,
       {core.String view, core.String location, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -375,7 +375,7 @@
   async.Future<JobMetrics> getMetrics(core.String projectId, core.String jobId,
       {core.String location, core.String startTime, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -461,7 +461,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -529,7 +529,7 @@
       Job request, core.String projectId, core.String jobId,
       {core.String location, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -596,7 +596,7 @@
       GetDebugConfigRequest request, core.String projectId, core.String jobId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -654,7 +654,7 @@
       SendDebugCaptureRequest request, core.String projectId, core.String jobId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -752,7 +752,7 @@
       core.String minimumImportance,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -832,7 +832,7 @@
       LeaseWorkItemRequest request, core.String projectId, core.String jobId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -892,7 +892,7 @@
       core.String jobId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -965,7 +965,7 @@
       core.String location,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1048,7 +1048,7 @@
       Job request, core.String projectId, core.String location,
       {core.String view, core.String replaceJobId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1120,7 +1120,7 @@
       core.String projectId, core.String location, core.String jobId,
       {core.String view, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1185,7 +1185,7 @@
       core.String projectId, core.String location, core.String jobId,
       {core.String startTime, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1273,7 +1273,7 @@
       core.String view,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1343,7 +1343,7 @@
       core.String location, core.String jobId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1414,7 +1414,7 @@
       core.String projectId, core.String location, core.String jobId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1482,7 +1482,7 @@
       core.String jobId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1584,7 +1584,7 @@
       core.String minimumImportance,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1668,7 +1668,7 @@
       core.String projectId, core.String location, core.String jobId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1736,7 +1736,7 @@
       core.String jobId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1808,7 +1808,7 @@
       core.String projectId, core.String location,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1873,7 +1873,7 @@
       core.String projectId, core.String location,
       {core.String view, core.String gcsPath, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1944,7 +1944,7 @@
       core.String projectId, core.String location,
       {core.bool validateOnly, core.String gcsPath, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2014,7 +2014,7 @@
       CreateJobFromTemplateRequest request, core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2076,7 +2076,7 @@
       core.String location,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2148,7 +2148,7 @@
       core.String location,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2622,22 +2622,24 @@
     }
     if (_json.containsKey("inputs")) {
       inputs = _json["inputs"]
-          .map((value) => new StreamLocation.fromJson(value))
+          .map<StreamLocation>((value) => new StreamLocation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("keyRanges")) {
       keyRanges = _json["keyRanges"]
-          .map((value) => new KeyRangeLocation.fromJson(value))
+          .map<KeyRangeLocation>(
+              (value) => new KeyRangeLocation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("outputs")) {
       outputs = _json["outputs"]
-          .map((value) => new StreamLocation.fromJson(value))
+          .map<StreamLocation>((value) => new StreamLocation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("stateFamilies")) {
       stateFamilies = _json["stateFamilies"]
-          .map((value) => new StateFamilyConfig.fromJson(value))
+          .map<StateFamilyConfig>(
+              (value) => new StateFamilyConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("systemStageName")) {
@@ -3647,7 +3649,7 @@
     }
     if (_json.containsKey("workerPools")) {
       workerPools = _json["workerPools"]
-          .map((value) => new WorkerPool.fromJson(value))
+          .map<WorkerPool>((value) => new WorkerPool.fromJson(value))
           .toList();
     }
   }
@@ -3825,12 +3827,13 @@
   ExecutionStageSummary.fromJson(core.Map _json) {
     if (_json.containsKey("componentSource")) {
       componentSource = _json["componentSource"]
-          .map((value) => new ComponentSource.fromJson(value))
+          .map<ComponentSource>((value) => new ComponentSource.fromJson(value))
           .toList();
     }
     if (_json.containsKey("componentTransform")) {
       componentTransform = _json["componentTransform"]
-          .map((value) => new ComponentTransform.fromJson(value))
+          .map<ComponentTransform>(
+              (value) => new ComponentTransform.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -3838,7 +3841,7 @@
     }
     if (_json.containsKey("inputSource")) {
       inputSource = _json["inputSource"]
-          .map((value) => new StageSource.fromJson(value))
+          .map<StageSource>((value) => new StageSource.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3849,7 +3852,7 @@
     }
     if (_json.containsKey("outputSource")) {
       outputSource = _json["outputSource"]
-          .map((value) => new StageSource.fromJson(value))
+          .map<StageSource>((value) => new StageSource.fromJson(value))
           .toList();
     }
   }
@@ -3919,7 +3922,8 @@
   FlattenInstruction.fromJson(core.Map _json) {
     if (_json.containsKey("inputs")) {
       inputs = _json["inputs"]
-          .map((value) => new InstructionInput.fromJson(value))
+          .map<InstructionInput>(
+              (value) => new InstructionInput.fromJson(value))
           .toList();
     }
   }
@@ -4252,7 +4256,7 @@
   IntegerList.fromJson(core.Map _json) {
     if (_json.containsKey("elements")) {
       elements = _json["elements"]
-          .map((value) => new SplitInt64.fromJson(value))
+          .map<SplitInt64>((value) => new SplitInt64.fromJson(value))
           .toList();
     }
   }
@@ -4590,11 +4594,14 @@
     }
     if (_json.containsKey("stageStates")) {
       stageStates = _json["stageStates"]
-          .map((value) => new ExecutionStageState.fromJson(value))
+          .map<ExecutionStageState>(
+              (value) => new ExecutionStageState.fromJson(value))
           .toList();
     }
     if (_json.containsKey("steps")) {
-      steps = _json["steps"].map((value) => new Step.fromJson(value)).toList();
+      steps = _json["steps"]
+          .map<Step>((value) => new Step.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("tempFiles")) {
       tempFiles = _json["tempFiles"];
@@ -4834,7 +4841,7 @@
     }
     if (_json.containsKey("metrics")) {
       metrics = _json["metrics"]
-          .map((value) => new MetricUpdate.fromJson(value))
+          .map<MetricUpdate>((value) => new MetricUpdate.fromJson(value))
           .toList();
     }
   }
@@ -5110,7 +5117,7 @@
   LeaseWorkItemResponse.fromJson(core.Map _json) {
     if (_json.containsKey("workItems")) {
       workItems = _json["workItems"]
-          .map((value) => new WorkItem.fromJson(value))
+          .map<WorkItem>((value) => new WorkItem.fromJson(value))
           .toList();
     }
   }
@@ -5141,12 +5148,13 @@
   ListJobMessagesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("autoscalingEvents")) {
       autoscalingEvents = _json["autoscalingEvents"]
-          .map((value) => new AutoscalingEvent.fromJson(value))
+          .map<AutoscalingEvent>(
+              (value) => new AutoscalingEvent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("jobMessages")) {
       jobMessages = _json["jobMessages"]
-          .map((value) => new JobMessage.fromJson(value))
+          .map<JobMessage>((value) => new JobMessage.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -5189,11 +5197,12 @@
   ListJobsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("failedLocation")) {
       failedLocation = _json["failedLocation"]
-          .map((value) => new FailedLocation.fromJson(value))
+          .map<FailedLocation>((value) => new FailedLocation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("jobs")) {
-      jobs = _json["jobs"].map((value) => new Job.fromJson(value)).toList();
+      jobs =
+          _json["jobs"].map<Job>((value) => new Job.fromJson(value)).toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -5240,7 +5249,8 @@
   MapTask.fromJson(core.Map _json) {
     if (_json.containsKey("instructions")) {
       instructions = _json["instructions"]
-          .map((value) => new ParallelInstruction.fromJson(value))
+          .map<ParallelInstruction>(
+              (value) => new ParallelInstruction.fromJson(value))
           .toList();
     }
     if (_json.containsKey("stageName")) {
@@ -5664,7 +5674,7 @@
     }
     if (_json.containsKey("multiOutputInfos")) {
       multiOutputInfos = _json["multiOutputInfos"]
-          .map((value) => new MultiOutputInfo.fromJson(value))
+          .map<MultiOutputInfo>((value) => new MultiOutputInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("numOutputs")) {
@@ -5672,7 +5682,7 @@
     }
     if (_json.containsKey("sideInputs")) {
       sideInputs = _json["sideInputs"]
-          .map((value) => new SideInputInfo.fromJson(value))
+          .map<SideInputInfo>((value) => new SideInputInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("userFn")) {
@@ -5748,7 +5758,8 @@
     }
     if (_json.containsKey("outputs")) {
       outputs = _json["outputs"]
-          .map((value) => new InstructionOutput.fromJson(value))
+          .map<InstructionOutput>(
+              (value) => new InstructionOutput.fromJson(value))
           .toList();
     }
     if (_json.containsKey("parDo")) {
@@ -5944,7 +5955,7 @@
     }
     if (_json.containsKey("sideInputs")) {
       sideInputs = _json["sideInputs"]
-          .map((value) => new SideInputInfo.fromJson(value))
+          .map<SideInputInfo>((value) => new SideInputInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("valueCombiningFn")) {
@@ -5998,17 +6009,19 @@
   PipelineDescription.fromJson(core.Map _json) {
     if (_json.containsKey("displayData")) {
       displayData = _json["displayData"]
-          .map((value) => new DisplayData.fromJson(value))
+          .map<DisplayData>((value) => new DisplayData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("executionPipelineStage")) {
       executionPipelineStage = _json["executionPipelineStage"]
-          .map((value) => new ExecutionStageSummary.fromJson(value))
+          .map<ExecutionStageSummary>(
+              (value) => new ExecutionStageSummary.fromJson(value))
           .toList();
     }
     if (_json.containsKey("originalPipelineTransform")) {
       originalPipelineTransform = _json["originalPipelineTransform"]
-          .map((value) => new TransformSummary.fromJson(value))
+          .map<TransformSummary>(
+              (value) => new TransformSummary.fromJson(value))
           .toList();
     }
   }
@@ -6241,7 +6254,7 @@
     }
     if (_json.containsKey("workItemStatuses")) {
       workItemStatuses = _json["workItemStatuses"]
-          .map((value) => new WorkItemStatus.fromJson(value))
+          .map<WorkItemStatus>((value) => new WorkItemStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("workerId")) {
@@ -6282,7 +6295,8 @@
   ReportWorkItemStatusResponse.fromJson(core.Map _json) {
     if (_json.containsKey("workItemServiceStates")) {
       workItemServiceStates = _json["workItemServiceStates"]
-          .map((value) => new WorkItemServiceState.fromJson(value))
+          .map<WorkItemServiceState>(
+              (value) => new WorkItemServiceState.fromJson(value))
           .toList();
     }
   }
@@ -6347,8 +6361,9 @@
 
   ResourceUtilizationReport.fromJson(core.Map _json) {
     if (_json.containsKey("cpuTime")) {
-      cpuTime =
-          _json["cpuTime"].map((value) => new CPUTime.fromJson(value)).toList();
+      cpuTime = _json["cpuTime"]
+          .map<CPUTime>((value) => new CPUTime.fromJson(value))
+          .toList();
     }
   }
 
@@ -6538,7 +6553,7 @@
     }
     if (_json.containsKey("workerMessages")) {
       workerMessages = _json["workerMessages"]
-          .map((value) => new WorkerMessage.fromJson(value))
+          .map<WorkerMessage>((value) => new WorkerMessage.fromJson(value))
           .toList();
     }
   }
@@ -6567,7 +6582,8 @@
   SendWorkerMessagesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("workerMessageResponses")) {
       workerMessageResponses = _json["workerMessageResponses"]
-          .map((value) => new WorkerMessageResponse.fromJson(value))
+          .map<WorkerMessageResponse>(
+              (value) => new WorkerMessageResponse.fromJson(value))
           .toList();
     }
   }
@@ -6613,7 +6629,7 @@
   SeqMapTask.fromJson(core.Map _json) {
     if (_json.containsKey("inputs")) {
       inputs = _json["inputs"]
-          .map((value) => new SideInputInfo.fromJson(value))
+          .map<SideInputInfo>((value) => new SideInputInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -6621,7 +6637,8 @@
     }
     if (_json.containsKey("outputInfos")) {
       outputInfos = _json["outputInfos"]
-          .map((value) => new SeqMapTaskOutputInfo.fromJson(value))
+          .map<SeqMapTaskOutputInfo>(
+              (value) => new SeqMapTaskOutputInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("stageName")) {
@@ -6750,8 +6767,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("sources")) {
-      sources =
-          _json["sources"].map((value) => new Source.fromJson(value)).toList();
+      sources = _json["sources"]
+          .map<Source>((value) => new Source.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("tag")) {
       tag = _json["tag"];
@@ -7267,7 +7285,7 @@
   SourceSplitResponse.fromJson(core.Map _json) {
     if (_json.containsKey("bundles")) {
       bundles = _json["bundles"]
-          .map((value) => new DerivedSource.fromJson(value))
+          .map<DerivedSource>((value) => new DerivedSource.fromJson(value))
           .toList();
     }
     if (_json.containsKey("outcome")) {
@@ -7275,7 +7293,8 @@
     }
     if (_json.containsKey("shards")) {
       shards = _json["shards"]
-          .map((value) => new SourceSplitShard.fromJson(value))
+          .map<SourceSplitShard>(
+              (value) => new SourceSplitShard.fromJson(value))
           .toList();
     }
   }
@@ -7703,7 +7722,8 @@
     }
     if (_json.containsKey("instructions")) {
       instructions = _json["instructions"]
-          .map((value) => new ParallelInstruction.fromJson(value))
+          .map<ParallelInstruction>(
+              (value) => new ParallelInstruction.fromJson(value))
           .toList();
     }
     if (_json.containsKey("stageName")) {
@@ -7752,7 +7772,8 @@
     }
     if (_json.containsKey("rangeAssignments")) {
       rangeAssignments = _json["rangeAssignments"]
-          .map((value) => new KeyRangeDataDiskAssignment.fromJson(value))
+          .map<KeyRangeDataDiskAssignment>(
+              (value) => new KeyRangeDataDiskAssignment.fromJson(value))
           .toList();
     }
   }
@@ -7795,12 +7816,13 @@
   StreamingComputationTask.fromJson(core.Map _json) {
     if (_json.containsKey("computationRanges")) {
       computationRanges = _json["computationRanges"]
-          .map((value) => new StreamingComputationRanges.fromJson(value))
+          .map<StreamingComputationRanges>(
+              (value) => new StreamingComputationRanges.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dataDisks")) {
       dataDisks = _json["dataDisks"]
-          .map((value) => new MountedDataDisk.fromJson(value))
+          .map<MountedDataDisk>((value) => new MountedDataDisk.fromJson(value))
           .toList();
     }
     if (_json.containsKey("taskType")) {
@@ -7848,7 +7870,8 @@
   StreamingConfigTask.fromJson(core.Map _json) {
     if (_json.containsKey("streamingComputationConfigs")) {
       streamingComputationConfigs = _json["streamingComputationConfigs"]
-          .map((value) => new StreamingComputationConfig.fromJson(value))
+          .map<StreamingComputationConfig>(
+              (value) => new StreamingComputationConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("userStepToStateFamilyNameMap")) {
@@ -8041,7 +8064,7 @@
     }
     if (_json.containsKey("parameters")) {
       parameters = _json["parameters"]
-          .map((value) => new Parameter.fromJson(value))
+          .map<Parameter>((value) => new Parameter.fromJson(value))
           .toList();
     }
   }
@@ -8297,7 +8320,8 @@
     }
     if (_json.containsKey("parameters")) {
       parameters = _json["parameters"]
-          .map((value) => new ParameterMetadata.fromJson(value))
+          .map<ParameterMetadata>(
+              (value) => new ParameterMetadata.fromJson(value))
           .toList();
     }
   }
@@ -8342,12 +8366,14 @@
   TopologyConfig.fromJson(core.Map _json) {
     if (_json.containsKey("computations")) {
       computations = _json["computations"]
-          .map((value) => new ComputationTopology.fromJson(value))
+          .map<ComputationTopology>(
+              (value) => new ComputationTopology.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dataDiskAssignments")) {
       dataDiskAssignments = _json["dataDiskAssignments"]
-          .map((value) => new DataDiskAssignment.fromJson(value))
+          .map<DataDiskAssignment>(
+              (value) => new DataDiskAssignment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("forwardingKeyBits")) {
@@ -8422,7 +8448,7 @@
   TransformSummary.fromJson(core.Map _json) {
     if (_json.containsKey("displayData")) {
       displayData = _json["displayData"]
-          .map((value) => new DisplayData.fromJson(value))
+          .map<DisplayData>((value) => new DisplayData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -8540,7 +8566,7 @@
     }
     if (_json.containsKey("packages")) {
       packages = _json["packages"]
-          .map((value) => new Package.fromJson(value))
+          .map<Package>((value) => new Package.fromJson(value))
           .toList();
     }
     if (_json.containsKey("projectId")) {
@@ -8675,7 +8701,7 @@
     }
     if (_json.containsKey("metricShortId")) {
       metricShortId = _json["metricShortId"]
-          .map((value) => new MetricShortId.fromJson(value))
+          .map<MetricShortId>((value) => new MetricShortId.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextReportIndex")) {
@@ -8825,7 +8851,7 @@
     }
     if (_json.containsKey("counterUpdates")) {
       counterUpdates = _json["counterUpdates"]
-          .map((value) => new CounterUpdate.fromJson(value))
+          .map<CounterUpdate>((value) => new CounterUpdate.fromJson(value))
           .toList();
     }
     if (_json.containsKey("dynamicSourceSplit")) {
@@ -8833,12 +8859,13 @@
           new DynamicSourceSplit.fromJson(_json["dynamicSourceSplit"]);
     }
     if (_json.containsKey("errors")) {
-      errors =
-          _json["errors"].map((value) => new Status.fromJson(value)).toList();
+      errors = _json["errors"]
+          .map<Status>((value) => new Status.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("metricUpdates")) {
       metricUpdates = _json["metricUpdates"]
-          .map((value) => new MetricUpdate.fromJson(value))
+          .map<MetricUpdate>((value) => new MetricUpdate.fromJson(value))
           .toList();
     }
     if (_json.containsKey("progress")) {
@@ -9410,8 +9437,9 @@
           new AutoscalingSettings.fromJson(_json["autoscalingSettings"]);
     }
     if (_json.containsKey("dataDisks")) {
-      dataDisks =
-          _json["dataDisks"].map((value) => new Disk.fromJson(value)).toList();
+      dataDisks = _json["dataDisks"]
+          .map<Disk>((value) => new Disk.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("defaultPackageSet")) {
       defaultPackageSet = _json["defaultPackageSet"];
@@ -9451,7 +9479,7 @@
     }
     if (_json.containsKey("packages")) {
       packages = _json["packages"]
-          .map((value) => new Package.fromJson(value))
+          .map<Package>((value) => new Package.fromJson(value))
           .toList();
     }
     if (_json.containsKey("poolArgs")) {
diff --git a/generated/googleapis_beta/lib/dialogflow/v2beta1.dart b/generated/googleapis_beta/lib/dialogflow/v2beta1.dart
index b9b544f..1996d79 100644
--- a/generated/googleapis_beta/lib/dialogflow/v2beta1.dart
+++ b/generated/googleapis_beta/lib/dialogflow/v2beta1.dart
@@ -64,7 +64,7 @@
   async.Future<GoogleCloudDialogflowV2beta1Agent> getAgent(core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -134,7 +134,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -198,7 +198,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -261,7 +261,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -329,7 +329,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -391,7 +391,7 @@
       GoogleCloudDialogflowV2beta1TrainAgentRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -460,7 +460,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -519,7 +519,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -580,7 +580,7 @@
       GoogleCloudDialogflowV2beta1EntityType request, core.String parent,
       {core.String languageCode, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -634,7 +634,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -686,7 +686,7 @@
   async.Future<GoogleCloudDialogflowV2beta1EntityType> get(core.String name,
       {core.String languageCode, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -753,7 +753,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -825,7 +825,7 @@
       GoogleCloudDialogflowV2beta1EntityType request, core.String name,
       {core.String languageCode, core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -895,7 +895,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -954,7 +954,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1014,7 +1014,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1079,7 +1079,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1136,7 +1136,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1203,7 +1203,7 @@
       GoogleCloudDialogflowV2beta1Intent request, core.String parent,
       {core.String languageCode, core.String intentView, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1260,7 +1260,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1318,7 +1318,7 @@
   async.Future<GoogleCloudDialogflowV2beta1Intent> get(core.String name,
       {core.String intentView, core.String languageCode, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1395,7 +1395,7 @@
       core.String languageCode,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1479,7 +1479,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1550,7 +1550,7 @@
   async.Future<GoogleProtobufEmpty> deleteContexts(core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1608,7 +1608,7 @@
       core.String session,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1669,7 +1669,7 @@
       GoogleCloudDialogflowV2beta1Context request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1721,7 +1721,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1767,7 +1767,7 @@
   async.Future<GoogleCloudDialogflowV2beta1Context> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1823,7 +1823,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1884,7 +1884,7 @@
       GoogleCloudDialogflowV2beta1Context request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1946,7 +1946,7 @@
       GoogleCloudDialogflowV2beta1SessionEntityType request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2000,7 +2000,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2049,7 +2049,7 @@
       core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2106,7 +2106,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2170,7 +2170,7 @@
       GoogleCloudDialogflowV2beta1SessionEntityType request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2230,7 +2230,7 @@
   async.Future<GoogleLongrunningOperation> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2267,7 +2267,8 @@
       core.Map _json) {
     if (_json.containsKey("entityTypes")) {
       entityTypes = _json["entityTypes"]
-          .map((value) => new GoogleCloudDialogflowV2EntityType.fromJson(value))
+          .map<GoogleCloudDialogflowV2EntityType>(
+              (value) => new GoogleCloudDialogflowV2EntityType.fromJson(value))
           .toList();
     }
   }
@@ -2293,7 +2294,8 @@
   GoogleCloudDialogflowV2BatchUpdateIntentsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("intents")) {
       intents = _json["intents"]
-          .map((value) => new GoogleCloudDialogflowV2Intent.fromJson(value))
+          .map<GoogleCloudDialogflowV2Intent>(
+              (value) => new GoogleCloudDialogflowV2Intent.fromJson(value))
           .toList();
     }
   }
@@ -2409,7 +2411,7 @@
     }
     if (_json.containsKey("entities")) {
       entities = _json["entities"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2EntityTypeEntity>((value) =>
               new GoogleCloudDialogflowV2EntityTypeEntity.fromJson(value))
           .toList();
     }
@@ -2694,7 +2696,7 @@
     }
     if (_json.containsKey("followupIntentInfo")) {
       followupIntentInfo = _json["followupIntentInfo"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2IntentFollowupIntentInfo>((value) =>
               new GoogleCloudDialogflowV2IntentFollowupIntentInfo.fromJson(
                   value))
           .toList();
@@ -2707,7 +2709,7 @@
     }
     if (_json.containsKey("messages")) {
       messages = _json["messages"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2IntentMessage>((value) =>
               new GoogleCloudDialogflowV2IntentMessage.fromJson(value))
           .toList();
     }
@@ -2719,12 +2721,13 @@
     }
     if (_json.containsKey("outputContexts")) {
       outputContexts = _json["outputContexts"]
-          .map((value) => new GoogleCloudDialogflowV2Context.fromJson(value))
+          .map<GoogleCloudDialogflowV2Context>(
+              (value) => new GoogleCloudDialogflowV2Context.fromJson(value))
           .toList();
     }
     if (_json.containsKey("parameters")) {
       parameters = _json["parameters"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2IntentParameter>((value) =>
               new GoogleCloudDialogflowV2IntentParameter.fromJson(value))
           .toList();
     }
@@ -2742,7 +2745,7 @@
     }
     if (_json.containsKey("trainingPhrases")) {
       trainingPhrases = _json["trainingPhrases"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2IntentTrainingPhrase>((value) =>
               new GoogleCloudDialogflowV2IntentTrainingPhrase.fromJson(value))
           .toList();
     }
@@ -3022,7 +3025,7 @@
   GoogleCloudDialogflowV2IntentMessageBasicCard.fromJson(core.Map _json) {
     if (_json.containsKey("buttons")) {
       buttons = _json["buttons"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2IntentMessageBasicCardButton>((value) =>
               new GoogleCloudDialogflowV2IntentMessageBasicCardButton.fromJson(
                   value))
           .toList();
@@ -3142,7 +3145,7 @@
   GoogleCloudDialogflowV2IntentMessageCard.fromJson(core.Map _json) {
     if (_json.containsKey("buttons")) {
       buttons = _json["buttons"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2IntentMessageCardButton>((value) =>
               new GoogleCloudDialogflowV2IntentMessageCardButton.fromJson(
                   value))
           .toList();
@@ -3220,9 +3223,10 @@
   GoogleCloudDialogflowV2IntentMessageCarouselSelect.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) =>
-              new GoogleCloudDialogflowV2IntentMessageCarouselSelectItem
-                  .fromJson(value))
+          .map<GoogleCloudDialogflowV2IntentMessageCarouselSelectItem>(
+              (value) =>
+                  new GoogleCloudDialogflowV2IntentMessageCarouselSelectItem
+                      .fromJson(value))
           .toList();
     }
   }
@@ -3371,7 +3375,7 @@
   GoogleCloudDialogflowV2IntentMessageListSelect.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2IntentMessageListSelectItem>((value) =>
               new GoogleCloudDialogflowV2IntentMessageListSelectItem.fromJson(
                   value))
           .toList();
@@ -3570,7 +3574,7 @@
   GoogleCloudDialogflowV2IntentMessageSimpleResponses.fromJson(core.Map _json) {
     if (_json.containsKey("simpleResponses")) {
       simpleResponses = _json["simpleResponses"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2IntentMessageSimpleResponse>((value) =>
               new GoogleCloudDialogflowV2IntentMessageSimpleResponse.fromJson(
                   value))
           .toList();
@@ -3622,7 +3626,7 @@
   GoogleCloudDialogflowV2IntentMessageSuggestions.fromJson(core.Map _json) {
     if (_json.containsKey("suggestions")) {
       suggestions = _json["suggestions"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2IntentMessageSuggestion>((value) =>
               new GoogleCloudDialogflowV2IntentMessageSuggestion.fromJson(
                   value))
           .toList();
@@ -3796,7 +3800,7 @@
     }
     if (_json.containsKey("parts")) {
       parts = _json["parts"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2IntentTrainingPhrasePart>((value) =>
               new GoogleCloudDialogflowV2IntentTrainingPhrasePart.fromJson(
                   value))
           .toList();
@@ -4021,7 +4025,7 @@
     }
     if (_json.containsKey("fulfillmentMessages")) {
       fulfillmentMessages = _json["fulfillmentMessages"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2IntentMessage>((value) =>
               new GoogleCloudDialogflowV2IntentMessage.fromJson(value))
           .toList();
     }
@@ -4039,7 +4043,8 @@
     }
     if (_json.containsKey("outputContexts")) {
       outputContexts = _json["outputContexts"]
-          .map((value) => new GoogleCloudDialogflowV2Context.fromJson(value))
+          .map<GoogleCloudDialogflowV2Context>(
+              (value) => new GoogleCloudDialogflowV2Context.fromJson(value))
           .toList();
     }
     if (_json.containsKey("parameters")) {
@@ -4208,7 +4213,7 @@
     }
     if (_json.containsKey("fulfillmentMessages")) {
       fulfillmentMessages = _json["fulfillmentMessages"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2IntentMessage>((value) =>
               new GoogleCloudDialogflowV2IntentMessage.fromJson(value))
           .toList();
     }
@@ -4217,7 +4222,8 @@
     }
     if (_json.containsKey("outputContexts")) {
       outputContexts = _json["outputContexts"]
-          .map((value) => new GoogleCloudDialogflowV2Context.fromJson(value))
+          .map<GoogleCloudDialogflowV2Context>(
+              (value) => new GoogleCloudDialogflowV2Context.fromJson(value))
           .toList();
     }
     if (_json.containsKey("payload")) {
@@ -4404,7 +4410,7 @@
       core.Map _json) {
     if (_json.containsKey("entities")) {
       entities = _json["entities"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1EntityTypeEntity>((value) =>
               new GoogleCloudDialogflowV2beta1EntityTypeEntity.fromJson(value))
           .toList();
     }
@@ -4502,7 +4508,7 @@
       core.Map _json) {
     if (_json.containsKey("intents")) {
       intents = _json["intents"]
-          .map(
+          .map<GoogleCloudDialogflowV2beta1Intent>(
               (value) => new GoogleCloudDialogflowV2beta1Intent.fromJson(value))
           .toList();
     }
@@ -4539,7 +4545,7 @@
       core.Map _json) {
     if (_json.containsKey("entities")) {
       entities = _json["entities"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1EntityTypeEntity>((value) =>
               new GoogleCloudDialogflowV2beta1EntityTypeEntity.fromJson(value))
           .toList();
     }
@@ -4639,7 +4645,7 @@
       core.Map _json) {
     if (_json.containsKey("entityTypes")) {
       entityTypes = _json["entityTypes"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1EntityType>((value) =>
               new GoogleCloudDialogflowV2beta1EntityType.fromJson(value))
           .toList();
     }
@@ -4738,7 +4744,7 @@
       core.Map _json) {
     if (_json.containsKey("intents")) {
       intents = _json["intents"]
-          .map(
+          .map<GoogleCloudDialogflowV2beta1Intent>(
               (value) => new GoogleCloudDialogflowV2beta1Intent.fromJson(value))
           .toList();
     }
@@ -4959,7 +4965,7 @@
     }
     if (_json.containsKey("entities")) {
       entities = _json["entities"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1EntityTypeEntity>((value) =>
               new GoogleCloudDialogflowV2beta1EntityTypeEntity.fromJson(value))
           .toList();
     }
@@ -5003,7 +5009,7 @@
   GoogleCloudDialogflowV2beta1EntityTypeBatch.fromJson(core.Map _json) {
     if (_json.containsKey("entityTypes")) {
       entityTypes = _json["entityTypes"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1EntityType>((value) =>
               new GoogleCloudDialogflowV2beta1EntityType.fromJson(value))
           .toList();
     }
@@ -5444,7 +5450,7 @@
     }
     if (_json.containsKey("followupIntentInfo")) {
       followupIntentInfo = _json["followupIntentInfo"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1IntentFollowupIntentInfo>((value) =>
               new GoogleCloudDialogflowV2beta1IntentFollowupIntentInfo.fromJson(
                   value))
           .toList();
@@ -5457,7 +5463,7 @@
     }
     if (_json.containsKey("messages")) {
       messages = _json["messages"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1IntentMessage>((value) =>
               new GoogleCloudDialogflowV2beta1IntentMessage.fromJson(value))
           .toList();
     }
@@ -5469,13 +5475,13 @@
     }
     if (_json.containsKey("outputContexts")) {
       outputContexts = _json["outputContexts"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1Context>((value) =>
               new GoogleCloudDialogflowV2beta1Context.fromJson(value))
           .toList();
     }
     if (_json.containsKey("parameters")) {
       parameters = _json["parameters"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1IntentParameter>((value) =>
               new GoogleCloudDialogflowV2beta1IntentParameter.fromJson(value))
           .toList();
     }
@@ -5493,7 +5499,7 @@
     }
     if (_json.containsKey("trainingPhrases")) {
       trainingPhrases = _json["trainingPhrases"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1IntentTrainingPhrase>((value) =>
               new GoogleCloudDialogflowV2beta1IntentTrainingPhrase.fromJson(
                   value))
           .toList();
@@ -5578,7 +5584,7 @@
   GoogleCloudDialogflowV2beta1IntentBatch.fromJson(core.Map _json) {
     if (_json.containsKey("intents")) {
       intents = _json["intents"]
-          .map(
+          .map<GoogleCloudDialogflowV2beta1Intent>(
               (value) => new GoogleCloudDialogflowV2beta1Intent.fromJson(value))
           .toList();
     }
@@ -5803,9 +5809,10 @@
   GoogleCloudDialogflowV2beta1IntentMessageBasicCard.fromJson(core.Map _json) {
     if (_json.containsKey("buttons")) {
       buttons = _json["buttons"]
-          .map((value) =>
-              new GoogleCloudDialogflowV2beta1IntentMessageBasicCardButton
-                  .fromJson(value))
+          .map<GoogleCloudDialogflowV2beta1IntentMessageBasicCardButton>(
+              (value) =>
+                  new GoogleCloudDialogflowV2beta1IntentMessageBasicCardButton
+                      .fromJson(value))
           .toList();
     }
     if (_json.containsKey("formattedText")) {
@@ -5924,7 +5931,7 @@
   GoogleCloudDialogflowV2beta1IntentMessageCard.fromJson(core.Map _json) {
     if (_json.containsKey("buttons")) {
       buttons = _json["buttons"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1IntentMessageCardButton>((value) =>
               new GoogleCloudDialogflowV2beta1IntentMessageCardButton.fromJson(
                   value))
           .toList();
@@ -6003,9 +6010,10 @@
       core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) =>
-              new GoogleCloudDialogflowV2beta1IntentMessageCarouselSelectItem
-                  .fromJson(value))
+          .map<GoogleCloudDialogflowV2beta1IntentMessageCarouselSelectItem>(
+              (value) =>
+                  new GoogleCloudDialogflowV2beta1IntentMessageCarouselSelectItem
+                      .fromJson(value))
           .toList();
     }
   }
@@ -6155,9 +6163,10 @@
   GoogleCloudDialogflowV2beta1IntentMessageListSelect.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) =>
-              new GoogleCloudDialogflowV2beta1IntentMessageListSelectItem
-                  .fromJson(value))
+          .map<GoogleCloudDialogflowV2beta1IntentMessageListSelectItem>(
+              (value) =>
+                  new GoogleCloudDialogflowV2beta1IntentMessageListSelectItem
+                      .fromJson(value))
           .toList();
     }
     if (_json.containsKey("title")) {
@@ -6361,9 +6370,10 @@
       core.Map _json) {
     if (_json.containsKey("simpleResponses")) {
       simpleResponses = _json["simpleResponses"]
-          .map((value) =>
-              new GoogleCloudDialogflowV2beta1IntentMessageSimpleResponse
-                  .fromJson(value))
+          .map<GoogleCloudDialogflowV2beta1IntentMessageSimpleResponse>(
+              (value) =>
+                  new GoogleCloudDialogflowV2beta1IntentMessageSimpleResponse
+                      .fromJson(value))
           .toList();
     }
   }
@@ -6414,7 +6424,7 @@
       core.Map _json) {
     if (_json.containsKey("suggestions")) {
       suggestions = _json["suggestions"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1IntentMessageSuggestion>((value) =>
               new GoogleCloudDialogflowV2beta1IntentMessageSuggestion.fromJson(
                   value))
           .toList();
@@ -6588,7 +6598,7 @@
     }
     if (_json.containsKey("parts")) {
       parts = _json["parts"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1IntentTrainingPhrasePart>((value) =>
               new GoogleCloudDialogflowV2beta1IntentTrainingPhrasePart.fromJson(
                   value))
           .toList();
@@ -6692,7 +6702,7 @@
   GoogleCloudDialogflowV2beta1ListContextsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("contexts")) {
       contexts = _json["contexts"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1Context>((value) =>
               new GoogleCloudDialogflowV2beta1Context.fromJson(value))
           .toList();
     }
@@ -6729,7 +6739,7 @@
   GoogleCloudDialogflowV2beta1ListEntityTypesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entityTypes")) {
       entityTypes = _json["entityTypes"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1EntityType>((value) =>
               new GoogleCloudDialogflowV2beta1EntityType.fromJson(value))
           .toList();
     }
@@ -6767,7 +6777,7 @@
   GoogleCloudDialogflowV2beta1ListIntentsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("intents")) {
       intents = _json["intents"]
-          .map(
+          .map<GoogleCloudDialogflowV2beta1Intent>(
               (value) => new GoogleCloudDialogflowV2beta1Intent.fromJson(value))
           .toList();
     }
@@ -6808,7 +6818,7 @@
     }
     if (_json.containsKey("sessionEntityTypes")) {
       sessionEntityTypes = _json["sessionEntityTypes"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1SessionEntityType>((value) =>
               new GoogleCloudDialogflowV2beta1SessionEntityType.fromJson(value))
           .toList();
     }
@@ -6956,7 +6966,7 @@
   GoogleCloudDialogflowV2beta1QueryParameters.fromJson(core.Map _json) {
     if (_json.containsKey("contexts")) {
       contexts = _json["contexts"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1Context>((value) =>
               new GoogleCloudDialogflowV2beta1Context.fromJson(value))
           .toList();
     }
@@ -6971,7 +6981,7 @@
     }
     if (_json.containsKey("sessionEntityTypes")) {
       sessionEntityTypes = _json["sessionEntityTypes"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1SessionEntityType>((value) =>
               new GoogleCloudDialogflowV2beta1SessionEntityType.fromJson(value))
           .toList();
     }
@@ -7103,7 +7113,7 @@
     }
     if (_json.containsKey("fulfillmentMessages")) {
       fulfillmentMessages = _json["fulfillmentMessages"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1IntentMessage>((value) =>
               new GoogleCloudDialogflowV2beta1IntentMessage.fromJson(value))
           .toList();
     }
@@ -7121,7 +7131,7 @@
     }
     if (_json.containsKey("outputContexts")) {
       outputContexts = _json["outputContexts"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1Context>((value) =>
               new GoogleCloudDialogflowV2beta1Context.fromJson(value))
           .toList();
     }
@@ -7262,7 +7272,8 @@
   GoogleCloudDialogflowV2beta1SearchAgentsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("agents")) {
       agents = _json["agents"]
-          .map((value) => new GoogleCloudDialogflowV2beta1Agent.fromJson(value))
+          .map<GoogleCloudDialogflowV2beta1Agent>(
+              (value) => new GoogleCloudDialogflowV2beta1Agent.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -7323,7 +7334,7 @@
   GoogleCloudDialogflowV2beta1SessionEntityType.fromJson(core.Map _json) {
     if (_json.containsKey("entities")) {
       entities = _json["entities"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1EntityTypeEntity>((value) =>
               new GoogleCloudDialogflowV2beta1EntityTypeEntity.fromJson(value))
           .toList();
     }
@@ -7498,7 +7509,7 @@
     }
     if (_json.containsKey("fulfillmentMessages")) {
       fulfillmentMessages = _json["fulfillmentMessages"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1IntentMessage>((value) =>
               new GoogleCloudDialogflowV2beta1IntentMessage.fromJson(value))
           .toList();
     }
@@ -7507,7 +7518,7 @@
     }
     if (_json.containsKey("outputContexts")) {
       outputContexts = _json["outputContexts"]
-          .map((value) =>
+          .map<GoogleCloudDialogflowV2beta1Context>((value) =>
               new GoogleCloudDialogflowV2beta1Context.fromJson(value))
           .toList();
     }
diff --git a/generated/googleapis_beta/lib/dlp/v2beta1.dart b/generated/googleapis_beta/lib/dlp/v2beta1.dart
index 45ed66f..ddf7ac0 100644
--- a/generated/googleapis_beta/lib/dlp/v2beta1.dart
+++ b/generated/googleapis_beta/lib/dlp/v2beta1.dart
@@ -65,7 +65,7 @@
       GooglePrivacyDlpV2beta1DeidentifyContentRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -111,7 +111,7 @@
       GooglePrivacyDlpV2beta1InspectContentRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -157,7 +157,7 @@
       GooglePrivacyDlpV2beta1RedactContentRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -209,7 +209,7 @@
       GooglePrivacyDlpV2beta1AnalyzeDataSourceRiskRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -277,7 +277,7 @@
       GoogleLongrunningCancelOperationRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -326,7 +326,7 @@
       GooglePrivacyDlpV2beta1CreateInspectOperationRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -371,7 +371,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -417,7 +417,7 @@
   async.Future<GoogleLongrunningOperation> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -472,7 +472,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -568,7 +568,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -645,7 +645,7 @@
       GoogleLongrunningCancelOperationRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -693,7 +693,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -739,7 +739,7 @@
   async.Future<GoogleLongrunningOperation> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -794,7 +794,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -859,7 +859,7 @@
   async.Future<GooglePrivacyDlpV2beta1ListRootCategoriesResponse> list(
       {core.String languageCode, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -918,7 +918,7 @@
       {core.String languageCode,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -978,7 +978,8 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new GoogleLongrunningOperation.fromJson(value))
+          .map<GoogleLongrunningOperation>(
+              (value) => new GoogleLongrunningOperation.fromJson(value))
           .toList();
     }
   }
@@ -1128,7 +1129,7 @@
   GooglePrivacyDlpV2beta1AuxiliaryTable.fromJson(core.Map _json) {
     if (_json.containsKey("quasiIds")) {
       quasiIds = _json["quasiIds"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1QuasiIdField>((value) =>
               new GooglePrivacyDlpV2beta1QuasiIdField.fromJson(value))
           .toList();
     }
@@ -1171,7 +1172,8 @@
   GooglePrivacyDlpV2beta1BigQueryOptions.fromJson(core.Map _json) {
     if (_json.containsKey("identifyingFields")) {
       identifyingFields = _json["identifyingFields"]
-          .map((value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1FieldId>(
+              (value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tableReference")) {
@@ -1303,7 +1305,8 @@
   GooglePrivacyDlpV2beta1BucketingConfig.fromJson(core.Map _json) {
     if (_json.containsKey("buckets")) {
       buckets = _json["buckets"]
-          .map((value) => new GooglePrivacyDlpV2beta1Bucket.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Bucket>(
+              (value) => new GooglePrivacyDlpV2beta1Bucket.fromJson(value))
           .toList();
     }
   }
@@ -1369,7 +1372,7 @@
     }
     if (_json.containsKey("bucketValues")) {
       bucketValues = _json["bucketValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1ValueFrequency>((value) =>
               new GooglePrivacyDlpV2beta1ValueFrequency.fromJson(value))
           .toList();
     }
@@ -1412,9 +1415,10 @@
   GooglePrivacyDlpV2beta1CategoricalStatsResult.fromJson(core.Map _json) {
     if (_json.containsKey("valueFrequencyHistogramBuckets")) {
       valueFrequencyHistogramBuckets = _json["valueFrequencyHistogramBuckets"]
-          .map((value) =>
-              new GooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket
-                  .fromJson(value))
+          .map<GooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket>(
+              (value) =>
+                  new GooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket
+                      .fromJson(value))
           .toList();
     }
   }
@@ -1498,7 +1502,7 @@
   GooglePrivacyDlpV2beta1CharacterMaskConfig.fromJson(core.Map _json) {
     if (_json.containsKey("charactersToIgnore")) {
       charactersToIgnore = _json["charactersToIgnore"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1CharsToIgnore>((value) =>
               new GooglePrivacyDlpV2beta1CharsToIgnore.fromJson(value))
           .toList();
     }
@@ -1767,7 +1771,8 @@
   GooglePrivacyDlpV2beta1Conditions.fromJson(core.Map _json) {
     if (_json.containsKey("conditions")) {
       conditions = _json["conditions"]
-          .map((value) => new GooglePrivacyDlpV2beta1Condition.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Condition>(
+              (value) => new GooglePrivacyDlpV2beta1Condition.fromJson(value))
           .toList();
     }
   }
@@ -2202,7 +2207,8 @@
     }
     if (_json.containsKey("projection")) {
       projection = _json["projection"]
-          .map((value) => new GooglePrivacyDlpV2beta1Projection.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Projection>(
+              (value) => new GooglePrivacyDlpV2beta1Projection.fromJson(value))
           .toList();
     }
   }
@@ -2238,7 +2244,7 @@
   GooglePrivacyDlpV2beta1DeidentificationSummary.fromJson(core.Map _json) {
     if (_json.containsKey("transformationSummaries")) {
       transformationSummaries = _json["transformationSummaries"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1TransformationSummary>((value) =>
               new GooglePrivacyDlpV2beta1TransformationSummary.fromJson(value))
           .toList();
     }
@@ -2325,7 +2331,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map(
+          .map<GooglePrivacyDlpV2beta1ContentItem>(
               (value) => new GooglePrivacyDlpV2beta1ContentItem.fromJson(value))
           .toList();
     }
@@ -2359,13 +2365,13 @@
   GooglePrivacyDlpV2beta1DeidentifyContentResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map(
+          .map<GooglePrivacyDlpV2beta1ContentItem>(
               (value) => new GooglePrivacyDlpV2beta1ContentItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("summaries")) {
       summaries = _json["summaries"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1DeidentificationSummary>((value) =>
               new GooglePrivacyDlpV2beta1DeidentificationSummary.fromJson(
                   value))
           .toList();
@@ -2545,7 +2551,8 @@
     }
     if (_json.containsKey("fields")) {
       fields = _json["fields"]
-          .map((value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1FieldId>(
+              (value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
           .toList();
     }
     if (_json.containsKey("infoTypeTransformations")) {
@@ -2876,7 +2883,7 @@
   GooglePrivacyDlpV2beta1InfoTypeDescription.fromJson(core.Map _json) {
     if (_json.containsKey("categories")) {
       categories = _json["categories"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1CategoryDescription>((value) =>
               new GooglePrivacyDlpV2beta1CategoryDescription.fromJson(value))
           .toList();
     }
@@ -2990,7 +2997,8 @@
   GooglePrivacyDlpV2beta1InfoTypeTransformation.fromJson(core.Map _json) {
     if (_json.containsKey("infoTypes")) {
       infoTypes = _json["infoTypes"]
-          .map((value) => new GooglePrivacyDlpV2beta1InfoType.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1InfoType>(
+              (value) => new GooglePrivacyDlpV2beta1InfoType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("primitiveTransformation")) {
@@ -3027,7 +3035,7 @@
   GooglePrivacyDlpV2beta1InfoTypeTransformations.fromJson(core.Map _json) {
     if (_json.containsKey("transformations")) {
       transformations = _json["transformations"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1InfoTypeTransformation>((value) =>
               new GooglePrivacyDlpV2beta1InfoTypeTransformation.fromJson(value))
           .toList();
     }
@@ -3086,7 +3094,7 @@
   GooglePrivacyDlpV2beta1InspectConfig.fromJson(core.Map _json) {
     if (_json.containsKey("customInfoTypes")) {
       customInfoTypes = _json["customInfoTypes"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1CustomInfoType>((value) =>
               new GooglePrivacyDlpV2beta1CustomInfoType.fromJson(value))
           .toList();
     }
@@ -3098,13 +3106,14 @@
     }
     if (_json.containsKey("infoTypeLimits")) {
       infoTypeLimits = _json["infoTypeLimits"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1InfoTypeLimit>((value) =>
               new GooglePrivacyDlpV2beta1InfoTypeLimit.fromJson(value))
           .toList();
     }
     if (_json.containsKey("infoTypes")) {
       infoTypes = _json["infoTypes"]
-          .map((value) => new GooglePrivacyDlpV2beta1InfoType.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1InfoType>(
+              (value) => new GooglePrivacyDlpV2beta1InfoType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("maxFindings")) {
@@ -3164,7 +3173,7 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map(
+          .map<GooglePrivacyDlpV2beta1ContentItem>(
               (value) => new GooglePrivacyDlpV2beta1ContentItem.fromJson(value))
           .toList();
     }
@@ -3194,7 +3203,7 @@
   GooglePrivacyDlpV2beta1InspectContentResponse.fromJson(core.Map _json) {
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1InspectResult>((value) =>
               new GooglePrivacyDlpV2beta1InspectResult.fromJson(value))
           .toList();
     }
@@ -3239,7 +3248,7 @@
     }
     if (_json.containsKey("infoTypeStats")) {
       infoTypeStats = _json["infoTypeStats"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1InfoTypeStatistics>((value) =>
               new GooglePrivacyDlpV2beta1InfoTypeStatistics.fromJson(value))
           .toList();
     }
@@ -3337,7 +3346,8 @@
   GooglePrivacyDlpV2beta1InspectResult.fromJson(core.Map _json) {
     if (_json.containsKey("findings")) {
       findings = _json["findings"]
-          .map((value) => new GooglePrivacyDlpV2beta1Finding.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Finding>(
+              (value) => new GooglePrivacyDlpV2beta1Finding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("findingsTruncated")) {
@@ -3389,7 +3399,8 @@
     }
     if (_json.containsKey("quasiIds")) {
       quasiIds = _json["quasiIds"]
-          .map((value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1FieldId>(
+              (value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
           .toList();
     }
   }
@@ -3426,7 +3437,8 @@
     }
     if (_json.containsKey("quasiIdsValues")) {
       quasiIdsValues = _json["quasiIdsValues"]
-          .map((value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Value>(
+              (value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
           .toList();
     }
   }
@@ -3468,7 +3480,7 @@
     }
     if (_json.containsKey("bucketValues")) {
       bucketValues = _json["bucketValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1KAnonymityEquivalenceClass>((value) =>
               new GooglePrivacyDlpV2beta1KAnonymityEquivalenceClass.fromJson(
                   value))
           .toList();
@@ -3513,7 +3525,7 @@
     if (_json.containsKey("equivalenceClassHistogramBuckets")) {
       equivalenceClassHistogramBuckets =
           _json["equivalenceClassHistogramBuckets"]
-              .map((value) =>
+              .map<GooglePrivacyDlpV2beta1KAnonymityHistogramBucket>((value) =>
                   new GooglePrivacyDlpV2beta1KAnonymityHistogramBucket.fromJson(
                       value))
               .toList();
@@ -3559,13 +3571,13 @@
   GooglePrivacyDlpV2beta1KMapEstimationConfig.fromJson(core.Map _json) {
     if (_json.containsKey("auxiliaryTables")) {
       auxiliaryTables = _json["auxiliaryTables"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1AuxiliaryTable>((value) =>
               new GooglePrivacyDlpV2beta1AuxiliaryTable.fromJson(value))
           .toList();
     }
     if (_json.containsKey("quasiIds")) {
       quasiIds = _json["quasiIds"]
-          .map(
+          .map<GooglePrivacyDlpV2beta1TaggedField>(
               (value) => new GooglePrivacyDlpV2beta1TaggedField.fromJson(value))
           .toList();
     }
@@ -3622,7 +3634,7 @@
     }
     if (_json.containsKey("bucketValues")) {
       bucketValues = _json["bucketValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues>((value) =>
               new GooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues.fromJson(
                   value))
           .toList();
@@ -3671,7 +3683,8 @@
     }
     if (_json.containsKey("quasiIdsValues")) {
       quasiIdsValues = _json["quasiIdsValues"]
-          .map((value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Value>(
+              (value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
           .toList();
     }
   }
@@ -3709,7 +3722,7 @@
   GooglePrivacyDlpV2beta1KMapEstimationResult.fromJson(core.Map _json) {
     if (_json.containsKey("kMapEstimationHistogram")) {
       kMapEstimationHistogram = _json["kMapEstimationHistogram"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1KMapEstimationHistogramBucket>((value) =>
               new GooglePrivacyDlpV2beta1KMapEstimationHistogramBucket.fromJson(
                   value))
           .toList();
@@ -3757,7 +3770,7 @@
     }
     if (_json.containsKey("path")) {
       path = _json["path"]
-          .map(
+          .map<GooglePrivacyDlpV2beta1PathElement>(
               (value) => new GooglePrivacyDlpV2beta1PathElement.fromJson(value))
           .toList();
     }
@@ -3857,7 +3870,8 @@
   GooglePrivacyDlpV2beta1LDiversityConfig.fromJson(core.Map _json) {
     if (_json.containsKey("quasiIds")) {
       quasiIds = _json["quasiIds"]
-          .map((value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1FieldId>(
+              (value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
           .toList();
     }
     if (_json.containsKey("sensitiveAttribute")) {
@@ -3905,12 +3919,13 @@
     }
     if (_json.containsKey("quasiIdsValues")) {
       quasiIdsValues = _json["quasiIdsValues"]
-          .map((value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Value>(
+              (value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
           .toList();
     }
     if (_json.containsKey("topSensitiveValues")) {
       topSensitiveValues = _json["topSensitiveValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1ValueFrequency>((value) =>
               new GooglePrivacyDlpV2beta1ValueFrequency.fromJson(value))
           .toList();
     }
@@ -3962,7 +3977,7 @@
     }
     if (_json.containsKey("bucketValues")) {
       bucketValues = _json["bucketValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1LDiversityEquivalenceClass>((value) =>
               new GooglePrivacyDlpV2beta1LDiversityEquivalenceClass.fromJson(
                   value))
           .toList();
@@ -4011,7 +4026,7 @@
     if (_json.containsKey("sensitiveValueFrequencyHistogramBuckets")) {
       sensitiveValueFrequencyHistogramBuckets =
           _json["sensitiveValueFrequencyHistogramBuckets"]
-              .map((value) =>
+              .map<GooglePrivacyDlpV2beta1LDiversityHistogramBucket>((value) =>
                   new GooglePrivacyDlpV2beta1LDiversityHistogramBucket.fromJson(
                       value))
               .toList();
@@ -4041,7 +4056,7 @@
   GooglePrivacyDlpV2beta1ListInfoTypesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("infoTypes")) {
       infoTypes = _json["infoTypes"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1InfoTypeDescription>((value) =>
               new GooglePrivacyDlpV2beta1InfoTypeDescription.fromJson(value))
           .toList();
     }
@@ -4102,7 +4117,7 @@
   GooglePrivacyDlpV2beta1ListRootCategoriesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("categories")) {
       categories = _json["categories"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1CategoryDescription>((value) =>
               new GooglePrivacyDlpV2beta1CategoryDescription.fromJson(value))
           .toList();
     }
@@ -4167,7 +4182,7 @@
     }
     if (_json.containsKey("imageBoxes")) {
       imageBoxes = _json["imageBoxes"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1ImageLocation>((value) =>
               new GooglePrivacyDlpV2beta1ImageLocation.fromJson(value))
           .toList();
     }
@@ -4255,7 +4270,8 @@
     }
     if (_json.containsKey("quantileValues")) {
       quantileValues = _json["quantileValues"]
-          .map((value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Value>(
+              (value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
           .toList();
     }
   }
@@ -4812,13 +4828,13 @@
   GooglePrivacyDlpV2beta1RecordTransformations.fromJson(core.Map _json) {
     if (_json.containsKey("fieldTransformations")) {
       fieldTransformations = _json["fieldTransformations"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1FieldTransformation>((value) =>
               new GooglePrivacyDlpV2beta1FieldTransformation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("recordSuppressions")) {
       recordSuppressions = _json["recordSuppressions"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1RecordSuppression>((value) =>
               new GooglePrivacyDlpV2beta1RecordSuppression.fromJson(value))
           .toList();
     }
@@ -4875,7 +4891,7 @@
   GooglePrivacyDlpV2beta1RedactContentRequest.fromJson(core.Map _json) {
     if (_json.containsKey("imageRedactionConfigs")) {
       imageRedactionConfigs = _json["imageRedactionConfigs"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1ImageRedactionConfig>((value) =>
               new GooglePrivacyDlpV2beta1ImageRedactionConfig.fromJson(value))
           .toList();
     }
@@ -4885,13 +4901,13 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map(
+          .map<GooglePrivacyDlpV2beta1ContentItem>(
               (value) => new GooglePrivacyDlpV2beta1ContentItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("replaceConfigs")) {
       replaceConfigs = _json["replaceConfigs"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1ReplaceConfig>((value) =>
               new GooglePrivacyDlpV2beta1ReplaceConfig.fromJson(value))
           .toList();
     }
@@ -4928,7 +4944,7 @@
   GooglePrivacyDlpV2beta1RedactContentResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map(
+          .map<GooglePrivacyDlpV2beta1ContentItem>(
               (value) => new GooglePrivacyDlpV2beta1ContentItem.fromJson(value))
           .toList();
     }
@@ -5130,7 +5146,8 @@
   GooglePrivacyDlpV2beta1Row.fromJson(core.Map _json) {
     if (_json.containsKey("values")) {
       values = _json["values"]
-          .map((value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Value>(
+              (value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
           .toList();
     }
   }
@@ -5265,12 +5282,14 @@
   GooglePrivacyDlpV2beta1Table.fromJson(core.Map _json) {
     if (_json.containsKey("headers")) {
       headers = _json["headers"]
-          .map((value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1FieldId>(
+              (value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
           .toList();
     }
     if (_json.containsKey("rows")) {
       rows = _json["rows"]
-          .map((value) => new GooglePrivacyDlpV2beta1Row.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Row>(
+              (value) => new GooglePrivacyDlpV2beta1Row.fromJson(value))
           .toList();
     }
   }
@@ -5432,7 +5451,7 @@
     }
     if (_json.containsKey("fieldTransformations")) {
       fieldTransformations = _json["fieldTransformations"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1FieldTransformation>((value) =>
               new GooglePrivacyDlpV2beta1FieldTransformation.fromJson(value))
           .toList();
     }
@@ -5446,7 +5465,7 @@
     }
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1SummaryResult>((value) =>
               new GooglePrivacyDlpV2beta1SummaryResult.fromJson(value))
           .toList();
     }
diff --git a/generated/googleapis_beta/lib/dlp/v2beta2.dart b/generated/googleapis_beta/lib/dlp/v2beta2.dart
index 00ae0f1..6f3a697 100644
--- a/generated/googleapis_beta/lib/dlp/v2beta2.dart
+++ b/generated/googleapis_beta/lib/dlp/v2beta2.dart
@@ -67,7 +67,7 @@
   async.Future<GooglePrivacyDlpV2beta2ListInfoTypesResponse> list(
       {core.String languageCode, core.String filter, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -139,7 +139,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -192,7 +192,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -239,7 +239,7 @@
   async.Future<GooglePrivacyDlpV2beta2DeidentifyTemplate> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -296,7 +296,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -357,7 +357,7 @@
       core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -418,7 +418,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -471,7 +471,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -518,7 +518,7 @@
   async.Future<GooglePrivacyDlpV2beta2InspectTemplate> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -575,7 +575,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -635,7 +635,7 @@
       core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -716,7 +716,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -772,7 +772,7 @@
       GooglePrivacyDlpV2beta2InspectContentRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -826,7 +826,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -888,7 +888,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -943,7 +943,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1006,7 +1006,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1059,7 +1059,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1106,7 +1106,7 @@
   async.Future<GooglePrivacyDlpV2beta2DeidentifyTemplate> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1163,7 +1163,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1224,7 +1224,7 @@
       core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1283,7 +1283,7 @@
       GooglePrivacyDlpV2beta2CancelDlpJobRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1333,7 +1333,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1377,7 +1377,7 @@
   async.Future<GooglePrivacyDlpV2beta2DlpJob> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1461,7 +1461,7 @@
       core.String type,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1531,7 +1531,7 @@
       GooglePrivacyDlpV2beta2RedactImageRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1594,7 +1594,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1647,7 +1647,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1694,7 +1694,7 @@
   async.Future<GooglePrivacyDlpV2beta2InspectTemplate> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1751,7 +1751,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1811,7 +1811,7 @@
       core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1871,7 +1871,7 @@
       core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1922,7 +1922,7 @@
   async.Future<GoogleProtobufEmpty> delete(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1967,7 +1967,7 @@
   async.Future<GooglePrivacyDlpV2beta2JobTrigger> get(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2038,7 +2038,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2098,7 +2098,7 @@
       GooglePrivacyDlpV2beta2UpdateJobTriggerRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2151,7 +2151,7 @@
   GooglePrivacyDlpV2beta1AuxiliaryTable.fromJson(core.Map _json) {
     if (_json.containsKey("quasiIds")) {
       quasiIds = _json["quasiIds"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1QuasiIdField>((value) =>
               new GooglePrivacyDlpV2beta1QuasiIdField.fromJson(value))
           .toList();
     }
@@ -2194,7 +2194,8 @@
   GooglePrivacyDlpV2beta1BigQueryOptions.fromJson(core.Map _json) {
     if (_json.containsKey("identifyingFields")) {
       identifyingFields = _json["identifyingFields"]
-          .map((value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1FieldId>(
+              (value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tableReference")) {
@@ -2314,7 +2315,7 @@
     }
     if (_json.containsKey("bucketValues")) {
       bucketValues = _json["bucketValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1ValueFrequency>((value) =>
               new GooglePrivacyDlpV2beta1ValueFrequency.fromJson(value))
           .toList();
     }
@@ -2357,9 +2358,10 @@
   GooglePrivacyDlpV2beta1CategoricalStatsResult.fromJson(core.Map _json) {
     if (_json.containsKey("valueFrequencyHistogramBuckets")) {
       valueFrequencyHistogramBuckets = _json["valueFrequencyHistogramBuckets"]
-          .map((value) =>
-              new GooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket
-                  .fromJson(value))
+          .map<GooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket>(
+              (value) =>
+                  new GooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket
+                      .fromJson(value))
           .toList();
     }
   }
@@ -2493,7 +2495,8 @@
     }
     if (_json.containsKey("projection")) {
       projection = _json["projection"]
-          .map((value) => new GooglePrivacyDlpV2beta1Projection.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Projection>(
+              (value) => new GooglePrivacyDlpV2beta1Projection.fromJson(value))
           .toList();
     }
   }
@@ -2766,7 +2769,7 @@
   GooglePrivacyDlpV2beta1InspectConfig.fromJson(core.Map _json) {
     if (_json.containsKey("customInfoTypes")) {
       customInfoTypes = _json["customInfoTypes"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1CustomInfoType>((value) =>
               new GooglePrivacyDlpV2beta1CustomInfoType.fromJson(value))
           .toList();
     }
@@ -2778,13 +2781,14 @@
     }
     if (_json.containsKey("infoTypeLimits")) {
       infoTypeLimits = _json["infoTypeLimits"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1InfoTypeLimit>((value) =>
               new GooglePrivacyDlpV2beta1InfoTypeLimit.fromJson(value))
           .toList();
     }
     if (_json.containsKey("infoTypes")) {
       infoTypes = _json["infoTypes"]
-          .map((value) => new GooglePrivacyDlpV2beta1InfoType.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1InfoType>(
+              (value) => new GooglePrivacyDlpV2beta1InfoType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("maxFindings")) {
@@ -2854,7 +2858,7 @@
     }
     if (_json.containsKey("infoTypeStats")) {
       infoTypeStats = _json["infoTypeStats"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1InfoTypeStatistics>((value) =>
               new GooglePrivacyDlpV2beta1InfoTypeStatistics.fromJson(value))
           .toList();
     }
@@ -2965,7 +2969,8 @@
     }
     if (_json.containsKey("quasiIds")) {
       quasiIds = _json["quasiIds"]
-          .map((value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1FieldId>(
+              (value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
           .toList();
     }
   }
@@ -3002,7 +3007,8 @@
     }
     if (_json.containsKey("quasiIdsValues")) {
       quasiIdsValues = _json["quasiIdsValues"]
-          .map((value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Value>(
+              (value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
           .toList();
     }
   }
@@ -3044,7 +3050,7 @@
     }
     if (_json.containsKey("bucketValues")) {
       bucketValues = _json["bucketValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1KAnonymityEquivalenceClass>((value) =>
               new GooglePrivacyDlpV2beta1KAnonymityEquivalenceClass.fromJson(
                   value))
           .toList();
@@ -3089,7 +3095,7 @@
     if (_json.containsKey("equivalenceClassHistogramBuckets")) {
       equivalenceClassHistogramBuckets =
           _json["equivalenceClassHistogramBuckets"]
-              .map((value) =>
+              .map<GooglePrivacyDlpV2beta1KAnonymityHistogramBucket>((value) =>
                   new GooglePrivacyDlpV2beta1KAnonymityHistogramBucket.fromJson(
                       value))
               .toList();
@@ -3135,13 +3141,13 @@
   GooglePrivacyDlpV2beta1KMapEstimationConfig.fromJson(core.Map _json) {
     if (_json.containsKey("auxiliaryTables")) {
       auxiliaryTables = _json["auxiliaryTables"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1AuxiliaryTable>((value) =>
               new GooglePrivacyDlpV2beta1AuxiliaryTable.fromJson(value))
           .toList();
     }
     if (_json.containsKey("quasiIds")) {
       quasiIds = _json["quasiIds"]
-          .map(
+          .map<GooglePrivacyDlpV2beta1TaggedField>(
               (value) => new GooglePrivacyDlpV2beta1TaggedField.fromJson(value))
           .toList();
     }
@@ -3198,7 +3204,7 @@
     }
     if (_json.containsKey("bucketValues")) {
       bucketValues = _json["bucketValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues>((value) =>
               new GooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues.fromJson(
                   value))
           .toList();
@@ -3247,7 +3253,8 @@
     }
     if (_json.containsKey("quasiIdsValues")) {
       quasiIdsValues = _json["quasiIdsValues"]
-          .map((value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Value>(
+              (value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
           .toList();
     }
   }
@@ -3285,7 +3292,7 @@
   GooglePrivacyDlpV2beta1KMapEstimationResult.fromJson(core.Map _json) {
     if (_json.containsKey("kMapEstimationHistogram")) {
       kMapEstimationHistogram = _json["kMapEstimationHistogram"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1KMapEstimationHistogramBucket>((value) =>
               new GooglePrivacyDlpV2beta1KMapEstimationHistogramBucket.fromJson(
                   value))
           .toList();
@@ -3341,7 +3348,8 @@
   GooglePrivacyDlpV2beta1LDiversityConfig.fromJson(core.Map _json) {
     if (_json.containsKey("quasiIds")) {
       quasiIds = _json["quasiIds"]
-          .map((value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1FieldId>(
+              (value) => new GooglePrivacyDlpV2beta1FieldId.fromJson(value))
           .toList();
     }
     if (_json.containsKey("sensitiveAttribute")) {
@@ -3389,12 +3397,13 @@
     }
     if (_json.containsKey("quasiIdsValues")) {
       quasiIdsValues = _json["quasiIdsValues"]
-          .map((value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Value>(
+              (value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
           .toList();
     }
     if (_json.containsKey("topSensitiveValues")) {
       topSensitiveValues = _json["topSensitiveValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1ValueFrequency>((value) =>
               new GooglePrivacyDlpV2beta1ValueFrequency.fromJson(value))
           .toList();
     }
@@ -3446,7 +3455,7 @@
     }
     if (_json.containsKey("bucketValues")) {
       bucketValues = _json["bucketValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta1LDiversityEquivalenceClass>((value) =>
               new GooglePrivacyDlpV2beta1LDiversityEquivalenceClass.fromJson(
                   value))
           .toList();
@@ -3495,7 +3504,7 @@
     if (_json.containsKey("sensitiveValueFrequencyHistogramBuckets")) {
       sensitiveValueFrequencyHistogramBuckets =
           _json["sensitiveValueFrequencyHistogramBuckets"]
-              .map((value) =>
+              .map<GooglePrivacyDlpV2beta1LDiversityHistogramBucket>((value) =>
                   new GooglePrivacyDlpV2beta1LDiversityHistogramBucket.fromJson(
                       value))
               .toList();
@@ -3563,7 +3572,8 @@
     }
     if (_json.containsKey("quantileValues")) {
       quantileValues = _json["quantileValues"]
-          .map((value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta1Value>(
+              (value) => new GooglePrivacyDlpV2beta1Value.fromJson(value))
           .toList();
     }
   }
@@ -4357,7 +4367,7 @@
   GooglePrivacyDlpV2beta2AuxiliaryTable.fromJson(core.Map _json) {
     if (_json.containsKey("quasiIds")) {
       quasiIds = _json["quasiIds"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2QuasiIdField>((value) =>
               new GooglePrivacyDlpV2beta2QuasiIdField.fromJson(value))
           .toList();
     }
@@ -4400,7 +4410,8 @@
   GooglePrivacyDlpV2beta2BigQueryOptions.fromJson(core.Map _json) {
     if (_json.containsKey("identifyingFields")) {
       identifyingFields = _json["identifyingFields"]
-          .map((value) => new GooglePrivacyDlpV2beta2FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2FieldId>(
+              (value) => new GooglePrivacyDlpV2beta2FieldId.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tableReference")) {
@@ -4532,7 +4543,8 @@
   GooglePrivacyDlpV2beta2BucketingConfig.fromJson(core.Map _json) {
     if (_json.containsKey("buckets")) {
       buckets = _json["buckets"]
-          .map((value) => new GooglePrivacyDlpV2beta2Bucket.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Bucket>(
+              (value) => new GooglePrivacyDlpV2beta2Bucket.fromJson(value))
           .toList();
     }
   }
@@ -4610,7 +4622,7 @@
     }
     if (_json.containsKey("bucketValues")) {
       bucketValues = _json["bucketValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2ValueFrequency>((value) =>
               new GooglePrivacyDlpV2beta2ValueFrequency.fromJson(value))
           .toList();
     }
@@ -4653,9 +4665,10 @@
   GooglePrivacyDlpV2beta2CategoricalStatsResult.fromJson(core.Map _json) {
     if (_json.containsKey("valueFrequencyHistogramBuckets")) {
       valueFrequencyHistogramBuckets = _json["valueFrequencyHistogramBuckets"]
-          .map((value) =>
-              new GooglePrivacyDlpV2beta2CategoricalStatsHistogramBucket
-                  .fromJson(value))
+          .map<GooglePrivacyDlpV2beta2CategoricalStatsHistogramBucket>(
+              (value) =>
+                  new GooglePrivacyDlpV2beta2CategoricalStatsHistogramBucket
+                      .fromJson(value))
           .toList();
     }
   }
@@ -4707,7 +4720,7 @@
   GooglePrivacyDlpV2beta2CharacterMaskConfig.fromJson(core.Map _json) {
     if (_json.containsKey("charactersToIgnore")) {
       charactersToIgnore = _json["charactersToIgnore"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2CharsToIgnore>((value) =>
               new GooglePrivacyDlpV2beta2CharsToIgnore.fromJson(value))
           .toList();
     }
@@ -4964,7 +4977,8 @@
   GooglePrivacyDlpV2beta2Conditions.fromJson(core.Map _json) {
     if (_json.containsKey("conditions")) {
       conditions = _json["conditions"]
-          .map((value) => new GooglePrivacyDlpV2beta2Condition.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Condition>(
+              (value) => new GooglePrivacyDlpV2beta2Condition.fromJson(value))
           .toList();
     }
   }
@@ -5396,7 +5410,7 @@
   GooglePrivacyDlpV2beta2CustomInfoType.fromJson(core.Map _json) {
     if (_json.containsKey("detectionRules")) {
       detectionRules = _json["detectionRules"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2DetectionRule>((value) =>
               new GooglePrivacyDlpV2beta2DetectionRule.fromJson(value))
           .toList();
     }
@@ -5846,7 +5860,7 @@
     }
     if (_json.containsKey("errorResults")) {
       errorResults = _json["errorResults"]
-          .map((value) => new GoogleRpcStatus.fromJson(value))
+          .map<GoogleRpcStatus>((value) => new GoogleRpcStatus.fromJson(value))
           .toList();
     }
     if (_json.containsKey("inspectDetails")) {
@@ -6063,7 +6077,8 @@
     }
     if (_json.containsKey("fields")) {
       fields = _json["fields"]
-          .map((value) => new GooglePrivacyDlpV2beta2FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2FieldId>(
+              (value) => new GooglePrivacyDlpV2beta2FieldId.fromJson(value))
           .toList();
     }
     if (_json.containsKey("infoTypeTransformations")) {
@@ -6210,7 +6225,7 @@
   GooglePrivacyDlpV2beta2FindingLimits.fromJson(core.Map _json) {
     if (_json.containsKey("maxFindingsPerInfoType")) {
       maxFindingsPerInfoType = _json["maxFindingsPerInfoType"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2InfoTypeLimit>((value) =>
               new GooglePrivacyDlpV2beta2InfoTypeLimit.fromJson(value))
           .toList();
     }
@@ -6599,7 +6614,8 @@
   GooglePrivacyDlpV2beta2InfoTypeTransformation.fromJson(core.Map _json) {
     if (_json.containsKey("infoTypes")) {
       infoTypes = _json["infoTypes"]
-          .map((value) => new GooglePrivacyDlpV2beta2InfoType.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2InfoType>(
+              (value) => new GooglePrivacyDlpV2beta2InfoType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("primitiveTransformation")) {
@@ -6636,7 +6652,7 @@
   GooglePrivacyDlpV2beta2InfoTypeTransformations.fromJson(core.Map _json) {
     if (_json.containsKey("transformations")) {
       transformations = _json["transformations"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2InfoTypeTransformation>((value) =>
               new GooglePrivacyDlpV2beta2InfoTypeTransformation.fromJson(value))
           .toList();
     }
@@ -6691,7 +6707,7 @@
   GooglePrivacyDlpV2beta2InspectConfig.fromJson(core.Map _json) {
     if (_json.containsKey("customInfoTypes")) {
       customInfoTypes = _json["customInfoTypes"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2CustomInfoType>((value) =>
               new GooglePrivacyDlpV2beta2CustomInfoType.fromJson(value))
           .toList();
     }
@@ -6703,7 +6719,8 @@
     }
     if (_json.containsKey("infoTypes")) {
       infoTypes = _json["infoTypes"]
-          .map((value) => new GooglePrivacyDlpV2beta2InfoType.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2InfoType>(
+              (value) => new GooglePrivacyDlpV2beta2InfoType.fromJson(value))
           .toList();
     }
     if (_json.containsKey("limits")) {
@@ -6909,7 +6926,8 @@
   GooglePrivacyDlpV2beta2InspectJobConfig.fromJson(core.Map _json) {
     if (_json.containsKey("actions")) {
       actions = _json["actions"]
-          .map((value) => new GooglePrivacyDlpV2beta2Action.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Action>(
+              (value) => new GooglePrivacyDlpV2beta2Action.fromJson(value))
           .toList();
     }
     if (_json.containsKey("inspectConfig")) {
@@ -6969,7 +6987,8 @@
   GooglePrivacyDlpV2beta2InspectResult.fromJson(core.Map _json) {
     if (_json.containsKey("findings")) {
       findings = _json["findings"]
-          .map((value) => new GooglePrivacyDlpV2beta2Finding.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Finding>(
+              (value) => new GooglePrivacyDlpV2beta2Finding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("findingsTruncated")) {
@@ -7122,7 +7141,8 @@
     }
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new GooglePrivacyDlpV2beta2Error.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Error>(
+              (value) => new GooglePrivacyDlpV2beta2Error.fromJson(value))
           .toList();
     }
     if (_json.containsKey("inspectJob")) {
@@ -7140,7 +7160,8 @@
     }
     if (_json.containsKey("triggers")) {
       triggers = _json["triggers"]
-          .map((value) => new GooglePrivacyDlpV2beta2Trigger.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Trigger>(
+              (value) => new GooglePrivacyDlpV2beta2Trigger.fromJson(value))
           .toList();
     }
     if (_json.containsKey("updateTime")) {
@@ -7216,7 +7237,8 @@
     }
     if (_json.containsKey("quasiIds")) {
       quasiIds = _json["quasiIds"]
-          .map((value) => new GooglePrivacyDlpV2beta2FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2FieldId>(
+              (value) => new GooglePrivacyDlpV2beta2FieldId.fromJson(value))
           .toList();
     }
   }
@@ -7253,7 +7275,8 @@
     }
     if (_json.containsKey("quasiIdsValues")) {
       quasiIdsValues = _json["quasiIdsValues"]
-          .map((value) => new GooglePrivacyDlpV2beta2Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Value>(
+              (value) => new GooglePrivacyDlpV2beta2Value.fromJson(value))
           .toList();
     }
   }
@@ -7294,7 +7317,7 @@
     }
     if (_json.containsKey("bucketValues")) {
       bucketValues = _json["bucketValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2KAnonymityEquivalenceClass>((value) =>
               new GooglePrivacyDlpV2beta2KAnonymityEquivalenceClass.fromJson(
                   value))
           .toList();
@@ -7339,7 +7362,7 @@
     if (_json.containsKey("equivalenceClassHistogramBuckets")) {
       equivalenceClassHistogramBuckets =
           _json["equivalenceClassHistogramBuckets"]
-              .map((value) =>
+              .map<GooglePrivacyDlpV2beta2KAnonymityHistogramBucket>((value) =>
                   new GooglePrivacyDlpV2beta2KAnonymityHistogramBucket.fromJson(
                       value))
               .toList();
@@ -7385,13 +7408,13 @@
   GooglePrivacyDlpV2beta2KMapEstimationConfig.fromJson(core.Map _json) {
     if (_json.containsKey("auxiliaryTables")) {
       auxiliaryTables = _json["auxiliaryTables"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2AuxiliaryTable>((value) =>
               new GooglePrivacyDlpV2beta2AuxiliaryTable.fromJson(value))
           .toList();
     }
     if (_json.containsKey("quasiIds")) {
       quasiIds = _json["quasiIds"]
-          .map(
+          .map<GooglePrivacyDlpV2beta2TaggedField>(
               (value) => new GooglePrivacyDlpV2beta2TaggedField.fromJson(value))
           .toList();
     }
@@ -7448,7 +7471,7 @@
     }
     if (_json.containsKey("bucketValues")) {
       bucketValues = _json["bucketValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2KMapEstimationQuasiIdValues>((value) =>
               new GooglePrivacyDlpV2beta2KMapEstimationQuasiIdValues.fromJson(
                   value))
           .toList();
@@ -7497,7 +7520,8 @@
     }
     if (_json.containsKey("quasiIdsValues")) {
       quasiIdsValues = _json["quasiIdsValues"]
-          .map((value) => new GooglePrivacyDlpV2beta2Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Value>(
+              (value) => new GooglePrivacyDlpV2beta2Value.fromJson(value))
           .toList();
     }
   }
@@ -7535,7 +7559,7 @@
   GooglePrivacyDlpV2beta2KMapEstimationResult.fromJson(core.Map _json) {
     if (_json.containsKey("kMapEstimationHistogram")) {
       kMapEstimationHistogram = _json["kMapEstimationHistogram"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2KMapEstimationHistogramBucket>((value) =>
               new GooglePrivacyDlpV2beta2KMapEstimationHistogramBucket.fromJson(
                   value))
           .toList();
@@ -7583,7 +7607,7 @@
     }
     if (_json.containsKey("path")) {
       path = _json["path"]
-          .map(
+          .map<GooglePrivacyDlpV2beta2PathElement>(
               (value) => new GooglePrivacyDlpV2beta2PathElement.fromJson(value))
           .toList();
     }
@@ -7683,7 +7707,8 @@
   GooglePrivacyDlpV2beta2LDiversityConfig.fromJson(core.Map _json) {
     if (_json.containsKey("quasiIds")) {
       quasiIds = _json["quasiIds"]
-          .map((value) => new GooglePrivacyDlpV2beta2FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2FieldId>(
+              (value) => new GooglePrivacyDlpV2beta2FieldId.fromJson(value))
           .toList();
     }
     if (_json.containsKey("sensitiveAttribute")) {
@@ -7731,12 +7756,13 @@
     }
     if (_json.containsKey("quasiIdsValues")) {
       quasiIdsValues = _json["quasiIdsValues"]
-          .map((value) => new GooglePrivacyDlpV2beta2Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Value>(
+              (value) => new GooglePrivacyDlpV2beta2Value.fromJson(value))
           .toList();
     }
     if (_json.containsKey("topSensitiveValues")) {
       topSensitiveValues = _json["topSensitiveValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2ValueFrequency>((value) =>
               new GooglePrivacyDlpV2beta2ValueFrequency.fromJson(value))
           .toList();
     }
@@ -7787,7 +7813,7 @@
     }
     if (_json.containsKey("bucketValues")) {
       bucketValues = _json["bucketValues"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2LDiversityEquivalenceClass>((value) =>
               new GooglePrivacyDlpV2beta2LDiversityEquivalenceClass.fromJson(
                   value))
           .toList();
@@ -7836,7 +7862,7 @@
     if (_json.containsKey("sensitiveValueFrequencyHistogramBuckets")) {
       sensitiveValueFrequencyHistogramBuckets =
           _json["sensitiveValueFrequencyHistogramBuckets"]
-              .map((value) =>
+              .map<GooglePrivacyDlpV2beta2LDiversityHistogramBucket>((value) =>
                   new GooglePrivacyDlpV2beta2LDiversityHistogramBucket.fromJson(
                       value))
               .toList();
@@ -7920,7 +7946,7 @@
       core.Map _json) {
     if (_json.containsKey("deidentifyTemplates")) {
       deidentifyTemplates = _json["deidentifyTemplates"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2DeidentifyTemplate>((value) =>
               new GooglePrivacyDlpV2beta2DeidentifyTemplate.fromJson(value))
           .toList();
     }
@@ -7956,7 +7982,8 @@
   GooglePrivacyDlpV2beta2ListDlpJobsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("jobs")) {
       jobs = _json["jobs"]
-          .map((value) => new GooglePrivacyDlpV2beta2DlpJob.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2DlpJob>(
+              (value) => new GooglePrivacyDlpV2beta2DlpJob.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -7987,7 +8014,7 @@
   GooglePrivacyDlpV2beta2ListInfoTypesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("infoTypes")) {
       infoTypes = _json["infoTypes"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2InfoTypeDescription>((value) =>
               new GooglePrivacyDlpV2beta2InfoTypeDescription.fromJson(value))
           .toList();
     }
@@ -8017,7 +8044,7 @@
   GooglePrivacyDlpV2beta2ListInspectTemplatesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("inspectTemplates")) {
       inspectTemplates = _json["inspectTemplates"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2InspectTemplate>((value) =>
               new GooglePrivacyDlpV2beta2InspectTemplate.fromJson(value))
           .toList();
     }
@@ -8054,7 +8081,8 @@
   GooglePrivacyDlpV2beta2ListJobTriggersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("jobTriggers")) {
       jobTriggers = _json["jobTriggers"]
-          .map((value) => new GooglePrivacyDlpV2beta2JobTrigger.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2JobTrigger>(
+              (value) => new GooglePrivacyDlpV2beta2JobTrigger.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -8124,7 +8152,7 @@
     }
     if (_json.containsKey("imageBoxes")) {
       imageBoxes = _json["imageBoxes"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2ImageLocation>((value) =>
               new GooglePrivacyDlpV2beta2ImageLocation.fromJson(value))
           .toList();
     }
@@ -8212,7 +8240,8 @@
     }
     if (_json.containsKey("quantileValues")) {
       quantileValues = _json["quantileValues"]
-          .map((value) => new GooglePrivacyDlpV2beta2Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Value>(
+              (value) => new GooglePrivacyDlpV2beta2Value.fromJson(value))
           .toList();
     }
   }
@@ -8717,13 +8746,13 @@
   GooglePrivacyDlpV2beta2RecordTransformations.fromJson(core.Map _json) {
     if (_json.containsKey("fieldTransformations")) {
       fieldTransformations = _json["fieldTransformations"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2FieldTransformation>((value) =>
               new GooglePrivacyDlpV2beta2FieldTransformation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("recordSuppressions")) {
       recordSuppressions = _json["recordSuppressions"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2RecordSuppression>((value) =>
               new GooglePrivacyDlpV2beta2RecordSuppression.fromJson(value))
           .toList();
     }
@@ -8791,7 +8820,7 @@
     }
     if (_json.containsKey("imageRedactionConfigs")) {
       imageRedactionConfigs = _json["imageRedactionConfigs"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2ImageRedactionConfig>((value) =>
               new GooglePrivacyDlpV2beta2ImageRedactionConfig.fromJson(value))
           .toList();
     }
@@ -9088,7 +9117,7 @@
   GooglePrivacyDlpV2beta2Result.fromJson(core.Map _json) {
     if (_json.containsKey("infoTypeStats")) {
       infoTypeStats = _json["infoTypeStats"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2InfoTypeStatistics>((value) =>
               new GooglePrivacyDlpV2beta2InfoTypeStatistics.fromJson(value))
           .toList();
     }
@@ -9134,7 +9163,8 @@
   GooglePrivacyDlpV2beta2RiskAnalysisJobConfig.fromJson(core.Map _json) {
     if (_json.containsKey("actions")) {
       actions = _json["actions"]
-          .map((value) => new GooglePrivacyDlpV2beta2Action.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Action>(
+              (value) => new GooglePrivacyDlpV2beta2Action.fromJson(value))
           .toList();
     }
     if (_json.containsKey("privacyMetric")) {
@@ -9171,7 +9201,8 @@
   GooglePrivacyDlpV2beta2Row.fromJson(core.Map _json) {
     if (_json.containsKey("values")) {
       values = _json["values"]
-          .map((value) => new GooglePrivacyDlpV2beta2Value.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Value>(
+              (value) => new GooglePrivacyDlpV2beta2Value.fromJson(value))
           .toList();
     }
   }
@@ -9368,12 +9399,14 @@
   GooglePrivacyDlpV2beta2Table.fromJson(core.Map _json) {
     if (_json.containsKey("headers")) {
       headers = _json["headers"]
-          .map((value) => new GooglePrivacyDlpV2beta2FieldId.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2FieldId>(
+              (value) => new GooglePrivacyDlpV2beta2FieldId.fromJson(value))
           .toList();
     }
     if (_json.containsKey("rows")) {
       rows = _json["rows"]
-          .map((value) => new GooglePrivacyDlpV2beta2Row.fromJson(value))
+          .map<GooglePrivacyDlpV2beta2Row>(
+              (value) => new GooglePrivacyDlpV2beta2Row.fromJson(value))
           .toList();
     }
   }
@@ -9566,7 +9599,7 @@
   GooglePrivacyDlpV2beta2TransformationOverview.fromJson(core.Map _json) {
     if (_json.containsKey("transformationSummaries")) {
       transformationSummaries = _json["transformationSummaries"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2TransformationSummary>((value) =>
               new GooglePrivacyDlpV2beta2TransformationSummary.fromJson(value))
           .toList();
     }
@@ -9622,7 +9655,7 @@
     }
     if (_json.containsKey("fieldTransformations")) {
       fieldTransformations = _json["fieldTransformations"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2FieldTransformation>((value) =>
               new GooglePrivacyDlpV2beta2FieldTransformation.fromJson(value))
           .toList();
     }
@@ -9636,7 +9669,7 @@
     }
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) =>
+          .map<GooglePrivacyDlpV2beta2SummaryResult>((value) =>
               new GooglePrivacyDlpV2beta2SummaryResult.fromJson(value))
           .toList();
     }
diff --git a/generated/googleapis_beta/lib/dns/v2beta1.dart b/generated/googleapis_beta/lib/dns/v2beta1.dart
index 0038956..52eb96a 100644
--- a/generated/googleapis_beta/lib/dns/v2beta1.dart
+++ b/generated/googleapis_beta/lib/dns/v2beta1.dart
@@ -85,7 +85,7 @@
       Change request, core.String project, core.String managedZone,
       {core.String clientOperationId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -151,7 +151,7 @@
       core.String project, core.String managedZone, core.String changeId,
       {core.String clientOperationId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -227,7 +227,7 @@
       core.String sortOrder,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -310,7 +310,7 @@
       core.String digestType,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -386,7 +386,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -460,7 +460,7 @@
       core.String project, core.String managedZone, core.String operation,
       {core.String clientOperationId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -534,7 +534,7 @@
       core.String sortBy,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -605,7 +605,7 @@
   async.Future<ManagedZone> create(ManagedZone request, core.String project,
       {core.String clientOperationId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -662,7 +662,7 @@
       core.String project, core.String managedZone,
       {core.String clientOperationId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -721,7 +721,7 @@
   async.Future<ManagedZone> get(core.String project, core.String managedZone,
       {core.String clientOperationId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -783,7 +783,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -846,7 +846,7 @@
       ManagedZone request, core.String project, core.String managedZone,
       {core.String clientOperationId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -910,7 +910,7 @@
       ManagedZone request, core.String project, core.String managedZone,
       {core.String clientOperationId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -974,7 +974,7 @@
   async.Future<Project> get(core.String project,
       {core.String clientOperationId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1047,7 +1047,7 @@
       core.String type,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1124,12 +1124,14 @@
   Change.fromJson(core.Map _json) {
     if (_json.containsKey("additions")) {
       additions = _json["additions"]
-          .map((value) => new ResourceRecordSet.fromJson(value))
+          .map<ResourceRecordSet>(
+              (value) => new ResourceRecordSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("deletions")) {
       deletions = _json["deletions"]
-          .map((value) => new ResourceRecordSet.fromJson(value))
+          .map<ResourceRecordSet>(
+              (value) => new ResourceRecordSet.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -1203,8 +1205,9 @@
 
   ChangesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("changes")) {
-      changes =
-          _json["changes"].map((value) => new Change.fromJson(value)).toList();
+      changes = _json["changes"]
+          .map<Change>((value) => new Change.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("header")) {
       header = new ResponseHeader.fromJson(_json["header"]);
@@ -1311,7 +1314,7 @@
     }
     if (_json.containsKey("digests")) {
       digests = _json["digests"]
-          .map((value) => new DnsKeyDigest.fromJson(value))
+          .map<DnsKeyDigest>((value) => new DnsKeyDigest.fromJson(value))
           .toList();
     }
     if (_json.containsKey("id")) {
@@ -1503,8 +1506,9 @@
 
   DnsKeysListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("dnsKeys")) {
-      dnsKeys =
-          _json["dnsKeys"].map((value) => new DnsKey.fromJson(value)).toList();
+      dnsKeys = _json["dnsKeys"]
+          .map<DnsKey>((value) => new DnsKey.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("header")) {
       header = new ResponseHeader.fromJson(_json["header"]);
@@ -1670,7 +1674,7 @@
   ManagedZoneDnsSecConfig.fromJson(core.Map _json) {
     if (_json.containsKey("defaultKeySpecs")) {
       defaultKeySpecs = _json["defaultKeySpecs"]
-          .map((value) => new DnsKeySpec.fromJson(value))
+          .map<DnsKeySpec>((value) => new DnsKeySpec.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1739,7 +1743,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -1817,7 +1821,7 @@
     }
     if (_json.containsKey("managedZones")) {
       managedZones = _json["managedZones"]
-          .map((value) => new ManagedZone.fromJson(value))
+          .map<ManagedZone>((value) => new ManagedZone.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2126,7 +2130,7 @@
     }
     if (_json.containsKey("whitelistedKeySpecs")) {
       whitelistedKeySpecs = _json["whitelistedKeySpecs"]
-          .map((value) => new DnsKeySpec.fromJson(value))
+          .map<DnsKeySpec>((value) => new DnsKeySpec.fromJson(value))
           .toList();
     }
   }
@@ -2271,7 +2275,8 @@
     }
     if (_json.containsKey("rrsets")) {
       rrsets = _json["rrsets"]
-          .map((value) => new ResourceRecordSet.fromJson(value))
+          .map<ResourceRecordSet>(
+              (value) => new ResourceRecordSet.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis_beta/lib/firestore/v1beta1.dart b/generated/googleapis_beta/lib/firestore/v1beta1.dart
index fa06dce..84864fa 100644
--- a/generated/googleapis_beta/lib/firestore/v1beta1.dart
+++ b/generated/googleapis_beta/lib/firestore/v1beta1.dart
@@ -87,7 +87,7 @@
       BatchGetDocumentsRequest request, core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -141,7 +141,7 @@
       BeginTransactionRequest request, core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -195,7 +195,7 @@
       CommitRequest request, core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -262,7 +262,7 @@
       core.String documentId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -333,7 +333,7 @@
       core.String currentDocument_updateTime,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -397,7 +397,7 @@
       core.String transaction,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -494,7 +494,7 @@
       core.String readTime,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -572,7 +572,7 @@
       ListCollectionIdsRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -626,7 +626,7 @@
       ListenRequest request, core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -699,7 +699,7 @@
       core.List<core.String> mask_fieldPaths,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -761,7 +761,7 @@
   async.Future<Empty> rollback(RollbackRequest request, core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -819,7 +819,7 @@
       RunQueryRequest request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -872,7 +872,7 @@
   async.Future<WriteResponse> write(WriteRequest request, core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -943,7 +943,7 @@
   async.Future<Operation> create(Index request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -992,7 +992,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1036,7 +1036,7 @@
   /// this method will complete with the same error.
   async.Future<Index> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1090,7 +1090,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1135,8 +1135,9 @@
 
   ArrayValue.fromJson(core.Map _json) {
     if (_json.containsKey("values")) {
-      values =
-          _json["values"].map((value) => new Value.fromJson(value)).toList();
+      values = _json["values"]
+          .map<Value>((value) => new Value.fromJson(value))
+          .toList();
     }
   }
 
@@ -1408,8 +1409,9 @@
       transaction = _json["transaction"];
     }
     if (_json.containsKey("writes")) {
-      writes =
-          _json["writes"].map((value) => new Write.fromJson(value)).toList();
+      writes = _json["writes"]
+          .map<Write>((value) => new Write.fromJson(value))
+          .toList();
     }
   }
 
@@ -1445,7 +1447,7 @@
     }
     if (_json.containsKey("writeResults")) {
       writeResults = _json["writeResults"]
-          .map((value) => new WriteResult.fromJson(value))
+          .map<WriteResult>((value) => new WriteResult.fromJson(value))
           .toList();
     }
   }
@@ -1481,8 +1483,9 @@
 
   CompositeFilter.fromJson(core.Map _json) {
     if (_json.containsKey("filters")) {
-      filters =
-          _json["filters"].map((value) => new Filter.fromJson(value)).toList();
+      filters = _json["filters"]
+          .map<Filter>((value) => new Filter.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("op")) {
       op = _json["op"];
@@ -1521,8 +1524,9 @@
       before = _json["before"];
     }
     if (_json.containsKey("values")) {
-      values =
-          _json["values"].map((value) => new Value.fromJson(value)).toList();
+      values = _json["values"]
+          .map<Value>((value) => new Value.fromJson(value))
+          .toList();
     }
   }
 
@@ -1823,7 +1827,7 @@
     }
     if (_json.containsKey("fieldTransforms")) {
       fieldTransforms = _json["fieldTransforms"]
-          .map((value) => new FieldTransform.fromJson(value))
+          .map<FieldTransform>((value) => new FieldTransform.fromJson(value))
           .toList();
     }
   }
@@ -2116,7 +2120,7 @@
     }
     if (_json.containsKey("fields")) {
       fields = _json["fields"]
-          .map((value) => new IndexField.fromJson(value))
+          .map<IndexField>((value) => new IndexField.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -2304,7 +2308,7 @@
   ListDocumentsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("documents")) {
       documents = _json["documents"]
-          .map((value) => new Document.fromJson(value))
+          .map<Document>((value) => new Document.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2337,8 +2341,9 @@
 
   ListIndexesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("indexes")) {
-      indexes =
-          _json["indexes"].map((value) => new Index.fromJson(value)).toList();
+      indexes = _json["indexes"]
+          .map<Index>((value) => new Index.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -2661,7 +2666,7 @@
   Projection.fromJson(core.Map _json) {
     if (_json.containsKey("fields")) {
       fields = _json["fields"]
-          .map((value) => new FieldReference.fromJson(value))
+          .map<FieldReference>((value) => new FieldReference.fromJson(value))
           .toList();
     }
   }
@@ -3089,7 +3094,8 @@
     }
     if (_json.containsKey("from")) {
       from = _json["from"]
-          .map((value) => new CollectionSelector.fromJson(value))
+          .map<CollectionSelector>(
+              (value) => new CollectionSelector.fromJson(value))
           .toList();
     }
     if (_json.containsKey("limit")) {
@@ -3099,8 +3105,9 @@
       offset = _json["offset"];
     }
     if (_json.containsKey("orderBy")) {
-      orderBy =
-          _json["orderBy"].map((value) => new Order.fromJson(value)).toList();
+      orderBy = _json["orderBy"]
+          .map<Order>((value) => new Order.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("select")) {
       select = new Projection.fromJson(_json["select"]);
@@ -3683,8 +3690,9 @@
       streamToken = _json["streamToken"];
     }
     if (_json.containsKey("writes")) {
-      writes =
-          _json["writes"].map((value) => new Write.fromJson(value)).toList();
+      writes = _json["writes"]
+          .map<Write>((value) => new Write.fromJson(value))
+          .toList();
     }
   }
 
@@ -3750,7 +3758,7 @@
     }
     if (_json.containsKey("writeResults")) {
       writeResults = _json["writeResults"]
-          .map((value) => new WriteResult.fromJson(value))
+          .map<WriteResult>((value) => new WriteResult.fromJson(value))
           .toList();
     }
   }
@@ -3793,7 +3801,7 @@
   WriteResult.fromJson(core.Map _json) {
     if (_json.containsKey("transformResults")) {
       transformResults = _json["transformResults"]
-          .map((value) => new Value.fromJson(value))
+          .map<Value>((value) => new Value.fromJson(value))
           .toList();
     }
     if (_json.containsKey("updateTime")) {
diff --git a/generated/googleapis_beta/lib/language/v1beta1.dart b/generated/googleapis_beta/lib/language/v1beta1.dart
index 3d35faf..af568bd 100644
--- a/generated/googleapis_beta/lib/language/v1beta1.dart
+++ b/generated/googleapis_beta/lib/language/v1beta1.dart
@@ -64,7 +64,7 @@
       AnalyzeEntitiesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -108,7 +108,7 @@
       AnalyzeSentimentRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -155,7 +155,7 @@
       AnalyzeSyntaxRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -199,7 +199,7 @@
   async.Future<AnnotateTextResponse> annotateText(AnnotateTextRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -286,8 +286,9 @@
 
   AnalyzeEntitiesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entities")) {
-      entities =
-          _json["entities"].map((value) => new Entity.fromJson(value)).toList();
+      entities = _json["entities"]
+          .map<Entity>((value) => new Entity.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("language")) {
       language = _json["language"];
@@ -380,7 +381,7 @@
     }
     if (_json.containsKey("sentences")) {
       sentences = _json["sentences"]
-          .map((value) => new Sentence.fromJson(value))
+          .map<Sentence>((value) => new Sentence.fromJson(value))
           .toList();
     }
   }
@@ -470,12 +471,13 @@
     }
     if (_json.containsKey("sentences")) {
       sentences = _json["sentences"]
-          .map((value) => new Sentence.fromJson(value))
+          .map<Sentence>((value) => new Sentence.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tokens")) {
-      tokens =
-          _json["tokens"].map((value) => new Token.fromJson(value)).toList();
+      tokens = _json["tokens"]
+          .map<Token>((value) => new Token.fromJson(value))
+          .toList();
     }
   }
 
@@ -585,20 +587,22 @@
       documentSentiment = new Sentiment.fromJson(_json["documentSentiment"]);
     }
     if (_json.containsKey("entities")) {
-      entities =
-          _json["entities"].map((value) => new Entity.fromJson(value)).toList();
+      entities = _json["entities"]
+          .map<Entity>((value) => new Entity.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("language")) {
       language = _json["language"];
     }
     if (_json.containsKey("sentences")) {
       sentences = _json["sentences"]
-          .map((value) => new Sentence.fromJson(value))
+          .map<Sentence>((value) => new Sentence.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tokens")) {
-      tokens =
-          _json["tokens"].map((value) => new Token.fromJson(value)).toList();
+      tokens = _json["tokens"]
+          .map<Token>((value) => new Token.fromJson(value))
+          .toList();
     }
   }
 
@@ -855,7 +859,7 @@
   Entity.fromJson(core.Map _json) {
     if (_json.containsKey("mentions")) {
       mentions = _json["mentions"]
-          .map((value) => new EntityMention.fromJson(value))
+          .map<EntityMention>((value) => new EntityMention.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metadata")) {
diff --git a/generated/googleapis_beta/lib/language/v1beta2.dart b/generated/googleapis_beta/lib/language/v1beta2.dart
index 69d969e..b08af98 100644
--- a/generated/googleapis_beta/lib/language/v1beta2.dart
+++ b/generated/googleapis_beta/lib/language/v1beta2.dart
@@ -64,7 +64,7 @@
       AnalyzeEntitiesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -109,7 +109,7 @@
       AnalyzeEntitySentimentRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -154,7 +154,7 @@
       AnalyzeSentimentRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -201,7 +201,7 @@
       AnalyzeSyntaxRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -245,7 +245,7 @@
   async.Future<AnnotateTextResponse> annotateText(AnnotateTextRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -288,7 +288,7 @@
   async.Future<ClassifyTextResponse> classifyText(ClassifyTextRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -375,8 +375,9 @@
 
   AnalyzeEntitiesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entities")) {
-      entities =
-          _json["entities"].map((value) => new Entity.fromJson(value)).toList();
+      entities = _json["entities"]
+          .map<Entity>((value) => new Entity.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("language")) {
       language = _json["language"];
@@ -458,8 +459,9 @@
 
   AnalyzeEntitySentimentResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entities")) {
-      entities =
-          _json["entities"].map((value) => new Entity.fromJson(value)).toList();
+      entities = _json["entities"]
+          .map<Entity>((value) => new Entity.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("language")) {
       language = _json["language"];
@@ -552,7 +554,7 @@
     }
     if (_json.containsKey("sentences")) {
       sentences = _json["sentences"]
-          .map((value) => new Sentence.fromJson(value))
+          .map<Sentence>((value) => new Sentence.fromJson(value))
           .toList();
     }
   }
@@ -642,12 +644,13 @@
     }
     if (_json.containsKey("sentences")) {
       sentences = _json["sentences"]
-          .map((value) => new Sentence.fromJson(value))
+          .map<Sentence>((value) => new Sentence.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tokens")) {
-      tokens =
-          _json["tokens"].map((value) => new Token.fromJson(value)).toList();
+      tokens = _json["tokens"]
+          .map<Token>((value) => new Token.fromJson(value))
+          .toList();
     }
   }
 
@@ -758,27 +761,30 @@
   AnnotateTextResponse.fromJson(core.Map _json) {
     if (_json.containsKey("categories")) {
       categories = _json["categories"]
-          .map((value) => new ClassificationCategory.fromJson(value))
+          .map<ClassificationCategory>(
+              (value) => new ClassificationCategory.fromJson(value))
           .toList();
     }
     if (_json.containsKey("documentSentiment")) {
       documentSentiment = new Sentiment.fromJson(_json["documentSentiment"]);
     }
     if (_json.containsKey("entities")) {
-      entities =
-          _json["entities"].map((value) => new Entity.fromJson(value)).toList();
+      entities = _json["entities"]
+          .map<Entity>((value) => new Entity.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("language")) {
       language = _json["language"];
     }
     if (_json.containsKey("sentences")) {
       sentences = _json["sentences"]
-          .map((value) => new Sentence.fromJson(value))
+          .map<Sentence>((value) => new Sentence.fromJson(value))
           .toList();
     }
     if (_json.containsKey("tokens")) {
-      tokens =
-          _json["tokens"].map((value) => new Token.fromJson(value)).toList();
+      tokens = _json["tokens"]
+          .map<Token>((value) => new Token.fromJson(value))
+          .toList();
     }
   }
 
@@ -874,7 +880,8 @@
   ClassifyTextResponse.fromJson(core.Map _json) {
     if (_json.containsKey("categories")) {
       categories = _json["categories"]
-          .map((value) => new ClassificationCategory.fromJson(value))
+          .map<ClassificationCategory>(
+              (value) => new ClassificationCategory.fromJson(value))
           .toList();
     }
   }
@@ -1127,7 +1134,7 @@
   Entity.fromJson(core.Map _json) {
     if (_json.containsKey("mentions")) {
       mentions = _json["mentions"]
-          .map((value) => new EntityMention.fromJson(value))
+          .map<EntityMention>((value) => new EntityMention.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metadata")) {
diff --git a/generated/googleapis_beta/lib/logging/v2beta1.dart b/generated/googleapis_beta/lib/logging/v2beta1.dart
index 90ecf10..bacd5d8 100644
--- a/generated/googleapis_beta/lib/logging/v2beta1.dart
+++ b/generated/googleapis_beta/lib/logging/v2beta1.dart
@@ -98,7 +98,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String logName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -157,7 +157,7 @@
   async.Future<ListLogsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -214,7 +214,7 @@
   async.Future<ListLogEntriesResponse> list(ListLogEntriesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -260,7 +260,7 @@
   async.Future<WriteLogEntriesResponse> write(WriteLogEntriesRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -318,7 +318,7 @@
   async.Future<ListMonitoredResourceDescriptorsResponse> list(
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -391,7 +391,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String logName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -450,7 +450,7 @@
   async.Future<ListLogsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -528,7 +528,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String logName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -587,7 +587,7 @@
   async.Future<ListLogsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -648,7 +648,7 @@
   async.Future<LogMetric> create(LogMetric request, core.String parent,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -698,7 +698,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String metricName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -743,7 +743,7 @@
   /// this method will complete with the same error.
   async.Future<LogMetric> get(core.String metricName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -798,7 +798,7 @@
   async.Future<ListLogMetricsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -856,7 +856,7 @@
   async.Future<LogMetric> update(LogMetric request, core.String metricName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -930,7 +930,7 @@
   async.Future<LogSink> create(LogSink request, core.String parent,
       {core.bool uniqueWriterIdentity, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -988,7 +988,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String sinkName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1036,7 +1036,7 @@
   /// this method will complete with the same error.
   async.Future<LogSink> get(core.String sinkName, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1094,7 +1094,7 @@
   async.Future<ListSinksResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1180,7 +1180,7 @@
       core.String updateMask,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1731,7 +1731,7 @@
   ListLogEntriesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new LogEntry.fromJson(value))
+          .map<LogEntry>((value) => new LogEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -1767,7 +1767,7 @@
   ListLogMetricsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("metrics")) {
       metrics = _json["metrics"]
-          .map((value) => new LogMetric.fromJson(value))
+          .map<LogMetric>((value) => new LogMetric.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -1841,7 +1841,8 @@
     }
     if (_json.containsKey("resourceDescriptors")) {
       resourceDescriptors = _json["resourceDescriptors"]
-          .map((value) => new MonitoredResourceDescriptor.fromJson(value))
+          .map<MonitoredResourceDescriptor>(
+              (value) => new MonitoredResourceDescriptor.fromJson(value))
           .toList();
     }
   }
@@ -1877,8 +1878,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("sinks")) {
-      sinks =
-          _json["sinks"].map((value) => new LogSink.fromJson(value)).toList();
+      sinks = _json["sinks"]
+          .map<LogSink>((value) => new LogSink.fromJson(value))
+          .toList();
     }
   }
 
@@ -2667,7 +2669,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("metricKind")) {
@@ -2812,7 +2814,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new LabelDescriptor.fromJson(value))
+          .map<LabelDescriptor>((value) => new LabelDescriptor.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -3000,7 +3002,9 @@
       latency = _json["latency"];
     }
     if (_json.containsKey("line")) {
-      line = _json["line"].map((value) => new LogLine.fromJson(value)).toList();
+      line = _json["line"]
+          .map<LogLine>((value) => new LogLine.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("megaCycles")) {
       megaCycles = _json["megaCycles"];
@@ -3031,7 +3035,7 @@
     }
     if (_json.containsKey("sourceReference")) {
       sourceReference = _json["sourceReference"]
-          .map((value) => new SourceReference.fromJson(value))
+          .map<SourceReference>((value) => new SourceReference.fromJson(value))
           .toList();
     }
     if (_json.containsKey("startTime")) {
@@ -3314,7 +3318,7 @@
     }
     if (_json.containsKey("entries")) {
       entries = _json["entries"]
-          .map((value) => new LogEntry.fromJson(value))
+          .map<LogEntry>((value) => new LogEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("labels")) {
diff --git a/generated/googleapis_beta/lib/oslogin/v1alpha.dart b/generated/googleapis_beta/lib/oslogin/v1alpha.dart
index 93c1254..8860907 100644
--- a/generated/googleapis_beta/lib/oslogin/v1alpha.dart
+++ b/generated/googleapis_beta/lib/oslogin/v1alpha.dart
@@ -73,7 +73,7 @@
   async.Future<LoginProfile> getLoginProfile(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -126,7 +126,7 @@
       SshPublicKey request, core.String parent,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -187,7 +187,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -240,7 +240,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -286,7 +286,7 @@
   /// this method will complete with the same error.
   async.Future<SshPublicKey> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -339,7 +339,7 @@
   async.Future<SshPublicKey> patch(SshPublicKey request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -434,7 +434,7 @@
     }
     if (_json.containsKey("posixAccounts")) {
       posixAccounts = _json["posixAccounts"]
-          .map((value) => new PosixAccount.fromJson(value))
+          .map<PosixAccount>((value) => new PosixAccount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("sshPublicKeys")) {
diff --git a/generated/googleapis_beta/lib/oslogin/v1beta.dart b/generated/googleapis_beta/lib/oslogin/v1beta.dart
index 843b3c8..3cba9dc 100644
--- a/generated/googleapis_beta/lib/oslogin/v1beta.dart
+++ b/generated/googleapis_beta/lib/oslogin/v1beta.dart
@@ -73,7 +73,7 @@
   async.Future<LoginProfile> getLoginProfile(core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -126,7 +126,7 @@
       SshPublicKey request, core.String parent,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -187,7 +187,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -240,7 +240,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -286,7 +286,7 @@
   /// this method will complete with the same error.
   async.Future<SshPublicKey> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -339,7 +339,7 @@
   async.Future<SshPublicKey> patch(SshPublicKey request, core.String name,
       {core.String updateMask, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -434,7 +434,7 @@
     }
     if (_json.containsKey("posixAccounts")) {
       posixAccounts = _json["posixAccounts"]
-          .map((value) => new PosixAccount.fromJson(value))
+          .map<PosixAccount>((value) => new PosixAccount.fromJson(value))
           .toList();
     }
     if (_json.containsKey("sshPublicKeys")) {
diff --git a/generated/googleapis_beta/lib/proximitybeacon/v1beta1.dart b/generated/googleapis_beta/lib/proximitybeacon/v1beta1.dart
index e33d962..a244536 100644
--- a/generated/googleapis_beta/lib/proximitybeacon/v1beta1.dart
+++ b/generated/googleapis_beta/lib/proximitybeacon/v1beta1.dart
@@ -63,7 +63,7 @@
       GetInfoForObservedBeaconsRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -140,7 +140,7 @@
   async.Future<Empty> activate(core.String beaconName,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -210,7 +210,7 @@
   async.Future<Empty> deactivate(core.String beaconName,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -280,7 +280,7 @@
   async.Future<Empty> decommission(core.String beaconName,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -347,7 +347,7 @@
   async.Future<Empty> delete(core.String beaconName,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -417,7 +417,7 @@
   async.Future<Beacon> get(core.String beaconName,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -553,7 +553,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -617,7 +617,7 @@
   async.Future<Beacon> register(Beacon request,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -690,7 +690,7 @@
   async.Future<Beacon> update(Beacon request, core.String beaconName,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -781,7 +781,7 @@
       core.String projectId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -866,7 +866,7 @@
       BeaconAttachment request, core.String beaconName,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -937,7 +937,7 @@
   async.Future<Empty> delete(core.String attachmentName,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1018,7 +1018,7 @@
       core.String projectId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1112,7 +1112,7 @@
       core.String projectId,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1183,7 +1183,7 @@
   async.Future<ListNamespacesResponse> list(
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1238,7 +1238,7 @@
   async.Future<Namespace> update(Namespace request, core.String namespaceName,
       {core.String projectId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1297,7 +1297,7 @@
   async.Future<EphemeralIdRegistrationParams> getEidparams(
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1732,7 +1732,7 @@
     }
     if (_json.containsKey("attachments")) {
       attachments = _json["attachments"]
-          .map((value) => new AttachmentInfo.fromJson(value))
+          .map<AttachmentInfo>((value) => new AttachmentInfo.fromJson(value))
           .toList();
     }
     if (_json.containsKey("beaconName")) {
@@ -2118,7 +2118,7 @@
     }
     if (_json.containsKey("observations")) {
       observations = _json["observations"]
-          .map((value) => new Observation.fromJson(value))
+          .map<Observation>((value) => new Observation.fromJson(value))
           .toList();
     }
   }
@@ -2149,7 +2149,7 @@
   GetInfoForObservedBeaconsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("beacons")) {
       beacons = _json["beacons"]
-          .map((value) => new BeaconInfo.fromJson(value))
+          .map<BeaconInfo>((value) => new BeaconInfo.fromJson(value))
           .toList();
     }
   }
@@ -2235,7 +2235,8 @@
   ListBeaconAttachmentsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("attachments")) {
       attachments = _json["attachments"]
-          .map((value) => new BeaconAttachment.fromJson(value))
+          .map<BeaconAttachment>(
+              (value) => new BeaconAttachment.fromJson(value))
           .toList();
     }
   }
@@ -2268,8 +2269,9 @@
 
   ListBeaconsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("beacons")) {
-      beacons =
-          _json["beacons"].map((value) => new Beacon.fromJson(value)).toList();
+      beacons = _json["beacons"]
+          .map<Beacon>((value) => new Beacon.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("nextPageToken")) {
       nextPageToken = _json["nextPageToken"];
@@ -2309,7 +2311,7 @@
   ListDiagnosticsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("diagnostics")) {
       diagnostics = _json["diagnostics"]
-          .map((value) => new Diagnostics.fromJson(value))
+          .map<Diagnostics>((value) => new Diagnostics.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -2342,7 +2344,7 @@
   ListNamespacesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("namespaces")) {
       namespaces = _json["namespaces"]
-          .map((value) => new Namespace.fromJson(value))
+          .map<Namespace>((value) => new Namespace.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis_beta/lib/pubsub/v1beta2.dart b/generated/googleapis_beta/lib/pubsub/v1beta2.dart
index 0a30d47..c2f8292 100644
--- a/generated/googleapis_beta/lib/pubsub/v1beta2.dart
+++ b/generated/googleapis_beta/lib/pubsub/v1beta2.dart
@@ -81,7 +81,7 @@
       AcknowledgeRequest request, core.String subscription,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -144,7 +144,7 @@
   async.Future<Subscription> create(Subscription request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -195,7 +195,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String subscription, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -239,7 +239,7 @@
   async.Future<Subscription> get(core.String subscription,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -287,7 +287,7 @@
   async.Future<Policy> getIamPolicy(core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -340,7 +340,7 @@
   async.Future<ListSubscriptionsResponse> list(core.String project,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -400,7 +400,7 @@
       ModifyAckDeadlineRequest request, core.String subscription,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -457,7 +457,7 @@
       ModifyPushConfigRequest request, core.String subscription,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -511,7 +511,7 @@
   async.Future<PullResponse> pull(PullRequest request, core.String subscription,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -566,7 +566,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -626,7 +626,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -692,7 +692,7 @@
   async.Future<Topic> create(Topic request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -742,7 +742,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String topic, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -785,7 +785,7 @@
   /// this method will complete with the same error.
   async.Future<Topic> get(core.String topic, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -833,7 +833,7 @@
   async.Future<Policy> getIamPolicy(core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -886,7 +886,7 @@
   async.Future<ListTopicsResponse> list(core.String project,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -943,7 +943,7 @@
       PublishRequest request, core.String topic,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -998,7 +998,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1058,7 +1058,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1122,7 +1122,7 @@
   async.Future<ListTopicSubscriptionsResponse> list(core.String topic,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1275,7 +1275,7 @@
     }
     if (_json.containsKey("subscriptions")) {
       subscriptions = _json["subscriptions"]
-          .map((value) => new Subscription.fromJson(value))
+          .map<Subscription>((value) => new Subscription.fromJson(value))
           .toList();
     }
   }
@@ -1344,8 +1344,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("topics")) {
-      topics =
-          _json["topics"].map((value) => new Topic.fromJson(value)).toList();
+      topics = _json["topics"]
+          .map<Topic>((value) => new Topic.fromJson(value))
+          .toList();
     }
   }
 
@@ -1503,7 +1504,7 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
@@ -1540,7 +1541,7 @@
   PublishRequest.fromJson(core.Map _json) {
     if (_json.containsKey("messages")) {
       messages = _json["messages"]
-          .map((value) => new PubsubMessage.fromJson(value))
+          .map<PubsubMessage>((value) => new PubsubMessage.fromJson(value))
           .toList();
     }
   }
@@ -1695,7 +1696,7 @@
   PullResponse.fromJson(core.Map _json) {
     if (_json.containsKey("receivedMessages")) {
       receivedMessages = _json["receivedMessages"]
-          .map((value) => new ReceivedMessage.fromJson(value))
+          .map<ReceivedMessage>((value) => new ReceivedMessage.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis_beta/lib/replicapool/v1beta2.dart b/generated/googleapis_beta/lib/replicapool/v1beta2.dart
index e34eaed..5db6250 100644
--- a/generated/googleapis_beta/lib/replicapool/v1beta2.dart
+++ b/generated/googleapis_beta/lib/replicapool/v1beta2.dart
@@ -87,7 +87,7 @@
       core.String instanceGroupManager,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -157,7 +157,7 @@
       core.String project, core.String zone, core.String instanceGroupManager,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -228,7 +228,7 @@
       core.String instanceGroupManager,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -295,7 +295,7 @@
       core.String project, core.String zone, core.String instanceGroupManager,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -360,7 +360,7 @@
       core.String project, core.String zone, core.int size,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -435,7 +435,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -509,7 +509,7 @@
       core.String instanceGroupManager,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -582,7 +582,7 @@
       core.String instanceGroupManager, core.int size,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -656,7 +656,7 @@
       core.String instanceGroupManager,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -729,7 +729,7 @@
       core.String instanceGroupManager,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -802,7 +802,7 @@
       core.String project, core.String zone, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -873,7 +873,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -988,7 +988,8 @@
   InstanceGroupManager.fromJson(core.Map _json) {
     if (_json.containsKey("autoHealingPolicies")) {
       autoHealingPolicies = _json["autoHealingPolicies"]
-          .map((value) => new ReplicaPoolAutoHealingPolicy.fromJson(value))
+          .map<ReplicaPoolAutoHealingPolicy>(
+              (value) => new ReplicaPoolAutoHealingPolicy.fromJson(value))
           .toList();
     }
     if (_json.containsKey("baseInstanceName")) {
@@ -1106,7 +1107,8 @@
     }
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new InstanceGroupManager.fromJson(value))
+          .map<InstanceGroupManager>(
+              (value) => new InstanceGroupManager.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1331,7 +1333,8 @@
   OperationError.fromJson(core.Map _json) {
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new OperationErrorErrors.fromJson(value))
+          .map<OperationErrorErrors>(
+              (value) => new OperationErrorErrors.fromJson(value))
           .toList();
     }
   }
@@ -1409,7 +1412,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new OperationWarningsData.fromJson(value))
+          .map<OperationWarningsData>(
+              (value) => new OperationWarningsData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -1588,7 +1592,8 @@
     }
     if (_json.containsKey("warnings")) {
       warnings = _json["warnings"]
-          .map((value) => new OperationWarnings.fromJson(value))
+          .map<OperationWarnings>(
+              (value) => new OperationWarnings.fromJson(value))
           .toList();
     }
     if (_json.containsKey("zone")) {
@@ -1692,8 +1697,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Operation.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Operation>((value) => new Operation.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
diff --git a/generated/googleapis_beta/lib/replicapoolupdater/v1beta1.dart b/generated/googleapis_beta/lib/replicapoolupdater/v1beta1.dart
index 9743e80..822cf88 100644
--- a/generated/googleapis_beta/lib/replicapoolupdater/v1beta1.dart
+++ b/generated/googleapis_beta/lib/replicapoolupdater/v1beta1.dart
@@ -79,7 +79,7 @@
       core.String project, core.String zone, core.String rollingUpdate,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -140,7 +140,7 @@
       core.String project, core.String zone, core.String rollingUpdate,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -200,7 +200,7 @@
       RollingUpdate request, core.String project, core.String zone,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -269,7 +269,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -346,7 +346,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -417,7 +417,7 @@
       core.String project, core.String zone, core.String rollingUpdate,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -479,7 +479,7 @@
       core.String project, core.String zone, core.String rollingUpdate,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -541,7 +541,7 @@
       core.String project, core.String zone, core.String rollingUpdate,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -608,7 +608,7 @@
       core.String project, core.String zone, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -678,7 +678,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -770,7 +770,8 @@
   InstanceUpdateError.fromJson(core.Map _json) {
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new InstanceUpdateErrorErrors.fromJson(value))
+          .map<InstanceUpdateErrorErrors>(
+              (value) => new InstanceUpdateErrorErrors.fromJson(value))
           .toList();
     }
   }
@@ -855,7 +856,7 @@
   InstanceUpdateList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new InstanceUpdate.fromJson(value))
+          .map<InstanceUpdate>((value) => new InstanceUpdate.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -941,7 +942,8 @@
   OperationError.fromJson(core.Map _json) {
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new OperationErrorErrors.fromJson(value))
+          .map<OperationErrorErrors>(
+              (value) => new OperationErrorErrors.fromJson(value))
           .toList();
     }
   }
@@ -1005,7 +1007,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new OperationWarningsData.fromJson(value))
+          .map<OperationWarningsData>(
+              (value) => new OperationWarningsData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -1154,7 +1157,8 @@
     }
     if (_json.containsKey("warnings")) {
       warnings = _json["warnings"]
-          .map((value) => new OperationWarnings.fromJson(value))
+          .map<OperationWarnings>(
+              (value) => new OperationWarnings.fromJson(value))
           .toList();
     }
     if (_json.containsKey("zone")) {
@@ -1260,8 +1264,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Operation.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Operation>((value) => new Operation.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1348,7 +1353,8 @@
   RollingUpdateError.fromJson(core.Map _json) {
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new RollingUpdateErrorErrors.fromJson(value))
+          .map<RollingUpdateErrorErrors>(
+              (value) => new RollingUpdateErrorErrors.fromJson(value))
           .toList();
     }
   }
@@ -1636,7 +1642,7 @@
   RollingUpdateList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new RollingUpdate.fromJson(value))
+          .map<RollingUpdate>((value) => new RollingUpdate.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
diff --git a/generated/googleapis_beta/lib/resourceviews/v1beta1.dart b/generated/googleapis_beta/lib/resourceviews/v1beta1.dart
index 45d93d2..2dedecf 100644
--- a/generated/googleapis_beta/lib/resourceviews/v1beta1.dart
+++ b/generated/googleapis_beta/lib/resourceviews/v1beta1.dart
@@ -84,7 +84,7 @@
       core.String projectName, core.String region, core.String resourceViewName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -146,7 +146,7 @@
       core.String projectName, core.String region, core.String resourceViewName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -206,7 +206,7 @@
       core.String projectName, core.String region, core.String resourceViewName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -264,7 +264,7 @@
       ResourceView request, core.String projectName, core.String region,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -328,7 +328,7 @@
       core.String projectName, core.String region,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -396,7 +396,7 @@
       core.String projectName, core.String region, core.String resourceViewName,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -462,7 +462,7 @@
       core.String projectName, core.String region, core.String resourceViewName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -532,7 +532,7 @@
       core.String projectName, core.String zone, core.String resourceViewName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -594,7 +594,7 @@
       core.String projectName, core.String zone, core.String resourceViewName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -654,7 +654,7 @@
       core.String projectName, core.String zone, core.String resourceViewName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -712,7 +712,7 @@
       ResourceView request, core.String projectName, core.String zone,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -775,7 +775,7 @@
       core.String projectName, core.String zone,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -843,7 +843,7 @@
       core.String projectName, core.String zone, core.String resourceViewName,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -909,7 +909,7 @@
       core.String projectName, core.String zone, core.String resourceViewName,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1076,7 +1076,7 @@
     }
     if (_json.containsKey("resourceViews")) {
       resourceViews = _json["resourceViews"]
-          .map((value) => new ResourceView.fromJson(value))
+          .map<ResourceView>((value) => new ResourceView.fromJson(value))
           .toList();
     }
   }
@@ -1166,8 +1166,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("labels")) {
-      labels =
-          _json["labels"].map((value) => new Label.fromJson(value)).toList();
+      labels = _json["labels"]
+          .map<Label>((value) => new Label.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("lastModified")) {
       lastModified = _json["lastModified"];
@@ -1317,7 +1318,7 @@
     }
     if (_json.containsKey("resourceViews")) {
       resourceViews = _json["resourceViews"]
-          .map((value) => new ResourceView.fromJson(value))
+          .map<ResourceView>((value) => new ResourceView.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis_beta/lib/resourceviews/v1beta2.dart b/generated/googleapis_beta/lib/resourceviews/v1beta2.dart
index d5f0764..fa674c3 100644
--- a/generated/googleapis_beta/lib/resourceviews/v1beta2.dart
+++ b/generated/googleapis_beta/lib/resourceviews/v1beta2.dart
@@ -88,7 +88,7 @@
       core.String project, core.String zone, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -159,7 +159,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -230,7 +230,7 @@
       core.String project, core.String zone, core.String resourceView,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -292,7 +292,7 @@
       core.String project, core.String zone, core.String resourceView,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -350,7 +350,7 @@
       core.String project, core.String zone, core.String resourceView,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -411,7 +411,7 @@
       core.String project, core.String zone, core.String resourceView,
       {core.String resourceName, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -474,7 +474,7 @@
       ResourceView request, core.String project, core.String zone,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -536,7 +536,7 @@
   async.Future<ZoneViewsList> list(core.String project, core.String zone,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -627,7 +627,7 @@
       core.String serviceName,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -707,7 +707,7 @@
       core.String resourceView,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -771,7 +771,7 @@
       core.String project, core.String zone, core.String resourceView,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -928,7 +928,8 @@
   OperationError.fromJson(core.Map _json) {
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new OperationErrorErrors.fromJson(value))
+          .map<OperationErrorErrors>(
+              (value) => new OperationErrorErrors.fromJson(value))
           .toList();
     }
   }
@@ -992,7 +993,8 @@
     }
     if (_json.containsKey("data")) {
       data = _json["data"]
-          .map((value) => new OperationWarningsData.fromJson(value))
+          .map<OperationWarningsData>(
+              (value) => new OperationWarningsData.fromJson(value))
           .toList();
     }
     if (_json.containsKey("message")) {
@@ -1167,7 +1169,8 @@
     }
     if (_json.containsKey("warnings")) {
       warnings = _json["warnings"]
-          .map((value) => new OperationWarnings.fromJson(value))
+          .map<OperationWarnings>(
+              (value) => new OperationWarnings.fromJson(value))
           .toList();
     }
     if (_json.containsKey("zone")) {
@@ -1271,8 +1274,9 @@
       id = _json["id"];
     }
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Operation.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Operation>((value) => new Operation.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1357,7 +1361,7 @@
     }
     if (_json.containsKey("endpoints")) {
       endpoints = _json["endpoints"]
-          .map((value) => new ServiceEndpoint.fromJson(value))
+          .map<ServiceEndpoint>((value) => new ServiceEndpoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("fingerprint")) {
@@ -1370,8 +1374,9 @@
       kind = _json["kind"];
     }
     if (_json.containsKey("labels")) {
-      labels =
-          _json["labels"].map((value) => new Label.fromJson(value)).toList();
+      labels = _json["labels"]
+          .map<Label>((value) => new Label.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("name")) {
       name = _json["name"];
@@ -1500,7 +1505,7 @@
   ZoneViewsGetServiceResponse.fromJson(core.Map _json) {
     if (_json.containsKey("endpoints")) {
       endpoints = _json["endpoints"]
-          .map((value) => new ServiceEndpoint.fromJson(value))
+          .map<ServiceEndpoint>((value) => new ServiceEndpoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("fingerprint")) {
@@ -1540,7 +1545,7 @@
   ZoneViewsList.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ResourceView.fromJson(value))
+          .map<ResourceView>((value) => new ResourceView.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -1590,7 +1595,8 @@
   ZoneViewsListResourcesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new ListResourceResponseItem.fromJson(value))
+          .map<ListResourceResponseItem>(
+              (value) => new ListResourceResponseItem.fromJson(value))
           .toList();
     }
     if (_json.containsKey("network")) {
@@ -1657,7 +1663,7 @@
   ZoneViewsSetServiceRequest.fromJson(core.Map _json) {
     if (_json.containsKey("endpoints")) {
       endpoints = _json["endpoints"]
-          .map((value) => new ServiceEndpoint.fromJson(value))
+          .map<ServiceEndpoint>((value) => new ServiceEndpoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("fingerprint")) {
diff --git a/generated/googleapis_beta/lib/runtimeconfig/v1beta1.dart b/generated/googleapis_beta/lib/runtimeconfig/v1beta1.dart
index a2b9452..f579c91 100644
--- a/generated/googleapis_beta/lib/runtimeconfig/v1beta1.dart
+++ b/generated/googleapis_beta/lib/runtimeconfig/v1beta1.dart
@@ -96,7 +96,7 @@
   async.Future<RuntimeConfig> create(RuntimeConfig request, core.String parent,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -149,7 +149,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -195,7 +195,7 @@
   /// this method will complete with the same error.
   async.Future<RuntimeConfig> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -243,7 +243,7 @@
   async.Future<Policy> getIamPolicy(core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -299,7 +299,7 @@
   async.Future<ListConfigsResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -357,7 +357,7 @@
       SetIamPolicyRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -417,7 +417,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -471,7 +471,7 @@
   async.Future<RuntimeConfig> update(RuntimeConfig request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -526,7 +526,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -581,7 +581,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -663,7 +663,7 @@
   async.Future<Variable> create(Variable request, core.String parent,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -726,7 +726,7 @@
   async.Future<Empty> delete(core.String name,
       {core.bool recursive, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -774,7 +774,7 @@
   /// this method will complete with the same error.
   async.Future<Variable> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -850,7 +850,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -919,7 +919,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -973,7 +973,7 @@
   async.Future<Variable> update(Variable request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1038,7 +1038,7 @@
   async.Future<Variable> watch(WatchVariableRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1114,7 +1114,7 @@
   async.Future<Operation> create(Waiter request, core.String parent,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1167,7 +1167,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1214,7 +1214,7 @@
   /// this method will complete with the same error.
   async.Future<Waiter> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1270,7 +1270,7 @@
   async.Future<ListWaitersResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1333,7 +1333,7 @@
       TestIamPermissionsRequest request, core.String resource,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1529,7 +1529,7 @@
   ListConfigsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("configs")) {
       configs = _json["configs"]
-          .map((value) => new RuntimeConfig.fromJson(value))
+          .map<RuntimeConfig>((value) => new RuntimeConfig.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -1572,7 +1572,7 @@
     }
     if (_json.containsKey("variables")) {
       variables = _json["variables"]
-          .map((value) => new Variable.fromJson(value))
+          .map<Variable>((value) => new Variable.fromJson(value))
           .toList();
     }
   }
@@ -1611,8 +1611,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("waiters")) {
-      waiters =
-          _json["waiters"].map((value) => new Waiter.fromJson(value)).toList();
+      waiters = _json["waiters"]
+          .map<Waiter>((value) => new Waiter.fromJson(value))
+          .toList();
     }
   }
 
@@ -1777,7 +1778,7 @@
   Policy.fromJson(core.Map _json) {
     if (_json.containsKey("bindings")) {
       bindings = _json["bindings"]
-          .map((value) => new Binding.fromJson(value))
+          .map<Binding>((value) => new Binding.fromJson(value))
           .toList();
     }
     if (_json.containsKey("etag")) {
diff --git a/generated/googleapis_beta/lib/speech/v1beta1.dart b/generated/googleapis_beta/lib/speech/v1beta1.dart
index 5dfe039..8fdf6d6 100644
--- a/generated/googleapis_beta/lib/speech/v1beta1.dart
+++ b/generated/googleapis_beta/lib/speech/v1beta1.dart
@@ -58,7 +58,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -113,7 +113,7 @@
   async.Future<Operation> asyncrecognize(AsyncRecognizeRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -158,7 +158,7 @@
       SyncRecognizeRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -533,7 +533,8 @@
   SpeechRecognitionResult.fromJson(core.Map _json) {
     if (_json.containsKey("alternatives")) {
       alternatives = _json["alternatives"]
-          .map((value) => new SpeechRecognitionAlternative.fromJson(value))
+          .map<SpeechRecognitionAlternative>(
+              (value) => new SpeechRecognitionAlternative.fromJson(value))
           .toList();
     }
   }
@@ -697,7 +698,8 @@
   SyncRecognizeResponse.fromJson(core.Map _json) {
     if (_json.containsKey("results")) {
       results = _json["results"]
-          .map((value) => new SpeechRecognitionResult.fromJson(value))
+          .map<SpeechRecognitionResult>(
+              (value) => new SpeechRecognitionResult.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis_beta/lib/sqladmin/v1beta3.dart b/generated/googleapis_beta/lib/sqladmin/v1beta3.dart
index 7503ff4..2ea6605 100644
--- a/generated/googleapis_beta/lib/sqladmin/v1beta3.dart
+++ b/generated/googleapis_beta/lib/sqladmin/v1beta3.dart
@@ -76,7 +76,7 @@
       core.String backupConfiguration, core.String dueTime,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -146,7 +146,7 @@
       core.String instance, core.String backupConfiguration,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -210,7 +210,7 @@
   /// this method will complete with the same error.
   async.Future<FlagsListResponse> list({core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -260,7 +260,7 @@
       InstancesCloneRequest request, core.String project,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -312,7 +312,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -368,7 +368,7 @@
       InstancesExportRequest request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -423,7 +423,7 @@
   async.Future<DatabaseInstance> get(core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -478,7 +478,7 @@
       InstancesImportRequest request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -535,7 +535,7 @@
       DatabaseInstance request, core.String project,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -589,7 +589,7 @@
   async.Future<InstancesListResponse> list(core.String project,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -645,7 +645,7 @@
       DatabaseInstance request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -700,7 +700,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -755,7 +755,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -810,7 +810,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -874,7 +874,7 @@
       core.String dueTime,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -941,7 +941,7 @@
       core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1000,7 +1000,7 @@
       DatabaseInstance request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1064,7 +1064,7 @@
       core.String project, core.String instance, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1126,7 +1126,7 @@
       core.String project, core.String instance,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1194,7 +1194,7 @@
       core.String project, core.String instance, core.String sha1Fingerprint,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1253,7 +1253,7 @@
       core.String project, core.String instance, core.String sha1Fingerprint,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1314,7 +1314,7 @@
       SslCertsInsertRequest request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1372,7 +1372,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1428,7 +1428,7 @@
   async.Future<TiersListResponse> list(core.String project,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1642,8 +1642,9 @@
 
   BackupRunsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new BackupRun.fromJson(value)).toList();
+      items = _json["items"]
+          .map<BackupRun>((value) => new BackupRun.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -1905,7 +1906,7 @@
     }
     if (_json.containsKey("ipAddresses")) {
       ipAddresses = _json["ipAddresses"]
-          .map((value) => new IpMapping.fromJson(value))
+          .map<IpMapping>((value) => new IpMapping.fromJson(value))
           .toList();
     }
     if (_json.containsKey("ipv6Address")) {
@@ -2153,7 +2154,9 @@
 
   FlagsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Flag.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Flag>((value) => new Flag.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -2278,7 +2281,7 @@
     }
     if (_json.containsKey("error")) {
       error = _json["error"]
-          .map((value) => new OperationError.fromJson(value))
+          .map<OperationError>((value) => new OperationError.fromJson(value))
           .toList();
     }
     if (_json.containsKey("exportContext")) {
@@ -2633,7 +2636,8 @@
   InstancesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new DatabaseInstance.fromJson(value))
+          .map<DatabaseInstance>(
+              (value) => new DatabaseInstance.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3047,7 +3051,8 @@
   OperationsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new InstanceOperation.fromJson(value))
+          .map<InstanceOperation>(
+              (value) => new InstanceOperation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -3170,12 +3175,13 @@
     }
     if (_json.containsKey("backupConfiguration")) {
       backupConfiguration = _json["backupConfiguration"]
-          .map((value) => new BackupConfiguration.fromJson(value))
+          .map<BackupConfiguration>(
+              (value) => new BackupConfiguration.fromJson(value))
           .toList();
     }
     if (_json.containsKey("databaseFlags")) {
       databaseFlags = _json["databaseFlags"]
-          .map((value) => new DatabaseFlags.fromJson(value))
+          .map<DatabaseFlags>((value) => new DatabaseFlags.fromJson(value))
           .toList();
     }
     if (_json.containsKey("databaseReplicationEnabled")) {
@@ -3484,8 +3490,9 @@
 
   SslCertsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new SslCert.fromJson(value)).toList();
+      items = _json["items"]
+          .map<SslCert>((value) => new SslCert.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3577,7 +3584,9 @@
 
   TiersListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Tier.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Tier>((value) => new Tier.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
diff --git a/generated/googleapis_beta/lib/sqladmin/v1beta4.dart b/generated/googleapis_beta/lib/sqladmin/v1beta4.dart
index 25cf5ff..837cb1a 100644
--- a/generated/googleapis_beta/lib/sqladmin/v1beta4.dart
+++ b/generated/googleapis_beta/lib/sqladmin/v1beta4.dart
@@ -73,7 +73,7 @@
       core.String project, core.String instance, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -132,7 +132,7 @@
       core.String project, core.String instance, core.String id,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -192,7 +192,7 @@
       BackupRun request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -254,7 +254,7 @@
       core.String project, core.String instance,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -321,7 +321,7 @@
       core.String project, core.String instance, core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -381,7 +381,7 @@
       core.String project, core.String instance, core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -441,7 +441,7 @@
       Database request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -498,7 +498,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -556,7 +556,7 @@
       core.String instance, core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -621,7 +621,7 @@
       core.String instance, core.String database,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -685,7 +685,7 @@
   async.Future<FlagsListResponse> list(
       {core.String databaseVersion, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -742,7 +742,7 @@
       InstancesCloneRequest request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -798,7 +798,7 @@
   async.Future<Operation> delete(core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -852,7 +852,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -912,7 +912,7 @@
       InstancesExportRequest request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -970,7 +970,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1025,7 +1025,7 @@
   async.Future<DatabaseInstance> get(core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1080,7 +1080,7 @@
       InstancesImportRequest request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1136,7 +1136,7 @@
   async.Future<Operation> insert(DatabaseInstance request, core.String project,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1196,7 +1196,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1257,7 +1257,7 @@
       DatabaseInstance request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1312,7 +1312,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1368,7 +1368,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1421,7 +1421,7 @@
   async.Future<Operation> restart(core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1476,7 +1476,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1532,7 +1532,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1584,7 +1584,7 @@
   async.Future<Operation> stopReplica(core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1639,7 +1639,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1699,7 +1699,7 @@
       DatabaseInstance request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1759,7 +1759,7 @@
   async.Future<Operation> get(core.String project, core.String operation,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1817,7 +1817,7 @@
       core.String project, core.String instance,
       {core.int maxResults, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1885,7 +1885,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1945,7 +1945,7 @@
       core.String project, core.String instance, core.String sha1Fingerprint,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2006,7 +2006,7 @@
       core.String project, core.String instance, core.String sha1Fingerprint,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2068,7 +2068,7 @@
       SslCertsInsertRequest request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2125,7 +2125,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2182,7 +2182,7 @@
   async.Future<TiersListResponse> list(core.String project,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2238,7 +2238,7 @@
       core.String host, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2301,7 +2301,7 @@
       User request, core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2357,7 +2357,7 @@
       core.String project, core.String instance,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2416,7 +2416,7 @@
       core.String instance, core.String host, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2717,8 +2717,9 @@
 
   BackupRunsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new BackupRun.fromJson(value)).toList();
+      items = _json["items"]
+          .map<BackupRun>((value) => new BackupRun.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3146,7 +3147,7 @@
     }
     if (_json.containsKey("ipAddresses")) {
       ipAddresses = _json["ipAddresses"]
-          .map((value) => new IpMapping.fromJson(value))
+          .map<IpMapping>((value) => new IpMapping.fromJson(value))
           .toList();
     }
     if (_json.containsKey("ipv6Address")) {
@@ -3296,8 +3297,9 @@
 
   DatabasesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Database.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Database>((value) => new Database.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -3742,7 +3744,9 @@
 
   FlagsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Flag.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Flag>((value) => new Flag.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -4005,7 +4009,8 @@
   InstancesListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
       items = _json["items"]
-          .map((value) => new DatabaseInstance.fromJson(value))
+          .map<DatabaseInstance>(
+              (value) => new DatabaseInstance.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4098,7 +4103,7 @@
   IpConfiguration.fromJson(core.Map _json) {
     if (_json.containsKey("authorizedNetworks")) {
       authorizedNetworks = _json["authorizedNetworks"]
-          .map((value) => new AclEntry.fromJson(value))
+          .map<AclEntry>((value) => new AclEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("ipv4Enabled")) {
@@ -4635,7 +4640,7 @@
   OperationErrors.fromJson(core.Map _json) {
     if (_json.containsKey("errors")) {
       errors = _json["errors"]
-          .map((value) => new OperationError.fromJson(value))
+          .map<OperationError>((value) => new OperationError.fromJson(value))
           .toList();
     }
     if (_json.containsKey("kind")) {
@@ -4672,8 +4677,9 @@
 
   OperationsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new Operation.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Operation>((value) => new Operation.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -4920,7 +4926,7 @@
     }
     if (_json.containsKey("databaseFlags")) {
       databaseFlags = _json["databaseFlags"]
-          .map((value) => new DatabaseFlags.fromJson(value))
+          .map<DatabaseFlags>((value) => new DatabaseFlags.fromJson(value))
           .toList();
     }
     if (_json.containsKey("databaseReplicationEnabled")) {
@@ -5275,8 +5281,9 @@
 
   SslCertsListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items =
-          _json["items"].map((value) => new SslCert.fromJson(value)).toList();
+      items = _json["items"]
+          .map<SslCert>((value) => new SslCert.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -5368,7 +5375,9 @@
 
   TiersListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Tier.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Tier>((value) => new Tier.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -5521,7 +5530,9 @@
 
   UsersListResponse.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new User.fromJson(value)).toList();
+      items = _json["items"]
+          .map<User>((value) => new User.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
diff --git a/generated/googleapis_beta/lib/taskqueue/v1beta2.dart b/generated/googleapis_beta/lib/taskqueue/v1beta2.dart
index 5c1fe4b..0b46705 100644
--- a/generated/googleapis_beta/lib/taskqueue/v1beta2.dart
+++ b/generated/googleapis_beta/lib/taskqueue/v1beta2.dart
@@ -63,7 +63,7 @@
   async.Future<TaskQueue> get(core.String project, core.String taskqueue,
       {core.bool getStats, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -123,7 +123,7 @@
       core.String project, core.String taskqueue, core.String task,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -183,7 +183,7 @@
       core.String project, core.String taskqueue, core.String task,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -241,7 +241,7 @@
       Task request, core.String project, core.String taskqueue,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -307,7 +307,7 @@
       core.int numTasks, core.int leaseSecs,
       {core.bool groupByTag, core.String tag, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -372,7 +372,7 @@
   async.Future<Tasks2> list(core.String project, core.String taskqueue,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -431,7 +431,7 @@
       core.String taskqueue, core.String task, core.int newLeaseSeconds,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -500,7 +500,7 @@
       core.String taskqueue, core.String task, core.int newLeaseSeconds,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -794,7 +794,9 @@
 
   Tasks.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Task.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Task>((value) => new Task.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
@@ -825,7 +827,9 @@
 
   Tasks2.fromJson(core.Map _json) {
     if (_json.containsKey("items")) {
-      items = _json["items"].map((value) => new Task.fromJson(value)).toList();
+      items = _json["items"]
+          .map<Task>((value) => new Task.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("kind")) {
       kind = _json["kind"];
diff --git a/generated/googleapis_beta/lib/toolresults/v1beta3.dart b/generated/googleapis_beta/lib/toolresults/v1beta3.dart
index 6595a1a..5c50f23 100644
--- a/generated/googleapis_beta/lib/toolresults/v1beta3.dart
+++ b/generated/googleapis_beta/lib/toolresults/v1beta3.dart
@@ -64,7 +64,7 @@
   async.Future<ProjectSettings> getSettings(core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -134,7 +134,7 @@
   async.Future<ProjectSettings> initializeSettings(core.String projectId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -204,7 +204,7 @@
   async.Future<History> create(History request, core.String projectId,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -265,7 +265,7 @@
   async.Future<History> get(core.String projectId, core.String historyId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -344,7 +344,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -430,7 +430,7 @@
       Execution request, core.String projectId, core.String historyId,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -502,7 +502,7 @@
       core.String projectId, core.String historyId, core.String executionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -583,7 +583,7 @@
       core.String projectId, core.String historyId,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -657,7 +657,7 @@
       core.String historyId, core.String executionId,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -738,7 +738,7 @@
       core.String historyId, core.String executionId, core.String clusterId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -814,7 +814,7 @@
       core.String projectId, core.String historyId, core.String executionId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -914,7 +914,7 @@
       core.String historyId, core.String executionId,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -995,7 +995,7 @@
       core.String executionId, core.String stepId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1063,7 +1063,7 @@
       core.String historyId, core.String executionId, core.String stepId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1155,7 +1155,7 @@
       core.String projectId, core.String historyId, core.String executionId,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1245,7 +1245,7 @@
       core.String historyId, core.String executionId, core.String stepId,
       {core.String requestId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1338,7 +1338,7 @@
       core.String stepId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1425,7 +1425,7 @@
       core.String stepId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1517,7 +1517,7 @@
       core.String stepId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1595,7 +1595,7 @@
       core.String sampleSeriesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1675,7 +1675,7 @@
       core.String historyId, core.String executionId, core.String stepId,
       {core.List<core.String> filter, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1770,7 +1770,7 @@
       core.String sampleSeriesId,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1869,7 +1869,7 @@
       core.String pageToken,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -1978,7 +1978,7 @@
       core.String historyId, core.String executionId, core.String stepId,
       {core.int pageSize, core.String pageToken, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -2475,7 +2475,7 @@
   BatchCreatePerfSamplesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("perfSamples")) {
       perfSamples = _json["perfSamples"]
-          .map((value) => new PerfSample.fromJson(value))
+          .map<PerfSample>((value) => new PerfSample.fromJson(value))
           .toList();
     }
   }
@@ -2499,7 +2499,7 @@
   BatchCreatePerfSamplesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("perfSamples")) {
       perfSamples = _json["perfSamples"]
-          .map((value) => new PerfSample.fromJson(value))
+          .map<PerfSample>((value) => new PerfSample.fromJson(value))
           .toList();
     }
   }
@@ -2900,7 +2900,8 @@
   GraphicsStats.fromJson(core.Map _json) {
     if (_json.containsKey("buckets")) {
       buckets = _json["buckets"]
-          .map((value) => new GraphicsStatsBucket.fromJson(value))
+          .map<GraphicsStatsBucket>(
+              (value) => new GraphicsStatsBucket.fromJson(value))
           .toList();
     }
     if (_json.containsKey("highInputLatencyCount")) {
@@ -3179,7 +3180,7 @@
   ListExecutionsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("executions")) {
       executions = _json["executions"]
-          .map((value) => new Execution.fromJson(value))
+          .map<Execution>((value) => new Execution.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -3221,7 +3222,7 @@
   ListHistoriesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("histories")) {
       histories = _json["histories"]
-          .map((value) => new History.fromJson(value))
+          .map<History>((value) => new History.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -3251,7 +3252,8 @@
   ListPerfSampleSeriesResponse.fromJson(core.Map _json) {
     if (_json.containsKey("perfSampleSeries")) {
       perfSampleSeries = _json["perfSampleSeries"]
-          .map((value) => new PerfSampleSeries.fromJson(value))
+          .map<PerfSampleSeries>(
+              (value) => new PerfSampleSeries.fromJson(value))
           .toList();
     }
   }
@@ -3282,7 +3284,7 @@
     }
     if (_json.containsKey("perfSamples")) {
       perfSamples = _json["perfSamples"]
-          .map((value) => new PerfSample.fromJson(value))
+          .map<PerfSample>((value) => new PerfSample.fromJson(value))
           .toList();
     }
   }
@@ -3310,7 +3312,8 @@
   ListScreenshotClustersResponse.fromJson(core.Map _json) {
     if (_json.containsKey("clusters")) {
       clusters = _json["clusters"]
-          .map((value) => new ScreenshotCluster.fromJson(value))
+          .map<ScreenshotCluster>(
+              (value) => new ScreenshotCluster.fromJson(value))
           .toList();
     }
   }
@@ -3351,7 +3354,7 @@
     }
     if (_json.containsKey("thumbnails")) {
       thumbnails = _json["thumbnails"]
-          .map((value) => new Image.fromJson(value))
+          .map<Image>((value) => new Image.fromJson(value))
           .toList();
     }
   }
@@ -3388,7 +3391,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("steps")) {
-      steps = _json["steps"].map((value) => new Step.fromJson(value)).toList();
+      steps = _json["steps"]
+          .map<Step>((value) => new Step.fromJson(value))
+          .toList();
     }
   }
 
@@ -3797,7 +3802,7 @@
   PublishXunitXmlFilesRequest.fromJson(core.Map _json) {
     if (_json.containsKey("xunitXmlFiles")) {
       xunitXmlFiles = _json["xunitXmlFiles"]
-          .map((value) => new FileReference.fromJson(value))
+          .map<FileReference>((value) => new FileReference.fromJson(value))
           .toList();
     }
   }
@@ -3891,8 +3896,9 @@
       keyScreen = new Screen.fromJson(_json["keyScreen"]);
     }
     if (_json.containsKey("screens")) {
-      screens =
-          _json["screens"].map((value) => new Screen.fromJson(value)).toList();
+      screens = _json["screens"]
+          .map<Screen>((value) => new Screen.fromJson(value))
+          .toList();
     }
   }
 
@@ -4093,8 +4099,9 @@
       code = _json["code"];
     }
     if (_json.containsKey("details")) {
-      details =
-          _json["details"].map((value) => new Any.fromJson(value)).toList();
+      details = _json["details"]
+          .map<Any>((value) => new Any.fromJson(value))
+          .toList();
     }
     if (_json.containsKey("message")) {
       message = _json["message"];
@@ -4303,7 +4310,8 @@
     }
     if (_json.containsKey("dimensionValue")) {
       dimensionValue = _json["dimensionValue"]
-          .map((value) => new StepDimensionValueEntry.fromJson(value))
+          .map<StepDimensionValueEntry>(
+              (value) => new StepDimensionValueEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("hasImages")) {
@@ -4311,7 +4319,7 @@
     }
     if (_json.containsKey("labels")) {
       labels = _json["labels"]
-          .map((value) => new StepLabelsEntry.fromJson(value))
+          .map<StepLabelsEntry>((value) => new StepLabelsEntry.fromJson(value))
           .toList();
     }
     if (_json.containsKey("name")) {
@@ -4560,12 +4568,13 @@
   TestExecutionStep.fromJson(core.Map _json) {
     if (_json.containsKey("testIssues")) {
       testIssues = _json["testIssues"]
-          .map((value) => new TestIssue.fromJson(value))
+          .map<TestIssue>((value) => new TestIssue.fromJson(value))
           .toList();
     }
     if (_json.containsKey("testSuiteOverviews")) {
       testSuiteOverviews = _json["testSuiteOverviews"]
-          .map((value) => new TestSuiteOverview.fromJson(value))
+          .map<TestSuiteOverview>(
+              (value) => new TestSuiteOverview.fromJson(value))
           .toList();
     }
     if (_json.containsKey("testTiming")) {
@@ -5016,12 +5025,13 @@
     }
     if (_json.containsKey("toolLogs")) {
       toolLogs = _json["toolLogs"]
-          .map((value) => new FileReference.fromJson(value))
+          .map<FileReference>((value) => new FileReference.fromJson(value))
           .toList();
     }
     if (_json.containsKey("toolOutputs")) {
       toolOutputs = _json["toolOutputs"]
-          .map((value) => new ToolOutputReference.fromJson(value))
+          .map<ToolOutputReference>(
+              (value) => new ToolOutputReference.fromJson(value))
           .toList();
     }
   }
diff --git a/generated/googleapis_beta/lib/tpu/v1alpha1.dart b/generated/googleapis_beta/lib/tpu/v1alpha1.dart
index cc19bfc..0e98107 100644
--- a/generated/googleapis_beta/lib/tpu/v1alpha1.dart
+++ b/generated/googleapis_beta/lib/tpu/v1alpha1.dart
@@ -72,7 +72,7 @@
   /// this method will complete with the same error.
   async.Future<Location> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -125,7 +125,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -191,7 +191,7 @@
   async.Future<Operation> create(Node request, core.String parent,
       {core.String nodeId, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -242,7 +242,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -285,7 +285,7 @@
   /// this method will complete with the same error.
   async.Future<Node> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -334,7 +334,7 @@
   async.Future<ListNodesResponse> list(core.String parent,
       {core.String pageToken, core.int pageSize, core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -388,7 +388,7 @@
   async.Future<Operation> reimage(ReimageNodeRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -439,7 +439,7 @@
   async.Future<Operation> reset(ResetNodeRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -489,7 +489,7 @@
   async.Future<Operation> start(StartNodeRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -539,7 +539,7 @@
   async.Future<Operation> stop(StopNodeRequest request, core.String name,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -603,7 +603,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> cancel(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -652,7 +652,7 @@
   /// this method will complete with the same error.
   async.Future<Empty> delete(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -698,7 +698,7 @@
   /// this method will complete with the same error.
   async.Future<Operation> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -761,7 +761,7 @@
       core.int pageSize,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -823,7 +823,7 @@
   /// this method will complete with the same error.
   async.Future<TensorFlowVersion> get(core.String name, {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -880,7 +880,7 @@
       core.String filter,
       core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -954,7 +954,7 @@
   ListLocationsResponse.fromJson(core.Map _json) {
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) => new Location.fromJson(value))
+          .map<Location>((value) => new Location.fromJson(value))
           .toList();
     }
     if (_json.containsKey("nextPageToken")) {
@@ -990,7 +990,9 @@
       nextPageToken = _json["nextPageToken"];
     }
     if (_json.containsKey("nodes")) {
-      nodes = _json["nodes"].map((value) => new Node.fromJson(value)).toList();
+      nodes = _json["nodes"]
+          .map<Node>((value) => new Node.fromJson(value))
+          .toList();
     }
   }
 
@@ -1023,7 +1025,7 @@
     }
     if (_json.containsKey("operations")) {
       operations = _json["operations"]
-          .map((value) => new Operation.fromJson(value))
+          .map<Operation>((value) => new Operation.fromJson(value))
           .toList();
     }
   }
@@ -1058,7 +1060,8 @@
     }
     if (_json.containsKey("tensorflowVersions")) {
       tensorflowVersions = _json["tensorflowVersions"]
-          .map((value) => new TensorFlowVersion.fromJson(value))
+          .map<TensorFlowVersion>(
+              (value) => new TensorFlowVersion.fromJson(value))
           .toList();
     }
   }
@@ -1295,7 +1298,7 @@
     }
     if (_json.containsKey("networkEndpoints")) {
       networkEndpoints = _json["networkEndpoints"]
-          .map((value) => new NetworkEndpoint.fromJson(value))
+          .map<NetworkEndpoint>((value) => new NetworkEndpoint.fromJson(value))
           .toList();
     }
     if (_json.containsKey("port")) {
diff --git a/generated/googleapis_beta/lib/videointelligence/v1beta1.dart b/generated/googleapis_beta/lib/videointelligence/v1beta1.dart
index f09cd8b..47f0e0f 100644
--- a/generated/googleapis_beta/lib/videointelligence/v1beta1.dart
+++ b/generated/googleapis_beta/lib/videointelligence/v1beta1.dart
@@ -59,7 +59,7 @@
       GoogleCloudVideointelligenceV1beta1AnnotateVideoRequest request,
       {core.String $fields}) {
     var _url = null;
-    var _queryParams = new core.Map();
+    var _queryParams = new core.Map<core.String, core.List<core.String>>();
     var _uploadMedia = null;
     var _uploadOptions = null;
     var _downloadOptions = commons.DownloadOptions.Metadata;
@@ -98,7 +98,7 @@
   GoogleCloudVideointelligenceV1AnnotateVideoProgress.fromJson(core.Map _json) {
     if (_json.containsKey("annotationProgress")) {
       annotationProgress = _json["annotationProgress"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1VideoAnnotationProgress>((value) =>
               new GoogleCloudVideointelligenceV1VideoAnnotationProgress
                   .fromJson(value))
           .toList();
@@ -129,7 +129,7 @@
   GoogleCloudVideointelligenceV1AnnotateVideoResponse.fromJson(core.Map _json) {
     if (_json.containsKey("annotationResults")) {
       annotationResults = _json["annotationResults"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1VideoAnnotationResults>((value) =>
               new GoogleCloudVideointelligenceV1VideoAnnotationResults.fromJson(
                   value))
           .toList();
@@ -203,7 +203,7 @@
       core.Map _json) {
     if (_json.containsKey("frames")) {
       frames = _json["frames"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1ExplicitContentFrame>((value) =>
               new GoogleCloudVideointelligenceV1ExplicitContentFrame.fromJson(
                   value))
           .toList();
@@ -282,7 +282,7 @@
   GoogleCloudVideointelligenceV1LabelAnnotation.fromJson(core.Map _json) {
     if (_json.containsKey("categoryEntities")) {
       categoryEntities = _json["categoryEntities"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1Entity>((value) =>
               new GoogleCloudVideointelligenceV1Entity.fromJson(value))
           .toList();
     }
@@ -292,13 +292,13 @@
     }
     if (_json.containsKey("frames")) {
       frames = _json["frames"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1LabelFrame>((value) =>
               new GoogleCloudVideointelligenceV1LabelFrame.fromJson(value))
           .toList();
     }
     if (_json.containsKey("segments")) {
       segments = _json["segments"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1LabelSegment>((value) =>
               new GoogleCloudVideointelligenceV1LabelSegment.fromJson(value))
           .toList();
     }
@@ -487,7 +487,7 @@
     }
     if (_json.containsKey("frameLabelAnnotations")) {
       frameLabelAnnotations = _json["frameLabelAnnotations"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1LabelAnnotation>((value) =>
               new GoogleCloudVideointelligenceV1LabelAnnotation.fromJson(value))
           .toList();
     }
@@ -496,19 +496,19 @@
     }
     if (_json.containsKey("segmentLabelAnnotations")) {
       segmentLabelAnnotations = _json["segmentLabelAnnotations"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1LabelAnnotation>((value) =>
               new GoogleCloudVideointelligenceV1LabelAnnotation.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shotAnnotations")) {
       shotAnnotations = _json["shotAnnotations"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1VideoSegment>((value) =>
               new GoogleCloudVideointelligenceV1VideoSegment.fromJson(value))
           .toList();
     }
     if (_json.containsKey("shotLabelAnnotations")) {
       shotLabelAnnotations = _json["shotLabelAnnotations"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1LabelAnnotation>((value) =>
               new GoogleCloudVideointelligenceV1LabelAnnotation.fromJson(value))
           .toList();
     }
@@ -594,9 +594,10 @@
       core.Map _json) {
     if (_json.containsKey("annotationProgress")) {
       annotationProgress = _json["annotationProgress"]
-          .map((value) =>
-              new GoogleCloudVideointelligenceV1beta1VideoAnnotationProgress
-                  .fromJson(value))
+          .map<GoogleCloudVideointelligenceV1beta1VideoAnnotationProgress>(
+              (value) =>
+                  new GoogleCloudVideointelligenceV1beta1VideoAnnotationProgress
+                      .fromJson(value))
           .toList();
     }
   }
@@ -716,9 +717,10 @@
       core.Map _json) {
     if (_json.containsKey("annotationResults")) {
       annotationResults = _json["annotationResults"]
-          .map((value) =>
-              new GoogleCloudVideointelligenceV1beta1VideoAnnotationResults
-                  .fromJson(value))
+          .map<GoogleCloudVideointelligenceV1beta1VideoAnnotationResults>(
+              (value) =>
+                  new GoogleCloudVideointelligenceV1beta1VideoAnnotationResults
+                      .fromJson(value))
           .toList();
     }
   }
@@ -756,7 +758,7 @@
     }
     if (_json.containsKey("locations")) {
       locations = _json["locations"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1beta1LabelLocation>((value) =>
               new GoogleCloudVideointelligenceV1beta1LabelLocation.fromJson(
                   value))
           .toList();
@@ -1028,21 +1030,22 @@
     }
     if (_json.containsKey("labelAnnotations")) {
       labelAnnotations = _json["labelAnnotations"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1beta1LabelAnnotation>((value) =>
               new GoogleCloudVideointelligenceV1beta1LabelAnnotation.fromJson(
                   value))
           .toList();
     }
     if (_json.containsKey("safeSearchAnnotations")) {
       safeSearchAnnotations = _json["safeSearchAnnotations"]
-          .map((value) =>
-              new GoogleCloudVideointelligenceV1beta1SafeSearchAnnotation
-                  .fromJson(value))
+          .map<GoogleCloudVideointelligenceV1beta1SafeSearchAnnotation>(
+              (value) =>
+                  new GoogleCloudVideointelligenceV1beta1SafeSearchAnnotation
+                      .fromJson(value))
           .toList();
     }
     if (_json.containsKey("shotAnnotations")) {
       shotAnnotations = _json["shotAnnotations"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1beta1VideoSegment>((value) =>
               new GoogleCloudVideointelligenceV1beta1VideoSegment.fromJson(
                   value))
           .toList();
@@ -1122,7 +1125,7 @@
     }
     if (_json.containsKey("segments")) {
       segments = _json["segments"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1beta1VideoSegment>((value) =>
               new GoogleCloudVideointelligenceV1beta1VideoSegment.fromJson(
                   value))
           .toList();
@@ -1206,9 +1209,10 @@
       core.Map _json) {
     if (_json.containsKey("annotationProgress")) {
       annotationProgress = _json["annotationProgress"]
-          .map((value) =>
-              new GoogleCloudVideointelligenceV1beta2VideoAnnotationProgress
-                  .fromJson(value))
+          .map<GoogleCloudVideointelligenceV1beta2VideoAnnotationProgress>(
+              (value) =>
+                  new GoogleCloudVideointelligenceV1beta2VideoAnnotationProgress
+                      .fromJson(value))
           .toList();
     }
   }
@@ -1238,9 +1242,10 @@
       core.Map _json) {
     if (_json.containsKey("annotationResults")) {
       annotationResults = _json["annotationResults"]
-          .map((value) =>
-              new GoogleCloudVideointelligenceV1beta2VideoAnnotationResults
-                  .fromJson(value))
+          .map<GoogleCloudVideointelligenceV1beta2VideoAnnotationResults>(
+              (value) =>
+                  new GoogleCloudVideointelligenceV1beta2VideoAnnotationResults
+                      .fromJson(value))
           .toList();
     }
   }
@@ -1312,9 +1317,10 @@
       core.Map _json) {
     if (_json.containsKey("frames")) {
       frames = _json["frames"]
-          .map((value) =>
-              new GoogleCloudVideointelligenceV1beta2ExplicitContentFrame
-                  .fromJson(value))
+          .map<GoogleCloudVideointelligenceV1beta2ExplicitContentFrame>(
+              (value) =>
+                  new GoogleCloudVideointelligenceV1beta2ExplicitContentFrame
+                      .fromJson(value))
           .toList();
     }
   }
@@ -1392,7 +1398,7 @@
   GoogleCloudVideointelligenceV1beta2LabelAnnotation.fromJson(core.Map _json) {
     if (_json.containsKey("categoryEntities")) {
       categoryEntities = _json["categoryEntities"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1beta2Entity>((value) =>
               new GoogleCloudVideointelligenceV1beta2Entity.fromJson(value))
           .toList();
     }
@@ -1402,13 +1408,13 @@
     }
     if (_json.containsKey("frames")) {
       frames = _json["frames"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1beta2LabelFrame>((value) =>
               new GoogleCloudVideointelligenceV1beta2LabelFrame.fromJson(value))
           .toList();
     }
     if (_json.containsKey("segments")) {
       segments = _json["segments"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1beta2LabelSegment>((value) =>
               new GoogleCloudVideointelligenceV1beta2LabelSegment.fromJson(
                   value))
           .toList();
@@ -1600,7 +1606,7 @@
     }
     if (_json.containsKey("frameLabelAnnotations")) {
       frameLabelAnnotations = _json["frameLabelAnnotations"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1beta2LabelAnnotation>((value) =>
               new GoogleCloudVideointelligenceV1beta2LabelAnnotation.fromJson(
                   value))
           .toList();
@@ -1610,21 +1616,21 @@
     }
     if (_json.containsKey("segmentLabelAnnotations")) {
       segmentLabelAnnotations = _json["segmentLabelAnnotations"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1beta2LabelAnnotation>((value) =>
               new GoogleCloudVideointelligenceV1beta2LabelAnnotation.fromJson(
                   value))
           .toList();
     }
     if (_json.containsKey("shotAnnotations")) {
       shotAnnotations = _json["shotAnnotations"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1beta2VideoSegment>((value) =>
               new GoogleCloudVideointelligenceV1beta2VideoSegment.fromJson(
                   value))
           .toList();
     }
     if (_json.containsKey("shotLabelAnnotations")) {
       shotLabelAnnotations = _json["shotLabelAnnotations"]
-          .map((value) =>
+          .map<GoogleCloudVideointelligenceV1beta2LabelAnnotation>((value) =>
               new GoogleCloudVideointelligenceV1beta2LabelAnnotation.fromJson(
                   value))
           .toList();
diff --git a/generated/googleapis_beta/pubspec.yaml b/generated/googleapis_beta/pubspec.yaml
index 8ae1403..aee9983 100644
--- a/generated/googleapis_beta/pubspec.yaml
+++ b/generated/googleapis_beta/pubspec.yaml
@@ -1,5 +1,5 @@
 name: googleapis_beta
-version: 0.45.0
+version: 0.45.1
 author: Dart Team <misc@dartlang.org>
 description: "Auto-generated client libraries for accessing the following APIs:adexchangebuyer2:v2beta1, appengine:v1beta, appengine:v1beta4, appengine:v1beta5, clouderrorreporting:v1beta1, cloudresourcemanager:v1beta1, cloudtasks:v2beta2, clouduseraccounts:beta, dataflow:v1b3, dialogflow:v2beta1, dlp:v2beta1, dlp:v2beta2, dns:v2beta1, firestore:v1beta1, language:v1beta1, language:v1beta2, logging:v2beta1, oslogin:v1alpha, oslogin:v1beta, proximitybeacon:v1beta1, pubsub:v1beta2, replicapool:v1beta2, replicapoolupdater:v1beta1, resourceviews:v1beta1, resourceviews:v1beta2, runtimeconfig:v1beta1, speech:v1beta1, sqladmin:v1beta3, sqladmin:v1beta4, taskqueue:v1beta2, toolresults:v1beta3, tpu:v1alpha1, videointelligence:v1beta1"
 homepage: http://www.dartlang.org/googleapis/
diff --git a/generated/googleapis_beta/test/adexchangebuyer2/v2beta1_test.dart b/generated/googleapis_beta/test/adexchangebuyer2/v2beta1_test.dart
index dee3bdc..e112dcc 100644
--- a/generated/googleapis_beta/test/adexchangebuyer2/v2beta1_test.dart
+++ b/generated/googleapis_beta/test/adexchangebuyer2/v2beta1_test.dart
@@ -90,14 +90,14 @@
   buildCounterAddDealAssociationRequest--;
 }
 
-buildUnnamed4160() {
+buildUnnamed3742() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4160(core.List<core.String> o) {
+checkUnnamed3742(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -108,7 +108,7 @@
   var o = new api.AppContext();
   buildCounterAppContext++;
   if (buildCounterAppContext < 3) {
-    o.appTypes = buildUnnamed4160();
+    o.appTypes = buildUnnamed3742();
   }
   buildCounterAppContext--;
   return o;
@@ -117,19 +117,19 @@
 checkAppContext(api.AppContext o) {
   buildCounterAppContext++;
   if (buildCounterAppContext < 3) {
-    checkUnnamed4160(o.appTypes);
+    checkUnnamed3742(o.appTypes);
   }
   buildCounterAppContext--;
 }
 
-buildUnnamed4161() {
+buildUnnamed3743() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4161(core.List<core.String> o) {
+checkUnnamed3743(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -140,7 +140,7 @@
   var o = new api.AuctionContext();
   buildCounterAuctionContext++;
   if (buildCounterAuctionContext < 3) {
-    o.auctionTypes = buildUnnamed4161();
+    o.auctionTypes = buildUnnamed3743();
   }
   buildCounterAuctionContext--;
   return o;
@@ -149,7 +149,7 @@
 checkAuctionContext(api.AuctionContext o) {
   buildCounterAuctionContext++;
   if (buildCounterAuctionContext < 3) {
-    checkUnnamed4161(o.auctionTypes);
+    checkUnnamed3743(o.auctionTypes);
   }
   buildCounterAuctionContext--;
 }
@@ -314,27 +314,27 @@
   buildCounterClientUserInvitation--;
 }
 
-buildUnnamed4162() {
+buildUnnamed3744() {
   var o = new core.List<api.ServingContext>();
   o.add(buildServingContext());
   o.add(buildServingContext());
   return o;
 }
 
-checkUnnamed4162(core.List<api.ServingContext> o) {
+checkUnnamed3744(core.List<api.ServingContext> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServingContext(o[0]);
   checkServingContext(o[1]);
 }
 
-buildUnnamed4163() {
+buildUnnamed3745() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4163(core.List<core.String> o) {
+checkUnnamed3745(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -345,8 +345,8 @@
   var o = new api.Correction();
   buildCounterCorrection++;
   if (buildCounterCorrection < 3) {
-    o.contexts = buildUnnamed4162();
-    o.details = buildUnnamed4163();
+    o.contexts = buildUnnamed3744();
+    o.details = buildUnnamed3745();
     o.type = "foo";
   }
   buildCounterCorrection--;
@@ -356,164 +356,164 @@
 checkCorrection(api.Correction o) {
   buildCounterCorrection++;
   if (buildCounterCorrection < 3) {
-    checkUnnamed4162(o.contexts);
-    checkUnnamed4163(o.details);
+    checkUnnamed3744(o.contexts);
+    checkUnnamed3745(o.details);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterCorrection--;
 }
 
-buildUnnamed4164() {
+buildUnnamed3746() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4164(core.List<core.String> o) {
+checkUnnamed3746(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4165() {
+buildUnnamed3747() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4165(core.List<core.String> o) {
+checkUnnamed3747(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4166() {
+buildUnnamed3748() {
   var o = new core.List<api.Correction>();
   o.add(buildCorrection());
   o.add(buildCorrection());
   return o;
 }
 
-checkUnnamed4166(core.List<api.Correction> o) {
+checkUnnamed3748(core.List<api.Correction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCorrection(o[0]);
   checkCorrection(o[1]);
 }
 
-buildUnnamed4167() {
+buildUnnamed3749() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4167(core.List<core.String> o) {
+checkUnnamed3749(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4168() {
+buildUnnamed3750() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4168(core.List<core.String> o) {
+checkUnnamed3750(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4169() {
+buildUnnamed3751() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4169(core.List<core.String> o) {
+checkUnnamed3751(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4170() {
+buildUnnamed3752() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed4170(core.List<core.int> o) {
+checkUnnamed3752(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed4171() {
+buildUnnamed3753() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed4171(core.List<core.int> o) {
+checkUnnamed3753(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed4172() {
+buildUnnamed3754() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4172(core.List<core.String> o) {
+checkUnnamed3754(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4173() {
+buildUnnamed3755() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4173(core.List<core.String> o) {
+checkUnnamed3755(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4174() {
+buildUnnamed3756() {
   var o = new core.List<api.ServingRestriction>();
   o.add(buildServingRestriction());
   o.add(buildServingRestriction());
   return o;
 }
 
-checkUnnamed4174(core.List<api.ServingRestriction> o) {
+checkUnnamed3756(core.List<api.ServingRestriction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServingRestriction(o[0]);
   checkServingRestriction(o[1]);
 }
 
-buildUnnamed4175() {
+buildUnnamed3757() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed4175(core.List<core.int> o) {
+checkUnnamed3757(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -529,24 +529,24 @@
     o.advertiserName = "foo";
     o.agencyId = "foo";
     o.apiUpdateTime = "foo";
-    o.attributes = buildUnnamed4164();
-    o.clickThroughUrls = buildUnnamed4165();
-    o.corrections = buildUnnamed4166();
+    o.attributes = buildUnnamed3746();
+    o.clickThroughUrls = buildUnnamed3747();
+    o.corrections = buildUnnamed3748();
     o.creativeId = "foo";
     o.dealsStatus = "foo";
-    o.detectedAdvertiserIds = buildUnnamed4167();
-    o.detectedDomains = buildUnnamed4168();
-    o.detectedLanguages = buildUnnamed4169();
-    o.detectedProductCategories = buildUnnamed4170();
-    o.detectedSensitiveCategories = buildUnnamed4171();
+    o.detectedAdvertiserIds = buildUnnamed3749();
+    o.detectedDomains = buildUnnamed3750();
+    o.detectedLanguages = buildUnnamed3751();
+    o.detectedProductCategories = buildUnnamed3752();
+    o.detectedSensitiveCategories = buildUnnamed3753();
     o.filteringStats = buildFilteringStats();
     o.html = buildHtmlContent();
-    o.impressionTrackingUrls = buildUnnamed4172();
+    o.impressionTrackingUrls = buildUnnamed3754();
     o.native = buildNativeContent();
     o.openAuctionStatus = "foo";
-    o.restrictedCategories = buildUnnamed4173();
-    o.servingRestrictions = buildUnnamed4174();
-    o.vendorIds = buildUnnamed4175();
+    o.restrictedCategories = buildUnnamed3755();
+    o.servingRestrictions = buildUnnamed3756();
+    o.vendorIds = buildUnnamed3757();
     o.version = 42;
     o.video = buildVideoContent();
   }
@@ -562,24 +562,24 @@
     unittest.expect(o.advertiserName, unittest.equals('foo'));
     unittest.expect(o.agencyId, unittest.equals('foo'));
     unittest.expect(o.apiUpdateTime, unittest.equals('foo'));
-    checkUnnamed4164(o.attributes);
-    checkUnnamed4165(o.clickThroughUrls);
-    checkUnnamed4166(o.corrections);
+    checkUnnamed3746(o.attributes);
+    checkUnnamed3747(o.clickThroughUrls);
+    checkUnnamed3748(o.corrections);
     unittest.expect(o.creativeId, unittest.equals('foo'));
     unittest.expect(o.dealsStatus, unittest.equals('foo'));
-    checkUnnamed4167(o.detectedAdvertiserIds);
-    checkUnnamed4168(o.detectedDomains);
-    checkUnnamed4169(o.detectedLanguages);
-    checkUnnamed4170(o.detectedProductCategories);
-    checkUnnamed4171(o.detectedSensitiveCategories);
+    checkUnnamed3749(o.detectedAdvertiserIds);
+    checkUnnamed3750(o.detectedDomains);
+    checkUnnamed3751(o.detectedLanguages);
+    checkUnnamed3752(o.detectedProductCategories);
+    checkUnnamed3753(o.detectedSensitiveCategories);
     checkFilteringStats(o.filteringStats);
     checkHtmlContent(o.html);
-    checkUnnamed4172(o.impressionTrackingUrls);
+    checkUnnamed3754(o.impressionTrackingUrls);
     checkNativeContent(o.native);
     unittest.expect(o.openAuctionStatus, unittest.equals('foo'));
-    checkUnnamed4173(o.restrictedCategories);
-    checkUnnamed4174(o.servingRestrictions);
-    checkUnnamed4175(o.vendorIds);
+    checkUnnamed3755(o.restrictedCategories);
+    checkUnnamed3756(o.servingRestrictions);
+    checkUnnamed3757(o.vendorIds);
     unittest.expect(o.version, unittest.equals(42));
     checkVideoContent(o.video);
   }
@@ -655,14 +655,14 @@
   buildCounterDate--;
 }
 
-buildUnnamed4176() {
+buildUnnamed3758() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4176(core.List<core.String> o) {
+checkUnnamed3758(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -673,7 +673,7 @@
   var o = new api.Disapproval();
   buildCounterDisapproval++;
   if (buildCounterDisapproval < 3) {
-    o.details = buildUnnamed4176();
+    o.details = buildUnnamed3758();
     o.reason = "foo";
   }
   buildCounterDisapproval--;
@@ -683,7 +683,7 @@
 checkDisapproval(api.Disapproval o) {
   buildCounterDisapproval++;
   if (buildCounterDisapproval < 3) {
-    checkUnnamed4176(o.details);
+    checkUnnamed3758(o.details);
     unittest.expect(o.reason, unittest.equals('foo'));
   }
   buildCounterDisapproval--;
@@ -704,40 +704,40 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed4177() {
+buildUnnamed3759() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4177(core.List<core.String> o) {
+checkUnnamed3759(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4178() {
+buildUnnamed3760() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4178(core.List<core.String> o) {
+checkUnnamed3760(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4179() {
+buildUnnamed3761() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed4179(core.List<core.int> o) {
+checkUnnamed3761(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -753,12 +753,12 @@
     o.dealId = "foo";
     o.environment = "foo";
     o.format = "foo";
-    o.formats = buildUnnamed4177();
+    o.formats = buildUnnamed3759();
     o.name = "foo";
-    o.platforms = buildUnnamed4178();
+    o.platforms = buildUnnamed3760();
     o.realtimeTimeRange = buildRealtimeTimeRange();
     o.relativeDateRange = buildRelativeDateRange();
-    o.sellerNetworkIds = buildUnnamed4179();
+    o.sellerNetworkIds = buildUnnamed3761();
     o.timeSeriesGranularity = "foo";
   }
   buildCounterFilterSet--;
@@ -773,12 +773,12 @@
     unittest.expect(o.dealId, unittest.equals('foo'));
     unittest.expect(o.environment, unittest.equals('foo'));
     unittest.expect(o.format, unittest.equals('foo'));
-    checkUnnamed4177(o.formats);
+    checkUnnamed3759(o.formats);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4178(o.platforms);
+    checkUnnamed3760(o.platforms);
     checkRealtimeTimeRange(o.realtimeTimeRange);
     checkRelativeDateRange(o.relativeDateRange);
-    checkUnnamed4179(o.sellerNetworkIds);
+    checkUnnamed3761(o.sellerNetworkIds);
     unittest.expect(o.timeSeriesGranularity, unittest.equals('foo'));
   }
   buildCounterFilterSet--;
@@ -830,14 +830,14 @@
   buildCounterFilteredBidDetailRow--;
 }
 
-buildUnnamed4180() {
+buildUnnamed3762() {
   var o = new core.List<api.Reason>();
   o.add(buildReason());
   o.add(buildReason());
   return o;
 }
 
-checkUnnamed4180(core.List<api.Reason> o) {
+checkUnnamed3762(core.List<api.Reason> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReason(o[0]);
   checkReason(o[1]);
@@ -849,7 +849,7 @@
   buildCounterFilteringStats++;
   if (buildCounterFilteringStats < 3) {
     o.date = buildDate();
-    o.reasons = buildUnnamed4180();
+    o.reasons = buildUnnamed3762();
   }
   buildCounterFilteringStats--;
   return o;
@@ -859,7 +859,7 @@
   buildCounterFilteringStats++;
   if (buildCounterFilteringStats < 3) {
     checkDate(o.date);
-    checkUnnamed4180(o.reasons);
+    checkUnnamed3762(o.reasons);
   }
   buildCounterFilteringStats--;
 }
@@ -939,14 +939,14 @@
   buildCounterImpressionMetricsRow--;
 }
 
-buildUnnamed4181() {
+buildUnnamed3763() {
   var o = new core.List<api.BidMetricsRow>();
   o.add(buildBidMetricsRow());
   o.add(buildBidMetricsRow());
   return o;
 }
 
-checkUnnamed4181(core.List<api.BidMetricsRow> o) {
+checkUnnamed3763(core.List<api.BidMetricsRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBidMetricsRow(o[0]);
   checkBidMetricsRow(o[1]);
@@ -957,7 +957,7 @@
   var o = new api.ListBidMetricsResponse();
   buildCounterListBidMetricsResponse++;
   if (buildCounterListBidMetricsResponse < 3) {
-    o.bidMetricsRows = buildUnnamed4181();
+    o.bidMetricsRows = buildUnnamed3763();
     o.nextPageToken = "foo";
   }
   buildCounterListBidMetricsResponse--;
@@ -967,20 +967,20 @@
 checkListBidMetricsResponse(api.ListBidMetricsResponse o) {
   buildCounterListBidMetricsResponse++;
   if (buildCounterListBidMetricsResponse < 3) {
-    checkUnnamed4181(o.bidMetricsRows);
+    checkUnnamed3763(o.bidMetricsRows);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListBidMetricsResponse--;
 }
 
-buildUnnamed4182() {
+buildUnnamed3764() {
   var o = new core.List<api.CalloutStatusRow>();
   o.add(buildCalloutStatusRow());
   o.add(buildCalloutStatusRow());
   return o;
 }
 
-checkUnnamed4182(core.List<api.CalloutStatusRow> o) {
+checkUnnamed3764(core.List<api.CalloutStatusRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCalloutStatusRow(o[0]);
   checkCalloutStatusRow(o[1]);
@@ -991,7 +991,7 @@
   var o = new api.ListBidResponseErrorsResponse();
   buildCounterListBidResponseErrorsResponse++;
   if (buildCounterListBidResponseErrorsResponse < 3) {
-    o.calloutStatusRows = buildUnnamed4182();
+    o.calloutStatusRows = buildUnnamed3764();
     o.nextPageToken = "foo";
   }
   buildCounterListBidResponseErrorsResponse--;
@@ -1001,20 +1001,20 @@
 checkListBidResponseErrorsResponse(api.ListBidResponseErrorsResponse o) {
   buildCounterListBidResponseErrorsResponse++;
   if (buildCounterListBidResponseErrorsResponse < 3) {
-    checkUnnamed4182(o.calloutStatusRows);
+    checkUnnamed3764(o.calloutStatusRows);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListBidResponseErrorsResponse--;
 }
 
-buildUnnamed4183() {
+buildUnnamed3765() {
   var o = new core.List<api.BidResponseWithoutBidsStatusRow>();
   o.add(buildBidResponseWithoutBidsStatusRow());
   o.add(buildBidResponseWithoutBidsStatusRow());
   return o;
 }
 
-checkUnnamed4183(core.List<api.BidResponseWithoutBidsStatusRow> o) {
+checkUnnamed3765(core.List<api.BidResponseWithoutBidsStatusRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBidResponseWithoutBidsStatusRow(o[0]);
   checkBidResponseWithoutBidsStatusRow(o[1]);
@@ -1025,7 +1025,7 @@
   var o = new api.ListBidResponsesWithoutBidsResponse();
   buildCounterListBidResponsesWithoutBidsResponse++;
   if (buildCounterListBidResponsesWithoutBidsResponse < 3) {
-    o.bidResponseWithoutBidsStatusRows = buildUnnamed4183();
+    o.bidResponseWithoutBidsStatusRows = buildUnnamed3765();
     o.nextPageToken = "foo";
   }
   buildCounterListBidResponsesWithoutBidsResponse--;
@@ -1036,20 +1036,20 @@
     api.ListBidResponsesWithoutBidsResponse o) {
   buildCounterListBidResponsesWithoutBidsResponse++;
   if (buildCounterListBidResponsesWithoutBidsResponse < 3) {
-    checkUnnamed4183(o.bidResponseWithoutBidsStatusRows);
+    checkUnnamed3765(o.bidResponseWithoutBidsStatusRows);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListBidResponsesWithoutBidsResponse--;
 }
 
-buildUnnamed4184() {
+buildUnnamed3766() {
   var o = new core.List<api.ClientUserInvitation>();
   o.add(buildClientUserInvitation());
   o.add(buildClientUserInvitation());
   return o;
 }
 
-checkUnnamed4184(core.List<api.ClientUserInvitation> o) {
+checkUnnamed3766(core.List<api.ClientUserInvitation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClientUserInvitation(o[0]);
   checkClientUserInvitation(o[1]);
@@ -1060,7 +1060,7 @@
   var o = new api.ListClientUserInvitationsResponse();
   buildCounterListClientUserInvitationsResponse++;
   if (buildCounterListClientUserInvitationsResponse < 3) {
-    o.invitations = buildUnnamed4184();
+    o.invitations = buildUnnamed3766();
     o.nextPageToken = "foo";
   }
   buildCounterListClientUserInvitationsResponse--;
@@ -1071,20 +1071,20 @@
     api.ListClientUserInvitationsResponse o) {
   buildCounterListClientUserInvitationsResponse++;
   if (buildCounterListClientUserInvitationsResponse < 3) {
-    checkUnnamed4184(o.invitations);
+    checkUnnamed3766(o.invitations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListClientUserInvitationsResponse--;
 }
 
-buildUnnamed4185() {
+buildUnnamed3767() {
   var o = new core.List<api.ClientUser>();
   o.add(buildClientUser());
   o.add(buildClientUser());
   return o;
 }
 
-checkUnnamed4185(core.List<api.ClientUser> o) {
+checkUnnamed3767(core.List<api.ClientUser> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClientUser(o[0]);
   checkClientUser(o[1]);
@@ -1096,7 +1096,7 @@
   buildCounterListClientUsersResponse++;
   if (buildCounterListClientUsersResponse < 3) {
     o.nextPageToken = "foo";
-    o.users = buildUnnamed4185();
+    o.users = buildUnnamed3767();
   }
   buildCounterListClientUsersResponse--;
   return o;
@@ -1106,19 +1106,19 @@
   buildCounterListClientUsersResponse++;
   if (buildCounterListClientUsersResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4185(o.users);
+    checkUnnamed3767(o.users);
   }
   buildCounterListClientUsersResponse--;
 }
 
-buildUnnamed4186() {
+buildUnnamed3768() {
   var o = new core.List<api.Client>();
   o.add(buildClient());
   o.add(buildClient());
   return o;
 }
 
-checkUnnamed4186(core.List<api.Client> o) {
+checkUnnamed3768(core.List<api.Client> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClient(o[0]);
   checkClient(o[1]);
@@ -1129,7 +1129,7 @@
   var o = new api.ListClientsResponse();
   buildCounterListClientsResponse++;
   if (buildCounterListClientsResponse < 3) {
-    o.clients = buildUnnamed4186();
+    o.clients = buildUnnamed3768();
     o.nextPageToken = "foo";
   }
   buildCounterListClientsResponse--;
@@ -1139,20 +1139,20 @@
 checkListClientsResponse(api.ListClientsResponse o) {
   buildCounterListClientsResponse++;
   if (buildCounterListClientsResponse < 3) {
-    checkUnnamed4186(o.clients);
+    checkUnnamed3768(o.clients);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListClientsResponse--;
 }
 
-buildUnnamed4187() {
+buildUnnamed3769() {
   var o = new core.List<api.FilteredBidCreativeRow>();
   o.add(buildFilteredBidCreativeRow());
   o.add(buildFilteredBidCreativeRow());
   return o;
 }
 
-checkUnnamed4187(core.List<api.FilteredBidCreativeRow> o) {
+checkUnnamed3769(core.List<api.FilteredBidCreativeRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilteredBidCreativeRow(o[0]);
   checkFilteredBidCreativeRow(o[1]);
@@ -1163,7 +1163,7 @@
   var o = new api.ListCreativeStatusBreakdownByCreativeResponse();
   buildCounterListCreativeStatusBreakdownByCreativeResponse++;
   if (buildCounterListCreativeStatusBreakdownByCreativeResponse < 3) {
-    o.filteredBidCreativeRows = buildUnnamed4187();
+    o.filteredBidCreativeRows = buildUnnamed3769();
     o.nextPageToken = "foo";
   }
   buildCounterListCreativeStatusBreakdownByCreativeResponse--;
@@ -1174,20 +1174,20 @@
     api.ListCreativeStatusBreakdownByCreativeResponse o) {
   buildCounterListCreativeStatusBreakdownByCreativeResponse++;
   if (buildCounterListCreativeStatusBreakdownByCreativeResponse < 3) {
-    checkUnnamed4187(o.filteredBidCreativeRows);
+    checkUnnamed3769(o.filteredBidCreativeRows);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListCreativeStatusBreakdownByCreativeResponse--;
 }
 
-buildUnnamed4188() {
+buildUnnamed3770() {
   var o = new core.List<api.FilteredBidDetailRow>();
   o.add(buildFilteredBidDetailRow());
   o.add(buildFilteredBidDetailRow());
   return o;
 }
 
-checkUnnamed4188(core.List<api.FilteredBidDetailRow> o) {
+checkUnnamed3770(core.List<api.FilteredBidDetailRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilteredBidDetailRow(o[0]);
   checkFilteredBidDetailRow(o[1]);
@@ -1199,7 +1199,7 @@
   buildCounterListCreativeStatusBreakdownByDetailResponse++;
   if (buildCounterListCreativeStatusBreakdownByDetailResponse < 3) {
     o.detailType = "foo";
-    o.filteredBidDetailRows = buildUnnamed4188();
+    o.filteredBidDetailRows = buildUnnamed3770();
     o.nextPageToken = "foo";
   }
   buildCounterListCreativeStatusBreakdownByDetailResponse--;
@@ -1211,20 +1211,20 @@
   buildCounterListCreativeStatusBreakdownByDetailResponse++;
   if (buildCounterListCreativeStatusBreakdownByDetailResponse < 3) {
     unittest.expect(o.detailType, unittest.equals('foo'));
-    checkUnnamed4188(o.filteredBidDetailRows);
+    checkUnnamed3770(o.filteredBidDetailRows);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListCreativeStatusBreakdownByDetailResponse--;
 }
 
-buildUnnamed4189() {
+buildUnnamed3771() {
   var o = new core.List<api.Creative>();
   o.add(buildCreative());
   o.add(buildCreative());
   return o;
 }
 
-checkUnnamed4189(core.List<api.Creative> o) {
+checkUnnamed3771(core.List<api.Creative> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreative(o[0]);
   checkCreative(o[1]);
@@ -1235,7 +1235,7 @@
   var o = new api.ListCreativesResponse();
   buildCounterListCreativesResponse++;
   if (buildCounterListCreativesResponse < 3) {
-    o.creatives = buildUnnamed4189();
+    o.creatives = buildUnnamed3771();
     o.nextPageToken = "foo";
   }
   buildCounterListCreativesResponse--;
@@ -1245,20 +1245,20 @@
 checkListCreativesResponse(api.ListCreativesResponse o) {
   buildCounterListCreativesResponse++;
   if (buildCounterListCreativesResponse < 3) {
-    checkUnnamed4189(o.creatives);
+    checkUnnamed3771(o.creatives);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListCreativesResponse--;
 }
 
-buildUnnamed4190() {
+buildUnnamed3772() {
   var o = new core.List<api.CreativeDealAssociation>();
   o.add(buildCreativeDealAssociation());
   o.add(buildCreativeDealAssociation());
   return o;
 }
 
-checkUnnamed4190(core.List<api.CreativeDealAssociation> o) {
+checkUnnamed3772(core.List<api.CreativeDealAssociation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeDealAssociation(o[0]);
   checkCreativeDealAssociation(o[1]);
@@ -1269,7 +1269,7 @@
   var o = new api.ListDealAssociationsResponse();
   buildCounterListDealAssociationsResponse++;
   if (buildCounterListDealAssociationsResponse < 3) {
-    o.associations = buildUnnamed4190();
+    o.associations = buildUnnamed3772();
     o.nextPageToken = "foo";
   }
   buildCounterListDealAssociationsResponse--;
@@ -1279,20 +1279,20 @@
 checkListDealAssociationsResponse(api.ListDealAssociationsResponse o) {
   buildCounterListDealAssociationsResponse++;
   if (buildCounterListDealAssociationsResponse < 3) {
-    checkUnnamed4190(o.associations);
+    checkUnnamed3772(o.associations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDealAssociationsResponse--;
 }
 
-buildUnnamed4191() {
+buildUnnamed3773() {
   var o = new core.List<api.FilterSet>();
   o.add(buildFilterSet());
   o.add(buildFilterSet());
   return o;
 }
 
-checkUnnamed4191(core.List<api.FilterSet> o) {
+checkUnnamed3773(core.List<api.FilterSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilterSet(o[0]);
   checkFilterSet(o[1]);
@@ -1303,7 +1303,7 @@
   var o = new api.ListFilterSetsResponse();
   buildCounterListFilterSetsResponse++;
   if (buildCounterListFilterSetsResponse < 3) {
-    o.filterSets = buildUnnamed4191();
+    o.filterSets = buildUnnamed3773();
     o.nextPageToken = "foo";
   }
   buildCounterListFilterSetsResponse--;
@@ -1313,20 +1313,20 @@
 checkListFilterSetsResponse(api.ListFilterSetsResponse o) {
   buildCounterListFilterSetsResponse++;
   if (buildCounterListFilterSetsResponse < 3) {
-    checkUnnamed4191(o.filterSets);
+    checkUnnamed3773(o.filterSets);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListFilterSetsResponse--;
 }
 
-buildUnnamed4192() {
+buildUnnamed3774() {
   var o = new core.List<api.CalloutStatusRow>();
   o.add(buildCalloutStatusRow());
   o.add(buildCalloutStatusRow());
   return o;
 }
 
-checkUnnamed4192(core.List<api.CalloutStatusRow> o) {
+checkUnnamed3774(core.List<api.CalloutStatusRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCalloutStatusRow(o[0]);
   checkCalloutStatusRow(o[1]);
@@ -1337,7 +1337,7 @@
   var o = new api.ListFilteredBidRequestsResponse();
   buildCounterListFilteredBidRequestsResponse++;
   if (buildCounterListFilteredBidRequestsResponse < 3) {
-    o.calloutStatusRows = buildUnnamed4192();
+    o.calloutStatusRows = buildUnnamed3774();
     o.nextPageToken = "foo";
   }
   buildCounterListFilteredBidRequestsResponse--;
@@ -1347,20 +1347,20 @@
 checkListFilteredBidRequestsResponse(api.ListFilteredBidRequestsResponse o) {
   buildCounterListFilteredBidRequestsResponse++;
   if (buildCounterListFilteredBidRequestsResponse < 3) {
-    checkUnnamed4192(o.calloutStatusRows);
+    checkUnnamed3774(o.calloutStatusRows);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListFilteredBidRequestsResponse--;
 }
 
-buildUnnamed4193() {
+buildUnnamed3775() {
   var o = new core.List<api.CreativeStatusRow>();
   o.add(buildCreativeStatusRow());
   o.add(buildCreativeStatusRow());
   return o;
 }
 
-checkUnnamed4193(core.List<api.CreativeStatusRow> o) {
+checkUnnamed3775(core.List<api.CreativeStatusRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeStatusRow(o[0]);
   checkCreativeStatusRow(o[1]);
@@ -1371,7 +1371,7 @@
   var o = new api.ListFilteredBidsResponse();
   buildCounterListFilteredBidsResponse++;
   if (buildCounterListFilteredBidsResponse < 3) {
-    o.creativeStatusRows = buildUnnamed4193();
+    o.creativeStatusRows = buildUnnamed3775();
     o.nextPageToken = "foo";
   }
   buildCounterListFilteredBidsResponse--;
@@ -1381,20 +1381,20 @@
 checkListFilteredBidsResponse(api.ListFilteredBidsResponse o) {
   buildCounterListFilteredBidsResponse++;
   if (buildCounterListFilteredBidsResponse < 3) {
-    checkUnnamed4193(o.creativeStatusRows);
+    checkUnnamed3775(o.creativeStatusRows);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListFilteredBidsResponse--;
 }
 
-buildUnnamed4194() {
+buildUnnamed3776() {
   var o = new core.List<api.ImpressionMetricsRow>();
   o.add(buildImpressionMetricsRow());
   o.add(buildImpressionMetricsRow());
   return o;
 }
 
-checkUnnamed4194(core.List<api.ImpressionMetricsRow> o) {
+checkUnnamed3776(core.List<api.ImpressionMetricsRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImpressionMetricsRow(o[0]);
   checkImpressionMetricsRow(o[1]);
@@ -1405,7 +1405,7 @@
   var o = new api.ListImpressionMetricsResponse();
   buildCounterListImpressionMetricsResponse++;
   if (buildCounterListImpressionMetricsResponse < 3) {
-    o.impressionMetricsRows = buildUnnamed4194();
+    o.impressionMetricsRows = buildUnnamed3776();
     o.nextPageToken = "foo";
   }
   buildCounterListImpressionMetricsResponse--;
@@ -1415,20 +1415,20 @@
 checkListImpressionMetricsResponse(api.ListImpressionMetricsResponse o) {
   buildCounterListImpressionMetricsResponse++;
   if (buildCounterListImpressionMetricsResponse < 3) {
-    checkUnnamed4194(o.impressionMetricsRows);
+    checkUnnamed3776(o.impressionMetricsRows);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListImpressionMetricsResponse--;
 }
 
-buildUnnamed4195() {
+buildUnnamed3777() {
   var o = new core.List<api.CreativeStatusRow>();
   o.add(buildCreativeStatusRow());
   o.add(buildCreativeStatusRow());
   return o;
 }
 
-checkUnnamed4195(core.List<api.CreativeStatusRow> o) {
+checkUnnamed3777(core.List<api.CreativeStatusRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCreativeStatusRow(o[0]);
   checkCreativeStatusRow(o[1]);
@@ -1439,7 +1439,7 @@
   var o = new api.ListLosingBidsResponse();
   buildCounterListLosingBidsResponse++;
   if (buildCounterListLosingBidsResponse < 3) {
-    o.creativeStatusRows = buildUnnamed4195();
+    o.creativeStatusRows = buildUnnamed3777();
     o.nextPageToken = "foo";
   }
   buildCounterListLosingBidsResponse--;
@@ -1449,20 +1449,20 @@
 checkListLosingBidsResponse(api.ListLosingBidsResponse o) {
   buildCounterListLosingBidsResponse++;
   if (buildCounterListLosingBidsResponse < 3) {
-    checkUnnamed4195(o.creativeStatusRows);
+    checkUnnamed3777(o.creativeStatusRows);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLosingBidsResponse--;
 }
 
-buildUnnamed4196() {
+buildUnnamed3778() {
   var o = new core.List<api.NonBillableWinningBidStatusRow>();
   o.add(buildNonBillableWinningBidStatusRow());
   o.add(buildNonBillableWinningBidStatusRow());
   return o;
 }
 
-checkUnnamed4196(core.List<api.NonBillableWinningBidStatusRow> o) {
+checkUnnamed3778(core.List<api.NonBillableWinningBidStatusRow> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNonBillableWinningBidStatusRow(o[0]);
   checkNonBillableWinningBidStatusRow(o[1]);
@@ -1474,7 +1474,7 @@
   buildCounterListNonBillableWinningBidsResponse++;
   if (buildCounterListNonBillableWinningBidsResponse < 3) {
     o.nextPageToken = "foo";
-    o.nonBillableWinningBidStatusRows = buildUnnamed4196();
+    o.nonBillableWinningBidStatusRows = buildUnnamed3778();
   }
   buildCounterListNonBillableWinningBidsResponse--;
   return o;
@@ -1485,19 +1485,19 @@
   buildCounterListNonBillableWinningBidsResponse++;
   if (buildCounterListNonBillableWinningBidsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4196(o.nonBillableWinningBidStatusRows);
+    checkUnnamed3778(o.nonBillableWinningBidStatusRows);
   }
   buildCounterListNonBillableWinningBidsResponse--;
 }
 
-buildUnnamed4197() {
+buildUnnamed3779() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed4197(core.List<core.int> o) {
+checkUnnamed3779(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -1508,7 +1508,7 @@
   var o = new api.LocationContext();
   buildCounterLocationContext++;
   if (buildCounterLocationContext < 3) {
-    o.geoCriteriaIds = buildUnnamed4197();
+    o.geoCriteriaIds = buildUnnamed3779();
   }
   buildCounterLocationContext--;
   return o;
@@ -1517,7 +1517,7 @@
 checkLocationContext(api.LocationContext o) {
   buildCounterLocationContext++;
   if (buildCounterLocationContext < 3) {
-    checkUnnamed4197(o.geoCriteriaIds);
+    checkUnnamed3779(o.geoCriteriaIds);
   }
   buildCounterLocationContext--;
 }
@@ -1609,14 +1609,14 @@
   buildCounterNonBillableWinningBidStatusRow--;
 }
 
-buildUnnamed4198() {
+buildUnnamed3780() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4198(core.List<core.String> o) {
+checkUnnamed3780(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1627,7 +1627,7 @@
   var o = new api.PlatformContext();
   buildCounterPlatformContext++;
   if (buildCounterPlatformContext < 3) {
-    o.platforms = buildUnnamed4198();
+    o.platforms = buildUnnamed3780();
   }
   buildCounterPlatformContext--;
   return o;
@@ -1636,7 +1636,7 @@
 checkPlatformContext(api.PlatformContext o) {
   buildCounterPlatformContext++;
   if (buildCounterPlatformContext < 3) {
-    checkUnnamed4198(o.platforms);
+    checkUnnamed3780(o.platforms);
   }
   buildCounterPlatformContext--;
 }
@@ -1740,14 +1740,14 @@
   buildCounterRowDimensions--;
 }
 
-buildUnnamed4199() {
+buildUnnamed3781() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4199(core.List<core.String> o) {
+checkUnnamed3781(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1758,7 +1758,7 @@
   var o = new api.SecurityContext();
   buildCounterSecurityContext++;
   if (buildCounterSecurityContext < 3) {
-    o.securities = buildUnnamed4199();
+    o.securities = buildUnnamed3781();
   }
   buildCounterSecurityContext--;
   return o;
@@ -1767,7 +1767,7 @@
 checkSecurityContext(api.SecurityContext o) {
   buildCounterSecurityContext++;
   if (buildCounterSecurityContext < 3) {
-    checkUnnamed4199(o.securities);
+    checkUnnamed3781(o.securities);
   }
   buildCounterSecurityContext--;
 }
@@ -1801,27 +1801,27 @@
   buildCounterServingContext--;
 }
 
-buildUnnamed4200() {
+buildUnnamed3782() {
   var o = new core.List<api.ServingContext>();
   o.add(buildServingContext());
   o.add(buildServingContext());
   return o;
 }
 
-checkUnnamed4200(core.List<api.ServingContext> o) {
+checkUnnamed3782(core.List<api.ServingContext> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServingContext(o[0]);
   checkServingContext(o[1]);
 }
 
-buildUnnamed4201() {
+buildUnnamed3783() {
   var o = new core.List<api.Disapproval>();
   o.add(buildDisapproval());
   o.add(buildDisapproval());
   return o;
 }
 
-checkUnnamed4201(core.List<api.Disapproval> o) {
+checkUnnamed3783(core.List<api.Disapproval> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisapproval(o[0]);
   checkDisapproval(o[1]);
@@ -1832,8 +1832,8 @@
   var o = new api.ServingRestriction();
   buildCounterServingRestriction++;
   if (buildCounterServingRestriction < 3) {
-    o.contexts = buildUnnamed4200();
-    o.disapprovalReasons = buildUnnamed4201();
+    o.contexts = buildUnnamed3782();
+    o.disapprovalReasons = buildUnnamed3783();
     o.status = "foo";
   }
   buildCounterServingRestriction--;
@@ -1843,8 +1843,8 @@
 checkServingRestriction(api.ServingRestriction o) {
   buildCounterServingRestriction++;
   if (buildCounterServingRestriction < 3) {
-    checkUnnamed4200(o.contexts);
-    checkUnnamed4201(o.disapprovalReasons);
+    checkUnnamed3782(o.contexts);
+    checkUnnamed3783(o.disapprovalReasons);
     unittest.expect(o.status, unittest.equals('foo'));
   }
   buildCounterServingRestriction--;
@@ -2446,7 +2446,7 @@
       }), true);
       res
           .create(arg_request, arg_accountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Client response) {
+          .then(unittest.expectAsync1(((response) {
         checkClient(response);
       })));
     });
@@ -2510,7 +2510,7 @@
       }), true);
       res
           .get(arg_accountId, arg_clientAccountId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Client response) {
+          .then(unittest.expectAsync1(((response) {
         checkClient(response);
       })));
     });
@@ -2583,7 +2583,7 @@
               partnerClientId: arg_partnerClientId,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListClientsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListClientsResponse(response);
       })));
     });
@@ -2652,7 +2652,7 @@
       res
           .update(arg_request, arg_accountId, arg_clientAccountId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Client response) {
+          .then(unittest.expectAsync1(((response) {
         checkClient(response);
       })));
     });
@@ -2729,7 +2729,7 @@
       res
           .create(arg_request, arg_accountId, arg_clientAccountId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ClientUserInvitation response) {
+          .then(unittest.expectAsync1(((response) {
         checkClientUserInvitation(response);
       })));
     });
@@ -2804,7 +2804,7 @@
       res
           .get(arg_accountId, arg_clientAccountId, arg_invitationId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ClientUserInvitation response) {
+          .then(unittest.expectAsync1(((response) {
         checkClientUserInvitation(response);
       })));
     });
@@ -2884,8 +2884,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListClientUserInvitationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListClientUserInvitationsResponse(response);
       })));
     });
@@ -2962,7 +2961,7 @@
       res
           .get(arg_accountId, arg_clientAccountId, arg_userId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ClientUser response) {
+          .then(unittest.expectAsync1(((response) {
         checkClientUser(response);
       })));
     });
@@ -3041,7 +3040,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListClientUsersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListClientUsersResponse(response);
       })));
     });
@@ -3120,7 +3119,7 @@
       res
           .update(arg_request, arg_accountId, arg_clientAccountId, arg_userId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ClientUser response) {
+          .then(unittest.expectAsync1(((response) {
         checkClientUser(response);
       })));
     });
@@ -3195,7 +3194,7 @@
               accountId1: arg_accountId1,
               duplicateIdMode: arg_duplicateIdMode,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -3259,7 +3258,7 @@
       }), true);
       res
           .get(arg_accountId, arg_creativeId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -3331,7 +3330,7 @@
               pageSize: arg_pageSize,
               query: arg_query,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListCreativesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCreativesResponse(response);
       })));
     });
@@ -3406,7 +3405,7 @@
       res
           .stopWatching(arg_request, arg_accountId, arg_creativeId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3478,7 +3477,7 @@
       res
           .update(arg_request, arg_accountId, arg_creativeId,
               accountId1: arg_accountId1, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Creative response) {
+          .then(unittest.expectAsync1(((response) {
         checkCreative(response);
       })));
     });
@@ -3553,7 +3552,7 @@
       res
           .watch(arg_request, arg_accountId, arg_creativeId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3629,7 +3628,7 @@
       }), true);
       res
           .add(arg_request, arg_accountId, arg_creativeId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3711,8 +3710,7 @@
               query: arg_query,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListDealAssociationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDealAssociationsResponse(response);
       })));
     });
@@ -3787,7 +3785,7 @@
       res
           .remove(arg_request, arg_accountId, arg_creativeId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3849,7 +3847,7 @@
       res
           .create(arg_request, arg_ownerName,
               isTransient: arg_isTransient, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FilterSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkFilterSet(response);
       })));
     });
@@ -3901,7 +3899,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3953,7 +3951,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FilterSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkFilterSet(response);
       })));
     });
@@ -4014,7 +4012,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListFilterSetsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListFilterSetsResponse(response);
       })));
     });
@@ -4081,7 +4079,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListBidMetricsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListBidMetricsResponse(response);
       })));
     });
@@ -4149,8 +4147,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListBidResponseErrorsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListBidResponseErrorsResponse(response);
       })));
     });
@@ -4220,8 +4217,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ListBidResponsesWithoutBidsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListBidResponsesWithoutBidsResponse(response);
       })));
     });
@@ -4289,8 +4285,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListFilteredBidRequestsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListFilteredBidRequestsResponse(response);
       })));
     });
@@ -4358,7 +4353,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListFilteredBidsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListFilteredBidsResponse(response);
       })));
     });
@@ -4429,8 +4424,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ListCreativeStatusBreakdownByCreativeResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCreativeStatusBreakdownByCreativeResponse(response);
       })));
     });
@@ -4501,8 +4495,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ListCreativeStatusBreakdownByDetailResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCreativeStatusBreakdownByDetailResponse(response);
       })));
     });
@@ -4570,8 +4563,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListImpressionMetricsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListImpressionMetricsResponse(response);
       })));
     });
@@ -4638,7 +4630,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLosingBidsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLosingBidsResponse(response);
       })));
     });
@@ -4708,8 +4700,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListNonBillableWinningBidsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListNonBillableWinningBidsResponse(response);
       })));
     });
@@ -4771,7 +4762,7 @@
       res
           .create(arg_request, arg_ownerName,
               isTransient: arg_isTransient, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FilterSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkFilterSet(response);
       })));
     });
@@ -4823,7 +4814,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4875,7 +4866,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FilterSet response) {
+          .then(unittest.expectAsync1(((response) {
         checkFilterSet(response);
       })));
     });
@@ -4936,7 +4927,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListFilterSetsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListFilterSetsResponse(response);
       })));
     });
@@ -4999,7 +4990,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListBidMetricsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListBidMetricsResponse(response);
       })));
     });
@@ -5065,8 +5056,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListBidResponseErrorsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListBidResponseErrorsResponse(response);
       })));
     });
@@ -5134,8 +5124,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ListBidResponsesWithoutBidsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListBidResponsesWithoutBidsResponse(response);
       })));
     });
@@ -5202,8 +5191,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListFilteredBidRequestsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListFilteredBidRequestsResponse(response);
       })));
     });
@@ -5266,7 +5254,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListFilteredBidsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListFilteredBidsResponse(response);
       })));
     });
@@ -5336,8 +5324,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ListCreativeStatusBreakdownByCreativeResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCreativeStatusBreakdownByCreativeResponse(response);
       })));
     });
@@ -5407,8 +5394,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ListCreativeStatusBreakdownByDetailResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListCreativeStatusBreakdownByDetailResponse(response);
       })));
     });
@@ -5474,8 +5460,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListImpressionMetricsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListImpressionMetricsResponse(response);
       })));
     });
@@ -5538,7 +5523,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLosingBidsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLosingBidsResponse(response);
       })));
     });
@@ -5606,8 +5591,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListNonBillableWinningBidsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListNonBillableWinningBidsResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/appengine/v1beta4_test.dart b/generated/googleapis_beta/test/appengine/v1beta4_test.dart
index 994b678..78495d8 100644
--- a/generated/googleapis_beta/test/appengine/v1beta4_test.dart
+++ b/generated/googleapis_beta/test/appengine/v1beta4_test.dart
@@ -96,14 +96,14 @@
   buildCounterApiEndpointHandler--;
 }
 
-buildUnnamed4299() {
+buildUnnamed4411() {
   var o = new core.List<api.UrlDispatchRule>();
   o.add(buildUrlDispatchRule());
   o.add(buildUrlDispatchRule());
   return o;
 }
 
-checkUnnamed4299(core.List<api.UrlDispatchRule> o) {
+checkUnnamed4411(core.List<api.UrlDispatchRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlDispatchRule(o[0]);
   checkUrlDispatchRule(o[1]);
@@ -119,7 +119,7 @@
     o.defaultBucket = "foo";
     o.defaultCookieExpiration = "foo";
     o.defaultHostname = "foo";
-    o.dispatchRules = buildUnnamed4299();
+    o.dispatchRules = buildUnnamed4411();
     o.iap = buildIdentityAwareProxy();
     o.id = "foo";
     o.location = "foo";
@@ -137,7 +137,7 @@
     unittest.expect(o.defaultBucket, unittest.equals('foo'));
     unittest.expect(o.defaultCookieExpiration, unittest.equals('foo'));
     unittest.expect(o.defaultHostname, unittest.equals('foo'));
-    checkUnnamed4299(o.dispatchRules);
+    checkUnnamed4411(o.dispatchRules);
     checkIdentityAwareProxy(o.iap);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.location, unittest.equals('foo'));
@@ -305,27 +305,27 @@
   buildCounterDebugInstanceRequest--;
 }
 
-buildUnnamed4300() {
+buildUnnamed4412() {
   var o = new core.Map<core.String, api.FileInfo>();
   o["x"] = buildFileInfo();
   o["y"] = buildFileInfo();
   return o;
 }
 
-checkUnnamed4300(core.Map<core.String, api.FileInfo> o) {
+checkUnnamed4412(core.Map<core.String, api.FileInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFileInfo(o["x"]);
   checkFileInfo(o["y"]);
 }
 
-buildUnnamed4301() {
+buildUnnamed4413() {
   var o = new core.List<api.SourceReference>();
   o.add(buildSourceReference());
   o.add(buildSourceReference());
   return o;
 }
 
-checkUnnamed4301(core.List<api.SourceReference> o) {
+checkUnnamed4413(core.List<api.SourceReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSourceReference(o[0]);
   checkSourceReference(o[1]);
@@ -337,8 +337,8 @@
   buildCounterDeployment++;
   if (buildCounterDeployment < 3) {
     o.container = buildContainerInfo();
-    o.files = buildUnnamed4300();
-    o.sourceReferences = buildUnnamed4301();
+    o.files = buildUnnamed4412();
+    o.sourceReferences = buildUnnamed4413();
   }
   buildCounterDeployment--;
   return o;
@@ -348,8 +348,8 @@
   buildCounterDeployment++;
   if (buildCounterDeployment < 3) {
     checkContainerInfo(o.container);
-    checkUnnamed4300(o.files);
-    checkUnnamed4301(o.sourceReferences);
+    checkUnnamed4412(o.files);
+    checkUnnamed4413(o.sourceReferences);
   }
   buildCounterDeployment--;
 }
@@ -572,14 +572,14 @@
   buildCounterLibrary--;
 }
 
-buildUnnamed4302() {
+buildUnnamed4414() {
   var o = new core.List<api.Instance>();
   o.add(buildInstance());
   o.add(buildInstance());
   return o;
 }
 
-checkUnnamed4302(core.List<api.Instance> o) {
+checkUnnamed4414(core.List<api.Instance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstance(o[0]);
   checkInstance(o[1]);
@@ -590,7 +590,7 @@
   var o = new api.ListInstancesResponse();
   buildCounterListInstancesResponse++;
   if (buildCounterListInstancesResponse < 3) {
-    o.instances = buildUnnamed4302();
+    o.instances = buildUnnamed4414();
     o.nextPageToken = "foo";
   }
   buildCounterListInstancesResponse--;
@@ -600,20 +600,20 @@
 checkListInstancesResponse(api.ListInstancesResponse o) {
   buildCounterListInstancesResponse++;
   if (buildCounterListInstancesResponse < 3) {
-    checkUnnamed4302(o.instances);
+    checkUnnamed4414(o.instances);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListInstancesResponse--;
 }
 
-buildUnnamed4303() {
+buildUnnamed4415() {
   var o = new core.List<api.Location>();
   o.add(buildLocation());
   o.add(buildLocation());
   return o;
 }
 
-checkUnnamed4303(core.List<api.Location> o) {
+checkUnnamed4415(core.List<api.Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocation(o[0]);
   checkLocation(o[1]);
@@ -624,7 +624,7 @@
   var o = new api.ListLocationsResponse();
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    o.locations = buildUnnamed4303();
+    o.locations = buildUnnamed4415();
     o.nextPageToken = "foo";
   }
   buildCounterListLocationsResponse--;
@@ -634,20 +634,20 @@
 checkListLocationsResponse(api.ListLocationsResponse o) {
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    checkUnnamed4303(o.locations);
+    checkUnnamed4415(o.locations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLocationsResponse--;
 }
 
-buildUnnamed4304() {
+buildUnnamed4416() {
   var o = new core.List<api.Module>();
   o.add(buildModule());
   o.add(buildModule());
   return o;
 }
 
-checkUnnamed4304(core.List<api.Module> o) {
+checkUnnamed4416(core.List<api.Module> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkModule(o[0]);
   checkModule(o[1]);
@@ -658,7 +658,7 @@
   var o = new api.ListModulesResponse();
   buildCounterListModulesResponse++;
   if (buildCounterListModulesResponse < 3) {
-    o.modules = buildUnnamed4304();
+    o.modules = buildUnnamed4416();
     o.nextPageToken = "foo";
   }
   buildCounterListModulesResponse--;
@@ -668,20 +668,20 @@
 checkListModulesResponse(api.ListModulesResponse o) {
   buildCounterListModulesResponse++;
   if (buildCounterListModulesResponse < 3) {
-    checkUnnamed4304(o.modules);
+    checkUnnamed4416(o.modules);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListModulesResponse--;
 }
 
-buildUnnamed4305() {
+buildUnnamed4417() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed4305(core.List<api.Operation> o) {
+checkUnnamed4417(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -693,7 +693,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed4305();
+    o.operations = buildUnnamed4417();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -703,19 +703,19 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4305(o.operations);
+    checkUnnamed4417(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed4306() {
+buildUnnamed4418() {
   var o = new core.List<api.Version>();
   o.add(buildVersion());
   o.add(buildVersion());
   return o;
 }
 
-checkUnnamed4306(core.List<api.Version> o) {
+checkUnnamed4418(core.List<api.Version> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVersion(o[0]);
   checkVersion(o[1]);
@@ -727,7 +727,7 @@
   buildCounterListVersionsResponse++;
   if (buildCounterListVersionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.versions = buildUnnamed4306();
+    o.versions = buildUnnamed4418();
   }
   buildCounterListVersionsResponse--;
   return o;
@@ -737,25 +737,25 @@
   buildCounterListVersionsResponse++;
   if (buildCounterListVersionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4306(o.versions);
+    checkUnnamed4418(o.versions);
   }
   buildCounterListVersionsResponse--;
 }
 
-buildUnnamed4307() {
+buildUnnamed4419() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4307(core.Map<core.String, core.String> o) {
+checkUnnamed4419(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed4308() {
+buildUnnamed4420() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -770,7 +770,7 @@
   return o;
 }
 
-checkUnnamed4308(core.Map<core.String, core.Object> o) {
+checkUnnamed4420(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -789,9 +789,9 @@
   var o = new api.Location();
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    o.labels = buildUnnamed4307();
+    o.labels = buildUnnamed4419();
     o.locationId = "foo";
-    o.metadata = buildUnnamed4308();
+    o.metadata = buildUnnamed4420();
     o.name = "foo";
   }
   buildCounterLocation--;
@@ -801,9 +801,9 @@
 checkLocation(api.Location o) {
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    checkUnnamed4307(o.labels);
+    checkUnnamed4419(o.labels);
     unittest.expect(o.locationId, unittest.equals('foo'));
-    checkUnnamed4308(o.metadata);
+    checkUnnamed4420(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLocation--;
@@ -872,14 +872,14 @@
   buildCounterModule--;
 }
 
-buildUnnamed4309() {
+buildUnnamed4421() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4309(core.List<core.String> o) {
+checkUnnamed4421(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -890,7 +890,7 @@
   var o = new api.Network();
   buildCounterNetwork++;
   if (buildCounterNetwork < 3) {
-    o.forwardedPorts = buildUnnamed4309();
+    o.forwardedPorts = buildUnnamed4421();
     o.instanceTag = "foo";
     o.name = "foo";
   }
@@ -901,7 +901,7 @@
 checkNetwork(api.Network o) {
   buildCounterNetwork++;
   if (buildCounterNetwork < 3) {
-    checkUnnamed4309(o.forwardedPorts);
+    checkUnnamed4421(o.forwardedPorts);
     unittest.expect(o.instanceTag, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
   }
@@ -933,7 +933,7 @@
   buildCounterNetworkUtilization--;
 }
 
-buildUnnamed4310() {
+buildUnnamed4422() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -948,7 +948,7 @@
   return o;
 }
 
-checkUnnamed4310(core.Map<core.String, core.Object> o) {
+checkUnnamed4422(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -962,7 +962,7 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4311() {
+buildUnnamed4423() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -977,7 +977,7 @@
   return o;
 }
 
-checkUnnamed4311(core.Map<core.String, core.Object> o) {
+checkUnnamed4423(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -998,9 +998,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed4310();
+    o.metadata = buildUnnamed4422();
     o.name = "foo";
-    o.response = buildUnnamed4311();
+    o.response = buildUnnamed4423();
   }
   buildCounterOperation--;
   return o;
@@ -1011,9 +1011,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed4310(o.metadata);
+    checkUnnamed4422(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4311(o.response);
+    checkUnnamed4423(o.response);
   }
   buildCounterOperation--;
 }
@@ -1047,14 +1047,14 @@
   buildCounterOperationMetadata--;
 }
 
-buildUnnamed4312() {
+buildUnnamed4424() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4312(core.List<core.String> o) {
+checkUnnamed4424(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1071,7 +1071,7 @@
     o.method = "foo";
     o.target = "foo";
     o.user = "foo";
-    o.warning = buildUnnamed4312();
+    o.warning = buildUnnamed4424();
   }
   buildCounterOperationMetadataV1--;
   return o;
@@ -1086,19 +1086,19 @@
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed4312(o.warning);
+    checkUnnamed4424(o.warning);
   }
   buildCounterOperationMetadataV1--;
 }
 
-buildUnnamed4313() {
+buildUnnamed4425() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4313(core.List<core.String> o) {
+checkUnnamed4425(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1116,7 +1116,7 @@
     o.method = "foo";
     o.target = "foo";
     o.user = "foo";
-    o.warning = buildUnnamed4313();
+    o.warning = buildUnnamed4425();
   }
   buildCounterOperationMetadataV1Alpha--;
   return o;
@@ -1132,19 +1132,19 @@
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed4313(o.warning);
+    checkUnnamed4425(o.warning);
   }
   buildCounterOperationMetadataV1Alpha--;
 }
 
-buildUnnamed4314() {
+buildUnnamed4426() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4314(core.List<core.String> o) {
+checkUnnamed4426(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1162,7 +1162,7 @@
     o.method = "foo";
     o.target = "foo";
     o.user = "foo";
-    o.warning = buildUnnamed4314();
+    o.warning = buildUnnamed4426();
   }
   buildCounterOperationMetadataV1Beta--;
   return o;
@@ -1178,7 +1178,7 @@
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed4314(o.warning);
+    checkUnnamed4426(o.warning);
   }
   buildCounterOperationMetadataV1Beta--;
 }
@@ -1231,14 +1231,14 @@
   buildCounterRequestUtilization--;
 }
 
-buildUnnamed4315() {
+buildUnnamed4427() {
   var o = new core.List<api.Volume>();
   o.add(buildVolume());
   o.add(buildVolume());
   return o;
 }
 
-checkUnnamed4315(core.List<api.Volume> o) {
+checkUnnamed4427(core.List<api.Volume> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolume(o[0]);
   checkVolume(o[1]);
@@ -1252,7 +1252,7 @@
     o.cpu = 42.0;
     o.diskGb = 42.0;
     o.memoryGb = 42.0;
-    o.volumes = buildUnnamed4315();
+    o.volumes = buildUnnamed4427();
   }
   buildCounterResources--;
   return o;
@@ -1264,7 +1264,7 @@
     unittest.expect(o.cpu, unittest.equals(42.0));
     unittest.expect(o.diskGb, unittest.equals(42.0));
     unittest.expect(o.memoryGb, unittest.equals(42.0));
-    checkUnnamed4315(o.volumes);
+    checkUnnamed4427(o.volumes);
   }
   buildCounterResources--;
 }
@@ -1309,14 +1309,14 @@
   buildCounterSourceReference--;
 }
 
-buildUnnamed4316() {
+buildUnnamed4428() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4316(core.Map<core.String, core.String> o) {
+checkUnnamed4428(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1330,7 +1330,7 @@
     o.applicationReadable = true;
     o.directory = "foo";
     o.expiration = "foo";
-    o.httpHeaders = buildUnnamed4316();
+    o.httpHeaders = buildUnnamed4428();
     o.mimeType = "foo";
     o.requireMatchingFile = true;
   }
@@ -1344,21 +1344,21 @@
     unittest.expect(o.applicationReadable, unittest.isTrue);
     unittest.expect(o.directory, unittest.equals('foo'));
     unittest.expect(o.expiration, unittest.equals('foo'));
-    checkUnnamed4316(o.httpHeaders);
+    checkUnnamed4428(o.httpHeaders);
     unittest.expect(o.mimeType, unittest.equals('foo'));
     unittest.expect(o.requireMatchingFile, unittest.isTrue);
   }
   buildCounterStaticDirectoryHandler--;
 }
 
-buildUnnamed4317() {
+buildUnnamed4429() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4317(core.Map<core.String, core.String> o) {
+checkUnnamed4429(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1371,7 +1371,7 @@
   if (buildCounterStaticFilesHandler < 3) {
     o.applicationReadable = true;
     o.expiration = "foo";
-    o.httpHeaders = buildUnnamed4317();
+    o.httpHeaders = buildUnnamed4429();
     o.mimeType = "foo";
     o.path = "foo";
     o.requireMatchingFile = true;
@@ -1386,7 +1386,7 @@
   if (buildCounterStaticFilesHandler < 3) {
     unittest.expect(o.applicationReadable, unittest.isTrue);
     unittest.expect(o.expiration, unittest.equals('foo'));
-    checkUnnamed4317(o.httpHeaders);
+    checkUnnamed4429(o.httpHeaders);
     unittest.expect(o.mimeType, unittest.equals('foo'));
     unittest.expect(o.path, unittest.equals('foo'));
     unittest.expect(o.requireMatchingFile, unittest.isTrue);
@@ -1395,7 +1395,7 @@
   buildCounterStaticFilesHandler--;
 }
 
-buildUnnamed4318() {
+buildUnnamed4430() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1410,7 +1410,7 @@
   return o;
 }
 
-checkUnnamed4318(core.Map<core.String, core.Object> o) {
+checkUnnamed4430(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -1424,17 +1424,17 @@
   unittest.expect(casted8["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4319() {
+buildUnnamed4431() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4318());
-  o.add(buildUnnamed4318());
+  o.add(buildUnnamed4430());
+  o.add(buildUnnamed4430());
   return o;
 }
 
-checkUnnamed4319(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4431(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4318(o[0]);
-  checkUnnamed4318(o[1]);
+  checkUnnamed4430(o[0]);
+  checkUnnamed4430(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1443,7 +1443,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed4319();
+    o.details = buildUnnamed4431();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1454,20 +1454,20 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed4319(o.details);
+    checkUnnamed4431(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed4320() {
+buildUnnamed4432() {
   var o = new core.Map<core.String, core.double>();
   o["x"] = 42.0;
   o["y"] = 42.0;
   return o;
 }
 
-checkUnnamed4320(core.Map<core.String, core.double> o) {
+checkUnnamed4432(core.Map<core.String, core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals(42.0));
   unittest.expect(o["y"], unittest.equals(42.0));
@@ -1478,7 +1478,7 @@
   var o = new api.TrafficSplit();
   buildCounterTrafficSplit++;
   if (buildCounterTrafficSplit < 3) {
-    o.allocations = buildUnnamed4320();
+    o.allocations = buildUnnamed4432();
     o.shardBy = "foo";
   }
   buildCounterTrafficSplit--;
@@ -1488,7 +1488,7 @@
 checkTrafficSplit(api.TrafficSplit o) {
   buildCounterTrafficSplit++;
   if (buildCounterTrafficSplit < 3) {
-    checkUnnamed4320(o.allocations);
+    checkUnnamed4432(o.allocations);
     unittest.expect(o.shardBy, unittest.equals('foo'));
   }
   buildCounterTrafficSplit--;
@@ -1552,79 +1552,79 @@
   buildCounterUrlMap--;
 }
 
-buildUnnamed4321() {
+buildUnnamed4433() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4321(core.Map<core.String, core.String> o) {
+checkUnnamed4433(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed4322() {
+buildUnnamed4434() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4322(core.Map<core.String, core.String> o) {
+checkUnnamed4434(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed4323() {
+buildUnnamed4435() {
   var o = new core.List<api.ErrorHandler>();
   o.add(buildErrorHandler());
   o.add(buildErrorHandler());
   return o;
 }
 
-checkUnnamed4323(core.List<api.ErrorHandler> o) {
+checkUnnamed4435(core.List<api.ErrorHandler> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorHandler(o[0]);
   checkErrorHandler(o[1]);
 }
 
-buildUnnamed4324() {
+buildUnnamed4436() {
   var o = new core.List<api.UrlMap>();
   o.add(buildUrlMap());
   o.add(buildUrlMap());
   return o;
 }
 
-checkUnnamed4324(core.List<api.UrlMap> o) {
+checkUnnamed4436(core.List<api.UrlMap> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlMap(o[0]);
   checkUrlMap(o[1]);
 }
 
-buildUnnamed4325() {
+buildUnnamed4437() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4325(core.List<core.String> o) {
+checkUnnamed4437(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4326() {
+buildUnnamed4438() {
   var o = new core.List<api.Library>();
   o.add(buildLibrary());
   o.add(buildLibrary());
   return o;
 }
 
-checkUnnamed4326(core.List<api.Library> o) {
+checkUnnamed4438(core.List<api.Library> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLibrary(o[0]);
   checkLibrary(o[1]);
@@ -1638,21 +1638,21 @@
     o.apiConfig = buildApiConfigHandler();
     o.automaticScaling = buildAutomaticScaling();
     o.basicScaling = buildBasicScaling();
-    o.betaSettings = buildUnnamed4321();
+    o.betaSettings = buildUnnamed4433();
     o.creationTime = "foo";
     o.defaultExpiration = "foo";
     o.deployer = "foo";
     o.deployment = buildDeployment();
     o.endpointsApiService = buildEndpointsApiService();
     o.env = "foo";
-    o.envVariables = buildUnnamed4322();
-    o.errorHandlers = buildUnnamed4323();
-    o.handlers = buildUnnamed4324();
+    o.envVariables = buildUnnamed4434();
+    o.errorHandlers = buildUnnamed4435();
+    o.handlers = buildUnnamed4436();
     o.healthCheck = buildHealthCheck();
     o.id = "foo";
-    o.inboundServices = buildUnnamed4325();
+    o.inboundServices = buildUnnamed4437();
     o.instanceClass = "foo";
-    o.libraries = buildUnnamed4326();
+    o.libraries = buildUnnamed4438();
     o.manualScaling = buildManualScaling();
     o.name = "foo";
     o.network = buildNetwork();
@@ -1674,21 +1674,21 @@
     checkApiConfigHandler(o.apiConfig);
     checkAutomaticScaling(o.automaticScaling);
     checkBasicScaling(o.basicScaling);
-    checkUnnamed4321(o.betaSettings);
+    checkUnnamed4433(o.betaSettings);
     unittest.expect(o.creationTime, unittest.equals('foo'));
     unittest.expect(o.defaultExpiration, unittest.equals('foo'));
     unittest.expect(o.deployer, unittest.equals('foo'));
     checkDeployment(o.deployment);
     checkEndpointsApiService(o.endpointsApiService);
     unittest.expect(o.env, unittest.equals('foo'));
-    checkUnnamed4322(o.envVariables);
-    checkUnnamed4323(o.errorHandlers);
-    checkUnnamed4324(o.handlers);
+    checkUnnamed4434(o.envVariables);
+    checkUnnamed4435(o.errorHandlers);
+    checkUnnamed4436(o.handlers);
     checkHealthCheck(o.healthCheck);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed4325(o.inboundServices);
+    checkUnnamed4437(o.inboundServices);
     unittest.expect(o.instanceClass, unittest.equals('foo'));
-    checkUnnamed4326(o.libraries);
+    checkUnnamed4438(o.libraries);
     checkManualScaling(o.manualScaling);
     unittest.expect(o.name, unittest.equals('foo'));
     checkNetwork(o.network);
@@ -2160,7 +2160,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2218,7 +2218,7 @@
           .get(arg_appsId,
               ensureResourcesExist: arg_ensureResourcesExist,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Application response) {
+          .then(unittest.expectAsync1(((response) {
         checkApplication(response);
       })));
     });
@@ -2277,7 +2277,7 @@
       }), true);
       res
           .patch(arg_request, arg_appsId, mask: arg_mask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2343,7 +2343,7 @@
       }), true);
       res
           .get(arg_appsId, arg_locationsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Location response) {
+          .then(unittest.expectAsync1(((response) {
         checkLocation(response);
       })));
     });
@@ -2415,7 +2415,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLocationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLocationsResponse(response);
       })));
     });
@@ -2480,7 +2480,7 @@
       }), true);
       res
           .delete(arg_appsId, arg_modulesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2543,7 +2543,7 @@
       }), true);
       res
           .get(arg_appsId, arg_modulesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Module response) {
+          .then(unittest.expectAsync1(((response) {
         checkModule(response);
       })));
     });
@@ -2611,7 +2611,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListModulesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListModulesResponse(response);
       })));
     });
@@ -2686,7 +2686,7 @@
               migrateTraffic: arg_migrateTraffic,
               mask: arg_mask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2762,7 +2762,7 @@
       }), true);
       res
           .create(arg_request, arg_appsId, arg_modulesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2837,7 +2837,7 @@
       res
           .delete(arg_appsId, arg_modulesId, arg_versionsId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2914,7 +2914,7 @@
       res
           .get(arg_appsId, arg_modulesId, arg_versionsId,
               view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Version response) {
+          .then(unittest.expectAsync1(((response) {
         checkVersion(response);
       })));
     });
@@ -2996,7 +2996,7 @@
               pageSize: arg_pageSize,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListVersionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListVersionsResponse(response);
       })));
     });
@@ -3077,7 +3077,7 @@
       res
           .patch(arg_request, arg_appsId, arg_modulesId, arg_versionsId,
               mask: arg_mask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3175,7 +3175,7 @@
           .debug(arg_request, arg_appsId, arg_modulesId, arg_versionsId,
               arg_instancesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3260,7 +3260,7 @@
       res
           .delete(arg_appsId, arg_modulesId, arg_versionsId, arg_instancesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3345,7 +3345,7 @@
       res
           .get(arg_appsId, arg_modulesId, arg_versionsId, arg_instancesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Instance response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstance(response);
       })));
     });
@@ -3434,7 +3434,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListInstancesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListInstancesResponse(response);
       })));
     });
@@ -3500,7 +3500,7 @@
       }), true);
       res
           .get(arg_appsId, arg_operationsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3572,7 +3572,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/appengine/v1beta5_test.dart b/generated/googleapis_beta/test/appengine/v1beta5_test.dart
index 390afd1..fc5093c 100644
--- a/generated/googleapis_beta/test/appengine/v1beta5_test.dart
+++ b/generated/googleapis_beta/test/appengine/v1beta5_test.dart
@@ -96,14 +96,14 @@
   buildCounterApiEndpointHandler--;
 }
 
-buildUnnamed4202() {
+buildUnnamed4352() {
   var o = new core.List<api.UrlDispatchRule>();
   o.add(buildUrlDispatchRule());
   o.add(buildUrlDispatchRule());
   return o;
 }
 
-checkUnnamed4202(core.List<api.UrlDispatchRule> o) {
+checkUnnamed4352(core.List<api.UrlDispatchRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlDispatchRule(o[0]);
   checkUrlDispatchRule(o[1]);
@@ -119,7 +119,7 @@
     o.defaultBucket = "foo";
     o.defaultCookieExpiration = "foo";
     o.defaultHostname = "foo";
-    o.dispatchRules = buildUnnamed4202();
+    o.dispatchRules = buildUnnamed4352();
     o.iap = buildIdentityAwareProxy();
     o.id = "foo";
     o.location = "foo";
@@ -137,7 +137,7 @@
     unittest.expect(o.defaultBucket, unittest.equals('foo'));
     unittest.expect(o.defaultCookieExpiration, unittest.equals('foo'));
     unittest.expect(o.defaultHostname, unittest.equals('foo'));
-    checkUnnamed4202(o.dispatchRules);
+    checkUnnamed4352(o.dispatchRules);
     checkIdentityAwareProxy(o.iap);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.location, unittest.equals('foo'));
@@ -305,27 +305,27 @@
   buildCounterDebugInstanceRequest--;
 }
 
-buildUnnamed4203() {
+buildUnnamed4353() {
   var o = new core.Map<core.String, api.FileInfo>();
   o["x"] = buildFileInfo();
   o["y"] = buildFileInfo();
   return o;
 }
 
-checkUnnamed4203(core.Map<core.String, api.FileInfo> o) {
+checkUnnamed4353(core.Map<core.String, api.FileInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFileInfo(o["x"]);
   checkFileInfo(o["y"]);
 }
 
-buildUnnamed4204() {
+buildUnnamed4354() {
   var o = new core.List<api.SourceReference>();
   o.add(buildSourceReference());
   o.add(buildSourceReference());
   return o;
 }
 
-checkUnnamed4204(core.List<api.SourceReference> o) {
+checkUnnamed4354(core.List<api.SourceReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSourceReference(o[0]);
   checkSourceReference(o[1]);
@@ -337,8 +337,8 @@
   buildCounterDeployment++;
   if (buildCounterDeployment < 3) {
     o.container = buildContainerInfo();
-    o.files = buildUnnamed4203();
-    o.sourceReferences = buildUnnamed4204();
+    o.files = buildUnnamed4353();
+    o.sourceReferences = buildUnnamed4354();
   }
   buildCounterDeployment--;
   return o;
@@ -348,8 +348,8 @@
   buildCounterDeployment++;
   if (buildCounterDeployment < 3) {
     checkContainerInfo(o.container);
-    checkUnnamed4203(o.files);
-    checkUnnamed4204(o.sourceReferences);
+    checkUnnamed4353(o.files);
+    checkUnnamed4354(o.sourceReferences);
   }
   buildCounterDeployment--;
 }
@@ -572,14 +572,14 @@
   buildCounterLibrary--;
 }
 
-buildUnnamed4205() {
+buildUnnamed4355() {
   var o = new core.List<api.Instance>();
   o.add(buildInstance());
   o.add(buildInstance());
   return o;
 }
 
-checkUnnamed4205(core.List<api.Instance> o) {
+checkUnnamed4355(core.List<api.Instance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstance(o[0]);
   checkInstance(o[1]);
@@ -590,7 +590,7 @@
   var o = new api.ListInstancesResponse();
   buildCounterListInstancesResponse++;
   if (buildCounterListInstancesResponse < 3) {
-    o.instances = buildUnnamed4205();
+    o.instances = buildUnnamed4355();
     o.nextPageToken = "foo";
   }
   buildCounterListInstancesResponse--;
@@ -600,20 +600,20 @@
 checkListInstancesResponse(api.ListInstancesResponse o) {
   buildCounterListInstancesResponse++;
   if (buildCounterListInstancesResponse < 3) {
-    checkUnnamed4205(o.instances);
+    checkUnnamed4355(o.instances);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListInstancesResponse--;
 }
 
-buildUnnamed4206() {
+buildUnnamed4356() {
   var o = new core.List<api.Location>();
   o.add(buildLocation());
   o.add(buildLocation());
   return o;
 }
 
-checkUnnamed4206(core.List<api.Location> o) {
+checkUnnamed4356(core.List<api.Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocation(o[0]);
   checkLocation(o[1]);
@@ -624,7 +624,7 @@
   var o = new api.ListLocationsResponse();
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    o.locations = buildUnnamed4206();
+    o.locations = buildUnnamed4356();
     o.nextPageToken = "foo";
   }
   buildCounterListLocationsResponse--;
@@ -634,20 +634,20 @@
 checkListLocationsResponse(api.ListLocationsResponse o) {
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    checkUnnamed4206(o.locations);
+    checkUnnamed4356(o.locations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLocationsResponse--;
 }
 
-buildUnnamed4207() {
+buildUnnamed4357() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed4207(core.List<api.Operation> o) {
+checkUnnamed4357(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -659,7 +659,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed4207();
+    o.operations = buildUnnamed4357();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -669,19 +669,19 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4207(o.operations);
+    checkUnnamed4357(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed4208() {
+buildUnnamed4358() {
   var o = new core.List<api.Service>();
   o.add(buildService());
   o.add(buildService());
   return o;
 }
 
-checkUnnamed4208(core.List<api.Service> o) {
+checkUnnamed4358(core.List<api.Service> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkService(o[0]);
   checkService(o[1]);
@@ -693,7 +693,7 @@
   buildCounterListServicesResponse++;
   if (buildCounterListServicesResponse < 3) {
     o.nextPageToken = "foo";
-    o.services = buildUnnamed4208();
+    o.services = buildUnnamed4358();
   }
   buildCounterListServicesResponse--;
   return o;
@@ -703,19 +703,19 @@
   buildCounterListServicesResponse++;
   if (buildCounterListServicesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4208(o.services);
+    checkUnnamed4358(o.services);
   }
   buildCounterListServicesResponse--;
 }
 
-buildUnnamed4209() {
+buildUnnamed4359() {
   var o = new core.List<api.Version>();
   o.add(buildVersion());
   o.add(buildVersion());
   return o;
 }
 
-checkUnnamed4209(core.List<api.Version> o) {
+checkUnnamed4359(core.List<api.Version> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVersion(o[0]);
   checkVersion(o[1]);
@@ -727,7 +727,7 @@
   buildCounterListVersionsResponse++;
   if (buildCounterListVersionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.versions = buildUnnamed4209();
+    o.versions = buildUnnamed4359();
   }
   buildCounterListVersionsResponse--;
   return o;
@@ -737,25 +737,25 @@
   buildCounterListVersionsResponse++;
   if (buildCounterListVersionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4209(o.versions);
+    checkUnnamed4359(o.versions);
   }
   buildCounterListVersionsResponse--;
 }
 
-buildUnnamed4210() {
+buildUnnamed4360() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4210(core.Map<core.String, core.String> o) {
+checkUnnamed4360(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed4211() {
+buildUnnamed4361() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -770,7 +770,7 @@
   return o;
 }
 
-checkUnnamed4211(core.Map<core.String, core.Object> o) {
+checkUnnamed4361(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -789,9 +789,9 @@
   var o = new api.Location();
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    o.labels = buildUnnamed4210();
+    o.labels = buildUnnamed4360();
     o.locationId = "foo";
-    o.metadata = buildUnnamed4211();
+    o.metadata = buildUnnamed4361();
     o.name = "foo";
   }
   buildCounterLocation--;
@@ -801,9 +801,9 @@
 checkLocation(api.Location o) {
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    checkUnnamed4210(o.labels);
+    checkUnnamed4360(o.labels);
     unittest.expect(o.locationId, unittest.equals('foo'));
-    checkUnnamed4211(o.metadata);
+    checkUnnamed4361(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLocation--;
@@ -849,14 +849,14 @@
   buildCounterManualScaling--;
 }
 
-buildUnnamed4212() {
+buildUnnamed4362() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4212(core.List<core.String> o) {
+checkUnnamed4362(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -867,7 +867,7 @@
   var o = new api.Network();
   buildCounterNetwork++;
   if (buildCounterNetwork < 3) {
-    o.forwardedPorts = buildUnnamed4212();
+    o.forwardedPorts = buildUnnamed4362();
     o.instanceTag = "foo";
     o.name = "foo";
     o.subnetworkName = "foo";
@@ -879,7 +879,7 @@
 checkNetwork(api.Network o) {
   buildCounterNetwork++;
   if (buildCounterNetwork < 3) {
-    checkUnnamed4212(o.forwardedPorts);
+    checkUnnamed4362(o.forwardedPorts);
     unittest.expect(o.instanceTag, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.subnetworkName, unittest.equals('foo'));
@@ -912,7 +912,7 @@
   buildCounterNetworkUtilization--;
 }
 
-buildUnnamed4213() {
+buildUnnamed4363() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -927,7 +927,7 @@
   return o;
 }
 
-checkUnnamed4213(core.Map<core.String, core.Object> o) {
+checkUnnamed4363(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -941,7 +941,7 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4214() {
+buildUnnamed4364() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -956,7 +956,7 @@
   return o;
 }
 
-checkUnnamed4214(core.Map<core.String, core.Object> o) {
+checkUnnamed4364(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -977,9 +977,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed4213();
+    o.metadata = buildUnnamed4363();
     o.name = "foo";
-    o.response = buildUnnamed4214();
+    o.response = buildUnnamed4364();
   }
   buildCounterOperation--;
   return o;
@@ -990,9 +990,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed4213(o.metadata);
+    checkUnnamed4363(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4214(o.response);
+    checkUnnamed4364(o.response);
   }
   buildCounterOperation--;
 }
@@ -1026,14 +1026,14 @@
   buildCounterOperationMetadata--;
 }
 
-buildUnnamed4215() {
+buildUnnamed4365() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4215(core.List<core.String> o) {
+checkUnnamed4365(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1050,7 +1050,7 @@
     o.method = "foo";
     o.target = "foo";
     o.user = "foo";
-    o.warning = buildUnnamed4215();
+    o.warning = buildUnnamed4365();
   }
   buildCounterOperationMetadataV1--;
   return o;
@@ -1065,19 +1065,19 @@
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed4215(o.warning);
+    checkUnnamed4365(o.warning);
   }
   buildCounterOperationMetadataV1--;
 }
 
-buildUnnamed4216() {
+buildUnnamed4366() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4216(core.List<core.String> o) {
+checkUnnamed4366(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1095,7 +1095,7 @@
     o.method = "foo";
     o.target = "foo";
     o.user = "foo";
-    o.warning = buildUnnamed4216();
+    o.warning = buildUnnamed4366();
   }
   buildCounterOperationMetadataV1Alpha--;
   return o;
@@ -1111,19 +1111,19 @@
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed4216(o.warning);
+    checkUnnamed4366(o.warning);
   }
   buildCounterOperationMetadataV1Alpha--;
 }
 
-buildUnnamed4217() {
+buildUnnamed4367() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4217(core.List<core.String> o) {
+checkUnnamed4367(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1141,7 +1141,7 @@
     o.method = "foo";
     o.target = "foo";
     o.user = "foo";
-    o.warning = buildUnnamed4217();
+    o.warning = buildUnnamed4367();
   }
   buildCounterOperationMetadataV1Beta--;
   return o;
@@ -1157,7 +1157,7 @@
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed4217(o.warning);
+    checkUnnamed4367(o.warning);
   }
   buildCounterOperationMetadataV1Beta--;
 }
@@ -1210,14 +1210,14 @@
   buildCounterRequestUtilization--;
 }
 
-buildUnnamed4218() {
+buildUnnamed4368() {
   var o = new core.List<api.Volume>();
   o.add(buildVolume());
   o.add(buildVolume());
   return o;
 }
 
-checkUnnamed4218(core.List<api.Volume> o) {
+checkUnnamed4368(core.List<api.Volume> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolume(o[0]);
   checkVolume(o[1]);
@@ -1231,7 +1231,7 @@
     o.cpu = 42.0;
     o.diskGb = 42.0;
     o.memoryGb = 42.0;
-    o.volumes = buildUnnamed4218();
+    o.volumes = buildUnnamed4368();
   }
   buildCounterResources--;
   return o;
@@ -1243,7 +1243,7 @@
     unittest.expect(o.cpu, unittest.equals(42.0));
     unittest.expect(o.diskGb, unittest.equals(42.0));
     unittest.expect(o.memoryGb, unittest.equals(42.0));
-    checkUnnamed4218(o.volumes);
+    checkUnnamed4368(o.volumes);
   }
   buildCounterResources--;
 }
@@ -1311,14 +1311,14 @@
   buildCounterSourceReference--;
 }
 
-buildUnnamed4219() {
+buildUnnamed4369() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4219(core.Map<core.String, core.String> o) {
+checkUnnamed4369(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1331,7 +1331,7 @@
   if (buildCounterStaticFilesHandler < 3) {
     o.applicationReadable = true;
     o.expiration = "foo";
-    o.httpHeaders = buildUnnamed4219();
+    o.httpHeaders = buildUnnamed4369();
     o.mimeType = "foo";
     o.path = "foo";
     o.requireMatchingFile = true;
@@ -1346,7 +1346,7 @@
   if (buildCounterStaticFilesHandler < 3) {
     unittest.expect(o.applicationReadable, unittest.isTrue);
     unittest.expect(o.expiration, unittest.equals('foo'));
-    checkUnnamed4219(o.httpHeaders);
+    checkUnnamed4369(o.httpHeaders);
     unittest.expect(o.mimeType, unittest.equals('foo'));
     unittest.expect(o.path, unittest.equals('foo'));
     unittest.expect(o.requireMatchingFile, unittest.isTrue);
@@ -1355,7 +1355,7 @@
   buildCounterStaticFilesHandler--;
 }
 
-buildUnnamed4220() {
+buildUnnamed4370() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1370,7 +1370,7 @@
   return o;
 }
 
-checkUnnamed4220(core.Map<core.String, core.Object> o) {
+checkUnnamed4370(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -1384,17 +1384,17 @@
   unittest.expect(casted8["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4221() {
+buildUnnamed4371() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4220());
-  o.add(buildUnnamed4220());
+  o.add(buildUnnamed4370());
+  o.add(buildUnnamed4370());
   return o;
 }
 
-checkUnnamed4221(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4371(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4220(o[0]);
-  checkUnnamed4220(o[1]);
+  checkUnnamed4370(o[0]);
+  checkUnnamed4370(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1403,7 +1403,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed4221();
+    o.details = buildUnnamed4371();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1414,20 +1414,20 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed4221(o.details);
+    checkUnnamed4371(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed4222() {
+buildUnnamed4372() {
   var o = new core.Map<core.String, core.double>();
   o["x"] = 42.0;
   o["y"] = 42.0;
   return o;
 }
 
-checkUnnamed4222(core.Map<core.String, core.double> o) {
+checkUnnamed4372(core.Map<core.String, core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals(42.0));
   unittest.expect(o["y"], unittest.equals(42.0));
@@ -1438,7 +1438,7 @@
   var o = new api.TrafficSplit();
   buildCounterTrafficSplit++;
   if (buildCounterTrafficSplit < 3) {
-    o.allocations = buildUnnamed4222();
+    o.allocations = buildUnnamed4372();
     o.shardBy = "foo";
   }
   buildCounterTrafficSplit--;
@@ -1448,7 +1448,7 @@
 checkTrafficSplit(api.TrafficSplit o) {
   buildCounterTrafficSplit++;
   if (buildCounterTrafficSplit < 3) {
-    checkUnnamed4222(o.allocations);
+    checkUnnamed4372(o.allocations);
     unittest.expect(o.shardBy, unittest.equals('foo'));
   }
   buildCounterTrafficSplit--;
@@ -1510,79 +1510,79 @@
   buildCounterUrlMap--;
 }
 
-buildUnnamed4223() {
+buildUnnamed4373() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4223(core.Map<core.String, core.String> o) {
+checkUnnamed4373(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed4224() {
+buildUnnamed4374() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4224(core.Map<core.String, core.String> o) {
+checkUnnamed4374(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed4225() {
+buildUnnamed4375() {
   var o = new core.List<api.ErrorHandler>();
   o.add(buildErrorHandler());
   o.add(buildErrorHandler());
   return o;
 }
 
-checkUnnamed4225(core.List<api.ErrorHandler> o) {
+checkUnnamed4375(core.List<api.ErrorHandler> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorHandler(o[0]);
   checkErrorHandler(o[1]);
 }
 
-buildUnnamed4226() {
+buildUnnamed4376() {
   var o = new core.List<api.UrlMap>();
   o.add(buildUrlMap());
   o.add(buildUrlMap());
   return o;
 }
 
-checkUnnamed4226(core.List<api.UrlMap> o) {
+checkUnnamed4376(core.List<api.UrlMap> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlMap(o[0]);
   checkUrlMap(o[1]);
 }
 
-buildUnnamed4227() {
+buildUnnamed4377() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4227(core.List<core.String> o) {
+checkUnnamed4377(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4228() {
+buildUnnamed4378() {
   var o = new core.List<api.Library>();
   o.add(buildLibrary());
   o.add(buildLibrary());
   return o;
 }
 
-checkUnnamed4228(core.List<api.Library> o) {
+checkUnnamed4378(core.List<api.Library> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLibrary(o[0]);
   checkLibrary(o[1]);
@@ -1596,7 +1596,7 @@
     o.apiConfig = buildApiConfigHandler();
     o.automaticScaling = buildAutomaticScaling();
     o.basicScaling = buildBasicScaling();
-    o.betaSettings = buildUnnamed4223();
+    o.betaSettings = buildUnnamed4373();
     o.creationTime = "foo";
     o.defaultExpiration = "foo";
     o.deployer = "foo";
@@ -1604,14 +1604,14 @@
     o.diskUsageBytes = "foo";
     o.endpointsApiService = buildEndpointsApiService();
     o.env = "foo";
-    o.envVariables = buildUnnamed4224();
-    o.errorHandlers = buildUnnamed4225();
-    o.handlers = buildUnnamed4226();
+    o.envVariables = buildUnnamed4374();
+    o.errorHandlers = buildUnnamed4375();
+    o.handlers = buildUnnamed4376();
     o.healthCheck = buildHealthCheck();
     o.id = "foo";
-    o.inboundServices = buildUnnamed4227();
+    o.inboundServices = buildUnnamed4377();
     o.instanceClass = "foo";
-    o.libraries = buildUnnamed4228();
+    o.libraries = buildUnnamed4378();
     o.manualScaling = buildManualScaling();
     o.name = "foo";
     o.network = buildNetwork();
@@ -1633,7 +1633,7 @@
     checkApiConfigHandler(o.apiConfig);
     checkAutomaticScaling(o.automaticScaling);
     checkBasicScaling(o.basicScaling);
-    checkUnnamed4223(o.betaSettings);
+    checkUnnamed4373(o.betaSettings);
     unittest.expect(o.creationTime, unittest.equals('foo'));
     unittest.expect(o.defaultExpiration, unittest.equals('foo'));
     unittest.expect(o.deployer, unittest.equals('foo'));
@@ -1641,14 +1641,14 @@
     unittest.expect(o.diskUsageBytes, unittest.equals('foo'));
     checkEndpointsApiService(o.endpointsApiService);
     unittest.expect(o.env, unittest.equals('foo'));
-    checkUnnamed4224(o.envVariables);
-    checkUnnamed4225(o.errorHandlers);
-    checkUnnamed4226(o.handlers);
+    checkUnnamed4374(o.envVariables);
+    checkUnnamed4375(o.errorHandlers);
+    checkUnnamed4376(o.handlers);
     checkHealthCheck(o.healthCheck);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed4227(o.inboundServices);
+    checkUnnamed4377(o.inboundServices);
     unittest.expect(o.instanceClass, unittest.equals('foo'));
-    checkUnnamed4228(o.libraries);
+    checkUnnamed4378(o.libraries);
     checkManualScaling(o.manualScaling);
     unittest.expect(o.name, unittest.equals('foo'));
     checkNetwork(o.network);
@@ -2112,7 +2112,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2170,7 +2170,7 @@
           .get(arg_appsId,
               ensureResourcesExist: arg_ensureResourcesExist,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Application response) {
+          .then(unittest.expectAsync1(((response) {
         checkApplication(response);
       })));
     });
@@ -2229,7 +2229,7 @@
       }), true);
       res
           .patch(arg_request, arg_appsId, mask: arg_mask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2295,7 +2295,7 @@
       }), true);
       res
           .get(arg_appsId, arg_locationsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Location response) {
+          .then(unittest.expectAsync1(((response) {
         checkLocation(response);
       })));
     });
@@ -2367,7 +2367,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLocationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLocationsResponse(response);
       })));
     });
@@ -2433,7 +2433,7 @@
       }), true);
       res
           .get(arg_appsId, arg_operationsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2505,7 +2505,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -2571,7 +2571,7 @@
       }), true);
       res
           .delete(arg_appsId, arg_servicesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2635,7 +2635,7 @@
       }), true);
       res
           .get(arg_appsId, arg_servicesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Service response) {
+          .then(unittest.expectAsync1(((response) {
         checkService(response);
       })));
     });
@@ -2704,7 +2704,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListServicesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListServicesResponse(response);
       })));
     });
@@ -2780,7 +2780,7 @@
               migrateTraffic: arg_migrateTraffic,
               mask: arg_mask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2856,7 +2856,7 @@
       }), true);
       res
           .create(arg_request, arg_appsId, arg_servicesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2931,7 +2931,7 @@
       res
           .delete(arg_appsId, arg_servicesId, arg_versionsId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3008,7 +3008,7 @@
       res
           .get(arg_appsId, arg_servicesId, arg_versionsId,
               view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Version response) {
+          .then(unittest.expectAsync1(((response) {
         checkVersion(response);
       })));
     });
@@ -3090,7 +3090,7 @@
               pageSize: arg_pageSize,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListVersionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListVersionsResponse(response);
       })));
     });
@@ -3171,7 +3171,7 @@
       res
           .patch(arg_request, arg_appsId, arg_servicesId, arg_versionsId,
               mask: arg_mask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3269,7 +3269,7 @@
           .debug(arg_request, arg_appsId, arg_servicesId, arg_versionsId,
               arg_instancesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3354,7 +3354,7 @@
       res
           .delete(arg_appsId, arg_servicesId, arg_versionsId, arg_instancesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3439,7 +3439,7 @@
       res
           .get(arg_appsId, arg_servicesId, arg_versionsId, arg_instancesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Instance response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstance(response);
       })));
     });
@@ -3528,7 +3528,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListInstancesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListInstancesResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/appengine/v1beta_test.dart b/generated/googleapis_beta/test/appengine/v1beta_test.dart
index 7ef1af6..e3f23f2 100644
--- a/generated/googleapis_beta/test/appengine/v1beta_test.dart
+++ b/generated/googleapis_beta/test/appengine/v1beta_test.dart
@@ -96,14 +96,14 @@
   buildCounterApiEndpointHandler--;
 }
 
-buildUnnamed3834() {
+buildUnnamed3953() {
   var o = new core.List<api.UrlDispatchRule>();
   o.add(buildUrlDispatchRule());
   o.add(buildUrlDispatchRule());
   return o;
 }
 
-checkUnnamed3834(core.List<api.UrlDispatchRule> o) {
+checkUnnamed3953(core.List<api.UrlDispatchRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlDispatchRule(o[0]);
   checkUrlDispatchRule(o[1]);
@@ -119,7 +119,7 @@
     o.defaultBucket = "foo";
     o.defaultCookieExpiration = "foo";
     o.defaultHostname = "foo";
-    o.dispatchRules = buildUnnamed3834();
+    o.dispatchRules = buildUnnamed3953();
     o.featureSettings = buildFeatureSettings();
     o.gcrDomain = "foo";
     o.iap = buildIdentityAwareProxy();
@@ -140,7 +140,7 @@
     unittest.expect(o.defaultBucket, unittest.equals('foo'));
     unittest.expect(o.defaultCookieExpiration, unittest.equals('foo'));
     unittest.expect(o.defaultHostname, unittest.equals('foo'));
-    checkUnnamed3834(o.dispatchRules);
+    checkUnnamed3953(o.dispatchRules);
     checkFeatureSettings(o.featureSettings);
     unittest.expect(o.gcrDomain, unittest.equals('foo'));
     checkIdentityAwareProxy(o.iap);
@@ -152,27 +152,27 @@
   buildCounterApplication--;
 }
 
-buildUnnamed3835() {
+buildUnnamed3954() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3835(core.List<core.String> o) {
+checkUnnamed3954(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3836() {
+buildUnnamed3955() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3836(core.List<core.String> o) {
+checkUnnamed3955(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -186,12 +186,12 @@
     o.certificateRawData = buildCertificateRawData();
     o.displayName = "foo";
     o.domainMappingsCount = 42;
-    o.domainNames = buildUnnamed3835();
+    o.domainNames = buildUnnamed3954();
     o.expireTime = "foo";
     o.id = "foo";
     o.managedCertificate = buildManagedCertificate();
     o.name = "foo";
-    o.visibleDomainMappings = buildUnnamed3836();
+    o.visibleDomainMappings = buildUnnamed3955();
   }
   buildCounterAuthorizedCertificate--;
   return o;
@@ -203,12 +203,12 @@
     checkCertificateRawData(o.certificateRawData);
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.domainMappingsCount, unittest.equals(42));
-    checkUnnamed3835(o.domainNames);
+    checkUnnamed3954(o.domainNames);
     unittest.expect(o.expireTime, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     checkManagedCertificate(o.managedCertificate);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3836(o.visibleDomainMappings);
+    checkUnnamed3955(o.visibleDomainMappings);
   }
   buildCounterAuthorizedCertificate--;
 }
@@ -234,14 +234,14 @@
   buildCounterAuthorizedDomain--;
 }
 
-buildUnnamed3837() {
+buildUnnamed3956() {
   var o = new core.List<api.CustomMetric>();
   o.add(buildCustomMetric());
   o.add(buildCustomMetric());
   return o;
 }
 
-checkUnnamed3837(core.List<api.CustomMetric> o) {
+checkUnnamed3956(core.List<api.CustomMetric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCustomMetric(o[0]);
   checkCustomMetric(o[1]);
@@ -254,7 +254,7 @@
   if (buildCounterAutomaticScaling < 3) {
     o.coolDownPeriod = "foo";
     o.cpuUtilization = buildCpuUtilization();
-    o.customMetrics = buildUnnamed3837();
+    o.customMetrics = buildUnnamed3956();
     o.diskUtilization = buildDiskUtilization();
     o.maxConcurrentRequests = 42;
     o.maxIdleInstances = 42;
@@ -276,7 +276,7 @@
   if (buildCounterAutomaticScaling < 3) {
     unittest.expect(o.coolDownPeriod, unittest.equals('foo'));
     checkCpuUtilization(o.cpuUtilization);
-    checkUnnamed3837(o.customMetrics);
+    checkUnnamed3956(o.customMetrics);
     checkDiskUtilization(o.diskUtilization);
     unittest.expect(o.maxConcurrentRequests, unittest.equals(42));
     unittest.expect(o.maxIdleInstances, unittest.equals(42));
@@ -313,14 +313,14 @@
   buildCounterBasicScaling--;
 }
 
-buildUnnamed3838() {
+buildUnnamed3957() {
   var o = new core.List<api.FirewallRule>();
   o.add(buildFirewallRule());
   o.add(buildFirewallRule());
   return o;
 }
 
-checkUnnamed3838(core.List<api.FirewallRule> o) {
+checkUnnamed3957(core.List<api.FirewallRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFirewallRule(o[0]);
   checkFirewallRule(o[1]);
@@ -331,7 +331,7 @@
   var o = new api.BatchUpdateIngressRulesRequest();
   buildCounterBatchUpdateIngressRulesRequest++;
   if (buildCounterBatchUpdateIngressRulesRequest < 3) {
-    o.ingressRules = buildUnnamed3838();
+    o.ingressRules = buildUnnamed3957();
   }
   buildCounterBatchUpdateIngressRulesRequest--;
   return o;
@@ -340,19 +340,19 @@
 checkBatchUpdateIngressRulesRequest(api.BatchUpdateIngressRulesRequest o) {
   buildCounterBatchUpdateIngressRulesRequest++;
   if (buildCounterBatchUpdateIngressRulesRequest < 3) {
-    checkUnnamed3838(o.ingressRules);
+    checkUnnamed3957(o.ingressRules);
   }
   buildCounterBatchUpdateIngressRulesRequest--;
 }
 
-buildUnnamed3839() {
+buildUnnamed3958() {
   var o = new core.List<api.FirewallRule>();
   o.add(buildFirewallRule());
   o.add(buildFirewallRule());
   return o;
 }
 
-checkUnnamed3839(core.List<api.FirewallRule> o) {
+checkUnnamed3958(core.List<api.FirewallRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFirewallRule(o[0]);
   checkFirewallRule(o[1]);
@@ -363,7 +363,7 @@
   var o = new api.BatchUpdateIngressRulesResponse();
   buildCounterBatchUpdateIngressRulesResponse++;
   if (buildCounterBatchUpdateIngressRulesResponse < 3) {
-    o.ingressRules = buildUnnamed3839();
+    o.ingressRules = buildUnnamed3958();
   }
   buildCounterBatchUpdateIngressRulesResponse--;
   return o;
@@ -372,7 +372,7 @@
 checkBatchUpdateIngressRulesResponse(api.BatchUpdateIngressRulesResponse o) {
   buildCounterBatchUpdateIngressRulesResponse++;
   if (buildCounterBatchUpdateIngressRulesResponse < 3) {
-    checkUnnamed3839(o.ingressRules);
+    checkUnnamed3958(o.ingressRules);
   }
   buildCounterBatchUpdateIngressRulesResponse--;
 }
@@ -562,14 +562,14 @@
   buildCounterDebugInstanceRequest--;
 }
 
-buildUnnamed3840() {
+buildUnnamed3959() {
   var o = new core.Map<core.String, api.FileInfo>();
   o["x"] = buildFileInfo();
   o["y"] = buildFileInfo();
   return o;
 }
 
-checkUnnamed3840(core.Map<core.String, api.FileInfo> o) {
+checkUnnamed3959(core.Map<core.String, api.FileInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFileInfo(o["x"]);
   checkFileInfo(o["y"]);
@@ -583,7 +583,7 @@
     o.build = buildBuildInfo();
     o.cloudBuildOptions = buildCloudBuildOptions();
     o.container = buildContainerInfo();
-    o.files = buildUnnamed3840();
+    o.files = buildUnnamed3959();
     o.zip = buildZipInfo();
   }
   buildCounterDeployment--;
@@ -596,7 +596,7 @@
     checkBuildInfo(o.build);
     checkCloudBuildOptions(o.cloudBuildOptions);
     checkContainerInfo(o.container);
-    checkUnnamed3840(o.files);
+    checkUnnamed3959(o.files);
     checkZipInfo(o.zip);
   }
   buildCounterDeployment--;
@@ -627,14 +627,14 @@
   buildCounterDiskUtilization--;
 }
 
-buildUnnamed3841() {
+buildUnnamed3960() {
   var o = new core.List<api.ResourceRecord>();
   o.add(buildResourceRecord());
   o.add(buildResourceRecord());
   return o;
 }
 
-checkUnnamed3841(core.List<api.ResourceRecord> o) {
+checkUnnamed3960(core.List<api.ResourceRecord> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceRecord(o[0]);
   checkResourceRecord(o[1]);
@@ -647,7 +647,7 @@
   if (buildCounterDomainMapping < 3) {
     o.id = "foo";
     o.name = "foo";
-    o.resourceRecords = buildUnnamed3841();
+    o.resourceRecords = buildUnnamed3960();
     o.sslSettings = buildSslSettings();
   }
   buildCounterDomainMapping--;
@@ -659,7 +659,7 @@
   if (buildCounterDomainMapping < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3841(o.resourceRecords);
+    checkUnnamed3960(o.resourceRecords);
     checkSslSettings(o.sslSettings);
   }
   buildCounterDomainMapping--;
@@ -919,14 +919,14 @@
   buildCounterLibrary--;
 }
 
-buildUnnamed3842() {
+buildUnnamed3961() {
   var o = new core.List<api.AuthorizedCertificate>();
   o.add(buildAuthorizedCertificate());
   o.add(buildAuthorizedCertificate());
   return o;
 }
 
-checkUnnamed3842(core.List<api.AuthorizedCertificate> o) {
+checkUnnamed3961(core.List<api.AuthorizedCertificate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthorizedCertificate(o[0]);
   checkAuthorizedCertificate(o[1]);
@@ -937,7 +937,7 @@
   var o = new api.ListAuthorizedCertificatesResponse();
   buildCounterListAuthorizedCertificatesResponse++;
   if (buildCounterListAuthorizedCertificatesResponse < 3) {
-    o.certificates = buildUnnamed3842();
+    o.certificates = buildUnnamed3961();
     o.nextPageToken = "foo";
   }
   buildCounterListAuthorizedCertificatesResponse--;
@@ -948,20 +948,20 @@
     api.ListAuthorizedCertificatesResponse o) {
   buildCounterListAuthorizedCertificatesResponse++;
   if (buildCounterListAuthorizedCertificatesResponse < 3) {
-    checkUnnamed3842(o.certificates);
+    checkUnnamed3961(o.certificates);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListAuthorizedCertificatesResponse--;
 }
 
-buildUnnamed3843() {
+buildUnnamed3962() {
   var o = new core.List<api.AuthorizedDomain>();
   o.add(buildAuthorizedDomain());
   o.add(buildAuthorizedDomain());
   return o;
 }
 
-checkUnnamed3843(core.List<api.AuthorizedDomain> o) {
+checkUnnamed3962(core.List<api.AuthorizedDomain> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuthorizedDomain(o[0]);
   checkAuthorizedDomain(o[1]);
@@ -972,7 +972,7 @@
   var o = new api.ListAuthorizedDomainsResponse();
   buildCounterListAuthorizedDomainsResponse++;
   if (buildCounterListAuthorizedDomainsResponse < 3) {
-    o.domains = buildUnnamed3843();
+    o.domains = buildUnnamed3962();
     o.nextPageToken = "foo";
   }
   buildCounterListAuthorizedDomainsResponse--;
@@ -982,20 +982,20 @@
 checkListAuthorizedDomainsResponse(api.ListAuthorizedDomainsResponse o) {
   buildCounterListAuthorizedDomainsResponse++;
   if (buildCounterListAuthorizedDomainsResponse < 3) {
-    checkUnnamed3843(o.domains);
+    checkUnnamed3962(o.domains);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListAuthorizedDomainsResponse--;
 }
 
-buildUnnamed3844() {
+buildUnnamed3963() {
   var o = new core.List<api.DomainMapping>();
   o.add(buildDomainMapping());
   o.add(buildDomainMapping());
   return o;
 }
 
-checkUnnamed3844(core.List<api.DomainMapping> o) {
+checkUnnamed3963(core.List<api.DomainMapping> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDomainMapping(o[0]);
   checkDomainMapping(o[1]);
@@ -1006,7 +1006,7 @@
   var o = new api.ListDomainMappingsResponse();
   buildCounterListDomainMappingsResponse++;
   if (buildCounterListDomainMappingsResponse < 3) {
-    o.domainMappings = buildUnnamed3844();
+    o.domainMappings = buildUnnamed3963();
     o.nextPageToken = "foo";
   }
   buildCounterListDomainMappingsResponse--;
@@ -1016,20 +1016,20 @@
 checkListDomainMappingsResponse(api.ListDomainMappingsResponse o) {
   buildCounterListDomainMappingsResponse++;
   if (buildCounterListDomainMappingsResponse < 3) {
-    checkUnnamed3844(o.domainMappings);
+    checkUnnamed3963(o.domainMappings);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDomainMappingsResponse--;
 }
 
-buildUnnamed3845() {
+buildUnnamed3964() {
   var o = new core.List<api.FirewallRule>();
   o.add(buildFirewallRule());
   o.add(buildFirewallRule());
   return o;
 }
 
-checkUnnamed3845(core.List<api.FirewallRule> o) {
+checkUnnamed3964(core.List<api.FirewallRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFirewallRule(o[0]);
   checkFirewallRule(o[1]);
@@ -1040,7 +1040,7 @@
   var o = new api.ListIngressRulesResponse();
   buildCounterListIngressRulesResponse++;
   if (buildCounterListIngressRulesResponse < 3) {
-    o.ingressRules = buildUnnamed3845();
+    o.ingressRules = buildUnnamed3964();
     o.nextPageToken = "foo";
   }
   buildCounterListIngressRulesResponse--;
@@ -1050,20 +1050,20 @@
 checkListIngressRulesResponse(api.ListIngressRulesResponse o) {
   buildCounterListIngressRulesResponse++;
   if (buildCounterListIngressRulesResponse < 3) {
-    checkUnnamed3845(o.ingressRules);
+    checkUnnamed3964(o.ingressRules);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListIngressRulesResponse--;
 }
 
-buildUnnamed3846() {
+buildUnnamed3965() {
   var o = new core.List<api.Instance>();
   o.add(buildInstance());
   o.add(buildInstance());
   return o;
 }
 
-checkUnnamed3846(core.List<api.Instance> o) {
+checkUnnamed3965(core.List<api.Instance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstance(o[0]);
   checkInstance(o[1]);
@@ -1074,7 +1074,7 @@
   var o = new api.ListInstancesResponse();
   buildCounterListInstancesResponse++;
   if (buildCounterListInstancesResponse < 3) {
-    o.instances = buildUnnamed3846();
+    o.instances = buildUnnamed3965();
     o.nextPageToken = "foo";
   }
   buildCounterListInstancesResponse--;
@@ -1084,20 +1084,20 @@
 checkListInstancesResponse(api.ListInstancesResponse o) {
   buildCounterListInstancesResponse++;
   if (buildCounterListInstancesResponse < 3) {
-    checkUnnamed3846(o.instances);
+    checkUnnamed3965(o.instances);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListInstancesResponse--;
 }
 
-buildUnnamed3847() {
+buildUnnamed3966() {
   var o = new core.List<api.Location>();
   o.add(buildLocation());
   o.add(buildLocation());
   return o;
 }
 
-checkUnnamed3847(core.List<api.Location> o) {
+checkUnnamed3966(core.List<api.Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocation(o[0]);
   checkLocation(o[1]);
@@ -1108,7 +1108,7 @@
   var o = new api.ListLocationsResponse();
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    o.locations = buildUnnamed3847();
+    o.locations = buildUnnamed3966();
     o.nextPageToken = "foo";
   }
   buildCounterListLocationsResponse--;
@@ -1118,20 +1118,20 @@
 checkListLocationsResponse(api.ListLocationsResponse o) {
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    checkUnnamed3847(o.locations);
+    checkUnnamed3966(o.locations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLocationsResponse--;
 }
 
-buildUnnamed3848() {
+buildUnnamed3967() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed3848(core.List<api.Operation> o) {
+checkUnnamed3967(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -1143,7 +1143,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed3848();
+    o.operations = buildUnnamed3967();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -1153,19 +1153,19 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3848(o.operations);
+    checkUnnamed3967(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed3849() {
+buildUnnamed3968() {
   var o = new core.List<api.Service>();
   o.add(buildService());
   o.add(buildService());
   return o;
 }
 
-checkUnnamed3849(core.List<api.Service> o) {
+checkUnnamed3968(core.List<api.Service> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkService(o[0]);
   checkService(o[1]);
@@ -1177,7 +1177,7 @@
   buildCounterListServicesResponse++;
   if (buildCounterListServicesResponse < 3) {
     o.nextPageToken = "foo";
-    o.services = buildUnnamed3849();
+    o.services = buildUnnamed3968();
   }
   buildCounterListServicesResponse--;
   return o;
@@ -1187,19 +1187,19 @@
   buildCounterListServicesResponse++;
   if (buildCounterListServicesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3849(o.services);
+    checkUnnamed3968(o.services);
   }
   buildCounterListServicesResponse--;
 }
 
-buildUnnamed3850() {
+buildUnnamed3969() {
   var o = new core.List<api.Version>();
   o.add(buildVersion());
   o.add(buildVersion());
   return o;
 }
 
-checkUnnamed3850(core.List<api.Version> o) {
+checkUnnamed3969(core.List<api.Version> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVersion(o[0]);
   checkVersion(o[1]);
@@ -1211,7 +1211,7 @@
   buildCounterListVersionsResponse++;
   if (buildCounterListVersionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.versions = buildUnnamed3850();
+    o.versions = buildUnnamed3969();
   }
   buildCounterListVersionsResponse--;
   return o;
@@ -1221,7 +1221,7 @@
   buildCounterListVersionsResponse++;
   if (buildCounterListVersionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3850(o.versions);
+    checkUnnamed3969(o.versions);
   }
   buildCounterListVersionsResponse--;
 }
@@ -1257,20 +1257,20 @@
   buildCounterLivenessCheck--;
 }
 
-buildUnnamed3851() {
+buildUnnamed3970() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3851(core.Map<core.String, core.String> o) {
+checkUnnamed3970(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed3852() {
+buildUnnamed3971() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1285,7 +1285,7 @@
   return o;
 }
 
-checkUnnamed3852(core.Map<core.String, core.Object> o) {
+checkUnnamed3971(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1304,9 +1304,9 @@
   var o = new api.Location();
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    o.labels = buildUnnamed3851();
+    o.labels = buildUnnamed3970();
     o.locationId = "foo";
-    o.metadata = buildUnnamed3852();
+    o.metadata = buildUnnamed3971();
     o.name = "foo";
   }
   buildCounterLocation--;
@@ -1316,9 +1316,9 @@
 checkLocation(api.Location o) {
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    checkUnnamed3851(o.labels);
+    checkUnnamed3970(o.labels);
     unittest.expect(o.locationId, unittest.equals('foo'));
-    checkUnnamed3852(o.metadata);
+    checkUnnamed3971(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLocation--;
@@ -1385,14 +1385,14 @@
   buildCounterManualScaling--;
 }
 
-buildUnnamed3853() {
+buildUnnamed3972() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3853(core.List<core.String> o) {
+checkUnnamed3972(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1403,7 +1403,7 @@
   var o = new api.Network();
   buildCounterNetwork++;
   if (buildCounterNetwork < 3) {
-    o.forwardedPorts = buildUnnamed3853();
+    o.forwardedPorts = buildUnnamed3972();
     o.instanceTag = "foo";
     o.name = "foo";
     o.sessionAffinity = true;
@@ -1416,7 +1416,7 @@
 checkNetwork(api.Network o) {
   buildCounterNetwork++;
   if (buildCounterNetwork < 3) {
-    checkUnnamed3853(o.forwardedPorts);
+    checkUnnamed3972(o.forwardedPorts);
     unittest.expect(o.instanceTag, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.sessionAffinity, unittest.isTrue);
@@ -1450,7 +1450,7 @@
   buildCounterNetworkUtilization--;
 }
 
-buildUnnamed3854() {
+buildUnnamed3973() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1465,7 +1465,7 @@
   return o;
 }
 
-checkUnnamed3854(core.Map<core.String, core.Object> o) {
+checkUnnamed3973(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -1479,7 +1479,7 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3855() {
+buildUnnamed3974() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1494,7 +1494,7 @@
   return o;
 }
 
-checkUnnamed3855(core.Map<core.String, core.Object> o) {
+checkUnnamed3974(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1515,9 +1515,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed3854();
+    o.metadata = buildUnnamed3973();
     o.name = "foo";
-    o.response = buildUnnamed3855();
+    o.response = buildUnnamed3974();
   }
   buildCounterOperation--;
   return o;
@@ -1528,9 +1528,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed3854(o.metadata);
+    checkUnnamed3973(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3855(o.response);
+    checkUnnamed3974(o.response);
   }
   buildCounterOperation--;
 }
@@ -1564,14 +1564,14 @@
   buildCounterOperationMetadata--;
 }
 
-buildUnnamed3856() {
+buildUnnamed3975() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3856(core.List<core.String> o) {
+checkUnnamed3975(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1588,7 +1588,7 @@
     o.method = "foo";
     o.target = "foo";
     o.user = "foo";
-    o.warning = buildUnnamed3856();
+    o.warning = buildUnnamed3975();
   }
   buildCounterOperationMetadataV1--;
   return o;
@@ -1603,19 +1603,19 @@
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed3856(o.warning);
+    checkUnnamed3975(o.warning);
   }
   buildCounterOperationMetadataV1--;
 }
 
-buildUnnamed3857() {
+buildUnnamed3976() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3857(core.List<core.String> o) {
+checkUnnamed3976(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1633,7 +1633,7 @@
     o.method = "foo";
     o.target = "foo";
     o.user = "foo";
-    o.warning = buildUnnamed3857();
+    o.warning = buildUnnamed3976();
   }
   buildCounterOperationMetadataV1Alpha--;
   return o;
@@ -1649,19 +1649,19 @@
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed3857(o.warning);
+    checkUnnamed3976(o.warning);
   }
   buildCounterOperationMetadataV1Alpha--;
 }
 
-buildUnnamed3858() {
+buildUnnamed3977() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3858(core.List<core.String> o) {
+checkUnnamed3977(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1679,7 +1679,7 @@
     o.method = "foo";
     o.target = "foo";
     o.user = "foo";
-    o.warning = buildUnnamed3858();
+    o.warning = buildUnnamed3977();
   }
   buildCounterOperationMetadataV1Beta--;
   return o;
@@ -1695,7 +1695,7 @@
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.target, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed3858(o.warning);
+    checkUnnamed3977(o.warning);
   }
   buildCounterOperationMetadataV1Beta--;
 }
@@ -1817,14 +1817,14 @@
   buildCounterResourceRecord--;
 }
 
-buildUnnamed3859() {
+buildUnnamed3978() {
   var o = new core.List<api.Volume>();
   o.add(buildVolume());
   o.add(buildVolume());
   return o;
 }
 
-checkUnnamed3859(core.List<api.Volume> o) {
+checkUnnamed3978(core.List<api.Volume> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVolume(o[0]);
   checkVolume(o[1]);
@@ -1838,7 +1838,7 @@
     o.cpu = 42.0;
     o.diskGb = 42.0;
     o.memoryGb = 42.0;
-    o.volumes = buildUnnamed3859();
+    o.volumes = buildUnnamed3978();
   }
   buildCounterResources--;
   return o;
@@ -1850,7 +1850,7 @@
     unittest.expect(o.cpu, unittest.equals(42.0));
     unittest.expect(o.diskGb, unittest.equals(42.0));
     unittest.expect(o.memoryGb, unittest.equals(42.0));
-    checkUnnamed3859(o.volumes);
+    checkUnnamed3978(o.volumes);
   }
   buildCounterResources--;
 }
@@ -1945,14 +1945,14 @@
   buildCounterStandardSchedulerSettings--;
 }
 
-buildUnnamed3860() {
+buildUnnamed3979() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3860(core.Map<core.String, core.String> o) {
+checkUnnamed3979(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1965,7 +1965,7 @@
   if (buildCounterStaticFilesHandler < 3) {
     o.applicationReadable = true;
     o.expiration = "foo";
-    o.httpHeaders = buildUnnamed3860();
+    o.httpHeaders = buildUnnamed3979();
     o.mimeType = "foo";
     o.path = "foo";
     o.requireMatchingFile = true;
@@ -1980,7 +1980,7 @@
   if (buildCounterStaticFilesHandler < 3) {
     unittest.expect(o.applicationReadable, unittest.isTrue);
     unittest.expect(o.expiration, unittest.equals('foo'));
-    checkUnnamed3860(o.httpHeaders);
+    checkUnnamed3979(o.httpHeaders);
     unittest.expect(o.mimeType, unittest.equals('foo'));
     unittest.expect(o.path, unittest.equals('foo'));
     unittest.expect(o.requireMatchingFile, unittest.isTrue);
@@ -1989,7 +1989,7 @@
   buildCounterStaticFilesHandler--;
 }
 
-buildUnnamed3861() {
+buildUnnamed3980() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2004,7 +2004,7 @@
   return o;
 }
 
-checkUnnamed3861(core.Map<core.String, core.Object> o) {
+checkUnnamed3980(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -2018,17 +2018,17 @@
   unittest.expect(casted8["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3862() {
+buildUnnamed3981() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3861());
-  o.add(buildUnnamed3861());
+  o.add(buildUnnamed3980());
+  o.add(buildUnnamed3980());
   return o;
 }
 
-checkUnnamed3862(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed3981(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3861(o[0]);
-  checkUnnamed3861(o[1]);
+  checkUnnamed3980(o[0]);
+  checkUnnamed3980(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -2037,7 +2037,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed3862();
+    o.details = buildUnnamed3981();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -2048,20 +2048,20 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed3862(o.details);
+    checkUnnamed3981(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed3863() {
+buildUnnamed3982() {
   var o = new core.Map<core.String, core.double>();
   o["x"] = 42.0;
   o["y"] = 42.0;
   return o;
 }
 
-checkUnnamed3863(core.Map<core.String, core.double> o) {
+checkUnnamed3982(core.Map<core.String, core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals(42.0));
   unittest.expect(o["y"], unittest.equals(42.0));
@@ -2072,7 +2072,7 @@
   var o = new api.TrafficSplit();
   buildCounterTrafficSplit++;
   if (buildCounterTrafficSplit < 3) {
-    o.allocations = buildUnnamed3863();
+    o.allocations = buildUnnamed3982();
     o.shardBy = "foo";
   }
   buildCounterTrafficSplit--;
@@ -2082,7 +2082,7 @@
 checkTrafficSplit(api.TrafficSplit o) {
   buildCounterTrafficSplit++;
   if (buildCounterTrafficSplit < 3) {
-    checkUnnamed3863(o.allocations);
+    checkUnnamed3982(o.allocations);
     unittest.expect(o.shardBy, unittest.equals('foo'));
   }
   buildCounterTrafficSplit--;
@@ -2144,92 +2144,92 @@
   buildCounterUrlMap--;
 }
 
-buildUnnamed3864() {
+buildUnnamed3983() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3864(core.Map<core.String, core.String> o) {
+checkUnnamed3983(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed3865() {
+buildUnnamed3984() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3865(core.Map<core.String, core.String> o) {
+checkUnnamed3984(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed3866() {
+buildUnnamed3985() {
   var o = new core.List<api.ErrorHandler>();
   o.add(buildErrorHandler());
   o.add(buildErrorHandler());
   return o;
 }
 
-checkUnnamed3866(core.List<api.ErrorHandler> o) {
+checkUnnamed3985(core.List<api.ErrorHandler> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorHandler(o[0]);
   checkErrorHandler(o[1]);
 }
 
-buildUnnamed3867() {
+buildUnnamed3986() {
   var o = new core.List<api.UrlMap>();
   o.add(buildUrlMap());
   o.add(buildUrlMap());
   return o;
 }
 
-checkUnnamed3867(core.List<api.UrlMap> o) {
+checkUnnamed3986(core.List<api.UrlMap> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUrlMap(o[0]);
   checkUrlMap(o[1]);
 }
 
-buildUnnamed3868() {
+buildUnnamed3987() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3868(core.List<core.String> o) {
+checkUnnamed3987(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3869() {
+buildUnnamed3988() {
   var o = new core.List<api.Library>();
   o.add(buildLibrary());
   o.add(buildLibrary());
   return o;
 }
 
-checkUnnamed3869(core.List<api.Library> o) {
+checkUnnamed3988(core.List<api.Library> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLibrary(o[0]);
   checkLibrary(o[1]);
 }
 
-buildUnnamed3870() {
+buildUnnamed3989() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3870(core.List<core.String> o) {
+checkUnnamed3989(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2243,7 +2243,7 @@
     o.apiConfig = buildApiConfigHandler();
     o.automaticScaling = buildAutomaticScaling();
     o.basicScaling = buildBasicScaling();
-    o.betaSettings = buildUnnamed3864();
+    o.betaSettings = buildUnnamed3983();
     o.createTime = "foo";
     o.createdBy = "foo";
     o.defaultExpiration = "foo";
@@ -2251,14 +2251,14 @@
     o.diskUsageBytes = "foo";
     o.endpointsApiService = buildEndpointsApiService();
     o.env = "foo";
-    o.envVariables = buildUnnamed3865();
-    o.errorHandlers = buildUnnamed3866();
-    o.handlers = buildUnnamed3867();
+    o.envVariables = buildUnnamed3984();
+    o.errorHandlers = buildUnnamed3985();
+    o.handlers = buildUnnamed3986();
     o.healthCheck = buildHealthCheck();
     o.id = "foo";
-    o.inboundServices = buildUnnamed3868();
+    o.inboundServices = buildUnnamed3987();
     o.instanceClass = "foo";
-    o.libraries = buildUnnamed3869();
+    o.libraries = buildUnnamed3988();
     o.livenessCheck = buildLivenessCheck();
     o.manualScaling = buildManualScaling();
     o.name = "foo";
@@ -2273,7 +2273,7 @@
     o.threadsafe = true;
     o.versionUrl = "foo";
     o.vm = true;
-    o.zones = buildUnnamed3870();
+    o.zones = buildUnnamed3989();
   }
   buildCounterVersion--;
   return o;
@@ -2285,7 +2285,7 @@
     checkApiConfigHandler(o.apiConfig);
     checkAutomaticScaling(o.automaticScaling);
     checkBasicScaling(o.basicScaling);
-    checkUnnamed3864(o.betaSettings);
+    checkUnnamed3983(o.betaSettings);
     unittest.expect(o.createTime, unittest.equals('foo'));
     unittest.expect(o.createdBy, unittest.equals('foo'));
     unittest.expect(o.defaultExpiration, unittest.equals('foo'));
@@ -2293,14 +2293,14 @@
     unittest.expect(o.diskUsageBytes, unittest.equals('foo'));
     checkEndpointsApiService(o.endpointsApiService);
     unittest.expect(o.env, unittest.equals('foo'));
-    checkUnnamed3865(o.envVariables);
-    checkUnnamed3866(o.errorHandlers);
-    checkUnnamed3867(o.handlers);
+    checkUnnamed3984(o.envVariables);
+    checkUnnamed3985(o.errorHandlers);
+    checkUnnamed3986(o.handlers);
     checkHealthCheck(o.healthCheck);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed3868(o.inboundServices);
+    checkUnnamed3987(o.inboundServices);
     unittest.expect(o.instanceClass, unittest.equals('foo'));
-    checkUnnamed3869(o.libraries);
+    checkUnnamed3988(o.libraries);
     checkLivenessCheck(o.livenessCheck);
     checkManualScaling(o.manualScaling);
     unittest.expect(o.name, unittest.equals('foo'));
@@ -2315,7 +2315,7 @@
     unittest.expect(o.threadsafe, unittest.isTrue);
     unittest.expect(o.versionUrl, unittest.equals('foo'));
     unittest.expect(o.vm, unittest.isTrue);
-    checkUnnamed3870(o.zones);
+    checkUnnamed3989(o.zones);
   }
   buildCounterVersion--;
 }
@@ -2974,7 +2974,7 @@
       }), true);
       res
           .create(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3027,7 +3027,7 @@
       }), true);
       res
           .get(arg_appsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Application response) {
+          .then(unittest.expectAsync1(((response) {
         checkApplication(response);
       })));
     });
@@ -3088,7 +3088,7 @@
       res
           .patch(arg_request, arg_appsId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3151,7 +3151,7 @@
       }), true);
       res
           .repair(arg_request, arg_appsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3217,7 +3217,7 @@
       }), true);
       res
           .create(arg_request, arg_appsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AuthorizedCertificate response) {
+          .then(unittest.expectAsync1(((response) {
         checkAuthorizedCertificate(response);
       })));
     });
@@ -3283,7 +3283,7 @@
       res
           .delete(arg_appsId, arg_authorizedCertificatesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3351,7 +3351,7 @@
       res
           .get(arg_appsId, arg_authorizedCertificatesId,
               view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AuthorizedCertificate response) {
+          .then(unittest.expectAsync1(((response) {
         checkAuthorizedCertificate(response);
       })));
     });
@@ -3424,8 +3424,7 @@
               pageSize: arg_pageSize,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListAuthorizedCertificatesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListAuthorizedCertificatesResponse(response);
       })));
     });
@@ -3498,7 +3497,7 @@
       res
           .patch(arg_request, arg_appsId, arg_authorizedCertificatesId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AuthorizedCertificate response) {
+          .then(unittest.expectAsync1(((response) {
         checkAuthorizedCertificate(response);
       })));
     });
@@ -3569,8 +3568,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListAuthorizedDomainsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListAuthorizedDomainsResponse(response);
       })));
     });
@@ -3640,7 +3638,7 @@
       res
           .create(arg_request, arg_appsId,
               overrideStrategy: arg_overrideStrategy, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3704,7 +3702,7 @@
       }), true);
       res
           .delete(arg_appsId, arg_domainMappingsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3768,7 +3766,7 @@
       }), true);
       res
           .get(arg_appsId, arg_domainMappingsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DomainMapping response) {
+          .then(unittest.expectAsync1(((response) {
         checkDomainMapping(response);
       })));
     });
@@ -3837,8 +3835,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListDomainMappingsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDomainMappingsResponse(response);
       })));
     });
@@ -3910,7 +3907,7 @@
       res
           .patch(arg_request, arg_appsId, arg_domainMappingsId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3974,9 +3971,9 @@
         var resp = convert.JSON.encode(buildBatchUpdateIngressRulesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchUpdate(arg_request, arg_appsId, $fields: arg_$fields).then(
-          unittest
-              .expectAsync1(((api.BatchUpdateIngressRulesResponse response) {
+      res
+          .batchUpdate(arg_request, arg_appsId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkBatchUpdateIngressRulesResponse(response);
       })));
     });
@@ -4040,7 +4037,7 @@
       }), true);
       res
           .create(arg_request, arg_appsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FirewallRule response) {
+          .then(unittest.expectAsync1(((response) {
         checkFirewallRule(response);
       })));
     });
@@ -4104,7 +4101,7 @@
       }), true);
       res
           .delete(arg_appsId, arg_ingressRulesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -4168,7 +4165,7 @@
       }), true);
       res
           .get(arg_appsId, arg_ingressRulesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FirewallRule response) {
+          .then(unittest.expectAsync1(((response) {
         checkFirewallRule(response);
       })));
     });
@@ -4241,7 +4238,7 @@
               pageSize: arg_pageSize,
               matchingAddress: arg_matchingAddress,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListIngressRulesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListIngressRulesResponse(response);
       })));
     });
@@ -4313,7 +4310,7 @@
       res
           .patch(arg_request, arg_appsId, arg_ingressRulesId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FirewallRule response) {
+          .then(unittest.expectAsync1(((response) {
         checkFirewallRule(response);
       })));
     });
@@ -4379,7 +4376,7 @@
       }), true);
       res
           .get(arg_appsId, arg_locationsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Location response) {
+          .then(unittest.expectAsync1(((response) {
         checkLocation(response);
       })));
     });
@@ -4451,7 +4448,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLocationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLocationsResponse(response);
       })));
     });
@@ -4517,7 +4514,7 @@
       }), true);
       res
           .get(arg_appsId, arg_operationsId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4589,7 +4586,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -4655,7 +4652,7 @@
       }), true);
       res
           .delete(arg_appsId, arg_servicesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4719,7 +4716,7 @@
       }), true);
       res
           .get(arg_appsId, arg_servicesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Service response) {
+          .then(unittest.expectAsync1(((response) {
         checkService(response);
       })));
     });
@@ -4788,7 +4785,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListServicesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListServicesResponse(response);
       })));
     });
@@ -4865,7 +4862,7 @@
               migrateTraffic: arg_migrateTraffic,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4941,7 +4938,7 @@
       }), true);
       res
           .create(arg_request, arg_appsId, arg_servicesId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5016,7 +5013,7 @@
       res
           .delete(arg_appsId, arg_servicesId, arg_versionsId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5093,7 +5090,7 @@
       res
           .get(arg_appsId, arg_servicesId, arg_versionsId,
               view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Version response) {
+          .then(unittest.expectAsync1(((response) {
         checkVersion(response);
       })));
     });
@@ -5175,7 +5172,7 @@
               view: arg_view,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListVersionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListVersionsResponse(response);
       })));
     });
@@ -5257,7 +5254,7 @@
       res
           .patch(arg_request, arg_appsId, arg_servicesId, arg_versionsId,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5355,7 +5352,7 @@
           .debug(arg_request, arg_appsId, arg_servicesId, arg_versionsId,
               arg_instancesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5440,7 +5437,7 @@
       res
           .delete(arg_appsId, arg_servicesId, arg_versionsId, arg_instancesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5525,7 +5522,7 @@
       res
           .get(arg_appsId, arg_servicesId, arg_versionsId, arg_instancesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Instance response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstance(response);
       })));
     });
@@ -5614,7 +5611,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListInstancesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListInstancesResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/clouderrorreporting/v1beta1_test.dart b/generated/googleapis_beta/test/clouderrorreporting/v1beta1_test.dart
index cf20cf5..85eaad2 100644
--- a/generated/googleapis_beta/test/clouderrorreporting/v1beta1_test.dart
+++ b/generated/googleapis_beta/test/clouderrorreporting/v1beta1_test.dart
@@ -65,14 +65,14 @@
   buildCounterDeleteEventsResponse--;
 }
 
-buildUnnamed3871() {
+buildUnnamed4471() {
   var o = new core.List<api.SourceReference>();
   o.add(buildSourceReference());
   o.add(buildSourceReference());
   return o;
 }
 
-checkUnnamed3871(core.List<api.SourceReference> o) {
+checkUnnamed4471(core.List<api.SourceReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSourceReference(o[0]);
   checkSourceReference(o[1]);
@@ -85,7 +85,7 @@
   if (buildCounterErrorContext < 3) {
     o.httpRequest = buildHttpRequestContext();
     o.reportLocation = buildSourceLocation();
-    o.sourceReferences = buildUnnamed3871();
+    o.sourceReferences = buildUnnamed4471();
     o.user = "foo";
   }
   buildCounterErrorContext--;
@@ -97,7 +97,7 @@
   if (buildCounterErrorContext < 3) {
     checkHttpRequestContext(o.httpRequest);
     checkSourceLocation(o.reportLocation);
-    checkUnnamed3871(o.sourceReferences);
+    checkUnnamed4471(o.sourceReferences);
     unittest.expect(o.user, unittest.equals('foo'));
   }
   buildCounterErrorContext--;
@@ -128,14 +128,14 @@
   buildCounterErrorEvent--;
 }
 
-buildUnnamed3872() {
+buildUnnamed4472() {
   var o = new core.List<api.TrackingIssue>();
   o.add(buildTrackingIssue());
   o.add(buildTrackingIssue());
   return o;
 }
 
-checkUnnamed3872(core.List<api.TrackingIssue> o) {
+checkUnnamed4472(core.List<api.TrackingIssue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTrackingIssue(o[0]);
   checkTrackingIssue(o[1]);
@@ -148,7 +148,7 @@
   if (buildCounterErrorGroup < 3) {
     o.groupId = "foo";
     o.name = "foo";
-    o.trackingIssues = buildUnnamed3872();
+    o.trackingIssues = buildUnnamed4472();
   }
   buildCounterErrorGroup--;
   return o;
@@ -159,32 +159,32 @@
   if (buildCounterErrorGroup < 3) {
     unittest.expect(o.groupId, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3872(o.trackingIssues);
+    checkUnnamed4472(o.trackingIssues);
   }
   buildCounterErrorGroup--;
 }
 
-buildUnnamed3873() {
+buildUnnamed4473() {
   var o = new core.List<api.ServiceContext>();
   o.add(buildServiceContext());
   o.add(buildServiceContext());
   return o;
 }
 
-checkUnnamed3873(core.List<api.ServiceContext> o) {
+checkUnnamed4473(core.List<api.ServiceContext> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServiceContext(o[0]);
   checkServiceContext(o[1]);
 }
 
-buildUnnamed3874() {
+buildUnnamed4474() {
   var o = new core.List<api.TimedCount>();
   o.add(buildTimedCount());
   o.add(buildTimedCount());
   return o;
 }
 
-checkUnnamed3874(core.List<api.TimedCount> o) {
+checkUnnamed4474(core.List<api.TimedCount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTimedCount(o[0]);
   checkTimedCount(o[1]);
@@ -195,7 +195,7 @@
   var o = new api.ErrorGroupStats();
   buildCounterErrorGroupStats++;
   if (buildCounterErrorGroupStats < 3) {
-    o.affectedServices = buildUnnamed3873();
+    o.affectedServices = buildUnnamed4473();
     o.affectedUsersCount = "foo";
     o.count = "foo";
     o.firstSeenTime = "foo";
@@ -203,7 +203,7 @@
     o.lastSeenTime = "foo";
     o.numAffectedServices = 42;
     o.representative = buildErrorEvent();
-    o.timedCounts = buildUnnamed3874();
+    o.timedCounts = buildUnnamed4474();
   }
   buildCounterErrorGroupStats--;
   return o;
@@ -212,7 +212,7 @@
 checkErrorGroupStats(api.ErrorGroupStats o) {
   buildCounterErrorGroupStats++;
   if (buildCounterErrorGroupStats < 3) {
-    checkUnnamed3873(o.affectedServices);
+    checkUnnamed4473(o.affectedServices);
     unittest.expect(o.affectedUsersCount, unittest.equals('foo'));
     unittest.expect(o.count, unittest.equals('foo'));
     unittest.expect(o.firstSeenTime, unittest.equals('foo'));
@@ -220,7 +220,7 @@
     unittest.expect(o.lastSeenTime, unittest.equals('foo'));
     unittest.expect(o.numAffectedServices, unittest.equals(42));
     checkErrorEvent(o.representative);
-    checkUnnamed3874(o.timedCounts);
+    checkUnnamed4474(o.timedCounts);
   }
   buildCounterErrorGroupStats--;
 }
@@ -254,14 +254,14 @@
   buildCounterHttpRequestContext--;
 }
 
-buildUnnamed3875() {
+buildUnnamed4475() {
   var o = new core.List<api.ErrorEvent>();
   o.add(buildErrorEvent());
   o.add(buildErrorEvent());
   return o;
 }
 
-checkUnnamed3875(core.List<api.ErrorEvent> o) {
+checkUnnamed4475(core.List<api.ErrorEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorEvent(o[0]);
   checkErrorEvent(o[1]);
@@ -272,7 +272,7 @@
   var o = new api.ListEventsResponse();
   buildCounterListEventsResponse++;
   if (buildCounterListEventsResponse < 3) {
-    o.errorEvents = buildUnnamed3875();
+    o.errorEvents = buildUnnamed4475();
     o.nextPageToken = "foo";
     o.timeRangeBegin = "foo";
   }
@@ -283,21 +283,21 @@
 checkListEventsResponse(api.ListEventsResponse o) {
   buildCounterListEventsResponse++;
   if (buildCounterListEventsResponse < 3) {
-    checkUnnamed3875(o.errorEvents);
+    checkUnnamed4475(o.errorEvents);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.timeRangeBegin, unittest.equals('foo'));
   }
   buildCounterListEventsResponse--;
 }
 
-buildUnnamed3876() {
+buildUnnamed4476() {
   var o = new core.List<api.ErrorGroupStats>();
   o.add(buildErrorGroupStats());
   o.add(buildErrorGroupStats());
   return o;
 }
 
-checkUnnamed3876(core.List<api.ErrorGroupStats> o) {
+checkUnnamed4476(core.List<api.ErrorGroupStats> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkErrorGroupStats(o[0]);
   checkErrorGroupStats(o[1]);
@@ -308,7 +308,7 @@
   var o = new api.ListGroupStatsResponse();
   buildCounterListGroupStatsResponse++;
   if (buildCounterListGroupStatsResponse < 3) {
-    o.errorGroupStats = buildUnnamed3876();
+    o.errorGroupStats = buildUnnamed4476();
     o.nextPageToken = "foo";
     o.timeRangeBegin = "foo";
   }
@@ -319,7 +319,7 @@
 checkListGroupStatsResponse(api.ListGroupStatsResponse o) {
   buildCounterListGroupStatsResponse++;
   if (buildCounterListGroupStatsResponse < 3) {
-    checkUnnamed3876(o.errorGroupStats);
+    checkUnnamed4476(o.errorGroupStats);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.timeRangeBegin, unittest.equals('foo'));
   }
@@ -475,14 +475,14 @@
   buildCounterTrackingIssue--;
 }
 
-buildUnnamed3877() {
+buildUnnamed4477() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3877(core.List<core.String> o) {
+checkUnnamed4477(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -657,7 +657,7 @@
       }), true);
       res
           .deleteEvents(arg_projectName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DeleteEventsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeleteEventsResponse(response);
       })));
     });
@@ -740,7 +740,7 @@
               serviceFilter_resourceType: arg_serviceFilter_resourceType,
               timeRange_period: arg_timeRange_period,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListEventsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListEventsResponse(response);
       })));
     });
@@ -796,7 +796,7 @@
       }), true);
       res
           .report(arg_request, arg_projectName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ReportErrorEventResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkReportErrorEventResponse(response);
       })));
     });
@@ -809,7 +809,7 @@
           new api.ClouderrorreportingApi(mock).projects.groupStats;
       var arg_projectName = "foo";
       var arg_alignment = "foo";
-      var arg_groupId = buildUnnamed3877();
+      var arg_groupId = buildUnnamed4477();
       var arg_serviceFilter_service = "foo";
       var arg_pageSize = 42;
       var arg_serviceFilter_version = "foo";
@@ -893,7 +893,7 @@
               pageToken: arg_pageToken,
               timeRange_period: arg_timeRange_period,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListGroupStatsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListGroupStatsResponse(response);
       })));
     });
@@ -947,7 +947,7 @@
       }), true);
       res
           .get(arg_groupName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ErrorGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkErrorGroup(response);
       })));
     });
@@ -1003,7 +1003,7 @@
       }), true);
       res
           .update(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ErrorGroup response) {
+          .then(unittest.expectAsync1(((response) {
         checkErrorGroup(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/cloudresourcemanager/v1beta1_test.dart b/generated/googleapis_beta/test/cloudresourcemanager/v1beta1_test.dart
index 3463f44..5d077f2 100644
--- a/generated/googleapis_beta/test/cloudresourcemanager/v1beta1_test.dart
+++ b/generated/googleapis_beta/test/cloudresourcemanager/v1beta1_test.dart
@@ -69,14 +69,14 @@
   buildCounterAncestor--;
 }
 
-buildUnnamed4258() {
+buildUnnamed4379() {
   var o = new core.List<api.AuditLogConfig>();
   o.add(buildAuditLogConfig());
   o.add(buildAuditLogConfig());
   return o;
 }
 
-checkUnnamed4258(core.List<api.AuditLogConfig> o) {
+checkUnnamed4379(core.List<api.AuditLogConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditLogConfig(o[0]);
   checkAuditLogConfig(o[1]);
@@ -87,7 +87,7 @@
   var o = new api.AuditConfig();
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    o.auditLogConfigs = buildUnnamed4258();
+    o.auditLogConfigs = buildUnnamed4379();
     o.service = "foo";
   }
   buildCounterAuditConfig--;
@@ -97,20 +97,20 @@
 checkAuditConfig(api.AuditConfig o) {
   buildCounterAuditConfig++;
   if (buildCounterAuditConfig < 3) {
-    checkUnnamed4258(o.auditLogConfigs);
+    checkUnnamed4379(o.auditLogConfigs);
     unittest.expect(o.service, unittest.equals('foo'));
   }
   buildCounterAuditConfig--;
 }
 
-buildUnnamed4259() {
+buildUnnamed4380() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4259(core.List<core.String> o) {
+checkUnnamed4380(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -121,7 +121,7 @@
   var o = new api.AuditLogConfig();
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    o.exemptedMembers = buildUnnamed4259();
+    o.exemptedMembers = buildUnnamed4380();
     o.logType = "foo";
   }
   buildCounterAuditLogConfig--;
@@ -131,20 +131,20 @@
 checkAuditLogConfig(api.AuditLogConfig o) {
   buildCounterAuditLogConfig++;
   if (buildCounterAuditLogConfig < 3) {
-    checkUnnamed4259(o.exemptedMembers);
+    checkUnnamed4380(o.exemptedMembers);
     unittest.expect(o.logType, unittest.equals('foo'));
   }
   buildCounterAuditLogConfig--;
 }
 
-buildUnnamed4260() {
+buildUnnamed4381() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4260(core.List<core.String> o) {
+checkUnnamed4381(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -155,7 +155,7 @@
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed4260();
+    o.members = buildUnnamed4381();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -165,7 +165,7 @@
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed4260(o.members);
+    checkUnnamed4381(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
@@ -245,14 +245,14 @@
   buildCounterGetAncestryRequest--;
 }
 
-buildUnnamed4261() {
+buildUnnamed4382() {
   var o = new core.List<api.Ancestor>();
   o.add(buildAncestor());
   o.add(buildAncestor());
   return o;
 }
 
-checkUnnamed4261(core.List<api.Ancestor> o) {
+checkUnnamed4382(core.List<api.Ancestor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAncestor(o[0]);
   checkAncestor(o[1]);
@@ -263,7 +263,7 @@
   var o = new api.GetAncestryResponse();
   buildCounterGetAncestryResponse++;
   if (buildCounterGetAncestryResponse < 3) {
-    o.ancestor = buildUnnamed4261();
+    o.ancestor = buildUnnamed4382();
   }
   buildCounterGetAncestryResponse--;
   return o;
@@ -272,7 +272,7 @@
 checkGetAncestryResponse(api.GetAncestryResponse o) {
   buildCounterGetAncestryResponse++;
   if (buildCounterGetAncestryResponse < 3) {
-    checkUnnamed4261(o.ancestor);
+    checkUnnamed4382(o.ancestor);
   }
   buildCounterGetAncestryResponse--;
 }
@@ -292,14 +292,14 @@
   buildCounterGetIamPolicyRequest--;
 }
 
-buildUnnamed4262() {
+buildUnnamed4383() {
   var o = new core.List<api.Organization>();
   o.add(buildOrganization());
   o.add(buildOrganization());
   return o;
 }
 
-checkUnnamed4262(core.List<api.Organization> o) {
+checkUnnamed4383(core.List<api.Organization> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrganization(o[0]);
   checkOrganization(o[1]);
@@ -311,7 +311,7 @@
   buildCounterListOrganizationsResponse++;
   if (buildCounterListOrganizationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.organizations = buildUnnamed4262();
+    o.organizations = buildUnnamed4383();
   }
   buildCounterListOrganizationsResponse--;
   return o;
@@ -321,19 +321,19 @@
   buildCounterListOrganizationsResponse++;
   if (buildCounterListOrganizationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4262(o.organizations);
+    checkUnnamed4383(o.organizations);
   }
   buildCounterListOrganizationsResponse--;
 }
 
-buildUnnamed4263() {
+buildUnnamed4384() {
   var o = new core.List<api.Project>();
   o.add(buildProject());
   o.add(buildProject());
   return o;
 }
 
-checkUnnamed4263(core.List<api.Project> o) {
+checkUnnamed4384(core.List<api.Project> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkProject(o[0]);
   checkProject(o[1]);
@@ -345,7 +345,7 @@
   buildCounterListProjectsResponse++;
   if (buildCounterListProjectsResponse < 3) {
     o.nextPageToken = "foo";
-    o.projects = buildUnnamed4263();
+    o.projects = buildUnnamed4384();
   }
   buildCounterListProjectsResponse--;
   return o;
@@ -355,7 +355,7 @@
   buildCounterListProjectsResponse++;
   if (buildCounterListProjectsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4263(o.projects);
+    checkUnnamed4384(o.projects);
   }
   buildCounterListProjectsResponse--;
 }
@@ -408,27 +408,27 @@
   buildCounterOrganizationOwner--;
 }
 
-buildUnnamed4264() {
+buildUnnamed4385() {
   var o = new core.List<api.AuditConfig>();
   o.add(buildAuditConfig());
   o.add(buildAuditConfig());
   return o;
 }
 
-checkUnnamed4264(core.List<api.AuditConfig> o) {
+checkUnnamed4385(core.List<api.AuditConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAuditConfig(o[0]);
   checkAuditConfig(o[1]);
 }
 
-buildUnnamed4265() {
+buildUnnamed4386() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed4265(core.List<api.Binding> o) {
+checkUnnamed4386(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -439,8 +439,8 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.auditConfigs = buildUnnamed4264();
-    o.bindings = buildUnnamed4265();
+    o.auditConfigs = buildUnnamed4385();
+    o.bindings = buildUnnamed4386();
     o.etag = "foo";
     o.version = 42;
   }
@@ -451,22 +451,22 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed4264(o.auditConfigs);
-    checkUnnamed4265(o.bindings);
+    checkUnnamed4385(o.auditConfigs);
+    checkUnnamed4386(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
   buildCounterPolicy--;
 }
 
-buildUnnamed4266() {
+buildUnnamed4387() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4266(core.Map<core.String, core.String> o) {
+checkUnnamed4387(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -478,7 +478,7 @@
   buildCounterProject++;
   if (buildCounterProject < 3) {
     o.createTime = "foo";
-    o.labels = buildUnnamed4266();
+    o.labels = buildUnnamed4387();
     o.lifecycleState = "foo";
     o.name = "foo";
     o.parent = buildResourceId();
@@ -493,7 +493,7 @@
   buildCounterProject++;
   if (buildCounterProject < 3) {
     unittest.expect(o.createTime, unittest.equals('foo'));
-    checkUnnamed4266(o.labels);
+    checkUnnamed4387(o.labels);
     unittest.expect(o.lifecycleState, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     checkResourceId(o.parent);
@@ -568,14 +568,14 @@
   buildCounterSetIamPolicyRequest--;
 }
 
-buildUnnamed4267() {
+buildUnnamed4388() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4267(core.List<core.String> o) {
+checkUnnamed4388(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -586,7 +586,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed4267();
+    o.permissions = buildUnnamed4388();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -595,19 +595,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed4267(o.permissions);
+    checkUnnamed4388(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed4268() {
+buildUnnamed4389() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4268(core.List<core.String> o) {
+checkUnnamed4389(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -618,7 +618,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed4268();
+    o.permissions = buildUnnamed4389();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -627,7 +627,7 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed4268(o.permissions);
+    checkUnnamed4389(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
@@ -876,7 +876,7 @@
       res
           .get(arg_name,
               organizationId: arg_organizationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Organization response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrganization(response);
       })));
     });
@@ -932,7 +932,7 @@
       }), true);
       res
           .getIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -994,8 +994,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListOrganizationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOrganizationsResponse(response);
       })));
     });
@@ -1051,7 +1050,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1107,8 +1106,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -1164,7 +1162,7 @@
       }), true);
       res
           .update(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Organization response) {
+          .then(unittest.expectAsync1(((response) {
         checkOrganization(response);
       })));
     });
@@ -1224,7 +1222,7 @@
       res
           .create(arg_request,
               useLegacyStack: arg_useLegacyStack, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
@@ -1278,7 +1276,7 @@
       }), true);
       res
           .delete(arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1332,7 +1330,7 @@
       }), true);
       res
           .get(arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
@@ -1396,7 +1394,7 @@
       }), true);
       res
           .getAncestry(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetAncestryResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetAncestryResponse(response);
       })));
     });
@@ -1460,7 +1458,7 @@
       }), true);
       res
           .getIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1522,7 +1520,7 @@
               filter: arg_filter,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListProjectsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListProjectsResponse(response);
       })));
     });
@@ -1586,7 +1584,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1650,8 +1648,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -1715,7 +1712,7 @@
       }), true);
       res
           .undelete(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1773,7 +1770,7 @@
       }), true);
       res
           .update(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/cloudtasks/v2beta2_test.dart b/generated/googleapis_beta/test/cloudtasks/v2beta2_test.dart
index 382c902..d76f032 100644
--- a/generated/googleapis_beta/test/cloudtasks/v2beta2_test.dart
+++ b/generated/googleapis_beta/test/cloudtasks/v2beta2_test.dart
@@ -69,14 +69,14 @@
   buildCounterAcknowledgeTaskRequest--;
 }
 
-buildUnnamed4231() {
+buildUnnamed4527() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4231(core.Map<core.String, core.String> o) {
+checkUnnamed4527(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -88,7 +88,7 @@
   buildCounterAppEngineHttpRequest++;
   if (buildCounterAppEngineHttpRequest < 3) {
     o.appEngineRouting = buildAppEngineRouting();
-    o.headers = buildUnnamed4231();
+    o.headers = buildUnnamed4527();
     o.httpMethod = "foo";
     o.payload = "foo";
     o.relativeUrl = "foo";
@@ -101,7 +101,7 @@
   buildCounterAppEngineHttpRequest++;
   if (buildCounterAppEngineHttpRequest < 3) {
     checkAppEngineRouting(o.appEngineRouting);
-    checkUnnamed4231(o.headers);
+    checkUnnamed4527(o.headers);
     unittest.expect(o.httpMethod, unittest.equals('foo'));
     unittest.expect(o.payload, unittest.equals('foo'));
     unittest.expect(o.relativeUrl, unittest.equals('foo'));
@@ -178,14 +178,14 @@
   buildCounterAttemptStatus--;
 }
 
-buildUnnamed4232() {
+buildUnnamed4528() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4232(core.List<core.String> o) {
+checkUnnamed4528(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -196,7 +196,7 @@
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed4232();
+    o.members = buildUnnamed4528();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -206,7 +206,7 @@
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed4232(o.members);
+    checkUnnamed4528(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
@@ -309,14 +309,14 @@
   buildCounterLeaseTasksRequest--;
 }
 
-buildUnnamed4233() {
+buildUnnamed4529() {
   var o = new core.List<api.Task>();
   o.add(buildTask());
   o.add(buildTask());
   return o;
 }
 
-checkUnnamed4233(core.List<api.Task> o) {
+checkUnnamed4529(core.List<api.Task> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTask(o[0]);
   checkTask(o[1]);
@@ -327,7 +327,7 @@
   var o = new api.LeaseTasksResponse();
   buildCounterLeaseTasksResponse++;
   if (buildCounterLeaseTasksResponse < 3) {
-    o.tasks = buildUnnamed4233();
+    o.tasks = buildUnnamed4529();
   }
   buildCounterLeaseTasksResponse--;
   return o;
@@ -336,19 +336,19 @@
 checkLeaseTasksResponse(api.LeaseTasksResponse o) {
   buildCounterLeaseTasksResponse++;
   if (buildCounterLeaseTasksResponse < 3) {
-    checkUnnamed4233(o.tasks);
+    checkUnnamed4529(o.tasks);
   }
   buildCounterLeaseTasksResponse--;
 }
 
-buildUnnamed4234() {
+buildUnnamed4530() {
   var o = new core.List<api.Location>();
   o.add(buildLocation());
   o.add(buildLocation());
   return o;
 }
 
-checkUnnamed4234(core.List<api.Location> o) {
+checkUnnamed4530(core.List<api.Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocation(o[0]);
   checkLocation(o[1]);
@@ -359,7 +359,7 @@
   var o = new api.ListLocationsResponse();
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    o.locations = buildUnnamed4234();
+    o.locations = buildUnnamed4530();
     o.nextPageToken = "foo";
   }
   buildCounterListLocationsResponse--;
@@ -369,20 +369,20 @@
 checkListLocationsResponse(api.ListLocationsResponse o) {
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    checkUnnamed4234(o.locations);
+    checkUnnamed4530(o.locations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLocationsResponse--;
 }
 
-buildUnnamed4235() {
+buildUnnamed4531() {
   var o = new core.List<api.Queue>();
   o.add(buildQueue());
   o.add(buildQueue());
   return o;
 }
 
-checkUnnamed4235(core.List<api.Queue> o) {
+checkUnnamed4531(core.List<api.Queue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkQueue(o[0]);
   checkQueue(o[1]);
@@ -394,7 +394,7 @@
   buildCounterListQueuesResponse++;
   if (buildCounterListQueuesResponse < 3) {
     o.nextPageToken = "foo";
-    o.queues = buildUnnamed4235();
+    o.queues = buildUnnamed4531();
   }
   buildCounterListQueuesResponse--;
   return o;
@@ -404,19 +404,19 @@
   buildCounterListQueuesResponse++;
   if (buildCounterListQueuesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4235(o.queues);
+    checkUnnamed4531(o.queues);
   }
   buildCounterListQueuesResponse--;
 }
 
-buildUnnamed4236() {
+buildUnnamed4532() {
   var o = new core.List<api.Task>();
   o.add(buildTask());
   o.add(buildTask());
   return o;
 }
 
-checkUnnamed4236(core.List<api.Task> o) {
+checkUnnamed4532(core.List<api.Task> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTask(o[0]);
   checkTask(o[1]);
@@ -428,7 +428,7 @@
   buildCounterListTasksResponse++;
   if (buildCounterListTasksResponse < 3) {
     o.nextPageToken = "foo";
-    o.tasks = buildUnnamed4236();
+    o.tasks = buildUnnamed4532();
   }
   buildCounterListTasksResponse--;
   return o;
@@ -438,25 +438,25 @@
   buildCounterListTasksResponse++;
   if (buildCounterListTasksResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4236(o.tasks);
+    checkUnnamed4532(o.tasks);
   }
   buildCounterListTasksResponse--;
 }
 
-buildUnnamed4237() {
+buildUnnamed4533() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4237(core.Map<core.String, core.String> o) {
+checkUnnamed4533(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed4238() {
+buildUnnamed4534() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -471,7 +471,7 @@
   return o;
 }
 
-checkUnnamed4238(core.Map<core.String, core.Object> o) {
+checkUnnamed4534(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -490,9 +490,9 @@
   var o = new api.Location();
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    o.labels = buildUnnamed4237();
+    o.labels = buildUnnamed4533();
     o.locationId = "foo";
-    o.metadata = buildUnnamed4238();
+    o.metadata = buildUnnamed4534();
     o.name = "foo";
   }
   buildCounterLocation--;
@@ -502,9 +502,9 @@
 checkLocation(api.Location o) {
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    checkUnnamed4237(o.labels);
+    checkUnnamed4533(o.labels);
     unittest.expect(o.locationId, unittest.equals('foo'));
-    checkUnnamed4238(o.metadata);
+    checkUnnamed4534(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLocation--;
@@ -525,14 +525,14 @@
   buildCounterPauseQueueRequest--;
 }
 
-buildUnnamed4239() {
+buildUnnamed4535() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed4239(core.List<api.Binding> o) {
+checkUnnamed4535(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -543,7 +543,7 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.bindings = buildUnnamed4239();
+    o.bindings = buildUnnamed4535();
     o.etag = "foo";
     o.version = 42;
   }
@@ -554,7 +554,7 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed4239(o.bindings);
+    checkUnnamed4535(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
@@ -771,7 +771,7 @@
   buildCounterSetIamPolicyRequest--;
 }
 
-buildUnnamed4240() {
+buildUnnamed4536() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -786,7 +786,7 @@
   return o;
 }
 
-checkUnnamed4240(core.Map<core.String, core.Object> o) {
+checkUnnamed4536(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -800,17 +800,17 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4241() {
+buildUnnamed4537() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4240());
-  o.add(buildUnnamed4240());
+  o.add(buildUnnamed4536());
+  o.add(buildUnnamed4536());
   return o;
 }
 
-checkUnnamed4241(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4537(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4240(o[0]);
-  checkUnnamed4240(o[1]);
+  checkUnnamed4536(o[0]);
+  checkUnnamed4536(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -819,7 +819,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed4241();
+    o.details = buildUnnamed4537();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -830,7 +830,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed4241(o.details);
+    checkUnnamed4537(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -892,14 +892,14 @@
   buildCounterTaskStatus--;
 }
 
-buildUnnamed4242() {
+buildUnnamed4538() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4242(core.List<core.String> o) {
+checkUnnamed4538(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -910,7 +910,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed4242();
+    o.permissions = buildUnnamed4538();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -919,19 +919,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed4242(o.permissions);
+    checkUnnamed4538(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed4243() {
+buildUnnamed4539() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4243(core.List<core.String> o) {
+checkUnnamed4539(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -942,7 +942,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed4243();
+    o.permissions = buildUnnamed4539();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -951,7 +951,7 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed4243(o.permissions);
+    checkUnnamed4539(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
@@ -1269,7 +1269,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Location response) {
+          .then(unittest.expectAsync1(((response) {
         checkLocation(response);
       })));
     });
@@ -1333,7 +1333,7 @@
               filter: arg_filter,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLocationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLocationsResponse(response);
       })));
     });
@@ -1391,7 +1391,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Queue response) {
+          .then(unittest.expectAsync1(((response) {
         checkQueue(response);
       })));
     });
@@ -1443,7 +1443,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1495,7 +1495,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Queue response) {
+          .then(unittest.expectAsync1(((response) {
         checkQueue(response);
       })));
     });
@@ -1551,7 +1551,7 @@
       }), true);
       res
           .getIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1615,7 +1615,7 @@
               filter: arg_filter,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListQueuesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListQueuesResponse(response);
       })));
     });
@@ -1675,7 +1675,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Queue response) {
+          .then(unittest.expectAsync1(((response) {
         checkQueue(response);
       })));
     });
@@ -1731,7 +1731,7 @@
       }), true);
       res
           .pause(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Queue response) {
+          .then(unittest.expectAsync1(((response) {
         checkQueue(response);
       })));
     });
@@ -1787,7 +1787,7 @@
       }), true);
       res
           .purge(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Queue response) {
+          .then(unittest.expectAsync1(((response) {
         checkQueue(response);
       })));
     });
@@ -1843,7 +1843,7 @@
       }), true);
       res
           .resume(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Queue response) {
+          .then(unittest.expectAsync1(((response) {
         checkQueue(response);
       })));
     });
@@ -1899,7 +1899,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1955,8 +1955,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -2014,7 +2013,7 @@
       }), true);
       res
           .acknowledge(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2070,7 +2069,7 @@
       }), true);
       res
           .cancelLease(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -2126,7 +2125,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -2178,7 +2177,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2233,7 +2232,7 @@
       }), true);
       res
           .get(arg_name, responseView: arg_responseView, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -2289,7 +2288,7 @@
       }), true);
       res
           .lease(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LeaseTasksResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLeaseTasksResponse(response);
       })));
     });
@@ -2358,7 +2357,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTasksResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTasksResponse(response);
       })));
     });
@@ -2414,7 +2413,7 @@
       }), true);
       res
           .renewLease(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -2470,7 +2469,7 @@
       }), true);
       res
           .run(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/clouduseraccounts/beta_test.dart b/generated/googleapis_beta/test/clouduseraccounts/beta_test.dart
index b688dd4..1ecc658 100644
--- a/generated/googleapis_beta/test/clouduseraccounts/beta_test.dart
+++ b/generated/googleapis_beta/test/clouduseraccounts/beta_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3920() {
+buildUnnamed3784() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3920(core.List<core.String> o) {
+checkUnnamed3784(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -68,7 +68,7 @@
   var o = new api.AuthorizedKeysView();
   buildCounterAuthorizedKeysView++;
   if (buildCounterAuthorizedKeysView < 3) {
-    o.keys = buildUnnamed3920();
+    o.keys = buildUnnamed3784();
     o.sudoer = true;
   }
   buildCounterAuthorizedKeysView--;
@@ -78,20 +78,20 @@
 checkAuthorizedKeysView(api.AuthorizedKeysView o) {
   buildCounterAuthorizedKeysView++;
   if (buildCounterAuthorizedKeysView < 3) {
-    checkUnnamed3920(o.keys);
+    checkUnnamed3784(o.keys);
     unittest.expect(o.sudoer, unittest.isTrue);
   }
   buildCounterAuthorizedKeysView--;
 }
 
-buildUnnamed3921() {
+buildUnnamed3785() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3921(core.List<core.String> o) {
+checkUnnamed3785(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -106,7 +106,7 @@
     o.description = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.members = buildUnnamed3921();
+    o.members = buildUnnamed3785();
     o.name = "foo";
     o.selfLink = "foo";
   }
@@ -121,21 +121,21 @@
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3921(o.members);
+    checkUnnamed3785(o.members);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
   buildCounterGroup--;
 }
 
-buildUnnamed3922() {
+buildUnnamed3786() {
   var o = new core.List<api.Group>();
   o.add(buildGroup());
   o.add(buildGroup());
   return o;
 }
 
-checkUnnamed3922(core.List<api.Group> o) {
+checkUnnamed3786(core.List<api.Group> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGroup(o[0]);
   checkGroup(o[1]);
@@ -147,7 +147,7 @@
   buildCounterGroupList++;
   if (buildCounterGroupList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed3922();
+    o.items = buildUnnamed3786();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -160,7 +160,7 @@
   buildCounterGroupList++;
   if (buildCounterGroupList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed3922(o.items);
+    checkUnnamed3786(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -168,14 +168,14 @@
   buildCounterGroupList--;
 }
 
-buildUnnamed3923() {
+buildUnnamed3787() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3923(core.List<core.String> o) {
+checkUnnamed3787(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -186,7 +186,7 @@
   var o = new api.GroupsAddMemberRequest();
   buildCounterGroupsAddMemberRequest++;
   if (buildCounterGroupsAddMemberRequest < 3) {
-    o.users = buildUnnamed3923();
+    o.users = buildUnnamed3787();
   }
   buildCounterGroupsAddMemberRequest--;
   return o;
@@ -195,19 +195,19 @@
 checkGroupsAddMemberRequest(api.GroupsAddMemberRequest o) {
   buildCounterGroupsAddMemberRequest++;
   if (buildCounterGroupsAddMemberRequest < 3) {
-    checkUnnamed3923(o.users);
+    checkUnnamed3787(o.users);
   }
   buildCounterGroupsAddMemberRequest--;
 }
 
-buildUnnamed3924() {
+buildUnnamed3788() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3924(core.List<core.String> o) {
+checkUnnamed3788(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -218,7 +218,7 @@
   var o = new api.GroupsRemoveMemberRequest();
   buildCounterGroupsRemoveMemberRequest++;
   if (buildCounterGroupsRemoveMemberRequest < 3) {
-    o.users = buildUnnamed3924();
+    o.users = buildUnnamed3788();
   }
   buildCounterGroupsRemoveMemberRequest--;
   return o;
@@ -227,32 +227,32 @@
 checkGroupsRemoveMemberRequest(api.GroupsRemoveMemberRequest o) {
   buildCounterGroupsRemoveMemberRequest++;
   if (buildCounterGroupsRemoveMemberRequest < 3) {
-    checkUnnamed3924(o.users);
+    checkUnnamed3788(o.users);
   }
   buildCounterGroupsRemoveMemberRequest--;
 }
 
-buildUnnamed3925() {
+buildUnnamed3789() {
   var o = new core.List<api.LinuxGroupView>();
   o.add(buildLinuxGroupView());
   o.add(buildLinuxGroupView());
   return o;
 }
 
-checkUnnamed3925(core.List<api.LinuxGroupView> o) {
+checkUnnamed3789(core.List<api.LinuxGroupView> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLinuxGroupView(o[0]);
   checkLinuxGroupView(o[1]);
 }
 
-buildUnnamed3926() {
+buildUnnamed3790() {
   var o = new core.List<api.LinuxUserView>();
   o.add(buildLinuxUserView());
   o.add(buildLinuxUserView());
   return o;
 }
 
-checkUnnamed3926(core.List<api.LinuxUserView> o) {
+checkUnnamed3790(core.List<api.LinuxUserView> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLinuxUserView(o[0]);
   checkLinuxUserView(o[1]);
@@ -263,9 +263,9 @@
   var o = new api.LinuxAccountViews();
   buildCounterLinuxAccountViews++;
   if (buildCounterLinuxAccountViews < 3) {
-    o.groupViews = buildUnnamed3925();
+    o.groupViews = buildUnnamed3789();
     o.kind = "foo";
-    o.userViews = buildUnnamed3926();
+    o.userViews = buildUnnamed3790();
   }
   buildCounterLinuxAccountViews--;
   return o;
@@ -274,9 +274,9 @@
 checkLinuxAccountViews(api.LinuxAccountViews o) {
   buildCounterLinuxAccountViews++;
   if (buildCounterLinuxAccountViews < 3) {
-    checkUnnamed3925(o.groupViews);
+    checkUnnamed3789(o.groupViews);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3926(o.userViews);
+    checkUnnamed3790(o.userViews);
   }
   buildCounterLinuxAccountViews--;
 }
@@ -321,14 +321,14 @@
   buildCounterLinuxGetLinuxAccountViewsResponse--;
 }
 
-buildUnnamed3927() {
+buildUnnamed3791() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3927(core.List<core.String> o) {
+checkUnnamed3791(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -341,7 +341,7 @@
   if (buildCounterLinuxGroupView < 3) {
     o.gid = 42;
     o.groupName = "foo";
-    o.members = buildUnnamed3927();
+    o.members = buildUnnamed3791();
   }
   buildCounterLinuxGroupView--;
   return o;
@@ -352,7 +352,7 @@
   if (buildCounterLinuxGroupView < 3) {
     unittest.expect(o.gid, unittest.equals(42));
     unittest.expect(o.groupName, unittest.equals('foo'));
-    checkUnnamed3927(o.members);
+    checkUnnamed3791(o.members);
   }
   buildCounterLinuxGroupView--;
 }
@@ -409,14 +409,14 @@
   buildCounterOperationErrorErrors--;
 }
 
-buildUnnamed3928() {
+buildUnnamed3792() {
   var o = new core.List<api.OperationErrorErrors>();
   o.add(buildOperationErrorErrors());
   o.add(buildOperationErrorErrors());
   return o;
 }
 
-checkUnnamed3928(core.List<api.OperationErrorErrors> o) {
+checkUnnamed3792(core.List<api.OperationErrorErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationErrorErrors(o[0]);
   checkOperationErrorErrors(o[1]);
@@ -427,7 +427,7 @@
   var o = new api.OperationError();
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    o.errors = buildUnnamed3928();
+    o.errors = buildUnnamed3792();
   }
   buildCounterOperationError--;
   return o;
@@ -436,7 +436,7 @@
 checkOperationError(api.OperationError o) {
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    checkUnnamed3928(o.errors);
+    checkUnnamed3792(o.errors);
   }
   buildCounterOperationError--;
 }
@@ -462,14 +462,14 @@
   buildCounterOperationWarningsData--;
 }
 
-buildUnnamed3929() {
+buildUnnamed3793() {
   var o = new core.List<api.OperationWarningsData>();
   o.add(buildOperationWarningsData());
   o.add(buildOperationWarningsData());
   return o;
 }
 
-checkUnnamed3929(core.List<api.OperationWarningsData> o) {
+checkUnnamed3793(core.List<api.OperationWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarningsData(o[0]);
   checkOperationWarningsData(o[1]);
@@ -481,7 +481,7 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed3929();
+    o.data = buildUnnamed3793();
     o.message = "foo";
   }
   buildCounterOperationWarnings--;
@@ -492,20 +492,20 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed3929(o.data);
+    checkUnnamed3793(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterOperationWarnings--;
 }
 
-buildUnnamed3930() {
+buildUnnamed3794() {
   var o = new core.List<api.OperationWarnings>();
   o.add(buildOperationWarnings());
   o.add(buildOperationWarnings());
   return o;
 }
 
-checkUnnamed3930(core.List<api.OperationWarnings> o) {
+checkUnnamed3794(core.List<api.OperationWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarnings(o[0]);
   checkOperationWarnings(o[1]);
@@ -537,7 +537,7 @@
     o.targetId = "foo";
     o.targetLink = "foo";
     o.user = "foo";
-    o.warnings = buildUnnamed3930();
+    o.warnings = buildUnnamed3794();
     o.zone = "foo";
   }
   buildCounterOperation--;
@@ -568,20 +568,20 @@
     unittest.expect(o.targetId, unittest.equals('foo'));
     unittest.expect(o.targetLink, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed3930(o.warnings);
+    checkUnnamed3794(o.warnings);
     unittest.expect(o.zone, unittest.equals('foo'));
   }
   buildCounterOperation--;
 }
 
-buildUnnamed3931() {
+buildUnnamed3795() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed3931(core.List<api.Operation> o) {
+checkUnnamed3795(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -593,7 +593,7 @@
   buildCounterOperationList++;
   if (buildCounterOperationList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed3931();
+    o.items = buildUnnamed3795();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -606,7 +606,7 @@
   buildCounterOperationList++;
   if (buildCounterOperationList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed3931(o.items);
+    checkUnnamed3795(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -641,27 +641,27 @@
   buildCounterPublicKey--;
 }
 
-buildUnnamed3932() {
+buildUnnamed3796() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3932(core.List<core.String> o) {
+checkUnnamed3796(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3933() {
+buildUnnamed3797() {
   var o = new core.List<api.PublicKey>();
   o.add(buildPublicKey());
   o.add(buildPublicKey());
   return o;
 }
 
-checkUnnamed3933(core.List<api.PublicKey> o) {
+checkUnnamed3797(core.List<api.PublicKey> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPublicKey(o[0]);
   checkPublicKey(o[1]);
@@ -674,12 +674,12 @@
   if (buildCounterUser < 3) {
     o.creationTimestamp = "foo";
     o.description = "foo";
-    o.groups = buildUnnamed3932();
+    o.groups = buildUnnamed3796();
     o.id = "foo";
     o.kind = "foo";
     o.name = "foo";
     o.owner = "foo";
-    o.publicKeys = buildUnnamed3933();
+    o.publicKeys = buildUnnamed3797();
     o.selfLink = "foo";
   }
   buildCounterUser--;
@@ -691,25 +691,25 @@
   if (buildCounterUser < 3) {
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed3932(o.groups);
+    checkUnnamed3796(o.groups);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.owner, unittest.equals('foo'));
-    checkUnnamed3933(o.publicKeys);
+    checkUnnamed3797(o.publicKeys);
     unittest.expect(o.selfLink, unittest.equals('foo'));
   }
   buildCounterUser--;
 }
 
-buildUnnamed3934() {
+buildUnnamed3798() {
   var o = new core.List<api.User>();
   o.add(buildUser());
   o.add(buildUser());
   return o;
 }
 
-checkUnnamed3934(core.List<api.User> o) {
+checkUnnamed3798(core.List<api.User> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUser(o[0]);
   checkUser(o[1]);
@@ -721,7 +721,7 @@
   buildCounterUserList++;
   if (buildCounterUserList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed3934();
+    o.items = buildUnnamed3798();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -734,7 +734,7 @@
   buildCounterUserList++;
   if (buildCounterUserList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed3934(o.items);
+    checkUnnamed3798(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -987,7 +987,7 @@
       }), true);
       res
           .get(arg_project, arg_operation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1051,7 +1051,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperationList response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperationList(response);
       })));
     });
@@ -1106,7 +1106,7 @@
       res
           .addMember(arg_request, arg_project, arg_groupName,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1154,7 +1154,7 @@
       }), true);
       res
           .delete(arg_project, arg_groupName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1202,7 +1202,7 @@
       }), true);
       res
           .get(arg_project, arg_groupName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Group response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroup(response);
       })));
     });
@@ -1253,7 +1253,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1316,7 +1316,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GroupList response) {
+          .then(unittest.expectAsync1(((response) {
         checkGroupList(response);
       })));
     });
@@ -1369,7 +1369,7 @@
       res
           .removeMember(arg_request, arg_project, arg_groupName,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1427,8 +1427,7 @@
       res
           .getAuthorizedKeysView(arg_project, arg_zone, arg_user, arg_instance,
               login: arg_login, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.LinuxGetAuthorizedKeysViewResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLinuxGetAuthorizedKeysViewResponse(response);
       })));
     });
@@ -1496,8 +1495,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.LinuxGetLinuxAccountViewsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLinuxGetLinuxAccountViewsResponse(response);
       })));
     });
@@ -1552,7 +1550,7 @@
       res
           .addPublicKey(arg_request, arg_project, arg_user,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1600,7 +1598,7 @@
       }), true);
       res
           .delete(arg_project, arg_user, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1648,7 +1646,7 @@
       }), true);
       res
           .get(arg_project, arg_user, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.User response) {
+          .then(unittest.expectAsync1(((response) {
         checkUser(response);
       })));
     });
@@ -1699,7 +1697,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1762,7 +1760,7 @@
               orderBy: arg_orderBy,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UserList response) {
+          .then(unittest.expectAsync1(((response) {
         checkUserList(response);
       })));
     });
@@ -1814,7 +1812,7 @@
       res
           .removePublicKey(arg_project, arg_user, arg_fingerprint,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/dataflow/v1b3_test.dart b/generated/googleapis_beta/test/dataflow/v1b3_test.dart
index cfca52c..8e0f1cf 100644
--- a/generated/googleapis_beta/test/dataflow/v1b3_test.dart
+++ b/generated/googleapis_beta/test/dataflow/v1b3_test.dart
@@ -236,53 +236,53 @@
   buildCounterComponentTransform--;
 }
 
-buildUnnamed3978() {
+buildUnnamed4134() {
   var o = new core.List<api.StreamLocation>();
   o.add(buildStreamLocation());
   o.add(buildStreamLocation());
   return o;
 }
 
-checkUnnamed3978(core.List<api.StreamLocation> o) {
+checkUnnamed4134(core.List<api.StreamLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStreamLocation(o[0]);
   checkStreamLocation(o[1]);
 }
 
-buildUnnamed3979() {
+buildUnnamed4135() {
   var o = new core.List<api.KeyRangeLocation>();
   o.add(buildKeyRangeLocation());
   o.add(buildKeyRangeLocation());
   return o;
 }
 
-checkUnnamed3979(core.List<api.KeyRangeLocation> o) {
+checkUnnamed4135(core.List<api.KeyRangeLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkKeyRangeLocation(o[0]);
   checkKeyRangeLocation(o[1]);
 }
 
-buildUnnamed3980() {
+buildUnnamed4136() {
   var o = new core.List<api.StreamLocation>();
   o.add(buildStreamLocation());
   o.add(buildStreamLocation());
   return o;
 }
 
-checkUnnamed3980(core.List<api.StreamLocation> o) {
+checkUnnamed4136(core.List<api.StreamLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStreamLocation(o[0]);
   checkStreamLocation(o[1]);
 }
 
-buildUnnamed3981() {
+buildUnnamed4137() {
   var o = new core.List<api.StateFamilyConfig>();
   o.add(buildStateFamilyConfig());
   o.add(buildStateFamilyConfig());
   return o;
 }
 
-checkUnnamed3981(core.List<api.StateFamilyConfig> o) {
+checkUnnamed4137(core.List<api.StateFamilyConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStateFamilyConfig(o[0]);
   checkStateFamilyConfig(o[1]);
@@ -294,10 +294,10 @@
   buildCounterComputationTopology++;
   if (buildCounterComputationTopology < 3) {
     o.computationId = "foo";
-    o.inputs = buildUnnamed3978();
-    o.keyRanges = buildUnnamed3979();
-    o.outputs = buildUnnamed3980();
-    o.stateFamilies = buildUnnamed3981();
+    o.inputs = buildUnnamed4134();
+    o.keyRanges = buildUnnamed4135();
+    o.outputs = buildUnnamed4136();
+    o.stateFamilies = buildUnnamed4137();
     o.systemStageName = "foo";
   }
   buildCounterComputationTopology--;
@@ -308,10 +308,10 @@
   buildCounterComputationTopology++;
   if (buildCounterComputationTopology < 3) {
     unittest.expect(o.computationId, unittest.equals('foo'));
-    checkUnnamed3978(o.inputs);
-    checkUnnamed3979(o.keyRanges);
-    checkUnnamed3980(o.outputs);
-    checkUnnamed3981(o.stateFamilies);
+    checkUnnamed4134(o.inputs);
+    checkUnnamed4135(o.keyRanges);
+    checkUnnamed4136(o.outputs);
+    checkUnnamed4137(o.stateFamilies);
     unittest.expect(o.systemStageName, unittest.equals('foo'));
   }
   buildCounterComputationTopology--;
@@ -474,14 +474,14 @@
   buildCounterCounterUpdate--;
 }
 
-buildUnnamed3982() {
+buildUnnamed4138() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3982(core.Map<core.String, core.String> o) {
+checkUnnamed4138(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -496,7 +496,7 @@
     o.gcsPath = "foo";
     o.jobName = "foo";
     o.location = "foo";
-    o.parameters = buildUnnamed3982();
+    o.parameters = buildUnnamed4138();
   }
   buildCounterCreateJobFromTemplateRequest--;
   return o;
@@ -509,7 +509,7 @@
     unittest.expect(o.gcsPath, unittest.equals('foo'));
     unittest.expect(o.jobName, unittest.equals('foo'));
     unittest.expect(o.location, unittest.equals('foo'));
-    checkUnnamed3982(o.parameters);
+    checkUnnamed4138(o.parameters);
   }
   buildCounterCreateJobFromTemplateRequest--;
 }
@@ -533,14 +533,14 @@
   buildCounterCustomSourceLocation--;
 }
 
-buildUnnamed3983() {
+buildUnnamed4139() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3983(core.List<core.String> o) {
+checkUnnamed4139(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -551,7 +551,7 @@
   var o = new api.DataDiskAssignment();
   buildCounterDataDiskAssignment++;
   if (buildCounterDataDiskAssignment < 3) {
-    o.dataDisks = buildUnnamed3983();
+    o.dataDisks = buildUnnamed4139();
     o.vmInstance = "foo";
   }
   buildCounterDataDiskAssignment--;
@@ -561,7 +561,7 @@
 checkDataDiskAssignment(api.DataDiskAssignment o) {
   buildCounterDataDiskAssignment++;
   if (buildCounterDataDiskAssignment < 3) {
-    checkUnnamed3983(o.dataDisks);
+    checkUnnamed4139(o.dataDisks);
     unittest.expect(o.vmInstance, unittest.equals('foo'));
   }
   buildCounterDataDiskAssignment--;
@@ -702,20 +702,20 @@
   buildCounterDynamicSourceSplit--;
 }
 
-buildUnnamed3984() {
+buildUnnamed4140() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3984(core.List<core.String> o) {
+checkUnnamed4140(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3985() {
+buildUnnamed4141() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -730,7 +730,7 @@
   return o;
 }
 
-checkUnnamed3985(core.Map<core.String, core.Object> o) {
+checkUnnamed4141(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted2 = (o["x"]) as core.Map;
   unittest.expect(casted2, unittest.hasLength(3));
@@ -744,7 +744,7 @@
   unittest.expect(casted3["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3986() {
+buildUnnamed4142() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -759,7 +759,7 @@
   return o;
 }
 
-checkUnnamed3986(core.Map<core.String, core.Object> o) {
+checkUnnamed4142(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted4 = (o["x"]) as core.Map;
   unittest.expect(casted4, unittest.hasLength(3));
@@ -773,7 +773,7 @@
   unittest.expect(casted5["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3987() {
+buildUnnamed4143() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -788,7 +788,7 @@
   return o;
 }
 
-checkUnnamed3987(core.Map<core.String, core.Object> o) {
+checkUnnamed4143(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted6 = (o["x"]) as core.Map;
   unittest.expect(casted6, unittest.hasLength(3));
@@ -802,7 +802,7 @@
   unittest.expect(casted7["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3988() {
+buildUnnamed4144() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -817,7 +817,7 @@
   return o;
 }
 
-checkUnnamed3988(core.Map<core.String, core.Object> o) {
+checkUnnamed4144(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted8 = (o["x"]) as core.Map;
   unittest.expect(casted8, unittest.hasLength(3));
@@ -831,14 +831,14 @@
   unittest.expect(casted9["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3989() {
+buildUnnamed4145() {
   var o = new core.List<api.WorkerPool>();
   o.add(buildWorkerPool());
   o.add(buildWorkerPool());
   return o;
 }
 
-checkUnnamed3989(core.List<api.WorkerPool> o) {
+checkUnnamed4145(core.List<api.WorkerPool> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorkerPool(o[0]);
   checkWorkerPool(o[1]);
@@ -851,14 +851,14 @@
   if (buildCounterEnvironment < 3) {
     o.clusterManagerApiService = "foo";
     o.dataset = "foo";
-    o.experiments = buildUnnamed3984();
-    o.internalExperiments = buildUnnamed3985();
-    o.sdkPipelineOptions = buildUnnamed3986();
+    o.experiments = buildUnnamed4140();
+    o.internalExperiments = buildUnnamed4141();
+    o.sdkPipelineOptions = buildUnnamed4142();
     o.serviceAccountEmail = "foo";
     o.tempStoragePrefix = "foo";
-    o.userAgent = buildUnnamed3987();
-    o.version = buildUnnamed3988();
-    o.workerPools = buildUnnamed3989();
+    o.userAgent = buildUnnamed4143();
+    o.version = buildUnnamed4144();
+    o.workerPools = buildUnnamed4145();
   }
   buildCounterEnvironment--;
   return o;
@@ -869,14 +869,14 @@
   if (buildCounterEnvironment < 3) {
     unittest.expect(o.clusterManagerApiService, unittest.equals('foo'));
     unittest.expect(o.dataset, unittest.equals('foo'));
-    checkUnnamed3984(o.experiments);
-    checkUnnamed3985(o.internalExperiments);
-    checkUnnamed3986(o.sdkPipelineOptions);
+    checkUnnamed4140(o.experiments);
+    checkUnnamed4141(o.internalExperiments);
+    checkUnnamed4142(o.sdkPipelineOptions);
     unittest.expect(o.serviceAccountEmail, unittest.equals('foo'));
     unittest.expect(o.tempStoragePrefix, unittest.equals('foo'));
-    checkUnnamed3987(o.userAgent);
-    checkUnnamed3988(o.version);
-    checkUnnamed3989(o.workerPools);
+    checkUnnamed4143(o.userAgent);
+    checkUnnamed4144(o.version);
+    checkUnnamed4145(o.workerPools);
   }
   buildCounterEnvironment--;
 }
@@ -904,53 +904,53 @@
   buildCounterExecutionStageState--;
 }
 
-buildUnnamed3990() {
+buildUnnamed4146() {
   var o = new core.List<api.ComponentSource>();
   o.add(buildComponentSource());
   o.add(buildComponentSource());
   return o;
 }
 
-checkUnnamed3990(core.List<api.ComponentSource> o) {
+checkUnnamed4146(core.List<api.ComponentSource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComponentSource(o[0]);
   checkComponentSource(o[1]);
 }
 
-buildUnnamed3991() {
+buildUnnamed4147() {
   var o = new core.List<api.ComponentTransform>();
   o.add(buildComponentTransform());
   o.add(buildComponentTransform());
   return o;
 }
 
-checkUnnamed3991(core.List<api.ComponentTransform> o) {
+checkUnnamed4147(core.List<api.ComponentTransform> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComponentTransform(o[0]);
   checkComponentTransform(o[1]);
 }
 
-buildUnnamed3992() {
+buildUnnamed4148() {
   var o = new core.List<api.StageSource>();
   o.add(buildStageSource());
   o.add(buildStageSource());
   return o;
 }
 
-checkUnnamed3992(core.List<api.StageSource> o) {
+checkUnnamed4148(core.List<api.StageSource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStageSource(o[0]);
   checkStageSource(o[1]);
 }
 
-buildUnnamed3993() {
+buildUnnamed4149() {
   var o = new core.List<api.StageSource>();
   o.add(buildStageSource());
   o.add(buildStageSource());
   return o;
 }
 
-checkUnnamed3993(core.List<api.StageSource> o) {
+checkUnnamed4149(core.List<api.StageSource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStageSource(o[0]);
   checkStageSource(o[1]);
@@ -961,13 +961,13 @@
   var o = new api.ExecutionStageSummary();
   buildCounterExecutionStageSummary++;
   if (buildCounterExecutionStageSummary < 3) {
-    o.componentSource = buildUnnamed3990();
-    o.componentTransform = buildUnnamed3991();
+    o.componentSource = buildUnnamed4146();
+    o.componentTransform = buildUnnamed4147();
     o.id = "foo";
-    o.inputSource = buildUnnamed3992();
+    o.inputSource = buildUnnamed4148();
     o.kind = "foo";
     o.name = "foo";
-    o.outputSource = buildUnnamed3993();
+    o.outputSource = buildUnnamed4149();
   }
   buildCounterExecutionStageSummary--;
   return o;
@@ -976,13 +976,13 @@
 checkExecutionStageSummary(api.ExecutionStageSummary o) {
   buildCounterExecutionStageSummary++;
   if (buildCounterExecutionStageSummary < 3) {
-    checkUnnamed3990(o.componentSource);
-    checkUnnamed3991(o.componentTransform);
+    checkUnnamed4146(o.componentSource);
+    checkUnnamed4147(o.componentTransform);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed3992(o.inputSource);
+    checkUnnamed4148(o.inputSource);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3993(o.outputSource);
+    checkUnnamed4149(o.outputSource);
   }
   buildCounterExecutionStageSummary--;
 }
@@ -1006,14 +1006,14 @@
   buildCounterFailedLocation--;
 }
 
-buildUnnamed3994() {
+buildUnnamed4150() {
   var o = new core.List<api.InstructionInput>();
   o.add(buildInstructionInput());
   o.add(buildInstructionInput());
   return o;
 }
 
-checkUnnamed3994(core.List<api.InstructionInput> o) {
+checkUnnamed4150(core.List<api.InstructionInput> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstructionInput(o[0]);
   checkInstructionInput(o[1]);
@@ -1024,7 +1024,7 @@
   var o = new api.FlattenInstruction();
   buildCounterFlattenInstruction++;
   if (buildCounterFlattenInstruction < 3) {
-    o.inputs = buildUnnamed3994();
+    o.inputs = buildUnnamed4150();
   }
   buildCounterFlattenInstruction--;
   return o;
@@ -1033,19 +1033,19 @@
 checkFlattenInstruction(api.FlattenInstruction o) {
   buildCounterFlattenInstruction++;
   if (buildCounterFlattenInstruction < 3) {
-    checkUnnamed3994(o.inputs);
+    checkUnnamed4150(o.inputs);
   }
   buildCounterFlattenInstruction--;
 }
 
-buildUnnamed3995() {
+buildUnnamed4151() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed3995(core.List<core.double> o) {
+checkUnnamed4151(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -1056,7 +1056,7 @@
   var o = new api.FloatingPointList();
   buildCounterFloatingPointList++;
   if (buildCounterFloatingPointList < 3) {
-    o.elements = buildUnnamed3995();
+    o.elements = buildUnnamed4151();
   }
   buildCounterFloatingPointList--;
   return o;
@@ -1065,7 +1065,7 @@
 checkFloatingPointList(api.FloatingPointList o) {
   buildCounterFloatingPointList++;
   if (buildCounterFloatingPointList < 3) {
-    checkUnnamed3995(o.elements);
+    checkUnnamed4151(o.elements);
   }
   buildCounterFloatingPointList--;
 }
@@ -1154,14 +1154,14 @@
   buildCounterGetTemplateResponse--;
 }
 
-buildUnnamed3996() {
+buildUnnamed4152() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3996(core.List<core.String> o) {
+checkUnnamed4152(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1172,7 +1172,7 @@
   var o = new api.Histogram();
   buildCounterHistogram++;
   if (buildCounterHistogram < 3) {
-    o.bucketCounts = buildUnnamed3996();
+    o.bucketCounts = buildUnnamed4152();
     o.firstBucketOffset = 42;
   }
   buildCounterHistogram--;
@@ -1182,7 +1182,7 @@
 checkHistogram(api.Histogram o) {
   buildCounterHistogram++;
   if (buildCounterHistogram < 3) {
-    checkUnnamed3996(o.bucketCounts);
+    checkUnnamed4152(o.bucketCounts);
     unittest.expect(o.firstBucketOffset, unittest.equals(42));
   }
   buildCounterHistogram--;
@@ -1209,7 +1209,7 @@
   buildCounterInstructionInput--;
 }
 
-buildUnnamed3997() {
+buildUnnamed4153() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1224,7 +1224,7 @@
   return o;
 }
 
-checkUnnamed3997(core.Map<core.String, core.Object> o) {
+checkUnnamed4153(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted10 = (o["x"]) as core.Map;
   unittest.expect(casted10, unittest.hasLength(3));
@@ -1243,7 +1243,7 @@
   var o = new api.InstructionOutput();
   buildCounterInstructionOutput++;
   if (buildCounterInstructionOutput < 3) {
-    o.codec = buildUnnamed3997();
+    o.codec = buildUnnamed4153();
     o.name = "foo";
     o.onlyCountKeyBytes = true;
     o.onlyCountValueBytes = true;
@@ -1257,7 +1257,7 @@
 checkInstructionOutput(api.InstructionOutput o) {
   buildCounterInstructionOutput++;
   if (buildCounterInstructionOutput < 3) {
-    checkUnnamed3997(o.codec);
+    checkUnnamed4153(o.codec);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.onlyCountKeyBytes, unittest.isTrue);
     unittest.expect(o.onlyCountValueBytes, unittest.isTrue);
@@ -1267,14 +1267,14 @@
   buildCounterInstructionOutput--;
 }
 
-buildUnnamed3998() {
+buildUnnamed4154() {
   var o = new core.List<api.SplitInt64>();
   o.add(buildSplitInt64());
   o.add(buildSplitInt64());
   return o;
 }
 
-checkUnnamed3998(core.List<api.SplitInt64> o) {
+checkUnnamed4154(core.List<api.SplitInt64> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSplitInt64(o[0]);
   checkSplitInt64(o[1]);
@@ -1285,7 +1285,7 @@
   var o = new api.IntegerList();
   buildCounterIntegerList++;
   if (buildCounterIntegerList < 3) {
-    o.elements = buildUnnamed3998();
+    o.elements = buildUnnamed4154();
   }
   buildCounterIntegerList--;
   return o;
@@ -1294,7 +1294,7 @@
 checkIntegerList(api.IntegerList o) {
   buildCounterIntegerList++;
   if (buildCounterIntegerList < 3) {
-    checkUnnamed3998(o.elements);
+    checkUnnamed4154(o.elements);
   }
   buildCounterIntegerList--;
 }
@@ -1320,66 +1320,66 @@
   buildCounterIntegerMean--;
 }
 
-buildUnnamed3999() {
+buildUnnamed4155() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3999(core.Map<core.String, core.String> o) {
+checkUnnamed4155(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed4000() {
+buildUnnamed4156() {
   var o = new core.List<api.ExecutionStageState>();
   o.add(buildExecutionStageState());
   o.add(buildExecutionStageState());
   return o;
 }
 
-checkUnnamed4000(core.List<api.ExecutionStageState> o) {
+checkUnnamed4156(core.List<api.ExecutionStageState> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExecutionStageState(o[0]);
   checkExecutionStageState(o[1]);
 }
 
-buildUnnamed4001() {
+buildUnnamed4157() {
   var o = new core.List<api.Step>();
   o.add(buildStep());
   o.add(buildStep());
   return o;
 }
 
-checkUnnamed4001(core.List<api.Step> o) {
+checkUnnamed4157(core.List<api.Step> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStep(o[0]);
   checkStep(o[1]);
 }
 
-buildUnnamed4002() {
+buildUnnamed4158() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4002(core.List<core.String> o) {
+checkUnnamed4158(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4003() {
+buildUnnamed4159() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4003(core.Map<core.String, core.String> o) {
+checkUnnamed4159(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1397,7 +1397,7 @@
     o.environment = buildEnvironment();
     o.executionInfo = buildJobExecutionInfo();
     o.id = "foo";
-    o.labels = buildUnnamed3999();
+    o.labels = buildUnnamed4155();
     o.location = "foo";
     o.name = "foo";
     o.pipelineDescription = buildPipelineDescription();
@@ -1405,10 +1405,10 @@
     o.replaceJobId = "foo";
     o.replacedByJobId = "foo";
     o.requestedState = "foo";
-    o.stageStates = buildUnnamed4000();
-    o.steps = buildUnnamed4001();
-    o.tempFiles = buildUnnamed4002();
-    o.transformNameMapping = buildUnnamed4003();
+    o.stageStates = buildUnnamed4156();
+    o.steps = buildUnnamed4157();
+    o.tempFiles = buildUnnamed4158();
+    o.transformNameMapping = buildUnnamed4159();
     o.type = "foo";
   }
   buildCounterJob--;
@@ -1425,7 +1425,7 @@
     checkEnvironment(o.environment);
     checkJobExecutionInfo(o.executionInfo);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed3999(o.labels);
+    checkUnnamed4155(o.labels);
     unittest.expect(o.location, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     checkPipelineDescription(o.pipelineDescription);
@@ -1433,23 +1433,23 @@
     unittest.expect(o.replaceJobId, unittest.equals('foo'));
     unittest.expect(o.replacedByJobId, unittest.equals('foo'));
     unittest.expect(o.requestedState, unittest.equals('foo'));
-    checkUnnamed4000(o.stageStates);
-    checkUnnamed4001(o.steps);
-    checkUnnamed4002(o.tempFiles);
-    checkUnnamed4003(o.transformNameMapping);
+    checkUnnamed4156(o.stageStates);
+    checkUnnamed4157(o.steps);
+    checkUnnamed4158(o.tempFiles);
+    checkUnnamed4159(o.transformNameMapping);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterJob--;
 }
 
-buildUnnamed4004() {
+buildUnnamed4160() {
   var o = new core.Map<core.String, api.JobExecutionStageInfo>();
   o["x"] = buildJobExecutionStageInfo();
   o["y"] = buildJobExecutionStageInfo();
   return o;
 }
 
-checkUnnamed4004(core.Map<core.String, api.JobExecutionStageInfo> o) {
+checkUnnamed4160(core.Map<core.String, api.JobExecutionStageInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJobExecutionStageInfo(o["x"]);
   checkJobExecutionStageInfo(o["y"]);
@@ -1460,7 +1460,7 @@
   var o = new api.JobExecutionInfo();
   buildCounterJobExecutionInfo++;
   if (buildCounterJobExecutionInfo < 3) {
-    o.stages = buildUnnamed4004();
+    o.stages = buildUnnamed4160();
   }
   buildCounterJobExecutionInfo--;
   return o;
@@ -1469,19 +1469,19 @@
 checkJobExecutionInfo(api.JobExecutionInfo o) {
   buildCounterJobExecutionInfo++;
   if (buildCounterJobExecutionInfo < 3) {
-    checkUnnamed4004(o.stages);
+    checkUnnamed4160(o.stages);
   }
   buildCounterJobExecutionInfo--;
 }
 
-buildUnnamed4005() {
+buildUnnamed4161() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4005(core.List<core.String> o) {
+checkUnnamed4161(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1492,7 +1492,7 @@
   var o = new api.JobExecutionStageInfo();
   buildCounterJobExecutionStageInfo++;
   if (buildCounterJobExecutionStageInfo < 3) {
-    o.stepName = buildUnnamed4005();
+    o.stepName = buildUnnamed4161();
   }
   buildCounterJobExecutionStageInfo--;
   return o;
@@ -1501,7 +1501,7 @@
 checkJobExecutionStageInfo(api.JobExecutionStageInfo o) {
   buildCounterJobExecutionStageInfo++;
   if (buildCounterJobExecutionStageInfo < 3) {
-    checkUnnamed4005(o.stepName);
+    checkUnnamed4161(o.stepName);
   }
   buildCounterJobExecutionStageInfo--;
 }
@@ -1531,14 +1531,14 @@
   buildCounterJobMessage--;
 }
 
-buildUnnamed4006() {
+buildUnnamed4162() {
   var o = new core.List<api.MetricUpdate>();
   o.add(buildMetricUpdate());
   o.add(buildMetricUpdate());
   return o;
 }
 
-checkUnnamed4006(core.List<api.MetricUpdate> o) {
+checkUnnamed4162(core.List<api.MetricUpdate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricUpdate(o[0]);
   checkMetricUpdate(o[1]);
@@ -1550,7 +1550,7 @@
   buildCounterJobMetrics++;
   if (buildCounterJobMetrics < 3) {
     o.metricTime = "foo";
-    o.metrics = buildUnnamed4006();
+    o.metrics = buildUnnamed4162();
   }
   buildCounterJobMetrics--;
   return o;
@@ -1560,7 +1560,7 @@
   buildCounterJobMetrics++;
   if (buildCounterJobMetrics < 3) {
     unittest.expect(o.metricTime, unittest.equals('foo'));
-    checkUnnamed4006(o.metrics);
+    checkUnnamed4162(o.metrics);
   }
   buildCounterJobMetrics--;
 }
@@ -1615,14 +1615,14 @@
   buildCounterKeyRangeLocation--;
 }
 
-buildUnnamed4007() {
+buildUnnamed4163() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4007(core.Map<core.String, core.String> o) {
+checkUnnamed4163(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1635,7 +1635,7 @@
   if (buildCounterLaunchTemplateParameters < 3) {
     o.environment = buildRuntimeEnvironment();
     o.jobName = "foo";
-    o.parameters = buildUnnamed4007();
+    o.parameters = buildUnnamed4163();
   }
   buildCounterLaunchTemplateParameters--;
   return o;
@@ -1646,7 +1646,7 @@
   if (buildCounterLaunchTemplateParameters < 3) {
     checkRuntimeEnvironment(o.environment);
     unittest.expect(o.jobName, unittest.equals('foo'));
-    checkUnnamed4007(o.parameters);
+    checkUnnamed4163(o.parameters);
   }
   buildCounterLaunchTemplateParameters--;
 }
@@ -1670,27 +1670,27 @@
   buildCounterLaunchTemplateResponse--;
 }
 
-buildUnnamed4008() {
+buildUnnamed4164() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4008(core.List<core.String> o) {
+checkUnnamed4164(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4009() {
+buildUnnamed4165() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4009(core.List<core.String> o) {
+checkUnnamed4165(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1704,8 +1704,8 @@
     o.currentWorkerTime = "foo";
     o.location = "foo";
     o.requestedLeaseDuration = "foo";
-    o.workItemTypes = buildUnnamed4008();
-    o.workerCapabilities = buildUnnamed4009();
+    o.workItemTypes = buildUnnamed4164();
+    o.workerCapabilities = buildUnnamed4165();
     o.workerId = "foo";
   }
   buildCounterLeaseWorkItemRequest--;
@@ -1718,21 +1718,21 @@
     unittest.expect(o.currentWorkerTime, unittest.equals('foo'));
     unittest.expect(o.location, unittest.equals('foo'));
     unittest.expect(o.requestedLeaseDuration, unittest.equals('foo'));
-    checkUnnamed4008(o.workItemTypes);
-    checkUnnamed4009(o.workerCapabilities);
+    checkUnnamed4164(o.workItemTypes);
+    checkUnnamed4165(o.workerCapabilities);
     unittest.expect(o.workerId, unittest.equals('foo'));
   }
   buildCounterLeaseWorkItemRequest--;
 }
 
-buildUnnamed4010() {
+buildUnnamed4166() {
   var o = new core.List<api.WorkItem>();
   o.add(buildWorkItem());
   o.add(buildWorkItem());
   return o;
 }
 
-checkUnnamed4010(core.List<api.WorkItem> o) {
+checkUnnamed4166(core.List<api.WorkItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorkItem(o[0]);
   checkWorkItem(o[1]);
@@ -1743,7 +1743,7 @@
   var o = new api.LeaseWorkItemResponse();
   buildCounterLeaseWorkItemResponse++;
   if (buildCounterLeaseWorkItemResponse < 3) {
-    o.workItems = buildUnnamed4010();
+    o.workItems = buildUnnamed4166();
   }
   buildCounterLeaseWorkItemResponse--;
   return o;
@@ -1752,32 +1752,32 @@
 checkLeaseWorkItemResponse(api.LeaseWorkItemResponse o) {
   buildCounterLeaseWorkItemResponse++;
   if (buildCounterLeaseWorkItemResponse < 3) {
-    checkUnnamed4010(o.workItems);
+    checkUnnamed4166(o.workItems);
   }
   buildCounterLeaseWorkItemResponse--;
 }
 
-buildUnnamed4011() {
+buildUnnamed4167() {
   var o = new core.List<api.AutoscalingEvent>();
   o.add(buildAutoscalingEvent());
   o.add(buildAutoscalingEvent());
   return o;
 }
 
-checkUnnamed4011(core.List<api.AutoscalingEvent> o) {
+checkUnnamed4167(core.List<api.AutoscalingEvent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAutoscalingEvent(o[0]);
   checkAutoscalingEvent(o[1]);
 }
 
-buildUnnamed4012() {
+buildUnnamed4168() {
   var o = new core.List<api.JobMessage>();
   o.add(buildJobMessage());
   o.add(buildJobMessage());
   return o;
 }
 
-checkUnnamed4012(core.List<api.JobMessage> o) {
+checkUnnamed4168(core.List<api.JobMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJobMessage(o[0]);
   checkJobMessage(o[1]);
@@ -1788,8 +1788,8 @@
   var o = new api.ListJobMessagesResponse();
   buildCounterListJobMessagesResponse++;
   if (buildCounterListJobMessagesResponse < 3) {
-    o.autoscalingEvents = buildUnnamed4011();
-    o.jobMessages = buildUnnamed4012();
+    o.autoscalingEvents = buildUnnamed4167();
+    o.jobMessages = buildUnnamed4168();
     o.nextPageToken = "foo";
   }
   buildCounterListJobMessagesResponse--;
@@ -1799,34 +1799,34 @@
 checkListJobMessagesResponse(api.ListJobMessagesResponse o) {
   buildCounterListJobMessagesResponse++;
   if (buildCounterListJobMessagesResponse < 3) {
-    checkUnnamed4011(o.autoscalingEvents);
-    checkUnnamed4012(o.jobMessages);
+    checkUnnamed4167(o.autoscalingEvents);
+    checkUnnamed4168(o.jobMessages);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListJobMessagesResponse--;
 }
 
-buildUnnamed4013() {
+buildUnnamed4169() {
   var o = new core.List<api.FailedLocation>();
   o.add(buildFailedLocation());
   o.add(buildFailedLocation());
   return o;
 }
 
-checkUnnamed4013(core.List<api.FailedLocation> o) {
+checkUnnamed4169(core.List<api.FailedLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFailedLocation(o[0]);
   checkFailedLocation(o[1]);
 }
 
-buildUnnamed4014() {
+buildUnnamed4170() {
   var o = new core.List<api.Job>();
   o.add(buildJob());
   o.add(buildJob());
   return o;
 }
 
-checkUnnamed4014(core.List<api.Job> o) {
+checkUnnamed4170(core.List<api.Job> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkJob(o[0]);
   checkJob(o[1]);
@@ -1837,8 +1837,8 @@
   var o = new api.ListJobsResponse();
   buildCounterListJobsResponse++;
   if (buildCounterListJobsResponse < 3) {
-    o.failedLocation = buildUnnamed4013();
-    o.jobs = buildUnnamed4014();
+    o.failedLocation = buildUnnamed4169();
+    o.jobs = buildUnnamed4170();
     o.nextPageToken = "foo";
   }
   buildCounterListJobsResponse--;
@@ -1848,21 +1848,21 @@
 checkListJobsResponse(api.ListJobsResponse o) {
   buildCounterListJobsResponse++;
   if (buildCounterListJobsResponse < 3) {
-    checkUnnamed4013(o.failedLocation);
-    checkUnnamed4014(o.jobs);
+    checkUnnamed4169(o.failedLocation);
+    checkUnnamed4170(o.jobs);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListJobsResponse--;
 }
 
-buildUnnamed4015() {
+buildUnnamed4171() {
   var o = new core.List<api.ParallelInstruction>();
   o.add(buildParallelInstruction());
   o.add(buildParallelInstruction());
   return o;
 }
 
-checkUnnamed4015(core.List<api.ParallelInstruction> o) {
+checkUnnamed4171(core.List<api.ParallelInstruction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParallelInstruction(o[0]);
   checkParallelInstruction(o[1]);
@@ -1873,7 +1873,7 @@
   var o = new api.MapTask();
   buildCounterMapTask++;
   if (buildCounterMapTask < 3) {
-    o.instructions = buildUnnamed4015();
+    o.instructions = buildUnnamed4171();
     o.stageName = "foo";
     o.systemName = "foo";
   }
@@ -1884,7 +1884,7 @@
 checkMapTask(api.MapTask o) {
   buildCounterMapTask++;
   if (buildCounterMapTask < 3) {
-    checkUnnamed4015(o.instructions);
+    checkUnnamed4171(o.instructions);
     unittest.expect(o.stageName, unittest.equals('foo'));
     unittest.expect(o.systemName, unittest.equals('foo'));
   }
@@ -1912,14 +1912,14 @@
   buildCounterMetricShortId--;
 }
 
-buildUnnamed4016() {
+buildUnnamed4172() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4016(core.Map<core.String, core.String> o) {
+checkUnnamed4172(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1930,7 +1930,7 @@
   var o = new api.MetricStructuredName();
   buildCounterMetricStructuredName++;
   if (buildCounterMetricStructuredName < 3) {
-    o.context = buildUnnamed4016();
+    o.context = buildUnnamed4172();
     o.name = "foo";
     o.origin = "foo";
   }
@@ -1941,7 +1941,7 @@
 checkMetricStructuredName(api.MetricStructuredName o) {
   buildCounterMetricStructuredName++;
   if (buildCounterMetricStructuredName < 3) {
-    checkUnnamed4016(o.context);
+    checkUnnamed4172(o.context);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.origin, unittest.equals('foo'));
   }
@@ -2113,33 +2113,33 @@
   buildCounterPackage--;
 }
 
-buildUnnamed4017() {
+buildUnnamed4173() {
   var o = new core.List<api.MultiOutputInfo>();
   o.add(buildMultiOutputInfo());
   o.add(buildMultiOutputInfo());
   return o;
 }
 
-checkUnnamed4017(core.List<api.MultiOutputInfo> o) {
+checkUnnamed4173(core.List<api.MultiOutputInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMultiOutputInfo(o[0]);
   checkMultiOutputInfo(o[1]);
 }
 
-buildUnnamed4018() {
+buildUnnamed4174() {
   var o = new core.List<api.SideInputInfo>();
   o.add(buildSideInputInfo());
   o.add(buildSideInputInfo());
   return o;
 }
 
-checkUnnamed4018(core.List<api.SideInputInfo> o) {
+checkUnnamed4174(core.List<api.SideInputInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSideInputInfo(o[0]);
   checkSideInputInfo(o[1]);
 }
 
-buildUnnamed4019() {
+buildUnnamed4175() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2154,7 +2154,7 @@
   return o;
 }
 
-checkUnnamed4019(core.Map<core.String, core.Object> o) {
+checkUnnamed4175(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted18 = (o["x"]) as core.Map;
   unittest.expect(casted18, unittest.hasLength(3));
@@ -2174,10 +2174,10 @@
   buildCounterParDoInstruction++;
   if (buildCounterParDoInstruction < 3) {
     o.input = buildInstructionInput();
-    o.multiOutputInfos = buildUnnamed4017();
+    o.multiOutputInfos = buildUnnamed4173();
     o.numOutputs = 42;
-    o.sideInputs = buildUnnamed4018();
-    o.userFn = buildUnnamed4019();
+    o.sideInputs = buildUnnamed4174();
+    o.userFn = buildUnnamed4175();
   }
   buildCounterParDoInstruction--;
   return o;
@@ -2187,22 +2187,22 @@
   buildCounterParDoInstruction++;
   if (buildCounterParDoInstruction < 3) {
     checkInstructionInput(o.input);
-    checkUnnamed4017(o.multiOutputInfos);
+    checkUnnamed4173(o.multiOutputInfos);
     unittest.expect(o.numOutputs, unittest.equals(42));
-    checkUnnamed4018(o.sideInputs);
-    checkUnnamed4019(o.userFn);
+    checkUnnamed4174(o.sideInputs);
+    checkUnnamed4175(o.userFn);
   }
   buildCounterParDoInstruction--;
 }
 
-buildUnnamed4020() {
+buildUnnamed4176() {
   var o = new core.List<api.InstructionOutput>();
   o.add(buildInstructionOutput());
   o.add(buildInstructionOutput());
   return o;
 }
 
-checkUnnamed4020(core.List<api.InstructionOutput> o) {
+checkUnnamed4176(core.List<api.InstructionOutput> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstructionOutput(o[0]);
   checkInstructionOutput(o[1]);
@@ -2216,7 +2216,7 @@
     o.flatten = buildFlattenInstruction();
     o.name = "foo";
     o.originalName = "foo";
-    o.outputs = buildUnnamed4020();
+    o.outputs = buildUnnamed4176();
     o.parDo = buildParDoInstruction();
     o.partialGroupByKey = buildPartialGroupByKeyInstruction();
     o.read = buildReadInstruction();
@@ -2233,7 +2233,7 @@
     checkFlattenInstruction(o.flatten);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.originalName, unittest.equals('foo'));
-    checkUnnamed4020(o.outputs);
+    checkUnnamed4176(o.outputs);
     checkParDoInstruction(o.parDo);
     checkPartialGroupByKeyInstruction(o.partialGroupByKey);
     checkReadInstruction(o.read);
@@ -2272,14 +2272,14 @@
   buildCounterParameter--;
 }
 
-buildUnnamed4021() {
+buildUnnamed4177() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4021(core.List<core.String> o) {
+checkUnnamed4177(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2294,7 +2294,7 @@
     o.isOptional = true;
     o.label = "foo";
     o.name = "foo";
-    o.regexes = buildUnnamed4021();
+    o.regexes = buildUnnamed4177();
   }
   buildCounterParameterMetadata--;
   return o;
@@ -2307,12 +2307,12 @@
     unittest.expect(o.isOptional, unittest.isTrue);
     unittest.expect(o.label, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4021(o.regexes);
+    checkUnnamed4177(o.regexes);
   }
   buildCounterParameterMetadata--;
 }
 
-buildUnnamed4022() {
+buildUnnamed4178() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2327,7 +2327,7 @@
   return o;
 }
 
-checkUnnamed4022(core.Map<core.String, core.Object> o) {
+checkUnnamed4178(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted21 = (o["x"]) as core.Map;
   unittest.expect(casted21, unittest.hasLength(3));
@@ -2341,20 +2341,20 @@
   unittest.expect(casted22["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4023() {
+buildUnnamed4179() {
   var o = new core.List<api.SideInputInfo>();
   o.add(buildSideInputInfo());
   o.add(buildSideInputInfo());
   return o;
 }
 
-checkUnnamed4023(core.List<api.SideInputInfo> o) {
+checkUnnamed4179(core.List<api.SideInputInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSideInputInfo(o[0]);
   checkSideInputInfo(o[1]);
 }
 
-buildUnnamed4024() {
+buildUnnamed4180() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2369,7 +2369,7 @@
   return o;
 }
 
-checkUnnamed4024(core.Map<core.String, core.Object> o) {
+checkUnnamed4180(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted23 = (o["x"]) as core.Map;
   unittest.expect(casted23, unittest.hasLength(3));
@@ -2389,11 +2389,11 @@
   buildCounterPartialGroupByKeyInstruction++;
   if (buildCounterPartialGroupByKeyInstruction < 3) {
     o.input = buildInstructionInput();
-    o.inputElementCodec = buildUnnamed4022();
+    o.inputElementCodec = buildUnnamed4178();
     o.originalCombineValuesInputStoreName = "foo";
     o.originalCombineValuesStepName = "foo";
-    o.sideInputs = buildUnnamed4023();
-    o.valueCombiningFn = buildUnnamed4024();
+    o.sideInputs = buildUnnamed4179();
+    o.valueCombiningFn = buildUnnamed4180();
   }
   buildCounterPartialGroupByKeyInstruction--;
   return o;
@@ -2403,50 +2403,50 @@
   buildCounterPartialGroupByKeyInstruction++;
   if (buildCounterPartialGroupByKeyInstruction < 3) {
     checkInstructionInput(o.input);
-    checkUnnamed4022(o.inputElementCodec);
+    checkUnnamed4178(o.inputElementCodec);
     unittest.expect(
         o.originalCombineValuesInputStoreName, unittest.equals('foo'));
     unittest.expect(o.originalCombineValuesStepName, unittest.equals('foo'));
-    checkUnnamed4023(o.sideInputs);
-    checkUnnamed4024(o.valueCombiningFn);
+    checkUnnamed4179(o.sideInputs);
+    checkUnnamed4180(o.valueCombiningFn);
   }
   buildCounterPartialGroupByKeyInstruction--;
 }
 
-buildUnnamed4025() {
+buildUnnamed4181() {
   var o = new core.List<api.DisplayData>();
   o.add(buildDisplayData());
   o.add(buildDisplayData());
   return o;
 }
 
-checkUnnamed4025(core.List<api.DisplayData> o) {
+checkUnnamed4181(core.List<api.DisplayData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisplayData(o[0]);
   checkDisplayData(o[1]);
 }
 
-buildUnnamed4026() {
+buildUnnamed4182() {
   var o = new core.List<api.ExecutionStageSummary>();
   o.add(buildExecutionStageSummary());
   o.add(buildExecutionStageSummary());
   return o;
 }
 
-checkUnnamed4026(core.List<api.ExecutionStageSummary> o) {
+checkUnnamed4182(core.List<api.ExecutionStageSummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExecutionStageSummary(o[0]);
   checkExecutionStageSummary(o[1]);
 }
 
-buildUnnamed4027() {
+buildUnnamed4183() {
   var o = new core.List<api.TransformSummary>();
   o.add(buildTransformSummary());
   o.add(buildTransformSummary());
   return o;
 }
 
-checkUnnamed4027(core.List<api.TransformSummary> o) {
+checkUnnamed4183(core.List<api.TransformSummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTransformSummary(o[0]);
   checkTransformSummary(o[1]);
@@ -2457,9 +2457,9 @@
   var o = new api.PipelineDescription();
   buildCounterPipelineDescription++;
   if (buildCounterPipelineDescription < 3) {
-    o.displayData = buildUnnamed4025();
-    o.executionPipelineStage = buildUnnamed4026();
-    o.originalPipelineTransform = buildUnnamed4027();
+    o.displayData = buildUnnamed4181();
+    o.executionPipelineStage = buildUnnamed4182();
+    o.originalPipelineTransform = buildUnnamed4183();
   }
   buildCounterPipelineDescription--;
   return o;
@@ -2468,9 +2468,9 @@
 checkPipelineDescription(api.PipelineDescription o) {
   buildCounterPipelineDescription++;
   if (buildCounterPipelineDescription < 3) {
-    checkUnnamed4025(o.displayData);
-    checkUnnamed4026(o.executionPipelineStage);
-    checkUnnamed4027(o.originalPipelineTransform);
+    checkUnnamed4181(o.displayData);
+    checkUnnamed4182(o.executionPipelineStage);
+    checkUnnamed4183(o.originalPipelineTransform);
   }
   buildCounterPipelineDescription--;
 }
@@ -2554,14 +2554,14 @@
   buildCounterReadInstruction--;
 }
 
-buildUnnamed4028() {
+buildUnnamed4184() {
   var o = new core.List<api.WorkItemStatus>();
   o.add(buildWorkItemStatus());
   o.add(buildWorkItemStatus());
   return o;
 }
 
-checkUnnamed4028(core.List<api.WorkItemStatus> o) {
+checkUnnamed4184(core.List<api.WorkItemStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorkItemStatus(o[0]);
   checkWorkItemStatus(o[1]);
@@ -2574,7 +2574,7 @@
   if (buildCounterReportWorkItemStatusRequest < 3) {
     o.currentWorkerTime = "foo";
     o.location = "foo";
-    o.workItemStatuses = buildUnnamed4028();
+    o.workItemStatuses = buildUnnamed4184();
     o.workerId = "foo";
   }
   buildCounterReportWorkItemStatusRequest--;
@@ -2586,20 +2586,20 @@
   if (buildCounterReportWorkItemStatusRequest < 3) {
     unittest.expect(o.currentWorkerTime, unittest.equals('foo'));
     unittest.expect(o.location, unittest.equals('foo'));
-    checkUnnamed4028(o.workItemStatuses);
+    checkUnnamed4184(o.workItemStatuses);
     unittest.expect(o.workerId, unittest.equals('foo'));
   }
   buildCounterReportWorkItemStatusRequest--;
 }
 
-buildUnnamed4029() {
+buildUnnamed4185() {
   var o = new core.List<api.WorkItemServiceState>();
   o.add(buildWorkItemServiceState());
   o.add(buildWorkItemServiceState());
   return o;
 }
 
-checkUnnamed4029(core.List<api.WorkItemServiceState> o) {
+checkUnnamed4185(core.List<api.WorkItemServiceState> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorkItemServiceState(o[0]);
   checkWorkItemServiceState(o[1]);
@@ -2610,7 +2610,7 @@
   var o = new api.ReportWorkItemStatusResponse();
   buildCounterReportWorkItemStatusResponse++;
   if (buildCounterReportWorkItemStatusResponse < 3) {
-    o.workItemServiceStates = buildUnnamed4029();
+    o.workItemServiceStates = buildUnnamed4185();
   }
   buildCounterReportWorkItemStatusResponse--;
   return o;
@@ -2619,7 +2619,7 @@
 checkReportWorkItemStatusResponse(api.ReportWorkItemStatusResponse o) {
   buildCounterReportWorkItemStatusResponse++;
   if (buildCounterReportWorkItemStatusResponse < 3) {
-    checkUnnamed4029(o.workItemServiceStates);
+    checkUnnamed4185(o.workItemServiceStates);
   }
   buildCounterReportWorkItemStatusResponse--;
 }
@@ -2645,14 +2645,14 @@
   buildCounterReportedParallelism--;
 }
 
-buildUnnamed4030() {
+buildUnnamed4186() {
   var o = new core.List<api.CPUTime>();
   o.add(buildCPUTime());
   o.add(buildCPUTime());
   return o;
 }
 
-checkUnnamed4030(core.List<api.CPUTime> o) {
+checkUnnamed4186(core.List<api.CPUTime> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCPUTime(o[0]);
   checkCPUTime(o[1]);
@@ -2663,7 +2663,7 @@
   var o = new api.ResourceUtilizationReport();
   buildCounterResourceUtilizationReport++;
   if (buildCounterResourceUtilizationReport < 3) {
-    o.cpuTime = buildUnnamed4030();
+    o.cpuTime = buildUnnamed4186();
   }
   buildCounterResourceUtilizationReport--;
   return o;
@@ -2672,7 +2672,7 @@
 checkResourceUtilizationReport(api.ResourceUtilizationReport o) {
   buildCounterResourceUtilizationReport++;
   if (buildCounterResourceUtilizationReport < 3) {
-    checkUnnamed4030(o.cpuTime);
+    checkUnnamed4186(o.cpuTime);
   }
   buildCounterResourceUtilizationReport--;
 }
@@ -2693,14 +2693,14 @@
   buildCounterResourceUtilizationReportResponse--;
 }
 
-buildUnnamed4031() {
+buildUnnamed4187() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4031(core.List<core.String> o) {
+checkUnnamed4187(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2711,7 +2711,7 @@
   var o = new api.RuntimeEnvironment();
   buildCounterRuntimeEnvironment++;
   if (buildCounterRuntimeEnvironment < 3) {
-    o.additionalExperiments = buildUnnamed4031();
+    o.additionalExperiments = buildUnnamed4187();
     o.bypassTempDirValidation = true;
     o.machineType = "foo";
     o.maxWorkers = 42;
@@ -2726,7 +2726,7 @@
 checkRuntimeEnvironment(api.RuntimeEnvironment o) {
   buildCounterRuntimeEnvironment++;
   if (buildCounterRuntimeEnvironment < 3) {
-    checkUnnamed4031(o.additionalExperiments);
+    checkUnnamed4187(o.additionalExperiments);
     unittest.expect(o.bypassTempDirValidation, unittest.isTrue);
     unittest.expect(o.machineType, unittest.equals('foo'));
     unittest.expect(o.maxWorkers, unittest.equals(42));
@@ -2777,14 +2777,14 @@
   buildCounterSendDebugCaptureResponse--;
 }
 
-buildUnnamed4032() {
+buildUnnamed4188() {
   var o = new core.List<api.WorkerMessage>();
   o.add(buildWorkerMessage());
   o.add(buildWorkerMessage());
   return o;
 }
 
-checkUnnamed4032(core.List<api.WorkerMessage> o) {
+checkUnnamed4188(core.List<api.WorkerMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorkerMessage(o[0]);
   checkWorkerMessage(o[1]);
@@ -2796,7 +2796,7 @@
   buildCounterSendWorkerMessagesRequest++;
   if (buildCounterSendWorkerMessagesRequest < 3) {
     o.location = "foo";
-    o.workerMessages = buildUnnamed4032();
+    o.workerMessages = buildUnnamed4188();
   }
   buildCounterSendWorkerMessagesRequest--;
   return o;
@@ -2806,19 +2806,19 @@
   buildCounterSendWorkerMessagesRequest++;
   if (buildCounterSendWorkerMessagesRequest < 3) {
     unittest.expect(o.location, unittest.equals('foo'));
-    checkUnnamed4032(o.workerMessages);
+    checkUnnamed4188(o.workerMessages);
   }
   buildCounterSendWorkerMessagesRequest--;
 }
 
-buildUnnamed4033() {
+buildUnnamed4189() {
   var o = new core.List<api.WorkerMessageResponse>();
   o.add(buildWorkerMessageResponse());
   o.add(buildWorkerMessageResponse());
   return o;
 }
 
-checkUnnamed4033(core.List<api.WorkerMessageResponse> o) {
+checkUnnamed4189(core.List<api.WorkerMessageResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWorkerMessageResponse(o[0]);
   checkWorkerMessageResponse(o[1]);
@@ -2829,7 +2829,7 @@
   var o = new api.SendWorkerMessagesResponse();
   buildCounterSendWorkerMessagesResponse++;
   if (buildCounterSendWorkerMessagesResponse < 3) {
-    o.workerMessageResponses = buildUnnamed4033();
+    o.workerMessageResponses = buildUnnamed4189();
   }
   buildCounterSendWorkerMessagesResponse--;
   return o;
@@ -2838,38 +2838,38 @@
 checkSendWorkerMessagesResponse(api.SendWorkerMessagesResponse o) {
   buildCounterSendWorkerMessagesResponse++;
   if (buildCounterSendWorkerMessagesResponse < 3) {
-    checkUnnamed4033(o.workerMessageResponses);
+    checkUnnamed4189(o.workerMessageResponses);
   }
   buildCounterSendWorkerMessagesResponse--;
 }
 
-buildUnnamed4034() {
+buildUnnamed4190() {
   var o = new core.List<api.SideInputInfo>();
   o.add(buildSideInputInfo());
   o.add(buildSideInputInfo());
   return o;
 }
 
-checkUnnamed4034(core.List<api.SideInputInfo> o) {
+checkUnnamed4190(core.List<api.SideInputInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSideInputInfo(o[0]);
   checkSideInputInfo(o[1]);
 }
 
-buildUnnamed4035() {
+buildUnnamed4191() {
   var o = new core.List<api.SeqMapTaskOutputInfo>();
   o.add(buildSeqMapTaskOutputInfo());
   o.add(buildSeqMapTaskOutputInfo());
   return o;
 }
 
-checkUnnamed4035(core.List<api.SeqMapTaskOutputInfo> o) {
+checkUnnamed4191(core.List<api.SeqMapTaskOutputInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSeqMapTaskOutputInfo(o[0]);
   checkSeqMapTaskOutputInfo(o[1]);
 }
 
-buildUnnamed4036() {
+buildUnnamed4192() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2884,7 +2884,7 @@
   return o;
 }
 
-checkUnnamed4036(core.Map<core.String, core.Object> o) {
+checkUnnamed4192(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted25 = (o["x"]) as core.Map;
   unittest.expect(casted25, unittest.hasLength(3));
@@ -2903,12 +2903,12 @@
   var o = new api.SeqMapTask();
   buildCounterSeqMapTask++;
   if (buildCounterSeqMapTask < 3) {
-    o.inputs = buildUnnamed4034();
+    o.inputs = buildUnnamed4190();
     o.name = "foo";
-    o.outputInfos = buildUnnamed4035();
+    o.outputInfos = buildUnnamed4191();
     o.stageName = "foo";
     o.systemName = "foo";
-    o.userFn = buildUnnamed4036();
+    o.userFn = buildUnnamed4192();
   }
   buildCounterSeqMapTask--;
   return o;
@@ -2917,12 +2917,12 @@
 checkSeqMapTask(api.SeqMapTask o) {
   buildCounterSeqMapTask++;
   if (buildCounterSeqMapTask < 3) {
-    checkUnnamed4034(o.inputs);
+    checkUnnamed4190(o.inputs);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4035(o.outputInfos);
+    checkUnnamed4191(o.outputInfos);
     unittest.expect(o.stageName, unittest.equals('foo'));
     unittest.expect(o.systemName, unittest.equals('foo'));
-    checkUnnamed4036(o.userFn);
+    checkUnnamed4192(o.userFn);
   }
   buildCounterSeqMapTask--;
 }
@@ -2969,7 +2969,7 @@
   buildCounterShellTask--;
 }
 
-buildUnnamed4037() {
+buildUnnamed4193() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2984,7 +2984,7 @@
   return o;
 }
 
-checkUnnamed4037(core.Map<core.String, core.Object> o) {
+checkUnnamed4193(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted27 = (o["x"]) as core.Map;
   unittest.expect(casted27, unittest.hasLength(3));
@@ -2998,14 +2998,14 @@
   unittest.expect(casted28["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4038() {
+buildUnnamed4194() {
   var o = new core.List<api.Source>();
   o.add(buildSource());
   o.add(buildSource());
   return o;
 }
 
-checkUnnamed4038(core.List<api.Source> o) {
+checkUnnamed4194(core.List<api.Source> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSource(o[0]);
   checkSource(o[1]);
@@ -3016,8 +3016,8 @@
   var o = new api.SideInputInfo();
   buildCounterSideInputInfo++;
   if (buildCounterSideInputInfo < 3) {
-    o.kind = buildUnnamed4037();
-    o.sources = buildUnnamed4038();
+    o.kind = buildUnnamed4193();
+    o.sources = buildUnnamed4194();
     o.tag = "foo";
   }
   buildCounterSideInputInfo--;
@@ -3027,14 +3027,14 @@
 checkSideInputInfo(api.SideInputInfo o) {
   buildCounterSideInputInfo++;
   if (buildCounterSideInputInfo < 3) {
-    checkUnnamed4037(o.kind);
-    checkUnnamed4038(o.sources);
+    checkUnnamed4193(o.kind);
+    checkUnnamed4194(o.sources);
     unittest.expect(o.tag, unittest.equals('foo'));
   }
   buildCounterSideInputInfo--;
 }
 
-buildUnnamed4039() {
+buildUnnamed4195() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3049,7 +3049,7 @@
   return o;
 }
 
-checkUnnamed4039(core.Map<core.String, core.Object> o) {
+checkUnnamed4195(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted29 = (o["x"]) as core.Map;
   unittest.expect(casted29, unittest.hasLength(3));
@@ -3063,7 +3063,7 @@
   unittest.expect(casted30["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4040() {
+buildUnnamed4196() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3078,7 +3078,7 @@
   return o;
 }
 
-checkUnnamed4040(core.Map<core.String, core.Object> o) {
+checkUnnamed4196(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted31 = (o["x"]) as core.Map;
   unittest.expect(casted31, unittest.hasLength(3));
@@ -3097,8 +3097,8 @@
   var o = new api.Sink();
   buildCounterSink++;
   if (buildCounterSink < 3) {
-    o.codec = buildUnnamed4039();
-    o.spec = buildUnnamed4040();
+    o.codec = buildUnnamed4195();
+    o.spec = buildUnnamed4196();
   }
   buildCounterSink--;
   return o;
@@ -3107,13 +3107,13 @@
 checkSink(api.Sink o) {
   buildCounterSink++;
   if (buildCounterSink < 3) {
-    checkUnnamed4039(o.codec);
-    checkUnnamed4040(o.spec);
+    checkUnnamed4195(o.codec);
+    checkUnnamed4196(o.spec);
   }
   buildCounterSink--;
 }
 
-buildUnnamed4041() {
+buildUnnamed4197() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3128,7 +3128,7 @@
   return o;
 }
 
-checkUnnamed4041(core.Map<core.String, core.Object> o) {
+checkUnnamed4197(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted33 = (o["x"]) as core.Map;
   unittest.expect(casted33, unittest.hasLength(3));
@@ -3142,20 +3142,20 @@
   unittest.expect(casted34["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4042() {
+buildUnnamed4198() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4041());
-  o.add(buildUnnamed4041());
+  o.add(buildUnnamed4197());
+  o.add(buildUnnamed4197());
   return o;
 }
 
-checkUnnamed4042(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4198(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4041(o[0]);
-  checkUnnamed4041(o[1]);
+  checkUnnamed4197(o[0]);
+  checkUnnamed4197(o[1]);
 }
 
-buildUnnamed4043() {
+buildUnnamed4199() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3170,7 +3170,7 @@
   return o;
 }
 
-checkUnnamed4043(core.Map<core.String, core.Object> o) {
+checkUnnamed4199(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted35 = (o["x"]) as core.Map;
   unittest.expect(casted35, unittest.hasLength(3));
@@ -3184,7 +3184,7 @@
   unittest.expect(casted36["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4044() {
+buildUnnamed4200() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3199,7 +3199,7 @@
   return o;
 }
 
-checkUnnamed4044(core.Map<core.String, core.Object> o) {
+checkUnnamed4200(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted37 = (o["x"]) as core.Map;
   unittest.expect(casted37, unittest.hasLength(3));
@@ -3218,11 +3218,11 @@
   var o = new api.Source();
   buildCounterSource++;
   if (buildCounterSource < 3) {
-    o.baseSpecs = buildUnnamed4042();
-    o.codec = buildUnnamed4043();
+    o.baseSpecs = buildUnnamed4198();
+    o.codec = buildUnnamed4199();
     o.doesNotNeedSplitting = true;
     o.metadata = buildSourceMetadata();
-    o.spec = buildUnnamed4044();
+    o.spec = buildUnnamed4200();
   }
   buildCounterSource--;
   return o;
@@ -3231,11 +3231,11 @@
 checkSource(api.Source o) {
   buildCounterSource++;
   if (buildCounterSource < 3) {
-    checkUnnamed4042(o.baseSpecs);
-    checkUnnamed4043(o.codec);
+    checkUnnamed4198(o.baseSpecs);
+    checkUnnamed4199(o.codec);
     unittest.expect(o.doesNotNeedSplitting, unittest.isTrue);
     checkSourceMetadata(o.metadata);
-    checkUnnamed4044(o.spec);
+    checkUnnamed4200(o.spec);
   }
   buildCounterSource--;
 }
@@ -3418,27 +3418,27 @@
   buildCounterSourceSplitRequest--;
 }
 
-buildUnnamed4045() {
+buildUnnamed4201() {
   var o = new core.List<api.DerivedSource>();
   o.add(buildDerivedSource());
   o.add(buildDerivedSource());
   return o;
 }
 
-checkUnnamed4045(core.List<api.DerivedSource> o) {
+checkUnnamed4201(core.List<api.DerivedSource> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDerivedSource(o[0]);
   checkDerivedSource(o[1]);
 }
 
-buildUnnamed4046() {
+buildUnnamed4202() {
   var o = new core.List<api.SourceSplitShard>();
   o.add(buildSourceSplitShard());
   o.add(buildSourceSplitShard());
   return o;
 }
 
-checkUnnamed4046(core.List<api.SourceSplitShard> o) {
+checkUnnamed4202(core.List<api.SourceSplitShard> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSourceSplitShard(o[0]);
   checkSourceSplitShard(o[1]);
@@ -3449,9 +3449,9 @@
   var o = new api.SourceSplitResponse();
   buildCounterSourceSplitResponse++;
   if (buildCounterSourceSplitResponse < 3) {
-    o.bundles = buildUnnamed4045();
+    o.bundles = buildUnnamed4201();
     o.outcome = "foo";
-    o.shards = buildUnnamed4046();
+    o.shards = buildUnnamed4202();
   }
   buildCounterSourceSplitResponse--;
   return o;
@@ -3460,9 +3460,9 @@
 checkSourceSplitResponse(api.SourceSplitResponse o) {
   buildCounterSourceSplitResponse++;
   if (buildCounterSourceSplitResponse < 3) {
-    checkUnnamed4045(o.bundles);
+    checkUnnamed4201(o.bundles);
     unittest.expect(o.outcome, unittest.equals('foo'));
-    checkUnnamed4046(o.shards);
+    checkUnnamed4202(o.shards);
   }
   buildCounterSourceSplitResponse--;
 }
@@ -3555,7 +3555,7 @@
   buildCounterStateFamilyConfig--;
 }
 
-buildUnnamed4047() {
+buildUnnamed4203() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3570,7 +3570,7 @@
   return o;
 }
 
-checkUnnamed4047(core.Map<core.String, core.Object> o) {
+checkUnnamed4203(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted39 = (o["x"]) as core.Map;
   unittest.expect(casted39, unittest.hasLength(3));
@@ -3584,17 +3584,17 @@
   unittest.expect(casted40["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4048() {
+buildUnnamed4204() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4047());
-  o.add(buildUnnamed4047());
+  o.add(buildUnnamed4203());
+  o.add(buildUnnamed4203());
   return o;
 }
 
-checkUnnamed4048(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4204(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4047(o[0]);
-  checkUnnamed4047(o[1]);
+  checkUnnamed4203(o[0]);
+  checkUnnamed4203(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -3603,7 +3603,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed4048();
+    o.details = buildUnnamed4204();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -3614,13 +3614,13 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed4048(o.details);
+    checkUnnamed4204(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed4049() {
+buildUnnamed4205() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3635,7 +3635,7 @@
   return o;
 }
 
-checkUnnamed4049(core.Map<core.String, core.Object> o) {
+checkUnnamed4205(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted41 = (o["x"]) as core.Map;
   unittest.expect(casted41, unittest.hasLength(3));
@@ -3656,7 +3656,7 @@
   if (buildCounterStep < 3) {
     o.kind = "foo";
     o.name = "foo";
-    o.properties = buildUnnamed4049();
+    o.properties = buildUnnamed4205();
   }
   buildCounterStep--;
   return o;
@@ -3667,7 +3667,7 @@
   if (buildCounterStep < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4049(o.properties);
+    checkUnnamed4205(o.properties);
   }
   buildCounterStep--;
 }
@@ -3697,14 +3697,14 @@
   buildCounterStreamLocation--;
 }
 
-buildUnnamed4050() {
+buildUnnamed4206() {
   var o = new core.List<api.ParallelInstruction>();
   o.add(buildParallelInstruction());
   o.add(buildParallelInstruction());
   return o;
 }
 
-checkUnnamed4050(core.List<api.ParallelInstruction> o) {
+checkUnnamed4206(core.List<api.ParallelInstruction> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParallelInstruction(o[0]);
   checkParallelInstruction(o[1]);
@@ -3716,7 +3716,7 @@
   buildCounterStreamingComputationConfig++;
   if (buildCounterStreamingComputationConfig < 3) {
     o.computationId = "foo";
-    o.instructions = buildUnnamed4050();
+    o.instructions = buildUnnamed4206();
     o.stageName = "foo";
     o.systemName = "foo";
   }
@@ -3728,21 +3728,21 @@
   buildCounterStreamingComputationConfig++;
   if (buildCounterStreamingComputationConfig < 3) {
     unittest.expect(o.computationId, unittest.equals('foo'));
-    checkUnnamed4050(o.instructions);
+    checkUnnamed4206(o.instructions);
     unittest.expect(o.stageName, unittest.equals('foo'));
     unittest.expect(o.systemName, unittest.equals('foo'));
   }
   buildCounterStreamingComputationConfig--;
 }
 
-buildUnnamed4051() {
+buildUnnamed4207() {
   var o = new core.List<api.KeyRangeDataDiskAssignment>();
   o.add(buildKeyRangeDataDiskAssignment());
   o.add(buildKeyRangeDataDiskAssignment());
   return o;
 }
 
-checkUnnamed4051(core.List<api.KeyRangeDataDiskAssignment> o) {
+checkUnnamed4207(core.List<api.KeyRangeDataDiskAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkKeyRangeDataDiskAssignment(o[0]);
   checkKeyRangeDataDiskAssignment(o[1]);
@@ -3754,7 +3754,7 @@
   buildCounterStreamingComputationRanges++;
   if (buildCounterStreamingComputationRanges < 3) {
     o.computationId = "foo";
-    o.rangeAssignments = buildUnnamed4051();
+    o.rangeAssignments = buildUnnamed4207();
   }
   buildCounterStreamingComputationRanges--;
   return o;
@@ -3764,32 +3764,32 @@
   buildCounterStreamingComputationRanges++;
   if (buildCounterStreamingComputationRanges < 3) {
     unittest.expect(o.computationId, unittest.equals('foo'));
-    checkUnnamed4051(o.rangeAssignments);
+    checkUnnamed4207(o.rangeAssignments);
   }
   buildCounterStreamingComputationRanges--;
 }
 
-buildUnnamed4052() {
+buildUnnamed4208() {
   var o = new core.List<api.StreamingComputationRanges>();
   o.add(buildStreamingComputationRanges());
   o.add(buildStreamingComputationRanges());
   return o;
 }
 
-checkUnnamed4052(core.List<api.StreamingComputationRanges> o) {
+checkUnnamed4208(core.List<api.StreamingComputationRanges> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStreamingComputationRanges(o[0]);
   checkStreamingComputationRanges(o[1]);
 }
 
-buildUnnamed4053() {
+buildUnnamed4209() {
   var o = new core.List<api.MountedDataDisk>();
   o.add(buildMountedDataDisk());
   o.add(buildMountedDataDisk());
   return o;
 }
 
-checkUnnamed4053(core.List<api.MountedDataDisk> o) {
+checkUnnamed4209(core.List<api.MountedDataDisk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMountedDataDisk(o[0]);
   checkMountedDataDisk(o[1]);
@@ -3800,8 +3800,8 @@
   var o = new api.StreamingComputationTask();
   buildCounterStreamingComputationTask++;
   if (buildCounterStreamingComputationTask < 3) {
-    o.computationRanges = buildUnnamed4052();
-    o.dataDisks = buildUnnamed4053();
+    o.computationRanges = buildUnnamed4208();
+    o.dataDisks = buildUnnamed4209();
     o.taskType = "foo";
   }
   buildCounterStreamingComputationTask--;
@@ -3811,34 +3811,34 @@
 checkStreamingComputationTask(api.StreamingComputationTask o) {
   buildCounterStreamingComputationTask++;
   if (buildCounterStreamingComputationTask < 3) {
-    checkUnnamed4052(o.computationRanges);
-    checkUnnamed4053(o.dataDisks);
+    checkUnnamed4208(o.computationRanges);
+    checkUnnamed4209(o.dataDisks);
     unittest.expect(o.taskType, unittest.equals('foo'));
   }
   buildCounterStreamingComputationTask--;
 }
 
-buildUnnamed4054() {
+buildUnnamed4210() {
   var o = new core.List<api.StreamingComputationConfig>();
   o.add(buildStreamingComputationConfig());
   o.add(buildStreamingComputationConfig());
   return o;
 }
 
-checkUnnamed4054(core.List<api.StreamingComputationConfig> o) {
+checkUnnamed4210(core.List<api.StreamingComputationConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStreamingComputationConfig(o[0]);
   checkStreamingComputationConfig(o[1]);
 }
 
-buildUnnamed4055() {
+buildUnnamed4211() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4055(core.Map<core.String, core.String> o) {
+checkUnnamed4211(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -3849,8 +3849,8 @@
   var o = new api.StreamingConfigTask();
   buildCounterStreamingConfigTask++;
   if (buildCounterStreamingConfigTask < 3) {
-    o.streamingComputationConfigs = buildUnnamed4054();
-    o.userStepToStateFamilyNameMap = buildUnnamed4055();
+    o.streamingComputationConfigs = buildUnnamed4210();
+    o.userStepToStateFamilyNameMap = buildUnnamed4211();
     o.windmillServiceEndpoint = "foo";
     o.windmillServicePort = "foo";
   }
@@ -3861,8 +3861,8 @@
 checkStreamingConfigTask(api.StreamingConfigTask o) {
   buildCounterStreamingConfigTask++;
   if (buildCounterStreamingConfigTask < 3) {
-    checkUnnamed4054(o.streamingComputationConfigs);
-    checkUnnamed4055(o.userStepToStateFamilyNameMap);
+    checkUnnamed4210(o.streamingComputationConfigs);
+    checkUnnamed4211(o.userStepToStateFamilyNameMap);
     unittest.expect(o.windmillServiceEndpoint, unittest.equals('foo'));
     unittest.expect(o.windmillServicePort, unittest.equals('foo'));
   }
@@ -3934,14 +3934,14 @@
   buildCounterStreamingStageLocation--;
 }
 
-buildUnnamed4056() {
+buildUnnamed4212() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4056(core.List<core.String> o) {
+checkUnnamed4212(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3952,7 +3952,7 @@
   var o = new api.StringList();
   buildCounterStringList++;
   if (buildCounterStringList < 3) {
-    o.elements = buildUnnamed4056();
+    o.elements = buildUnnamed4212();
   }
   buildCounterStringList--;
   return o;
@@ -3961,19 +3961,19 @@
 checkStringList(api.StringList o) {
   buildCounterStringList++;
   if (buildCounterStringList < 3) {
-    checkUnnamed4056(o.elements);
+    checkUnnamed4212(o.elements);
   }
   buildCounterStringList--;
 }
 
-buildUnnamed4057() {
+buildUnnamed4213() {
   var o = new core.List<api.Parameter>();
   o.add(buildParameter());
   o.add(buildParameter());
   return o;
 }
 
-checkUnnamed4057(core.List<api.Parameter> o) {
+checkUnnamed4213(core.List<api.Parameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameter(o[0]);
   checkParameter(o[1]);
@@ -3986,7 +3986,7 @@
   if (buildCounterStructuredMessage < 3) {
     o.messageKey = "foo";
     o.messageText = "foo";
-    o.parameters = buildUnnamed4057();
+    o.parameters = buildUnnamed4213();
   }
   buildCounterStructuredMessage--;
   return o;
@@ -3997,19 +3997,19 @@
   if (buildCounterStructuredMessage < 3) {
     unittest.expect(o.messageKey, unittest.equals('foo'));
     unittest.expect(o.messageText, unittest.equals('foo'));
-    checkUnnamed4057(o.parameters);
+    checkUnnamed4213(o.parameters);
   }
   buildCounterStructuredMessage--;
 }
 
-buildUnnamed4058() {
+buildUnnamed4214() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4058(core.List<core.String> o) {
+checkUnnamed4214(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4031,7 +4031,7 @@
     o.logDir = "foo";
     o.logToSerialconsole = true;
     o.logUploadLocation = "foo";
-    o.oauthScopes = buildUnnamed4058();
+    o.oauthScopes = buildUnnamed4214();
     o.parallelWorkerSettings = buildWorkerSettings();
     o.streamingWorkerMainClass = "foo";
     o.taskGroup = "foo";
@@ -4058,7 +4058,7 @@
     unittest.expect(o.logDir, unittest.equals('foo'));
     unittest.expect(o.logToSerialconsole, unittest.isTrue);
     unittest.expect(o.logUploadLocation, unittest.equals('foo'));
-    checkUnnamed4058(o.oauthScopes);
+    checkUnnamed4214(o.oauthScopes);
     checkWorkerSettings(o.parallelWorkerSettings);
     unittest.expect(o.streamingWorkerMainClass, unittest.equals('foo'));
     unittest.expect(o.taskGroup, unittest.equals('foo'));
@@ -4070,14 +4070,14 @@
   buildCounterTaskRunnerSettings--;
 }
 
-buildUnnamed4059() {
+buildUnnamed4215() {
   var o = new core.List<api.ParameterMetadata>();
   o.add(buildParameterMetadata());
   o.add(buildParameterMetadata());
   return o;
 }
 
-checkUnnamed4059(core.List<api.ParameterMetadata> o) {
+checkUnnamed4215(core.List<api.ParameterMetadata> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkParameterMetadata(o[0]);
   checkParameterMetadata(o[1]);
@@ -4090,7 +4090,7 @@
   if (buildCounterTemplateMetadata < 3) {
     o.description = "foo";
     o.name = "foo";
-    o.parameters = buildUnnamed4059();
+    o.parameters = buildUnnamed4215();
   }
   buildCounterTemplateMetadata--;
   return o;
@@ -4101,45 +4101,45 @@
   if (buildCounterTemplateMetadata < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4059(o.parameters);
+    checkUnnamed4215(o.parameters);
   }
   buildCounterTemplateMetadata--;
 }
 
-buildUnnamed4060() {
+buildUnnamed4216() {
   var o = new core.List<api.ComputationTopology>();
   o.add(buildComputationTopology());
   o.add(buildComputationTopology());
   return o;
 }
 
-checkUnnamed4060(core.List<api.ComputationTopology> o) {
+checkUnnamed4216(core.List<api.ComputationTopology> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkComputationTopology(o[0]);
   checkComputationTopology(o[1]);
 }
 
-buildUnnamed4061() {
+buildUnnamed4217() {
   var o = new core.List<api.DataDiskAssignment>();
   o.add(buildDataDiskAssignment());
   o.add(buildDataDiskAssignment());
   return o;
 }
 
-checkUnnamed4061(core.List<api.DataDiskAssignment> o) {
+checkUnnamed4217(core.List<api.DataDiskAssignment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDataDiskAssignment(o[0]);
   checkDataDiskAssignment(o[1]);
 }
 
-buildUnnamed4062() {
+buildUnnamed4218() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4062(core.Map<core.String, core.String> o) {
+checkUnnamed4218(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -4150,11 +4150,11 @@
   var o = new api.TopologyConfig();
   buildCounterTopologyConfig++;
   if (buildCounterTopologyConfig < 3) {
-    o.computations = buildUnnamed4060();
-    o.dataDiskAssignments = buildUnnamed4061();
+    o.computations = buildUnnamed4216();
+    o.dataDiskAssignments = buildUnnamed4217();
     o.forwardingKeyBits = 42;
     o.persistentStateVersion = 42;
-    o.userStageToComputationNameMap = buildUnnamed4062();
+    o.userStageToComputationNameMap = buildUnnamed4218();
   }
   buildCounterTopologyConfig--;
   return o;
@@ -4163,49 +4163,49 @@
 checkTopologyConfig(api.TopologyConfig o) {
   buildCounterTopologyConfig++;
   if (buildCounterTopologyConfig < 3) {
-    checkUnnamed4060(o.computations);
-    checkUnnamed4061(o.dataDiskAssignments);
+    checkUnnamed4216(o.computations);
+    checkUnnamed4217(o.dataDiskAssignments);
     unittest.expect(o.forwardingKeyBits, unittest.equals(42));
     unittest.expect(o.persistentStateVersion, unittest.equals(42));
-    checkUnnamed4062(o.userStageToComputationNameMap);
+    checkUnnamed4218(o.userStageToComputationNameMap);
   }
   buildCounterTopologyConfig--;
 }
 
-buildUnnamed4063() {
+buildUnnamed4219() {
   var o = new core.List<api.DisplayData>();
   o.add(buildDisplayData());
   o.add(buildDisplayData());
   return o;
 }
 
-checkUnnamed4063(core.List<api.DisplayData> o) {
+checkUnnamed4219(core.List<api.DisplayData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisplayData(o[0]);
   checkDisplayData(o[1]);
 }
 
-buildUnnamed4064() {
+buildUnnamed4220() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4064(core.List<core.String> o) {
+checkUnnamed4220(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4065() {
+buildUnnamed4221() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4065(core.List<core.String> o) {
+checkUnnamed4221(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -4216,12 +4216,12 @@
   var o = new api.TransformSummary();
   buildCounterTransformSummary++;
   if (buildCounterTransformSummary < 3) {
-    o.displayData = buildUnnamed4063();
+    o.displayData = buildUnnamed4219();
     o.id = "foo";
-    o.inputCollectionName = buildUnnamed4064();
+    o.inputCollectionName = buildUnnamed4220();
     o.kind = "foo";
     o.name = "foo";
-    o.outputCollectionName = buildUnnamed4065();
+    o.outputCollectionName = buildUnnamed4221();
   }
   buildCounterTransformSummary--;
   return o;
@@ -4230,24 +4230,24 @@
 checkTransformSummary(api.TransformSummary o) {
   buildCounterTransformSummary++;
   if (buildCounterTransformSummary < 3) {
-    checkUnnamed4063(o.displayData);
+    checkUnnamed4219(o.displayData);
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed4064(o.inputCollectionName);
+    checkUnnamed4220(o.inputCollectionName);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4065(o.outputCollectionName);
+    checkUnnamed4221(o.outputCollectionName);
   }
   buildCounterTransformSummary--;
 }
 
-buildUnnamed4066() {
+buildUnnamed4222() {
   var o = new core.List<api.Package>();
   o.add(buildPackage());
   o.add(buildPackage());
   return o;
 }
 
-checkUnnamed4066(core.List<api.Package> o) {
+checkUnnamed4222(core.List<api.Package> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPackage(o[0]);
   checkPackage(o[1]);
@@ -4264,7 +4264,7 @@
     o.jobId = "foo";
     o.leaseExpireTime = "foo";
     o.mapTask = buildMapTask();
-    o.packages = buildUnnamed4066();
+    o.packages = buildUnnamed4222();
     o.projectId = "foo";
     o.reportStatusInterval = "foo";
     o.seqMapTask = buildSeqMapTask();
@@ -4287,7 +4287,7 @@
     unittest.expect(o.jobId, unittest.equals('foo'));
     unittest.expect(o.leaseExpireTime, unittest.equals('foo'));
     checkMapTask(o.mapTask);
-    checkUnnamed4066(o.packages);
+    checkUnnamed4222(o.packages);
     unittest.expect(o.projectId, unittest.equals('foo'));
     unittest.expect(o.reportStatusInterval, unittest.equals('foo'));
     checkSeqMapTask(o.seqMapTask);
@@ -4300,7 +4300,7 @@
   buildCounterWorkItem--;
 }
 
-buildUnnamed4067() {
+buildUnnamed4223() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -4315,7 +4315,7 @@
   return o;
 }
 
-checkUnnamed4067(core.Map<core.String, core.Object> o) {
+checkUnnamed4223(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted43 = (o["x"]) as core.Map;
   unittest.expect(casted43, unittest.hasLength(3));
@@ -4329,14 +4329,14 @@
   unittest.expect(casted44["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4068() {
+buildUnnamed4224() {
   var o = new core.List<api.MetricShortId>();
   o.add(buildMetricShortId());
   o.add(buildMetricShortId());
   return o;
 }
 
-checkUnnamed4068(core.List<api.MetricShortId> o) {
+checkUnnamed4224(core.List<api.MetricShortId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricShortId(o[0]);
   checkMetricShortId(o[1]);
@@ -4347,9 +4347,9 @@
   var o = new api.WorkItemServiceState();
   buildCounterWorkItemServiceState++;
   if (buildCounterWorkItemServiceState < 3) {
-    o.harnessData = buildUnnamed4067();
+    o.harnessData = buildUnnamed4223();
     o.leaseExpireTime = "foo";
-    o.metricShortId = buildUnnamed4068();
+    o.metricShortId = buildUnnamed4224();
     o.nextReportIndex = "foo";
     o.reportStatusInterval = "foo";
     o.splitRequest = buildApproximateSplitRequest();
@@ -4363,9 +4363,9 @@
 checkWorkItemServiceState(api.WorkItemServiceState o) {
   buildCounterWorkItemServiceState++;
   if (buildCounterWorkItemServiceState < 3) {
-    checkUnnamed4067(o.harnessData);
+    checkUnnamed4223(o.harnessData);
     unittest.expect(o.leaseExpireTime, unittest.equals('foo'));
-    checkUnnamed4068(o.metricShortId);
+    checkUnnamed4224(o.metricShortId);
     unittest.expect(o.nextReportIndex, unittest.equals('foo'));
     unittest.expect(o.reportStatusInterval, unittest.equals('foo'));
     checkApproximateSplitRequest(o.splitRequest);
@@ -4375,40 +4375,40 @@
   buildCounterWorkItemServiceState--;
 }
 
-buildUnnamed4069() {
+buildUnnamed4225() {
   var o = new core.List<api.CounterUpdate>();
   o.add(buildCounterUpdate());
   o.add(buildCounterUpdate());
   return o;
 }
 
-checkUnnamed4069(core.List<api.CounterUpdate> o) {
+checkUnnamed4225(core.List<api.CounterUpdate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCounterUpdate(o[0]);
   checkCounterUpdate(o[1]);
 }
 
-buildUnnamed4070() {
+buildUnnamed4226() {
   var o = new core.List<api.Status>();
   o.add(buildStatus());
   o.add(buildStatus());
   return o;
 }
 
-checkUnnamed4070(core.List<api.Status> o) {
+checkUnnamed4226(core.List<api.Status> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStatus(o[0]);
   checkStatus(o[1]);
 }
 
-buildUnnamed4071() {
+buildUnnamed4227() {
   var o = new core.List<api.MetricUpdate>();
   o.add(buildMetricUpdate());
   o.add(buildMetricUpdate());
   return o;
 }
 
-checkUnnamed4071(core.List<api.MetricUpdate> o) {
+checkUnnamed4227(core.List<api.MetricUpdate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMetricUpdate(o[0]);
   checkMetricUpdate(o[1]);
@@ -4420,10 +4420,10 @@
   buildCounterWorkItemStatus++;
   if (buildCounterWorkItemStatus < 3) {
     o.completed = true;
-    o.counterUpdates = buildUnnamed4069();
+    o.counterUpdates = buildUnnamed4225();
     o.dynamicSourceSplit = buildDynamicSourceSplit();
-    o.errors = buildUnnamed4070();
-    o.metricUpdates = buildUnnamed4071();
+    o.errors = buildUnnamed4226();
+    o.metricUpdates = buildUnnamed4227();
     o.progress = buildApproximateProgress();
     o.reportIndex = "foo";
     o.reportedProgress = buildApproximateReportedProgress();
@@ -4442,10 +4442,10 @@
   buildCounterWorkItemStatus++;
   if (buildCounterWorkItemStatus < 3) {
     unittest.expect(o.completed, unittest.isTrue);
-    checkUnnamed4069(o.counterUpdates);
+    checkUnnamed4225(o.counterUpdates);
     checkDynamicSourceSplit(o.dynamicSourceSplit);
-    checkUnnamed4070(o.errors);
-    checkUnnamed4071(o.metricUpdates);
+    checkUnnamed4226(o.errors);
+    checkUnnamed4227(o.metricUpdates);
     checkApproximateProgress(o.progress);
     unittest.expect(o.reportIndex, unittest.equals('foo'));
     checkApproximateReportedProgress(o.reportedProgress);
@@ -4459,7 +4459,7 @@
   buildCounterWorkItemStatus--;
 }
 
-buildUnnamed4072() {
+buildUnnamed4228() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -4474,7 +4474,7 @@
   return o;
 }
 
-checkUnnamed4072(core.Map<core.String, core.Object> o) {
+checkUnnamed4228(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted45 = (o["x"]) as core.Map;
   unittest.expect(casted45, unittest.hasLength(3));
@@ -4488,17 +4488,17 @@
   unittest.expect(casted46["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4073() {
+buildUnnamed4229() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4072());
-  o.add(buildUnnamed4072());
+  o.add(buildUnnamed4228());
+  o.add(buildUnnamed4228());
   return o;
 }
 
-checkUnnamed4073(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4229(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4072(o[0]);
-  checkUnnamed4072(o[1]);
+  checkUnnamed4228(o[0]);
+  checkUnnamed4228(o[1]);
 }
 
 core.int buildCounterWorkerHealthReport = 0;
@@ -4506,7 +4506,7 @@
   var o = new api.WorkerHealthReport();
   buildCounterWorkerHealthReport++;
   if (buildCounterWorkerHealthReport < 3) {
-    o.pods = buildUnnamed4073();
+    o.pods = buildUnnamed4229();
     o.reportInterval = "foo";
     o.vmIsHealthy = true;
     o.vmStartupTime = "foo";
@@ -4518,7 +4518,7 @@
 checkWorkerHealthReport(api.WorkerHealthReport o) {
   buildCounterWorkerHealthReport++;
   if (buildCounterWorkerHealthReport < 3) {
-    checkUnnamed4073(o.pods);
+    checkUnnamed4229(o.pods);
     unittest.expect(o.reportInterval, unittest.equals('foo'));
     unittest.expect(o.vmIsHealthy, unittest.isTrue);
     unittest.expect(o.vmStartupTime, unittest.equals('foo'));
@@ -4545,14 +4545,14 @@
   buildCounterWorkerHealthReportResponse--;
 }
 
-buildUnnamed4074() {
+buildUnnamed4230() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4074(core.Map<core.String, core.String> o) {
+checkUnnamed4230(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -4564,7 +4564,7 @@
   buildCounterWorkerLifecycleEvent++;
   if (buildCounterWorkerLifecycleEvent < 3) {
     o.event = "foo";
-    o.metadata = buildUnnamed4074();
+    o.metadata = buildUnnamed4230();
   }
   buildCounterWorkerLifecycleEvent--;
   return o;
@@ -4574,19 +4574,19 @@
   buildCounterWorkerLifecycleEvent++;
   if (buildCounterWorkerLifecycleEvent < 3) {
     unittest.expect(o.event, unittest.equals('foo'));
-    checkUnnamed4074(o.metadata);
+    checkUnnamed4230(o.metadata);
   }
   buildCounterWorkerLifecycleEvent--;
 }
 
-buildUnnamed4075() {
+buildUnnamed4231() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4075(core.Map<core.String, core.String> o) {
+checkUnnamed4231(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -4597,7 +4597,7 @@
   var o = new api.WorkerMessage();
   buildCounterWorkerMessage++;
   if (buildCounterWorkerMessage < 3) {
-    o.labels = buildUnnamed4075();
+    o.labels = buildUnnamed4231();
     o.time = "foo";
     o.workerHealthReport = buildWorkerHealthReport();
     o.workerLifecycleEvent = buildWorkerLifecycleEvent();
@@ -4612,7 +4612,7 @@
 checkWorkerMessage(api.WorkerMessage o) {
   buildCounterWorkerMessage++;
   if (buildCounterWorkerMessage < 3) {
-    checkUnnamed4075(o.labels);
+    checkUnnamed4231(o.labels);
     unittest.expect(o.time, unittest.equals('foo'));
     checkWorkerHealthReport(o.workerHealthReport);
     checkWorkerLifecycleEvent(o.workerLifecycleEvent);
@@ -4623,7 +4623,7 @@
   buildCounterWorkerMessage--;
 }
 
-buildUnnamed4076() {
+buildUnnamed4232() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -4638,7 +4638,7 @@
   return o;
 }
 
-checkUnnamed4076(core.Map<core.String, core.Object> o) {
+checkUnnamed4232(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted47 = (o["x"]) as core.Map;
   unittest.expect(casted47, unittest.hasLength(3));
@@ -4658,7 +4658,7 @@
   buildCounterWorkerMessageCode++;
   if (buildCounterWorkerMessageCode < 3) {
     o.code = "foo";
-    o.parameters = buildUnnamed4076();
+    o.parameters = buildUnnamed4232();
   }
   buildCounterWorkerMessageCode--;
   return o;
@@ -4668,7 +4668,7 @@
   buildCounterWorkerMessageCode++;
   if (buildCounterWorkerMessageCode < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed4076(o.parameters);
+    checkUnnamed4232(o.parameters);
   }
   buildCounterWorkerMessageCode--;
 }
@@ -4696,46 +4696,46 @@
   buildCounterWorkerMessageResponse--;
 }
 
-buildUnnamed4077() {
+buildUnnamed4233() {
   var o = new core.List<api.Disk>();
   o.add(buildDisk());
   o.add(buildDisk());
   return o;
 }
 
-checkUnnamed4077(core.List<api.Disk> o) {
+checkUnnamed4233(core.List<api.Disk> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDisk(o[0]);
   checkDisk(o[1]);
 }
 
-buildUnnamed4078() {
+buildUnnamed4234() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4078(core.Map<core.String, core.String> o) {
+checkUnnamed4234(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed4079() {
+buildUnnamed4235() {
   var o = new core.List<api.Package>();
   o.add(buildPackage());
   o.add(buildPackage());
   return o;
 }
 
-checkUnnamed4079(core.List<api.Package> o) {
+checkUnnamed4235(core.List<api.Package> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPackage(o[0]);
   checkPackage(o[1]);
 }
 
-buildUnnamed4080() {
+buildUnnamed4236() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -4750,7 +4750,7 @@
   return o;
 }
 
-checkUnnamed4080(core.Map<core.String, core.Object> o) {
+checkUnnamed4236(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted49 = (o["x"]) as core.Map;
   unittest.expect(casted49, unittest.hasLength(3));
@@ -4770,7 +4770,7 @@
   buildCounterWorkerPool++;
   if (buildCounterWorkerPool < 3) {
     o.autoscalingSettings = buildAutoscalingSettings();
-    o.dataDisks = buildUnnamed4077();
+    o.dataDisks = buildUnnamed4233();
     o.defaultPackageSet = "foo";
     o.diskSizeGb = 42;
     o.diskSourceImage = "foo";
@@ -4778,13 +4778,13 @@
     o.ipConfiguration = "foo";
     o.kind = "foo";
     o.machineType = "foo";
-    o.metadata = buildUnnamed4078();
+    o.metadata = buildUnnamed4234();
     o.network = "foo";
     o.numThreadsPerWorker = 42;
     o.numWorkers = 42;
     o.onHostMaintenance = "foo";
-    o.packages = buildUnnamed4079();
-    o.poolArgs = buildUnnamed4080();
+    o.packages = buildUnnamed4235();
+    o.poolArgs = buildUnnamed4236();
     o.subnetwork = "foo";
     o.taskrunnerSettings = buildTaskRunnerSettings();
     o.teardownPolicy = "foo";
@@ -4799,7 +4799,7 @@
   buildCounterWorkerPool++;
   if (buildCounterWorkerPool < 3) {
     checkAutoscalingSettings(o.autoscalingSettings);
-    checkUnnamed4077(o.dataDisks);
+    checkUnnamed4233(o.dataDisks);
     unittest.expect(o.defaultPackageSet, unittest.equals('foo'));
     unittest.expect(o.diskSizeGb, unittest.equals(42));
     unittest.expect(o.diskSourceImage, unittest.equals('foo'));
@@ -4807,13 +4807,13 @@
     unittest.expect(o.ipConfiguration, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.machineType, unittest.equals('foo'));
-    checkUnnamed4078(o.metadata);
+    checkUnnamed4234(o.metadata);
     unittest.expect(o.network, unittest.equals('foo'));
     unittest.expect(o.numThreadsPerWorker, unittest.equals(42));
     unittest.expect(o.numWorkers, unittest.equals(42));
     unittest.expect(o.onHostMaintenance, unittest.equals('foo'));
-    checkUnnamed4079(o.packages);
-    checkUnnamed4080(o.poolArgs);
+    checkUnnamed4235(o.packages);
+    checkUnnamed4236(o.poolArgs);
     unittest.expect(o.subnetwork, unittest.equals('foo'));
     checkTaskRunnerSettings(o.taskrunnerSettings);
     unittest.expect(o.teardownPolicy, unittest.equals('foo'));
@@ -5973,8 +5973,9 @@
         var resp = convert.JSON.encode(buildSendWorkerMessagesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.workerMessages(arg_request, arg_projectId, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.SendWorkerMessagesResponse response) {
+      res
+          .workerMessages(arg_request, arg_projectId, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkSendWorkerMessagesResponse(response);
       })));
     });
@@ -6054,7 +6055,7 @@
               pageSize: arg_pageSize,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListJobsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListJobsResponse(response);
       })));
     });
@@ -6129,7 +6130,7 @@
               replaceJobId: arg_replaceJobId,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -6198,7 +6199,7 @@
       res
           .get(arg_projectId, arg_jobId,
               view: arg_view, location: arg_location, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -6276,7 +6277,7 @@
               location: arg_location,
               startTime: arg_startTime,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.JobMetrics response) {
+          .then(unittest.expectAsync1(((response) {
         checkJobMetrics(response);
       })));
     });
@@ -6354,7 +6355,7 @@
               pageSize: arg_pageSize,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListJobsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListJobsResponse(response);
       })));
     });
@@ -6425,7 +6426,7 @@
       res
           .update(arg_request, arg_projectId, arg_jobId,
               location: arg_location, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -6502,7 +6503,7 @@
       res
           .getConfig(arg_request, arg_projectId, arg_jobId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetDebugConfigResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetDebugConfigResponse(response);
       })));
     });
@@ -6577,7 +6578,7 @@
       res
           .sendCapture(arg_request, arg_projectId, arg_jobId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SendDebugCaptureResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSendDebugCaptureResponse(response);
       })));
     });
@@ -6674,7 +6675,7 @@
               pageSize: arg_pageSize,
               minimumImportance: arg_minimumImportance,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListJobMessagesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListJobMessagesResponse(response);
       })));
     });
@@ -6750,7 +6751,7 @@
       }), true);
       res
           .lease(arg_request, arg_projectId, arg_jobId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LeaseWorkItemResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLeaseWorkItemResponse(response);
       })));
     });
@@ -6825,8 +6826,7 @@
       res
           .reportStatus(arg_request, arg_projectId, arg_jobId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ReportWorkItemStatusResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkReportWorkItemStatusResponse(response);
       })));
     });
@@ -6903,8 +6903,7 @@
       res
           .workerMessages(arg_request, arg_projectId, arg_location,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.SendWorkerMessagesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSendWorkerMessagesResponse(response);
       })));
     });
@@ -6988,7 +6987,7 @@
               view: arg_view,
               replaceJobId: arg_replaceJobId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -7065,7 +7064,7 @@
       res
           .get(arg_projectId, arg_location, arg_jobId,
               view: arg_view, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -7149,7 +7148,7 @@
       res
           .getMetrics(arg_projectId, arg_location, arg_jobId,
               startTime: arg_startTime, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.JobMetrics response) {
+          .then(unittest.expectAsync1(((response) {
         checkJobMetrics(response);
       })));
     });
@@ -7234,7 +7233,7 @@
               pageSize: arg_pageSize,
               view: arg_view,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListJobsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListJobsResponse(response);
       })));
     });
@@ -7313,7 +7312,7 @@
       res
           .update(arg_request, arg_projectId, arg_location, arg_jobId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -7400,7 +7399,7 @@
       res
           .getConfig(arg_request, arg_projectId, arg_location, arg_jobId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetDebugConfigResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetDebugConfigResponse(response);
       })));
     });
@@ -7485,7 +7484,7 @@
       res
           .sendCapture(arg_request, arg_projectId, arg_location, arg_jobId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SendDebugCaptureResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSendDebugCaptureResponse(response);
       })));
     });
@@ -7588,7 +7587,7 @@
               pageSize: arg_pageSize,
               minimumImportance: arg_minimumImportance,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListJobMessagesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListJobMessagesResponse(response);
       })));
     });
@@ -7675,7 +7674,7 @@
       res
           .lease(arg_request, arg_projectId, arg_location, arg_jobId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LeaseWorkItemResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLeaseWorkItemResponse(response);
       })));
     });
@@ -7760,8 +7759,7 @@
       res
           .reportStatus(arg_request, arg_projectId, arg_location, arg_jobId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ReportWorkItemStatusResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkReportWorkItemStatusResponse(response);
       })));
     });
@@ -7838,7 +7836,7 @@
       res
           .create(arg_request, arg_projectId, arg_location,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -7914,7 +7912,7 @@
       res
           .get(arg_projectId, arg_location,
               view: arg_view, gcsPath: arg_gcsPath, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetTemplateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetTemplateResponse(response);
       })));
     });
@@ -7997,7 +7995,7 @@
               validateOnly: arg_validateOnly,
               gcsPath: arg_gcsPath,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LaunchTemplateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLaunchTemplateResponse(response);
       })));
     });
@@ -8063,7 +8061,7 @@
       }), true);
       res
           .create(arg_request, arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Job response) {
+          .then(unittest.expectAsync1(((response) {
         checkJob(response);
       })));
     });
@@ -8135,7 +8133,7 @@
               gcsPath: arg_gcsPath,
               location: arg_location,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GetTemplateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGetTemplateResponse(response);
       })));
     });
@@ -8212,7 +8210,7 @@
               gcsPath: arg_gcsPath,
               location: arg_location,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LaunchTemplateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkLaunchTemplateResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/dialogflow/v2beta1_test.dart b/generated/googleapis_beta/test/dialogflow/v2beta1_test.dart
index 401930c..d13c6ab 100644
--- a/generated/googleapis_beta/test/dialogflow/v2beta1_test.dart
+++ b/generated/googleapis_beta/test/dialogflow/v2beta1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed4327() {
+buildUnnamed4237() {
   var o = new core.List<api.GoogleCloudDialogflowV2EntityType>();
   o.add(buildGoogleCloudDialogflowV2EntityType());
   o.add(buildGoogleCloudDialogflowV2EntityType());
   return o;
 }
 
-checkUnnamed4327(core.List<api.GoogleCloudDialogflowV2EntityType> o) {
+checkUnnamed4237(core.List<api.GoogleCloudDialogflowV2EntityType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2EntityType(o[0]);
   checkGoogleCloudDialogflowV2EntityType(o[1]);
@@ -68,7 +68,7 @@
   var o = new api.GoogleCloudDialogflowV2BatchUpdateEntityTypesResponse();
   buildCounterGoogleCloudDialogflowV2BatchUpdateEntityTypesResponse++;
   if (buildCounterGoogleCloudDialogflowV2BatchUpdateEntityTypesResponse < 3) {
-    o.entityTypes = buildUnnamed4327();
+    o.entityTypes = buildUnnamed4237();
   }
   buildCounterGoogleCloudDialogflowV2BatchUpdateEntityTypesResponse--;
   return o;
@@ -78,19 +78,19 @@
     api.GoogleCloudDialogflowV2BatchUpdateEntityTypesResponse o) {
   buildCounterGoogleCloudDialogflowV2BatchUpdateEntityTypesResponse++;
   if (buildCounterGoogleCloudDialogflowV2BatchUpdateEntityTypesResponse < 3) {
-    checkUnnamed4327(o.entityTypes);
+    checkUnnamed4237(o.entityTypes);
   }
   buildCounterGoogleCloudDialogflowV2BatchUpdateEntityTypesResponse--;
 }
 
-buildUnnamed4328() {
+buildUnnamed4238() {
   var o = new core.List<api.GoogleCloudDialogflowV2Intent>();
   o.add(buildGoogleCloudDialogflowV2Intent());
   o.add(buildGoogleCloudDialogflowV2Intent());
   return o;
 }
 
-checkUnnamed4328(core.List<api.GoogleCloudDialogflowV2Intent> o) {
+checkUnnamed4238(core.List<api.GoogleCloudDialogflowV2Intent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2Intent(o[0]);
   checkGoogleCloudDialogflowV2Intent(o[1]);
@@ -101,7 +101,7 @@
   var o = new api.GoogleCloudDialogflowV2BatchUpdateIntentsResponse();
   buildCounterGoogleCloudDialogflowV2BatchUpdateIntentsResponse++;
   if (buildCounterGoogleCloudDialogflowV2BatchUpdateIntentsResponse < 3) {
-    o.intents = buildUnnamed4328();
+    o.intents = buildUnnamed4238();
   }
   buildCounterGoogleCloudDialogflowV2BatchUpdateIntentsResponse--;
   return o;
@@ -111,12 +111,12 @@
     api.GoogleCloudDialogflowV2BatchUpdateIntentsResponse o) {
   buildCounterGoogleCloudDialogflowV2BatchUpdateIntentsResponse++;
   if (buildCounterGoogleCloudDialogflowV2BatchUpdateIntentsResponse < 3) {
-    checkUnnamed4328(o.intents);
+    checkUnnamed4238(o.intents);
   }
   buildCounterGoogleCloudDialogflowV2BatchUpdateIntentsResponse--;
 }
 
-buildUnnamed4329() {
+buildUnnamed4239() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -131,7 +131,7 @@
   return o;
 }
 
-checkUnnamed4329(core.Map<core.String, core.Object> o) {
+checkUnnamed4239(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -152,7 +152,7 @@
   if (buildCounterGoogleCloudDialogflowV2Context < 3) {
     o.lifespanCount = 42;
     o.name = "foo";
-    o.parameters = buildUnnamed4329();
+    o.parameters = buildUnnamed4239();
   }
   buildCounterGoogleCloudDialogflowV2Context--;
   return o;
@@ -163,19 +163,19 @@
   if (buildCounterGoogleCloudDialogflowV2Context < 3) {
     unittest.expect(o.lifespanCount, unittest.equals(42));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4329(o.parameters);
+    checkUnnamed4239(o.parameters);
   }
   buildCounterGoogleCloudDialogflowV2Context--;
 }
 
-buildUnnamed4330() {
+buildUnnamed4240() {
   var o = new core.List<api.GoogleCloudDialogflowV2EntityTypeEntity>();
   o.add(buildGoogleCloudDialogflowV2EntityTypeEntity());
   o.add(buildGoogleCloudDialogflowV2EntityTypeEntity());
   return o;
 }
 
-checkUnnamed4330(core.List<api.GoogleCloudDialogflowV2EntityTypeEntity> o) {
+checkUnnamed4240(core.List<api.GoogleCloudDialogflowV2EntityTypeEntity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2EntityTypeEntity(o[0]);
   checkGoogleCloudDialogflowV2EntityTypeEntity(o[1]);
@@ -188,7 +188,7 @@
   if (buildCounterGoogleCloudDialogflowV2EntityType < 3) {
     o.autoExpansionMode = "foo";
     o.displayName = "foo";
-    o.entities = buildUnnamed4330();
+    o.entities = buildUnnamed4240();
     o.kind = "foo";
     o.name = "foo";
   }
@@ -202,21 +202,21 @@
   if (buildCounterGoogleCloudDialogflowV2EntityType < 3) {
     unittest.expect(o.autoExpansionMode, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed4330(o.entities);
+    checkUnnamed4240(o.entities);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2EntityType--;
 }
 
-buildUnnamed4331() {
+buildUnnamed4241() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4331(core.List<core.String> o) {
+checkUnnamed4241(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -227,7 +227,7 @@
   var o = new api.GoogleCloudDialogflowV2EntityTypeEntity();
   buildCounterGoogleCloudDialogflowV2EntityTypeEntity++;
   if (buildCounterGoogleCloudDialogflowV2EntityTypeEntity < 3) {
-    o.synonyms = buildUnnamed4331();
+    o.synonyms = buildUnnamed4241();
     o.value = "foo";
   }
   buildCounterGoogleCloudDialogflowV2EntityTypeEntity--;
@@ -238,13 +238,13 @@
     api.GoogleCloudDialogflowV2EntityTypeEntity o) {
   buildCounterGoogleCloudDialogflowV2EntityTypeEntity++;
   if (buildCounterGoogleCloudDialogflowV2EntityTypeEntity < 3) {
-    checkUnnamed4331(o.synonyms);
+    checkUnnamed4241(o.synonyms);
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2EntityTypeEntity--;
 }
 
-buildUnnamed4332() {
+buildUnnamed4242() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -259,7 +259,7 @@
   return o;
 }
 
-checkUnnamed4332(core.Map<core.String, core.Object> o) {
+checkUnnamed4242(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -280,7 +280,7 @@
   if (buildCounterGoogleCloudDialogflowV2EventInput < 3) {
     o.languageCode = "foo";
     o.name = "foo";
-    o.parameters = buildUnnamed4332();
+    o.parameters = buildUnnamed4242();
   }
   buildCounterGoogleCloudDialogflowV2EventInput--;
   return o;
@@ -292,7 +292,7 @@
   if (buildCounterGoogleCloudDialogflowV2EventInput < 3) {
     unittest.expect(o.languageCode, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4332(o.parameters);
+    checkUnnamed4242(o.parameters);
   }
   buildCounterGoogleCloudDialogflowV2EventInput--;
 }
@@ -319,106 +319,106 @@
   buildCounterGoogleCloudDialogflowV2ExportAgentResponse--;
 }
 
-buildUnnamed4333() {
+buildUnnamed4243() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4333(core.List<core.String> o) {
+checkUnnamed4243(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4334() {
+buildUnnamed4244() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4334(core.List<core.String> o) {
+checkUnnamed4244(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4335() {
+buildUnnamed4245() {
   var o = new core.List<api.GoogleCloudDialogflowV2IntentFollowupIntentInfo>();
   o.add(buildGoogleCloudDialogflowV2IntentFollowupIntentInfo());
   o.add(buildGoogleCloudDialogflowV2IntentFollowupIntentInfo());
   return o;
 }
 
-checkUnnamed4335(
+checkUnnamed4245(
     core.List<api.GoogleCloudDialogflowV2IntentFollowupIntentInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentFollowupIntentInfo(o[0]);
   checkGoogleCloudDialogflowV2IntentFollowupIntentInfo(o[1]);
 }
 
-buildUnnamed4336() {
+buildUnnamed4246() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4336(core.List<core.String> o) {
+checkUnnamed4246(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4337() {
+buildUnnamed4247() {
   var o = new core.List<api.GoogleCloudDialogflowV2IntentMessage>();
   o.add(buildGoogleCloudDialogflowV2IntentMessage());
   o.add(buildGoogleCloudDialogflowV2IntentMessage());
   return o;
 }
 
-checkUnnamed4337(core.List<api.GoogleCloudDialogflowV2IntentMessage> o) {
+checkUnnamed4247(core.List<api.GoogleCloudDialogflowV2IntentMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentMessage(o[0]);
   checkGoogleCloudDialogflowV2IntentMessage(o[1]);
 }
 
-buildUnnamed4338() {
+buildUnnamed4248() {
   var o = new core.List<api.GoogleCloudDialogflowV2Context>();
   o.add(buildGoogleCloudDialogflowV2Context());
   o.add(buildGoogleCloudDialogflowV2Context());
   return o;
 }
 
-checkUnnamed4338(core.List<api.GoogleCloudDialogflowV2Context> o) {
+checkUnnamed4248(core.List<api.GoogleCloudDialogflowV2Context> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2Context(o[0]);
   checkGoogleCloudDialogflowV2Context(o[1]);
 }
 
-buildUnnamed4339() {
+buildUnnamed4249() {
   var o = new core.List<api.GoogleCloudDialogflowV2IntentParameter>();
   o.add(buildGoogleCloudDialogflowV2IntentParameter());
   o.add(buildGoogleCloudDialogflowV2IntentParameter());
   return o;
 }
 
-checkUnnamed4339(core.List<api.GoogleCloudDialogflowV2IntentParameter> o) {
+checkUnnamed4249(core.List<api.GoogleCloudDialogflowV2IntentParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentParameter(o[0]);
   checkGoogleCloudDialogflowV2IntentParameter(o[1]);
 }
 
-buildUnnamed4340() {
+buildUnnamed4250() {
   var o = new core.List<api.GoogleCloudDialogflowV2IntentTrainingPhrase>();
   o.add(buildGoogleCloudDialogflowV2IntentTrainingPhrase());
   o.add(buildGoogleCloudDialogflowV2IntentTrainingPhrase());
   return o;
 }
 
-checkUnnamed4340(core.List<api.GoogleCloudDialogflowV2IntentTrainingPhrase> o) {
+checkUnnamed4250(core.List<api.GoogleCloudDialogflowV2IntentTrainingPhrase> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentTrainingPhrase(o[0]);
   checkGoogleCloudDialogflowV2IntentTrainingPhrase(o[1]);
@@ -430,22 +430,22 @@
   buildCounterGoogleCloudDialogflowV2Intent++;
   if (buildCounterGoogleCloudDialogflowV2Intent < 3) {
     o.action = "foo";
-    o.defaultResponsePlatforms = buildUnnamed4333();
+    o.defaultResponsePlatforms = buildUnnamed4243();
     o.displayName = "foo";
-    o.events = buildUnnamed4334();
-    o.followupIntentInfo = buildUnnamed4335();
-    o.inputContextNames = buildUnnamed4336();
+    o.events = buildUnnamed4244();
+    o.followupIntentInfo = buildUnnamed4245();
+    o.inputContextNames = buildUnnamed4246();
     o.isFallback = true;
-    o.messages = buildUnnamed4337();
+    o.messages = buildUnnamed4247();
     o.mlDisabled = true;
     o.name = "foo";
-    o.outputContexts = buildUnnamed4338();
-    o.parameters = buildUnnamed4339();
+    o.outputContexts = buildUnnamed4248();
+    o.parameters = buildUnnamed4249();
     o.parentFollowupIntentName = "foo";
     o.priority = 42;
     o.resetContexts = true;
     o.rootFollowupIntentName = "foo";
-    o.trainingPhrases = buildUnnamed4340();
+    o.trainingPhrases = buildUnnamed4250();
     o.webhookState = "foo";
   }
   buildCounterGoogleCloudDialogflowV2Intent--;
@@ -456,22 +456,22 @@
   buildCounterGoogleCloudDialogflowV2Intent++;
   if (buildCounterGoogleCloudDialogflowV2Intent < 3) {
     unittest.expect(o.action, unittest.equals('foo'));
-    checkUnnamed4333(o.defaultResponsePlatforms);
+    checkUnnamed4243(o.defaultResponsePlatforms);
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed4334(o.events);
-    checkUnnamed4335(o.followupIntentInfo);
-    checkUnnamed4336(o.inputContextNames);
+    checkUnnamed4244(o.events);
+    checkUnnamed4245(o.followupIntentInfo);
+    checkUnnamed4246(o.inputContextNames);
     unittest.expect(o.isFallback, unittest.isTrue);
-    checkUnnamed4337(o.messages);
+    checkUnnamed4247(o.messages);
     unittest.expect(o.mlDisabled, unittest.isTrue);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4338(o.outputContexts);
-    checkUnnamed4339(o.parameters);
+    checkUnnamed4248(o.outputContexts);
+    checkUnnamed4249(o.parameters);
     unittest.expect(o.parentFollowupIntentName, unittest.equals('foo'));
     unittest.expect(o.priority, unittest.equals(42));
     unittest.expect(o.resetContexts, unittest.isTrue);
     unittest.expect(o.rootFollowupIntentName, unittest.equals('foo'));
-    checkUnnamed4340(o.trainingPhrases);
+    checkUnnamed4250(o.trainingPhrases);
     unittest.expect(o.webhookState, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2Intent--;
@@ -499,7 +499,7 @@
   buildCounterGoogleCloudDialogflowV2IntentFollowupIntentInfo--;
 }
 
-buildUnnamed4341() {
+buildUnnamed4251() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -514,7 +514,7 @@
   return o;
 }
 
-checkUnnamed4341(core.Map<core.String, core.Object> o) {
+checkUnnamed4251(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -541,7 +541,7 @@
     o.linkOutSuggestion =
         buildGoogleCloudDialogflowV2IntentMessageLinkOutSuggestion();
     o.listSelect = buildGoogleCloudDialogflowV2IntentMessageListSelect();
-    o.payload = buildUnnamed4341();
+    o.payload = buildUnnamed4251();
     o.platform = "foo";
     o.quickReplies = buildGoogleCloudDialogflowV2IntentMessageQuickReplies();
     o.simpleResponses =
@@ -564,7 +564,7 @@
     checkGoogleCloudDialogflowV2IntentMessageLinkOutSuggestion(
         o.linkOutSuggestion);
     checkGoogleCloudDialogflowV2IntentMessageListSelect(o.listSelect);
-    checkUnnamed4341(o.payload);
+    checkUnnamed4251(o.payload);
     unittest.expect(o.platform, unittest.equals('foo'));
     checkGoogleCloudDialogflowV2IntentMessageQuickReplies(o.quickReplies);
     checkGoogleCloudDialogflowV2IntentMessageSimpleResponses(o.simpleResponses);
@@ -574,7 +574,7 @@
   buildCounterGoogleCloudDialogflowV2IntentMessage--;
 }
 
-buildUnnamed4342() {
+buildUnnamed4252() {
   var o =
       new core.List<api.GoogleCloudDialogflowV2IntentMessageBasicCardButton>();
   o.add(buildGoogleCloudDialogflowV2IntentMessageBasicCardButton());
@@ -582,7 +582,7 @@
   return o;
 }
 
-checkUnnamed4342(
+checkUnnamed4252(
     core.List<api.GoogleCloudDialogflowV2IntentMessageBasicCardButton> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentMessageBasicCardButton(o[0]);
@@ -594,7 +594,7 @@
   var o = new api.GoogleCloudDialogflowV2IntentMessageBasicCard();
   buildCounterGoogleCloudDialogflowV2IntentMessageBasicCard++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageBasicCard < 3) {
-    o.buttons = buildUnnamed4342();
+    o.buttons = buildUnnamed4252();
     o.formattedText = "foo";
     o.image = buildGoogleCloudDialogflowV2IntentMessageImage();
     o.subtitle = "foo";
@@ -608,7 +608,7 @@
     api.GoogleCloudDialogflowV2IntentMessageBasicCard o) {
   buildCounterGoogleCloudDialogflowV2IntentMessageBasicCard++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageBasicCard < 3) {
-    checkUnnamed4342(o.buttons);
+    checkUnnamed4252(o.buttons);
     unittest.expect(o.formattedText, unittest.equals('foo'));
     checkGoogleCloudDialogflowV2IntentMessageImage(o.image);
     unittest.expect(o.subtitle, unittest.equals('foo'));
@@ -666,14 +666,14 @@
   buildCounterGoogleCloudDialogflowV2IntentMessageBasicCardButtonOpenUriAction--;
 }
 
-buildUnnamed4343() {
+buildUnnamed4253() {
   var o = new core.List<api.GoogleCloudDialogflowV2IntentMessageCardButton>();
   o.add(buildGoogleCloudDialogflowV2IntentMessageCardButton());
   o.add(buildGoogleCloudDialogflowV2IntentMessageCardButton());
   return o;
 }
 
-checkUnnamed4343(
+checkUnnamed4253(
     core.List<api.GoogleCloudDialogflowV2IntentMessageCardButton> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentMessageCardButton(o[0]);
@@ -685,7 +685,7 @@
   var o = new api.GoogleCloudDialogflowV2IntentMessageCard();
   buildCounterGoogleCloudDialogflowV2IntentMessageCard++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageCard < 3) {
-    o.buttons = buildUnnamed4343();
+    o.buttons = buildUnnamed4253();
     o.imageUri = "foo";
     o.subtitle = "foo";
     o.title = "foo";
@@ -698,7 +698,7 @@
     api.GoogleCloudDialogflowV2IntentMessageCard o) {
   buildCounterGoogleCloudDialogflowV2IntentMessageCard++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageCard < 3) {
-    checkUnnamed4343(o.buttons);
+    checkUnnamed4253(o.buttons);
     unittest.expect(o.imageUri, unittest.equals('foo'));
     unittest.expect(o.subtitle, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
@@ -728,7 +728,7 @@
   buildCounterGoogleCloudDialogflowV2IntentMessageCardButton--;
 }
 
-buildUnnamed4344() {
+buildUnnamed4254() {
   var o = new core
       .List<api.GoogleCloudDialogflowV2IntentMessageCarouselSelectItem>();
   o.add(buildGoogleCloudDialogflowV2IntentMessageCarouselSelectItem());
@@ -736,7 +736,7 @@
   return o;
 }
 
-checkUnnamed4344(
+checkUnnamed4254(
     core.List<api.GoogleCloudDialogflowV2IntentMessageCarouselSelectItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentMessageCarouselSelectItem(o[0]);
@@ -748,7 +748,7 @@
   var o = new api.GoogleCloudDialogflowV2IntentMessageCarouselSelect();
   buildCounterGoogleCloudDialogflowV2IntentMessageCarouselSelect++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageCarouselSelect < 3) {
-    o.items = buildUnnamed4344();
+    o.items = buildUnnamed4254();
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageCarouselSelect--;
   return o;
@@ -758,7 +758,7 @@
     api.GoogleCloudDialogflowV2IntentMessageCarouselSelect o) {
   buildCounterGoogleCloudDialogflowV2IntentMessageCarouselSelect++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageCarouselSelect < 3) {
-    checkUnnamed4344(o.items);
+    checkUnnamed4254(o.items);
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageCarouselSelect--;
 }
@@ -833,7 +833,7 @@
   buildCounterGoogleCloudDialogflowV2IntentMessageLinkOutSuggestion--;
 }
 
-buildUnnamed4345() {
+buildUnnamed4255() {
   var o =
       new core.List<api.GoogleCloudDialogflowV2IntentMessageListSelectItem>();
   o.add(buildGoogleCloudDialogflowV2IntentMessageListSelectItem());
@@ -841,7 +841,7 @@
   return o;
 }
 
-checkUnnamed4345(
+checkUnnamed4255(
     core.List<api.GoogleCloudDialogflowV2IntentMessageListSelectItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentMessageListSelectItem(o[0]);
@@ -853,7 +853,7 @@
   var o = new api.GoogleCloudDialogflowV2IntentMessageListSelect();
   buildCounterGoogleCloudDialogflowV2IntentMessageListSelect++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageListSelect < 3) {
-    o.items = buildUnnamed4345();
+    o.items = buildUnnamed4255();
     o.title = "foo";
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageListSelect--;
@@ -864,7 +864,7 @@
     api.GoogleCloudDialogflowV2IntentMessageListSelect o) {
   buildCounterGoogleCloudDialogflowV2IntentMessageListSelect++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageListSelect < 3) {
-    checkUnnamed4345(o.items);
+    checkUnnamed4255(o.items);
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageListSelect--;
@@ -896,14 +896,14 @@
   buildCounterGoogleCloudDialogflowV2IntentMessageListSelectItem--;
 }
 
-buildUnnamed4346() {
+buildUnnamed4256() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4346(core.List<core.String> o) {
+checkUnnamed4256(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -914,7 +914,7 @@
   var o = new api.GoogleCloudDialogflowV2IntentMessageQuickReplies();
   buildCounterGoogleCloudDialogflowV2IntentMessageQuickReplies++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageQuickReplies < 3) {
-    o.quickReplies = buildUnnamed4346();
+    o.quickReplies = buildUnnamed4256();
     o.title = "foo";
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageQuickReplies--;
@@ -925,20 +925,20 @@
     api.GoogleCloudDialogflowV2IntentMessageQuickReplies o) {
   buildCounterGoogleCloudDialogflowV2IntentMessageQuickReplies++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageQuickReplies < 3) {
-    checkUnnamed4346(o.quickReplies);
+    checkUnnamed4256(o.quickReplies);
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageQuickReplies--;
 }
 
-buildUnnamed4347() {
+buildUnnamed4257() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4347(core.List<core.String> o) {
+checkUnnamed4257(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -950,7 +950,7 @@
   buildCounterGoogleCloudDialogflowV2IntentMessageSelectItemInfo++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageSelectItemInfo < 3) {
     o.key = "foo";
-    o.synonyms = buildUnnamed4347();
+    o.synonyms = buildUnnamed4257();
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageSelectItemInfo--;
   return o;
@@ -961,7 +961,7 @@
   buildCounterGoogleCloudDialogflowV2IntentMessageSelectItemInfo++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageSelectItemInfo < 3) {
     unittest.expect(o.key, unittest.equals('foo'));
-    checkUnnamed4347(o.synonyms);
+    checkUnnamed4257(o.synonyms);
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageSelectItemInfo--;
 }
@@ -990,7 +990,7 @@
   buildCounterGoogleCloudDialogflowV2IntentMessageSimpleResponse--;
 }
 
-buildUnnamed4348() {
+buildUnnamed4258() {
   var o =
       new core.List<api.GoogleCloudDialogflowV2IntentMessageSimpleResponse>();
   o.add(buildGoogleCloudDialogflowV2IntentMessageSimpleResponse());
@@ -998,7 +998,7 @@
   return o;
 }
 
-checkUnnamed4348(
+checkUnnamed4258(
     core.List<api.GoogleCloudDialogflowV2IntentMessageSimpleResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentMessageSimpleResponse(o[0]);
@@ -1010,7 +1010,7 @@
   var o = new api.GoogleCloudDialogflowV2IntentMessageSimpleResponses();
   buildCounterGoogleCloudDialogflowV2IntentMessageSimpleResponses++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageSimpleResponses < 3) {
-    o.simpleResponses = buildUnnamed4348();
+    o.simpleResponses = buildUnnamed4258();
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageSimpleResponses--;
   return o;
@@ -1020,7 +1020,7 @@
     api.GoogleCloudDialogflowV2IntentMessageSimpleResponses o) {
   buildCounterGoogleCloudDialogflowV2IntentMessageSimpleResponses++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageSimpleResponses < 3) {
-    checkUnnamed4348(o.simpleResponses);
+    checkUnnamed4258(o.simpleResponses);
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageSimpleResponses--;
 }
@@ -1045,14 +1045,14 @@
   buildCounterGoogleCloudDialogflowV2IntentMessageSuggestion--;
 }
 
-buildUnnamed4349() {
+buildUnnamed4259() {
   var o = new core.List<api.GoogleCloudDialogflowV2IntentMessageSuggestion>();
   o.add(buildGoogleCloudDialogflowV2IntentMessageSuggestion());
   o.add(buildGoogleCloudDialogflowV2IntentMessageSuggestion());
   return o;
 }
 
-checkUnnamed4349(
+checkUnnamed4259(
     core.List<api.GoogleCloudDialogflowV2IntentMessageSuggestion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentMessageSuggestion(o[0]);
@@ -1064,7 +1064,7 @@
   var o = new api.GoogleCloudDialogflowV2IntentMessageSuggestions();
   buildCounterGoogleCloudDialogflowV2IntentMessageSuggestions++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageSuggestions < 3) {
-    o.suggestions = buildUnnamed4349();
+    o.suggestions = buildUnnamed4259();
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageSuggestions--;
   return o;
@@ -1074,19 +1074,19 @@
     api.GoogleCloudDialogflowV2IntentMessageSuggestions o) {
   buildCounterGoogleCloudDialogflowV2IntentMessageSuggestions++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageSuggestions < 3) {
-    checkUnnamed4349(o.suggestions);
+    checkUnnamed4259(o.suggestions);
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageSuggestions--;
 }
 
-buildUnnamed4350() {
+buildUnnamed4260() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4350(core.List<core.String> o) {
+checkUnnamed4260(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1097,7 +1097,7 @@
   var o = new api.GoogleCloudDialogflowV2IntentMessageText();
   buildCounterGoogleCloudDialogflowV2IntentMessageText++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageText < 3) {
-    o.text = buildUnnamed4350();
+    o.text = buildUnnamed4260();
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageText--;
   return o;
@@ -1107,19 +1107,19 @@
     api.GoogleCloudDialogflowV2IntentMessageText o) {
   buildCounterGoogleCloudDialogflowV2IntentMessageText++;
   if (buildCounterGoogleCloudDialogflowV2IntentMessageText < 3) {
-    checkUnnamed4350(o.text);
+    checkUnnamed4260(o.text);
   }
   buildCounterGoogleCloudDialogflowV2IntentMessageText--;
 }
 
-buildUnnamed4351() {
+buildUnnamed4261() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4351(core.List<core.String> o) {
+checkUnnamed4261(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1136,7 +1136,7 @@
     o.isList = true;
     o.mandatory = true;
     o.name = "foo";
-    o.prompts = buildUnnamed4351();
+    o.prompts = buildUnnamed4261();
     o.value = "foo";
   }
   buildCounterGoogleCloudDialogflowV2IntentParameter--;
@@ -1153,20 +1153,20 @@
     unittest.expect(o.isList, unittest.isTrue);
     unittest.expect(o.mandatory, unittest.isTrue);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4351(o.prompts);
+    checkUnnamed4261(o.prompts);
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2IntentParameter--;
 }
 
-buildUnnamed4352() {
+buildUnnamed4262() {
   var o = new core.List<api.GoogleCloudDialogflowV2IntentTrainingPhrasePart>();
   o.add(buildGoogleCloudDialogflowV2IntentTrainingPhrasePart());
   o.add(buildGoogleCloudDialogflowV2IntentTrainingPhrasePart());
   return o;
 }
 
-checkUnnamed4352(
+checkUnnamed4262(
     core.List<api.GoogleCloudDialogflowV2IntentTrainingPhrasePart> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentTrainingPhrasePart(o[0]);
@@ -1179,7 +1179,7 @@
   buildCounterGoogleCloudDialogflowV2IntentTrainingPhrase++;
   if (buildCounterGoogleCloudDialogflowV2IntentTrainingPhrase < 3) {
     o.name = "foo";
-    o.parts = buildUnnamed4352();
+    o.parts = buildUnnamed4262();
     o.timesAddedCount = 42;
     o.type = "foo";
   }
@@ -1192,7 +1192,7 @@
   buildCounterGoogleCloudDialogflowV2IntentTrainingPhrase++;
   if (buildCounterGoogleCloudDialogflowV2IntentTrainingPhrase < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4352(o.parts);
+    checkUnnamed4262(o.parts);
     unittest.expect(o.timesAddedCount, unittest.equals(42));
     unittest.expect(o.type, unittest.equals('foo'));
   }
@@ -1225,7 +1225,7 @@
   buildCounterGoogleCloudDialogflowV2IntentTrainingPhrasePart--;
 }
 
-buildUnnamed4353() {
+buildUnnamed4263() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1240,7 +1240,7 @@
   return o;
 }
 
-checkUnnamed4353(core.Map<core.String, core.Object> o) {
+checkUnnamed4263(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -1259,7 +1259,7 @@
   var o = new api.GoogleCloudDialogflowV2OriginalDetectIntentRequest();
   buildCounterGoogleCloudDialogflowV2OriginalDetectIntentRequest++;
   if (buildCounterGoogleCloudDialogflowV2OriginalDetectIntentRequest < 3) {
-    o.payload = buildUnnamed4353();
+    o.payload = buildUnnamed4263();
     o.source = "foo";
   }
   buildCounterGoogleCloudDialogflowV2OriginalDetectIntentRequest--;
@@ -1270,13 +1270,13 @@
     api.GoogleCloudDialogflowV2OriginalDetectIntentRequest o) {
   buildCounterGoogleCloudDialogflowV2OriginalDetectIntentRequest++;
   if (buildCounterGoogleCloudDialogflowV2OriginalDetectIntentRequest < 3) {
-    checkUnnamed4353(o.payload);
+    checkUnnamed4263(o.payload);
     unittest.expect(o.source, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2OriginalDetectIntentRequest--;
 }
 
-buildUnnamed4354() {
+buildUnnamed4264() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1291,7 +1291,7 @@
   return o;
 }
 
-checkUnnamed4354(core.Map<core.String, core.Object> o) {
+checkUnnamed4264(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted9 = (o["x"]) as core.Map;
   unittest.expect(casted9, unittest.hasLength(3));
@@ -1305,33 +1305,33 @@
   unittest.expect(casted10["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4355() {
+buildUnnamed4265() {
   var o = new core.List<api.GoogleCloudDialogflowV2IntentMessage>();
   o.add(buildGoogleCloudDialogflowV2IntentMessage());
   o.add(buildGoogleCloudDialogflowV2IntentMessage());
   return o;
 }
 
-checkUnnamed4355(core.List<api.GoogleCloudDialogflowV2IntentMessage> o) {
+checkUnnamed4265(core.List<api.GoogleCloudDialogflowV2IntentMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentMessage(o[0]);
   checkGoogleCloudDialogflowV2IntentMessage(o[1]);
 }
 
-buildUnnamed4356() {
+buildUnnamed4266() {
   var o = new core.List<api.GoogleCloudDialogflowV2Context>();
   o.add(buildGoogleCloudDialogflowV2Context());
   o.add(buildGoogleCloudDialogflowV2Context());
   return o;
 }
 
-checkUnnamed4356(core.List<api.GoogleCloudDialogflowV2Context> o) {
+checkUnnamed4266(core.List<api.GoogleCloudDialogflowV2Context> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2Context(o[0]);
   checkGoogleCloudDialogflowV2Context(o[1]);
 }
 
-buildUnnamed4357() {
+buildUnnamed4267() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1346,7 +1346,7 @@
   return o;
 }
 
-checkUnnamed4357(core.Map<core.String, core.Object> o) {
+checkUnnamed4267(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted11 = (o["x"]) as core.Map;
   unittest.expect(casted11, unittest.hasLength(3));
@@ -1360,7 +1360,7 @@
   unittest.expect(casted12["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4358() {
+buildUnnamed4268() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1375,7 +1375,7 @@
   return o;
 }
 
-checkUnnamed4358(core.Map<core.String, core.Object> o) {
+checkUnnamed4268(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted13 = (o["x"]) as core.Map;
   unittest.expect(casted13, unittest.hasLength(3));
@@ -1396,17 +1396,17 @@
   if (buildCounterGoogleCloudDialogflowV2QueryResult < 3) {
     o.action = "foo";
     o.allRequiredParamsPresent = true;
-    o.diagnosticInfo = buildUnnamed4354();
-    o.fulfillmentMessages = buildUnnamed4355();
+    o.diagnosticInfo = buildUnnamed4264();
+    o.fulfillmentMessages = buildUnnamed4265();
     o.fulfillmentText = "foo";
     o.intent = buildGoogleCloudDialogflowV2Intent();
     o.intentDetectionConfidence = 42.0;
     o.languageCode = "foo";
-    o.outputContexts = buildUnnamed4356();
-    o.parameters = buildUnnamed4357();
+    o.outputContexts = buildUnnamed4266();
+    o.parameters = buildUnnamed4267();
     o.queryText = "foo";
     o.speechRecognitionConfidence = 42.0;
-    o.webhookPayload = buildUnnamed4358();
+    o.webhookPayload = buildUnnamed4268();
     o.webhookSource = "foo";
   }
   buildCounterGoogleCloudDialogflowV2QueryResult--;
@@ -1419,17 +1419,17 @@
   if (buildCounterGoogleCloudDialogflowV2QueryResult < 3) {
     unittest.expect(o.action, unittest.equals('foo'));
     unittest.expect(o.allRequiredParamsPresent, unittest.isTrue);
-    checkUnnamed4354(o.diagnosticInfo);
-    checkUnnamed4355(o.fulfillmentMessages);
+    checkUnnamed4264(o.diagnosticInfo);
+    checkUnnamed4265(o.fulfillmentMessages);
     unittest.expect(o.fulfillmentText, unittest.equals('foo'));
     checkGoogleCloudDialogflowV2Intent(o.intent);
     unittest.expect(o.intentDetectionConfidence, unittest.equals(42.0));
     unittest.expect(o.languageCode, unittest.equals('foo'));
-    checkUnnamed4356(o.outputContexts);
-    checkUnnamed4357(o.parameters);
+    checkUnnamed4266(o.outputContexts);
+    checkUnnamed4267(o.parameters);
     unittest.expect(o.queryText, unittest.equals('foo'));
     unittest.expect(o.speechRecognitionConfidence, unittest.equals(42.0));
-    checkUnnamed4358(o.webhookPayload);
+    checkUnnamed4268(o.webhookPayload);
     unittest.expect(o.webhookSource, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2QueryResult--;
@@ -1463,33 +1463,33 @@
   buildCounterGoogleCloudDialogflowV2WebhookRequest--;
 }
 
-buildUnnamed4359() {
+buildUnnamed4269() {
   var o = new core.List<api.GoogleCloudDialogflowV2IntentMessage>();
   o.add(buildGoogleCloudDialogflowV2IntentMessage());
   o.add(buildGoogleCloudDialogflowV2IntentMessage());
   return o;
 }
 
-checkUnnamed4359(core.List<api.GoogleCloudDialogflowV2IntentMessage> o) {
+checkUnnamed4269(core.List<api.GoogleCloudDialogflowV2IntentMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2IntentMessage(o[0]);
   checkGoogleCloudDialogflowV2IntentMessage(o[1]);
 }
 
-buildUnnamed4360() {
+buildUnnamed4270() {
   var o = new core.List<api.GoogleCloudDialogflowV2Context>();
   o.add(buildGoogleCloudDialogflowV2Context());
   o.add(buildGoogleCloudDialogflowV2Context());
   return o;
 }
 
-checkUnnamed4360(core.List<api.GoogleCloudDialogflowV2Context> o) {
+checkUnnamed4270(core.List<api.GoogleCloudDialogflowV2Context> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2Context(o[0]);
   checkGoogleCloudDialogflowV2Context(o[1]);
 }
 
-buildUnnamed4361() {
+buildUnnamed4271() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1504,7 +1504,7 @@
   return o;
 }
 
-checkUnnamed4361(core.Map<core.String, core.Object> o) {
+checkUnnamed4271(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted15 = (o["x"]) as core.Map;
   unittest.expect(casted15, unittest.hasLength(3));
@@ -1524,10 +1524,10 @@
   buildCounterGoogleCloudDialogflowV2WebhookResponse++;
   if (buildCounterGoogleCloudDialogflowV2WebhookResponse < 3) {
     o.followupEventInput = buildGoogleCloudDialogflowV2EventInput();
-    o.fulfillmentMessages = buildUnnamed4359();
+    o.fulfillmentMessages = buildUnnamed4269();
     o.fulfillmentText = "foo";
-    o.outputContexts = buildUnnamed4360();
-    o.payload = buildUnnamed4361();
+    o.outputContexts = buildUnnamed4270();
+    o.payload = buildUnnamed4271();
     o.source = "foo";
   }
   buildCounterGoogleCloudDialogflowV2WebhookResponse--;
@@ -1539,23 +1539,23 @@
   buildCounterGoogleCloudDialogflowV2WebhookResponse++;
   if (buildCounterGoogleCloudDialogflowV2WebhookResponse < 3) {
     checkGoogleCloudDialogflowV2EventInput(o.followupEventInput);
-    checkUnnamed4359(o.fulfillmentMessages);
+    checkUnnamed4269(o.fulfillmentMessages);
     unittest.expect(o.fulfillmentText, unittest.equals('foo'));
-    checkUnnamed4360(o.outputContexts);
-    checkUnnamed4361(o.payload);
+    checkUnnamed4270(o.outputContexts);
+    checkUnnamed4271(o.payload);
     unittest.expect(o.source, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2WebhookResponse--;
 }
 
-buildUnnamed4362() {
+buildUnnamed4272() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4362(core.List<core.String> o) {
+checkUnnamed4272(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1574,7 +1574,7 @@
     o.enableLogging = true;
     o.matchMode = "foo";
     o.parent = "foo";
-    o.supportedLanguageCodes = buildUnnamed4362();
+    o.supportedLanguageCodes = buildUnnamed4272();
     o.timeZone = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1Agent--;
@@ -1593,20 +1593,20 @@
     unittest.expect(o.enableLogging, unittest.isTrue);
     unittest.expect(o.matchMode, unittest.equals('foo'));
     unittest.expect(o.parent, unittest.equals('foo'));
-    checkUnnamed4362(o.supportedLanguageCodes);
+    checkUnnamed4272(o.supportedLanguageCodes);
     unittest.expect(o.timeZone, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1Agent--;
 }
 
-buildUnnamed4363() {
+buildUnnamed4273() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1EntityTypeEntity>();
   o.add(buildGoogleCloudDialogflowV2beta1EntityTypeEntity());
   o.add(buildGoogleCloudDialogflowV2beta1EntityTypeEntity());
   return o;
 }
 
-checkUnnamed4363(
+checkUnnamed4273(
     core.List<api.GoogleCloudDialogflowV2beta1EntityTypeEntity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1EntityTypeEntity(o[0]);
@@ -1618,7 +1618,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1BatchCreateEntitiesRequest();
   buildCounterGoogleCloudDialogflowV2beta1BatchCreateEntitiesRequest++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchCreateEntitiesRequest < 3) {
-    o.entities = buildUnnamed4363();
+    o.entities = buildUnnamed4273();
     o.languageCode = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1BatchCreateEntitiesRequest--;
@@ -1629,20 +1629,20 @@
     api.GoogleCloudDialogflowV2beta1BatchCreateEntitiesRequest o) {
   buildCounterGoogleCloudDialogflowV2beta1BatchCreateEntitiesRequest++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchCreateEntitiesRequest < 3) {
-    checkUnnamed4363(o.entities);
+    checkUnnamed4273(o.entities);
     unittest.expect(o.languageCode, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1BatchCreateEntitiesRequest--;
 }
 
-buildUnnamed4364() {
+buildUnnamed4274() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4364(core.List<core.String> o) {
+checkUnnamed4274(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1653,7 +1653,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1BatchDeleteEntitiesRequest();
   buildCounterGoogleCloudDialogflowV2beta1BatchDeleteEntitiesRequest++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchDeleteEntitiesRequest < 3) {
-    o.entityValues = buildUnnamed4364();
+    o.entityValues = buildUnnamed4274();
     o.languageCode = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1BatchDeleteEntitiesRequest--;
@@ -1664,20 +1664,20 @@
     api.GoogleCloudDialogflowV2beta1BatchDeleteEntitiesRequest o) {
   buildCounterGoogleCloudDialogflowV2beta1BatchDeleteEntitiesRequest++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchDeleteEntitiesRequest < 3) {
-    checkUnnamed4364(o.entityValues);
+    checkUnnamed4274(o.entityValues);
     unittest.expect(o.languageCode, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1BatchDeleteEntitiesRequest--;
 }
 
-buildUnnamed4365() {
+buildUnnamed4275() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4365(core.List<core.String> o) {
+checkUnnamed4275(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1690,7 +1690,7 @@
   buildCounterGoogleCloudDialogflowV2beta1BatchDeleteEntityTypesRequest++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchDeleteEntityTypesRequest <
       3) {
-    o.entityTypeNames = buildUnnamed4365();
+    o.entityTypeNames = buildUnnamed4275();
   }
   buildCounterGoogleCloudDialogflowV2beta1BatchDeleteEntityTypesRequest--;
   return o;
@@ -1701,19 +1701,19 @@
   buildCounterGoogleCloudDialogflowV2beta1BatchDeleteEntityTypesRequest++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchDeleteEntityTypesRequest <
       3) {
-    checkUnnamed4365(o.entityTypeNames);
+    checkUnnamed4275(o.entityTypeNames);
   }
   buildCounterGoogleCloudDialogflowV2beta1BatchDeleteEntityTypesRequest--;
 }
 
-buildUnnamed4366() {
+buildUnnamed4276() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1Intent>();
   o.add(buildGoogleCloudDialogflowV2beta1Intent());
   o.add(buildGoogleCloudDialogflowV2beta1Intent());
   return o;
 }
 
-checkUnnamed4366(core.List<api.GoogleCloudDialogflowV2beta1Intent> o) {
+checkUnnamed4276(core.List<api.GoogleCloudDialogflowV2beta1Intent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1Intent(o[0]);
   checkGoogleCloudDialogflowV2beta1Intent(o[1]);
@@ -1724,7 +1724,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1BatchDeleteIntentsRequest();
   buildCounterGoogleCloudDialogflowV2beta1BatchDeleteIntentsRequest++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchDeleteIntentsRequest < 3) {
-    o.intents = buildUnnamed4366();
+    o.intents = buildUnnamed4276();
   }
   buildCounterGoogleCloudDialogflowV2beta1BatchDeleteIntentsRequest--;
   return o;
@@ -1734,19 +1734,19 @@
     api.GoogleCloudDialogflowV2beta1BatchDeleteIntentsRequest o) {
   buildCounterGoogleCloudDialogflowV2beta1BatchDeleteIntentsRequest++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchDeleteIntentsRequest < 3) {
-    checkUnnamed4366(o.intents);
+    checkUnnamed4276(o.intents);
   }
   buildCounterGoogleCloudDialogflowV2beta1BatchDeleteIntentsRequest--;
 }
 
-buildUnnamed4367() {
+buildUnnamed4277() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1EntityTypeEntity>();
   o.add(buildGoogleCloudDialogflowV2beta1EntityTypeEntity());
   o.add(buildGoogleCloudDialogflowV2beta1EntityTypeEntity());
   return o;
 }
 
-checkUnnamed4367(
+checkUnnamed4277(
     core.List<api.GoogleCloudDialogflowV2beta1EntityTypeEntity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1EntityTypeEntity(o[0]);
@@ -1758,7 +1758,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1BatchUpdateEntitiesRequest();
   buildCounterGoogleCloudDialogflowV2beta1BatchUpdateEntitiesRequest++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchUpdateEntitiesRequest < 3) {
-    o.entities = buildUnnamed4367();
+    o.entities = buildUnnamed4277();
     o.languageCode = "foo";
     o.updateMask = "foo";
   }
@@ -1770,7 +1770,7 @@
     api.GoogleCloudDialogflowV2beta1BatchUpdateEntitiesRequest o) {
   buildCounterGoogleCloudDialogflowV2beta1BatchUpdateEntitiesRequest++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchUpdateEntitiesRequest < 3) {
-    checkUnnamed4367(o.entities);
+    checkUnnamed4277(o.entities);
     unittest.expect(o.languageCode, unittest.equals('foo'));
     unittest.expect(o.updateMask, unittest.equals('foo'));
   }
@@ -1807,14 +1807,14 @@
   buildCounterGoogleCloudDialogflowV2beta1BatchUpdateEntityTypesRequest--;
 }
 
-buildUnnamed4368() {
+buildUnnamed4278() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1EntityType>();
   o.add(buildGoogleCloudDialogflowV2beta1EntityType());
   o.add(buildGoogleCloudDialogflowV2beta1EntityType());
   return o;
 }
 
-checkUnnamed4368(core.List<api.GoogleCloudDialogflowV2beta1EntityType> o) {
+checkUnnamed4278(core.List<api.GoogleCloudDialogflowV2beta1EntityType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1EntityType(o[0]);
   checkGoogleCloudDialogflowV2beta1EntityType(o[1]);
@@ -1827,7 +1827,7 @@
   buildCounterGoogleCloudDialogflowV2beta1BatchUpdateEntityTypesResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchUpdateEntityTypesResponse <
       3) {
-    o.entityTypes = buildUnnamed4368();
+    o.entityTypes = buildUnnamed4278();
   }
   buildCounterGoogleCloudDialogflowV2beta1BatchUpdateEntityTypesResponse--;
   return o;
@@ -1838,7 +1838,7 @@
   buildCounterGoogleCloudDialogflowV2beta1BatchUpdateEntityTypesResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchUpdateEntityTypesResponse <
       3) {
-    checkUnnamed4368(o.entityTypes);
+    checkUnnamed4278(o.entityTypes);
   }
   buildCounterGoogleCloudDialogflowV2beta1BatchUpdateEntityTypesResponse--;
 }
@@ -1871,14 +1871,14 @@
   buildCounterGoogleCloudDialogflowV2beta1BatchUpdateIntentsRequest--;
 }
 
-buildUnnamed4369() {
+buildUnnamed4279() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1Intent>();
   o.add(buildGoogleCloudDialogflowV2beta1Intent());
   o.add(buildGoogleCloudDialogflowV2beta1Intent());
   return o;
 }
 
-checkUnnamed4369(core.List<api.GoogleCloudDialogflowV2beta1Intent> o) {
+checkUnnamed4279(core.List<api.GoogleCloudDialogflowV2beta1Intent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1Intent(o[0]);
   checkGoogleCloudDialogflowV2beta1Intent(o[1]);
@@ -1889,7 +1889,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1BatchUpdateIntentsResponse();
   buildCounterGoogleCloudDialogflowV2beta1BatchUpdateIntentsResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchUpdateIntentsResponse < 3) {
-    o.intents = buildUnnamed4369();
+    o.intents = buildUnnamed4279();
   }
   buildCounterGoogleCloudDialogflowV2beta1BatchUpdateIntentsResponse--;
   return o;
@@ -1899,12 +1899,12 @@
     api.GoogleCloudDialogflowV2beta1BatchUpdateIntentsResponse o) {
   buildCounterGoogleCloudDialogflowV2beta1BatchUpdateIntentsResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1BatchUpdateIntentsResponse < 3) {
-    checkUnnamed4369(o.intents);
+    checkUnnamed4279(o.intents);
   }
   buildCounterGoogleCloudDialogflowV2beta1BatchUpdateIntentsResponse--;
 }
 
-buildUnnamed4370() {
+buildUnnamed4280() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1919,7 +1919,7 @@
   return o;
 }
 
-checkUnnamed4370(core.Map<core.String, core.Object> o) {
+checkUnnamed4280(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted17 = (o["x"]) as core.Map;
   unittest.expect(casted17, unittest.hasLength(3));
@@ -1940,7 +1940,7 @@
   if (buildCounterGoogleCloudDialogflowV2beta1Context < 3) {
     o.lifespanCount = 42;
     o.name = "foo";
-    o.parameters = buildUnnamed4370();
+    o.parameters = buildUnnamed4280();
   }
   buildCounterGoogleCloudDialogflowV2beta1Context--;
   return o;
@@ -1952,7 +1952,7 @@
   if (buildCounterGoogleCloudDialogflowV2beta1Context < 3) {
     unittest.expect(o.lifespanCount, unittest.equals(42));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4370(o.parameters);
+    checkUnnamed4280(o.parameters);
   }
   buildCounterGoogleCloudDialogflowV2beta1Context--;
 }
@@ -2005,14 +2005,14 @@
   buildCounterGoogleCloudDialogflowV2beta1DetectIntentResponse--;
 }
 
-buildUnnamed4371() {
+buildUnnamed4281() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1EntityTypeEntity>();
   o.add(buildGoogleCloudDialogflowV2beta1EntityTypeEntity());
   o.add(buildGoogleCloudDialogflowV2beta1EntityTypeEntity());
   return o;
 }
 
-checkUnnamed4371(
+checkUnnamed4281(
     core.List<api.GoogleCloudDialogflowV2beta1EntityTypeEntity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1EntityTypeEntity(o[0]);
@@ -2026,7 +2026,7 @@
   if (buildCounterGoogleCloudDialogflowV2beta1EntityType < 3) {
     o.autoExpansionMode = "foo";
     o.displayName = "foo";
-    o.entities = buildUnnamed4371();
+    o.entities = buildUnnamed4281();
     o.kind = "foo";
     o.name = "foo";
   }
@@ -2040,21 +2040,21 @@
   if (buildCounterGoogleCloudDialogflowV2beta1EntityType < 3) {
     unittest.expect(o.autoExpansionMode, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed4371(o.entities);
+    checkUnnamed4281(o.entities);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1EntityType--;
 }
 
-buildUnnamed4372() {
+buildUnnamed4282() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1EntityType>();
   o.add(buildGoogleCloudDialogflowV2beta1EntityType());
   o.add(buildGoogleCloudDialogflowV2beta1EntityType());
   return o;
 }
 
-checkUnnamed4372(core.List<api.GoogleCloudDialogflowV2beta1EntityType> o) {
+checkUnnamed4282(core.List<api.GoogleCloudDialogflowV2beta1EntityType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1EntityType(o[0]);
   checkGoogleCloudDialogflowV2beta1EntityType(o[1]);
@@ -2065,7 +2065,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1EntityTypeBatch();
   buildCounterGoogleCloudDialogflowV2beta1EntityTypeBatch++;
   if (buildCounterGoogleCloudDialogflowV2beta1EntityTypeBatch < 3) {
-    o.entityTypes = buildUnnamed4372();
+    o.entityTypes = buildUnnamed4282();
   }
   buildCounterGoogleCloudDialogflowV2beta1EntityTypeBatch--;
   return o;
@@ -2075,19 +2075,19 @@
     api.GoogleCloudDialogflowV2beta1EntityTypeBatch o) {
   buildCounterGoogleCloudDialogflowV2beta1EntityTypeBatch++;
   if (buildCounterGoogleCloudDialogflowV2beta1EntityTypeBatch < 3) {
-    checkUnnamed4372(o.entityTypes);
+    checkUnnamed4282(o.entityTypes);
   }
   buildCounterGoogleCloudDialogflowV2beta1EntityTypeBatch--;
 }
 
-buildUnnamed4373() {
+buildUnnamed4283() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4373(core.List<core.String> o) {
+checkUnnamed4283(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2098,7 +2098,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1EntityTypeEntity();
   buildCounterGoogleCloudDialogflowV2beta1EntityTypeEntity++;
   if (buildCounterGoogleCloudDialogflowV2beta1EntityTypeEntity < 3) {
-    o.synonyms = buildUnnamed4373();
+    o.synonyms = buildUnnamed4283();
     o.value = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1EntityTypeEntity--;
@@ -2109,13 +2109,13 @@
     api.GoogleCloudDialogflowV2beta1EntityTypeEntity o) {
   buildCounterGoogleCloudDialogflowV2beta1EntityTypeEntity++;
   if (buildCounterGoogleCloudDialogflowV2beta1EntityTypeEntity < 3) {
-    checkUnnamed4373(o.synonyms);
+    checkUnnamed4283(o.synonyms);
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1EntityTypeEntity--;
 }
 
-buildUnnamed4374() {
+buildUnnamed4284() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2130,7 +2130,7 @@
   return o;
 }
 
-checkUnnamed4374(core.Map<core.String, core.Object> o) {
+checkUnnamed4284(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted19 = (o["x"]) as core.Map;
   unittest.expect(casted19, unittest.hasLength(3));
@@ -2151,7 +2151,7 @@
   if (buildCounterGoogleCloudDialogflowV2beta1EventInput < 3) {
     o.languageCode = "foo";
     o.name = "foo";
-    o.parameters = buildUnnamed4374();
+    o.parameters = buildUnnamed4284();
   }
   buildCounterGoogleCloudDialogflowV2beta1EventInput--;
   return o;
@@ -2163,7 +2163,7 @@
   if (buildCounterGoogleCloudDialogflowV2beta1EventInput < 3) {
     unittest.expect(o.languageCode, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4374(o.parameters);
+    checkUnnamed4284(o.parameters);
   }
   buildCounterGoogleCloudDialogflowV2beta1EventInput--;
 }
@@ -2232,14 +2232,14 @@
   buildCounterGoogleCloudDialogflowV2beta1ImportAgentRequest--;
 }
 
-buildUnnamed4375() {
+buildUnnamed4285() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4375(core.List<core.String> o) {
+checkUnnamed4285(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2252,7 +2252,7 @@
   if (buildCounterGoogleCloudDialogflowV2beta1InputAudioConfig < 3) {
     o.audioEncoding = "foo";
     o.languageCode = "foo";
-    o.phraseHints = buildUnnamed4375();
+    o.phraseHints = buildUnnamed4285();
     o.sampleRateHertz = 42;
   }
   buildCounterGoogleCloudDialogflowV2beta1InputAudioConfig--;
@@ -2265,39 +2265,39 @@
   if (buildCounterGoogleCloudDialogflowV2beta1InputAudioConfig < 3) {
     unittest.expect(o.audioEncoding, unittest.equals('foo'));
     unittest.expect(o.languageCode, unittest.equals('foo'));
-    checkUnnamed4375(o.phraseHints);
+    checkUnnamed4285(o.phraseHints);
     unittest.expect(o.sampleRateHertz, unittest.equals(42));
   }
   buildCounterGoogleCloudDialogflowV2beta1InputAudioConfig--;
 }
 
-buildUnnamed4376() {
+buildUnnamed4286() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4376(core.List<core.String> o) {
+checkUnnamed4286(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4377() {
+buildUnnamed4287() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4377(core.List<core.String> o) {
+checkUnnamed4287(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4378() {
+buildUnnamed4288() {
   var o =
       new core.List<api.GoogleCloudDialogflowV2beta1IntentFollowupIntentInfo>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentFollowupIntentInfo());
@@ -2305,73 +2305,73 @@
   return o;
 }
 
-checkUnnamed4378(
+checkUnnamed4288(
     core.List<api.GoogleCloudDialogflowV2beta1IntentFollowupIntentInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1IntentFollowupIntentInfo(o[0]);
   checkGoogleCloudDialogflowV2beta1IntentFollowupIntentInfo(o[1]);
 }
 
-buildUnnamed4379() {
+buildUnnamed4289() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4379(core.List<core.String> o) {
+checkUnnamed4289(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4380() {
+buildUnnamed4290() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1IntentMessage>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentMessage());
   o.add(buildGoogleCloudDialogflowV2beta1IntentMessage());
   return o;
 }
 
-checkUnnamed4380(core.List<api.GoogleCloudDialogflowV2beta1IntentMessage> o) {
+checkUnnamed4290(core.List<api.GoogleCloudDialogflowV2beta1IntentMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1IntentMessage(o[0]);
   checkGoogleCloudDialogflowV2beta1IntentMessage(o[1]);
 }
 
-buildUnnamed4381() {
+buildUnnamed4291() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1Context>();
   o.add(buildGoogleCloudDialogflowV2beta1Context());
   o.add(buildGoogleCloudDialogflowV2beta1Context());
   return o;
 }
 
-checkUnnamed4381(core.List<api.GoogleCloudDialogflowV2beta1Context> o) {
+checkUnnamed4291(core.List<api.GoogleCloudDialogflowV2beta1Context> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1Context(o[0]);
   checkGoogleCloudDialogflowV2beta1Context(o[1]);
 }
 
-buildUnnamed4382() {
+buildUnnamed4292() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1IntentParameter>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentParameter());
   o.add(buildGoogleCloudDialogflowV2beta1IntentParameter());
   return o;
 }
 
-checkUnnamed4382(core.List<api.GoogleCloudDialogflowV2beta1IntentParameter> o) {
+checkUnnamed4292(core.List<api.GoogleCloudDialogflowV2beta1IntentParameter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1IntentParameter(o[0]);
   checkGoogleCloudDialogflowV2beta1IntentParameter(o[1]);
 }
 
-buildUnnamed4383() {
+buildUnnamed4293() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1IntentTrainingPhrase>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentTrainingPhrase());
   o.add(buildGoogleCloudDialogflowV2beta1IntentTrainingPhrase());
   return o;
 }
 
-checkUnnamed4383(
+checkUnnamed4293(
     core.List<api.GoogleCloudDialogflowV2beta1IntentTrainingPhrase> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1IntentTrainingPhrase(o[0]);
@@ -2384,22 +2384,22 @@
   buildCounterGoogleCloudDialogflowV2beta1Intent++;
   if (buildCounterGoogleCloudDialogflowV2beta1Intent < 3) {
     o.action = "foo";
-    o.defaultResponsePlatforms = buildUnnamed4376();
+    o.defaultResponsePlatforms = buildUnnamed4286();
     o.displayName = "foo";
-    o.events = buildUnnamed4377();
-    o.followupIntentInfo = buildUnnamed4378();
-    o.inputContextNames = buildUnnamed4379();
+    o.events = buildUnnamed4287();
+    o.followupIntentInfo = buildUnnamed4288();
+    o.inputContextNames = buildUnnamed4289();
     o.isFallback = true;
-    o.messages = buildUnnamed4380();
+    o.messages = buildUnnamed4290();
     o.mlEnabled = true;
     o.name = "foo";
-    o.outputContexts = buildUnnamed4381();
-    o.parameters = buildUnnamed4382();
+    o.outputContexts = buildUnnamed4291();
+    o.parameters = buildUnnamed4292();
     o.parentFollowupIntentName = "foo";
     o.priority = 42;
     o.resetContexts = true;
     o.rootFollowupIntentName = "foo";
-    o.trainingPhrases = buildUnnamed4383();
+    o.trainingPhrases = buildUnnamed4293();
     o.webhookState = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1Intent--;
@@ -2411,35 +2411,35 @@
   buildCounterGoogleCloudDialogflowV2beta1Intent++;
   if (buildCounterGoogleCloudDialogflowV2beta1Intent < 3) {
     unittest.expect(o.action, unittest.equals('foo'));
-    checkUnnamed4376(o.defaultResponsePlatforms);
+    checkUnnamed4286(o.defaultResponsePlatforms);
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed4377(o.events);
-    checkUnnamed4378(o.followupIntentInfo);
-    checkUnnamed4379(o.inputContextNames);
+    checkUnnamed4287(o.events);
+    checkUnnamed4288(o.followupIntentInfo);
+    checkUnnamed4289(o.inputContextNames);
     unittest.expect(o.isFallback, unittest.isTrue);
-    checkUnnamed4380(o.messages);
+    checkUnnamed4290(o.messages);
     unittest.expect(o.mlEnabled, unittest.isTrue);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4381(o.outputContexts);
-    checkUnnamed4382(o.parameters);
+    checkUnnamed4291(o.outputContexts);
+    checkUnnamed4292(o.parameters);
     unittest.expect(o.parentFollowupIntentName, unittest.equals('foo'));
     unittest.expect(o.priority, unittest.equals(42));
     unittest.expect(o.resetContexts, unittest.isTrue);
     unittest.expect(o.rootFollowupIntentName, unittest.equals('foo'));
-    checkUnnamed4383(o.trainingPhrases);
+    checkUnnamed4293(o.trainingPhrases);
     unittest.expect(o.webhookState, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1Intent--;
 }
 
-buildUnnamed4384() {
+buildUnnamed4294() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1Intent>();
   o.add(buildGoogleCloudDialogflowV2beta1Intent());
   o.add(buildGoogleCloudDialogflowV2beta1Intent());
   return o;
 }
 
-checkUnnamed4384(core.List<api.GoogleCloudDialogflowV2beta1Intent> o) {
+checkUnnamed4294(core.List<api.GoogleCloudDialogflowV2beta1Intent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1Intent(o[0]);
   checkGoogleCloudDialogflowV2beta1Intent(o[1]);
@@ -2450,7 +2450,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1IntentBatch();
   buildCounterGoogleCloudDialogflowV2beta1IntentBatch++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentBatch < 3) {
-    o.intents = buildUnnamed4384();
+    o.intents = buildUnnamed4294();
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentBatch--;
   return o;
@@ -2460,7 +2460,7 @@
     api.GoogleCloudDialogflowV2beta1IntentBatch o) {
   buildCounterGoogleCloudDialogflowV2beta1IntentBatch++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentBatch < 3) {
-    checkUnnamed4384(o.intents);
+    checkUnnamed4294(o.intents);
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentBatch--;
 }
@@ -2487,7 +2487,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentFollowupIntentInfo--;
 }
 
-buildUnnamed4385() {
+buildUnnamed4295() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -2502,7 +2502,7 @@
   return o;
 }
 
-checkUnnamed4385(core.Map<core.String, core.Object> o) {
+checkUnnamed4295(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted21 = (o["x"]) as core.Map;
   unittest.expect(casted21, unittest.hasLength(3));
@@ -2529,7 +2529,7 @@
     o.linkOutSuggestion =
         buildGoogleCloudDialogflowV2beta1IntentMessageLinkOutSuggestion();
     o.listSelect = buildGoogleCloudDialogflowV2beta1IntentMessageListSelect();
-    o.payload = buildUnnamed4385();
+    o.payload = buildUnnamed4295();
     o.platform = "foo";
     o.quickReplies =
         buildGoogleCloudDialogflowV2beta1IntentMessageQuickReplies();
@@ -2554,7 +2554,7 @@
     checkGoogleCloudDialogflowV2beta1IntentMessageLinkOutSuggestion(
         o.linkOutSuggestion);
     checkGoogleCloudDialogflowV2beta1IntentMessageListSelect(o.listSelect);
-    checkUnnamed4385(o.payload);
+    checkUnnamed4295(o.payload);
     unittest.expect(o.platform, unittest.equals('foo'));
     checkGoogleCloudDialogflowV2beta1IntentMessageQuickReplies(o.quickReplies);
     checkGoogleCloudDialogflowV2beta1IntentMessageSimpleResponses(
@@ -2565,7 +2565,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentMessage--;
 }
 
-buildUnnamed4386() {
+buildUnnamed4296() {
   var o = new core
       .List<api.GoogleCloudDialogflowV2beta1IntentMessageBasicCardButton>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentMessageBasicCardButton());
@@ -2573,7 +2573,7 @@
   return o;
 }
 
-checkUnnamed4386(
+checkUnnamed4296(
     core.List<api.GoogleCloudDialogflowV2beta1IntentMessageBasicCardButton> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1IntentMessageBasicCardButton(o[0]);
@@ -2585,7 +2585,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1IntentMessageBasicCard();
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageBasicCard++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageBasicCard < 3) {
-    o.buttons = buildUnnamed4386();
+    o.buttons = buildUnnamed4296();
     o.formattedText = "foo";
     o.image = buildGoogleCloudDialogflowV2beta1IntentMessageImage();
     o.subtitle = "foo";
@@ -2599,7 +2599,7 @@
     api.GoogleCloudDialogflowV2beta1IntentMessageBasicCard o) {
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageBasicCard++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageBasicCard < 3) {
-    checkUnnamed4386(o.buttons);
+    checkUnnamed4296(o.buttons);
     unittest.expect(o.formattedText, unittest.equals('foo'));
     checkGoogleCloudDialogflowV2beta1IntentMessageImage(o.image);
     unittest.expect(o.subtitle, unittest.equals('foo'));
@@ -2661,7 +2661,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageBasicCardButtonOpenUriAction--;
 }
 
-buildUnnamed4387() {
+buildUnnamed4297() {
   var o =
       new core.List<api.GoogleCloudDialogflowV2beta1IntentMessageCardButton>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentMessageCardButton());
@@ -2669,7 +2669,7 @@
   return o;
 }
 
-checkUnnamed4387(
+checkUnnamed4297(
     core.List<api.GoogleCloudDialogflowV2beta1IntentMessageCardButton> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1IntentMessageCardButton(o[0]);
@@ -2681,7 +2681,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1IntentMessageCard();
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageCard++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageCard < 3) {
-    o.buttons = buildUnnamed4387();
+    o.buttons = buildUnnamed4297();
     o.imageUri = "foo";
     o.subtitle = "foo";
     o.title = "foo";
@@ -2694,7 +2694,7 @@
     api.GoogleCloudDialogflowV2beta1IntentMessageCard o) {
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageCard++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageCard < 3) {
-    checkUnnamed4387(o.buttons);
+    checkUnnamed4297(o.buttons);
     unittest.expect(o.imageUri, unittest.equals('foo'));
     unittest.expect(o.subtitle, unittest.equals('foo'));
     unittest.expect(o.title, unittest.equals('foo'));
@@ -2724,7 +2724,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageCardButton--;
 }
 
-buildUnnamed4388() {
+buildUnnamed4298() {
   var o = new core
       .List<api.GoogleCloudDialogflowV2beta1IntentMessageCarouselSelectItem>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentMessageCarouselSelectItem());
@@ -2732,7 +2732,7 @@
   return o;
 }
 
-checkUnnamed4388(
+checkUnnamed4298(
     core.List<api.GoogleCloudDialogflowV2beta1IntentMessageCarouselSelectItem>
         o) {
   unittest.expect(o, unittest.hasLength(2));
@@ -2746,7 +2746,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1IntentMessageCarouselSelect();
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageCarouselSelect++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageCarouselSelect < 3) {
-    o.items = buildUnnamed4388();
+    o.items = buildUnnamed4298();
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageCarouselSelect--;
   return o;
@@ -2756,7 +2756,7 @@
     api.GoogleCloudDialogflowV2beta1IntentMessageCarouselSelect o) {
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageCarouselSelect++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageCarouselSelect < 3) {
-    checkUnnamed4388(o.items);
+    checkUnnamed4298(o.items);
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageCarouselSelect--;
 }
@@ -2837,7 +2837,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageLinkOutSuggestion--;
 }
 
-buildUnnamed4389() {
+buildUnnamed4299() {
   var o = new core
       .List<api.GoogleCloudDialogflowV2beta1IntentMessageListSelectItem>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentMessageListSelectItem());
@@ -2845,7 +2845,7 @@
   return o;
 }
 
-checkUnnamed4389(
+checkUnnamed4299(
     core.List<api.GoogleCloudDialogflowV2beta1IntentMessageListSelectItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1IntentMessageListSelectItem(o[0]);
@@ -2857,7 +2857,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1IntentMessageListSelect();
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageListSelect++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageListSelect < 3) {
-    o.items = buildUnnamed4389();
+    o.items = buildUnnamed4299();
     o.title = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageListSelect--;
@@ -2868,7 +2868,7 @@
     api.GoogleCloudDialogflowV2beta1IntentMessageListSelect o) {
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageListSelect++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageListSelect < 3) {
-    checkUnnamed4389(o.items);
+    checkUnnamed4299(o.items);
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageListSelect--;
@@ -2901,14 +2901,14 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageListSelectItem--;
 }
 
-buildUnnamed4390() {
+buildUnnamed4300() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4390(core.List<core.String> o) {
+checkUnnamed4300(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2919,7 +2919,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1IntentMessageQuickReplies();
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageQuickReplies++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageQuickReplies < 3) {
-    o.quickReplies = buildUnnamed4390();
+    o.quickReplies = buildUnnamed4300();
     o.title = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageQuickReplies--;
@@ -2930,20 +2930,20 @@
     api.GoogleCloudDialogflowV2beta1IntentMessageQuickReplies o) {
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageQuickReplies++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageQuickReplies < 3) {
-    checkUnnamed4390(o.quickReplies);
+    checkUnnamed4300(o.quickReplies);
     unittest.expect(o.title, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageQuickReplies--;
 }
 
-buildUnnamed4391() {
+buildUnnamed4301() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4391(core.List<core.String> o) {
+checkUnnamed4301(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2956,7 +2956,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSelectItemInfo++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageSelectItemInfo < 3) {
     o.key = "foo";
-    o.synonyms = buildUnnamed4391();
+    o.synonyms = buildUnnamed4301();
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSelectItemInfo--;
   return o;
@@ -2967,7 +2967,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSelectItemInfo++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageSelectItemInfo < 3) {
     unittest.expect(o.key, unittest.equals('foo'));
-    checkUnnamed4391(o.synonyms);
+    checkUnnamed4301(o.synonyms);
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSelectItemInfo--;
 }
@@ -2997,7 +2997,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSimpleResponse--;
 }
 
-buildUnnamed4392() {
+buildUnnamed4302() {
   var o = new core
       .List<api.GoogleCloudDialogflowV2beta1IntentMessageSimpleResponse>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentMessageSimpleResponse());
@@ -3005,7 +3005,7 @@
   return o;
 }
 
-checkUnnamed4392(
+checkUnnamed4302(
     core.List<api.GoogleCloudDialogflowV2beta1IntentMessageSimpleResponse> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1IntentMessageSimpleResponse(o[0]);
@@ -3019,7 +3019,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSimpleResponses++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageSimpleResponses <
       3) {
-    o.simpleResponses = buildUnnamed4392();
+    o.simpleResponses = buildUnnamed4302();
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSimpleResponses--;
   return o;
@@ -3030,7 +3030,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSimpleResponses++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageSimpleResponses <
       3) {
-    checkUnnamed4392(o.simpleResponses);
+    checkUnnamed4302(o.simpleResponses);
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSimpleResponses--;
 }
@@ -3055,7 +3055,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSuggestion--;
 }
 
-buildUnnamed4393() {
+buildUnnamed4303() {
   var o =
       new core.List<api.GoogleCloudDialogflowV2beta1IntentMessageSuggestion>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentMessageSuggestion());
@@ -3063,7 +3063,7 @@
   return o;
 }
 
-checkUnnamed4393(
+checkUnnamed4303(
     core.List<api.GoogleCloudDialogflowV2beta1IntentMessageSuggestion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1IntentMessageSuggestion(o[0]);
@@ -3075,7 +3075,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1IntentMessageSuggestions();
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSuggestions++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageSuggestions < 3) {
-    o.suggestions = buildUnnamed4393();
+    o.suggestions = buildUnnamed4303();
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSuggestions--;
   return o;
@@ -3085,19 +3085,19 @@
     api.GoogleCloudDialogflowV2beta1IntentMessageSuggestions o) {
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSuggestions++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageSuggestions < 3) {
-    checkUnnamed4393(o.suggestions);
+    checkUnnamed4303(o.suggestions);
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageSuggestions--;
 }
 
-buildUnnamed4394() {
+buildUnnamed4304() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4394(core.List<core.String> o) {
+checkUnnamed4304(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3108,7 +3108,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1IntentMessageText();
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageText++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageText < 3) {
-    o.text = buildUnnamed4394();
+    o.text = buildUnnamed4304();
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageText--;
   return o;
@@ -3118,19 +3118,19 @@
     api.GoogleCloudDialogflowV2beta1IntentMessageText o) {
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageText++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentMessageText < 3) {
-    checkUnnamed4394(o.text);
+    checkUnnamed4304(o.text);
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentMessageText--;
 }
 
-buildUnnamed4395() {
+buildUnnamed4305() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4395(core.List<core.String> o) {
+checkUnnamed4305(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3147,7 +3147,7 @@
     o.isList = true;
     o.mandatory = true;
     o.name = "foo";
-    o.prompts = buildUnnamed4395();
+    o.prompts = buildUnnamed4305();
     o.value = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentParameter--;
@@ -3164,13 +3164,13 @@
     unittest.expect(o.isList, unittest.isTrue);
     unittest.expect(o.mandatory, unittest.isTrue);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4395(o.prompts);
+    checkUnnamed4305(o.prompts);
     unittest.expect(o.value, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1IntentParameter--;
 }
 
-buildUnnamed4396() {
+buildUnnamed4306() {
   var o =
       new core.List<api.GoogleCloudDialogflowV2beta1IntentTrainingPhrasePart>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentTrainingPhrasePart());
@@ -3178,7 +3178,7 @@
   return o;
 }
 
-checkUnnamed4396(
+checkUnnamed4306(
     core.List<api.GoogleCloudDialogflowV2beta1IntentTrainingPhrasePart> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1IntentTrainingPhrasePart(o[0]);
@@ -3191,7 +3191,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentTrainingPhrase++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentTrainingPhrase < 3) {
     o.name = "foo";
-    o.parts = buildUnnamed4396();
+    o.parts = buildUnnamed4306();
     o.timesAddedCount = 42;
     o.type = "foo";
   }
@@ -3204,7 +3204,7 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentTrainingPhrase++;
   if (buildCounterGoogleCloudDialogflowV2beta1IntentTrainingPhrase < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4396(o.parts);
+    checkUnnamed4306(o.parts);
     unittest.expect(o.timesAddedCount, unittest.equals(42));
     unittest.expect(o.type, unittest.equals('foo'));
   }
@@ -3237,14 +3237,14 @@
   buildCounterGoogleCloudDialogflowV2beta1IntentTrainingPhrasePart--;
 }
 
-buildUnnamed4397() {
+buildUnnamed4307() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1Context>();
   o.add(buildGoogleCloudDialogflowV2beta1Context());
   o.add(buildGoogleCloudDialogflowV2beta1Context());
   return o;
 }
 
-checkUnnamed4397(core.List<api.GoogleCloudDialogflowV2beta1Context> o) {
+checkUnnamed4307(core.List<api.GoogleCloudDialogflowV2beta1Context> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1Context(o[0]);
   checkGoogleCloudDialogflowV2beta1Context(o[1]);
@@ -3255,7 +3255,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1ListContextsResponse();
   buildCounterGoogleCloudDialogflowV2beta1ListContextsResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1ListContextsResponse < 3) {
-    o.contexts = buildUnnamed4397();
+    o.contexts = buildUnnamed4307();
     o.nextPageToken = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1ListContextsResponse--;
@@ -3266,20 +3266,20 @@
     api.GoogleCloudDialogflowV2beta1ListContextsResponse o) {
   buildCounterGoogleCloudDialogflowV2beta1ListContextsResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1ListContextsResponse < 3) {
-    checkUnnamed4397(o.contexts);
+    checkUnnamed4307(o.contexts);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1ListContextsResponse--;
 }
 
-buildUnnamed4398() {
+buildUnnamed4308() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1EntityType>();
   o.add(buildGoogleCloudDialogflowV2beta1EntityType());
   o.add(buildGoogleCloudDialogflowV2beta1EntityType());
   return o;
 }
 
-checkUnnamed4398(core.List<api.GoogleCloudDialogflowV2beta1EntityType> o) {
+checkUnnamed4308(core.List<api.GoogleCloudDialogflowV2beta1EntityType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1EntityType(o[0]);
   checkGoogleCloudDialogflowV2beta1EntityType(o[1]);
@@ -3290,7 +3290,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1ListEntityTypesResponse();
   buildCounterGoogleCloudDialogflowV2beta1ListEntityTypesResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1ListEntityTypesResponse < 3) {
-    o.entityTypes = buildUnnamed4398();
+    o.entityTypes = buildUnnamed4308();
     o.nextPageToken = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1ListEntityTypesResponse--;
@@ -3301,20 +3301,20 @@
     api.GoogleCloudDialogflowV2beta1ListEntityTypesResponse o) {
   buildCounterGoogleCloudDialogflowV2beta1ListEntityTypesResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1ListEntityTypesResponse < 3) {
-    checkUnnamed4398(o.entityTypes);
+    checkUnnamed4308(o.entityTypes);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1ListEntityTypesResponse--;
 }
 
-buildUnnamed4399() {
+buildUnnamed4309() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1Intent>();
   o.add(buildGoogleCloudDialogflowV2beta1Intent());
   o.add(buildGoogleCloudDialogflowV2beta1Intent());
   return o;
 }
 
-checkUnnamed4399(core.List<api.GoogleCloudDialogflowV2beta1Intent> o) {
+checkUnnamed4309(core.List<api.GoogleCloudDialogflowV2beta1Intent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1Intent(o[0]);
   checkGoogleCloudDialogflowV2beta1Intent(o[1]);
@@ -3325,7 +3325,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1ListIntentsResponse();
   buildCounterGoogleCloudDialogflowV2beta1ListIntentsResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1ListIntentsResponse < 3) {
-    o.intents = buildUnnamed4399();
+    o.intents = buildUnnamed4309();
     o.nextPageToken = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1ListIntentsResponse--;
@@ -3336,20 +3336,20 @@
     api.GoogleCloudDialogflowV2beta1ListIntentsResponse o) {
   buildCounterGoogleCloudDialogflowV2beta1ListIntentsResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1ListIntentsResponse < 3) {
-    checkUnnamed4399(o.intents);
+    checkUnnamed4309(o.intents);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1ListIntentsResponse--;
 }
 
-buildUnnamed4400() {
+buildUnnamed4310() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1SessionEntityType>();
   o.add(buildGoogleCloudDialogflowV2beta1SessionEntityType());
   o.add(buildGoogleCloudDialogflowV2beta1SessionEntityType());
   return o;
 }
 
-checkUnnamed4400(
+checkUnnamed4310(
     core.List<api.GoogleCloudDialogflowV2beta1SessionEntityType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1SessionEntityType(o[0]);
@@ -3364,7 +3364,7 @@
   if (buildCounterGoogleCloudDialogflowV2beta1ListSessionEntityTypesResponse <
       3) {
     o.nextPageToken = "foo";
-    o.sessionEntityTypes = buildUnnamed4400();
+    o.sessionEntityTypes = buildUnnamed4310();
   }
   buildCounterGoogleCloudDialogflowV2beta1ListSessionEntityTypesResponse--;
   return o;
@@ -3376,12 +3376,12 @@
   if (buildCounterGoogleCloudDialogflowV2beta1ListSessionEntityTypesResponse <
       3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4400(o.sessionEntityTypes);
+    checkUnnamed4310(o.sessionEntityTypes);
   }
   buildCounterGoogleCloudDialogflowV2beta1ListSessionEntityTypesResponse--;
 }
 
-buildUnnamed4401() {
+buildUnnamed4311() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3396,7 +3396,7 @@
   return o;
 }
 
-checkUnnamed4401(core.Map<core.String, core.Object> o) {
+checkUnnamed4311(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted23 = (o["x"]) as core.Map;
   unittest.expect(casted23, unittest.hasLength(3));
@@ -3416,7 +3416,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1OriginalDetectIntentRequest();
   buildCounterGoogleCloudDialogflowV2beta1OriginalDetectIntentRequest++;
   if (buildCounterGoogleCloudDialogflowV2beta1OriginalDetectIntentRequest < 3) {
-    o.payload = buildUnnamed4401();
+    o.payload = buildUnnamed4311();
     o.source = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1OriginalDetectIntentRequest--;
@@ -3427,7 +3427,7 @@
     api.GoogleCloudDialogflowV2beta1OriginalDetectIntentRequest o) {
   buildCounterGoogleCloudDialogflowV2beta1OriginalDetectIntentRequest++;
   if (buildCounterGoogleCloudDialogflowV2beta1OriginalDetectIntentRequest < 3) {
-    checkUnnamed4401(o.payload);
+    checkUnnamed4311(o.payload);
     unittest.expect(o.source, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1OriginalDetectIntentRequest--;
@@ -3457,20 +3457,20 @@
   buildCounterGoogleCloudDialogflowV2beta1QueryInput--;
 }
 
-buildUnnamed4402() {
+buildUnnamed4312() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1Context>();
   o.add(buildGoogleCloudDialogflowV2beta1Context());
   o.add(buildGoogleCloudDialogflowV2beta1Context());
   return o;
 }
 
-checkUnnamed4402(core.List<api.GoogleCloudDialogflowV2beta1Context> o) {
+checkUnnamed4312(core.List<api.GoogleCloudDialogflowV2beta1Context> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1Context(o[0]);
   checkGoogleCloudDialogflowV2beta1Context(o[1]);
 }
 
-buildUnnamed4403() {
+buildUnnamed4313() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3485,7 +3485,7 @@
   return o;
 }
 
-checkUnnamed4403(core.Map<core.String, core.Object> o) {
+checkUnnamed4313(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted25 = (o["x"]) as core.Map;
   unittest.expect(casted25, unittest.hasLength(3));
@@ -3499,14 +3499,14 @@
   unittest.expect(casted26["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4404() {
+buildUnnamed4314() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1SessionEntityType>();
   o.add(buildGoogleCloudDialogflowV2beta1SessionEntityType());
   o.add(buildGoogleCloudDialogflowV2beta1SessionEntityType());
   return o;
 }
 
-checkUnnamed4404(
+checkUnnamed4314(
     core.List<api.GoogleCloudDialogflowV2beta1SessionEntityType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1SessionEntityType(o[0]);
@@ -3518,11 +3518,11 @@
   var o = new api.GoogleCloudDialogflowV2beta1QueryParameters();
   buildCounterGoogleCloudDialogflowV2beta1QueryParameters++;
   if (buildCounterGoogleCloudDialogflowV2beta1QueryParameters < 3) {
-    o.contexts = buildUnnamed4402();
+    o.contexts = buildUnnamed4312();
     o.geoLocation = buildGoogleTypeLatLng();
-    o.payload = buildUnnamed4403();
+    o.payload = buildUnnamed4313();
     o.resetContexts = true;
-    o.sessionEntityTypes = buildUnnamed4404();
+    o.sessionEntityTypes = buildUnnamed4314();
     o.timeZone = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1QueryParameters--;
@@ -3533,17 +3533,17 @@
     api.GoogleCloudDialogflowV2beta1QueryParameters o) {
   buildCounterGoogleCloudDialogflowV2beta1QueryParameters++;
   if (buildCounterGoogleCloudDialogflowV2beta1QueryParameters < 3) {
-    checkUnnamed4402(o.contexts);
+    checkUnnamed4312(o.contexts);
     checkGoogleTypeLatLng(o.geoLocation);
-    checkUnnamed4403(o.payload);
+    checkUnnamed4313(o.payload);
     unittest.expect(o.resetContexts, unittest.isTrue);
-    checkUnnamed4404(o.sessionEntityTypes);
+    checkUnnamed4314(o.sessionEntityTypes);
     unittest.expect(o.timeZone, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1QueryParameters--;
 }
 
-buildUnnamed4405() {
+buildUnnamed4315() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3558,7 +3558,7 @@
   return o;
 }
 
-checkUnnamed4405(core.Map<core.String, core.Object> o) {
+checkUnnamed4315(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted27 = (o["x"]) as core.Map;
   unittest.expect(casted27, unittest.hasLength(3));
@@ -3572,33 +3572,33 @@
   unittest.expect(casted28["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4406() {
+buildUnnamed4316() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1IntentMessage>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentMessage());
   o.add(buildGoogleCloudDialogflowV2beta1IntentMessage());
   return o;
 }
 
-checkUnnamed4406(core.List<api.GoogleCloudDialogflowV2beta1IntentMessage> o) {
+checkUnnamed4316(core.List<api.GoogleCloudDialogflowV2beta1IntentMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1IntentMessage(o[0]);
   checkGoogleCloudDialogflowV2beta1IntentMessage(o[1]);
 }
 
-buildUnnamed4407() {
+buildUnnamed4317() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1Context>();
   o.add(buildGoogleCloudDialogflowV2beta1Context());
   o.add(buildGoogleCloudDialogflowV2beta1Context());
   return o;
 }
 
-checkUnnamed4407(core.List<api.GoogleCloudDialogflowV2beta1Context> o) {
+checkUnnamed4317(core.List<api.GoogleCloudDialogflowV2beta1Context> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1Context(o[0]);
   checkGoogleCloudDialogflowV2beta1Context(o[1]);
 }
 
-buildUnnamed4408() {
+buildUnnamed4318() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3613,7 +3613,7 @@
   return o;
 }
 
-checkUnnamed4408(core.Map<core.String, core.Object> o) {
+checkUnnamed4318(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted29 = (o["x"]) as core.Map;
   unittest.expect(casted29, unittest.hasLength(3));
@@ -3627,7 +3627,7 @@
   unittest.expect(casted30["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4409() {
+buildUnnamed4319() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3642,7 +3642,7 @@
   return o;
 }
 
-checkUnnamed4409(core.Map<core.String, core.Object> o) {
+checkUnnamed4319(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted31 = (o["x"]) as core.Map;
   unittest.expect(casted31, unittest.hasLength(3));
@@ -3663,17 +3663,17 @@
   if (buildCounterGoogleCloudDialogflowV2beta1QueryResult < 3) {
     o.action = "foo";
     o.allRequiredParamsPresent = true;
-    o.diagnosticInfo = buildUnnamed4405();
-    o.fulfillmentMessages = buildUnnamed4406();
+    o.diagnosticInfo = buildUnnamed4315();
+    o.fulfillmentMessages = buildUnnamed4316();
     o.fulfillmentText = "foo";
     o.intent = buildGoogleCloudDialogflowV2beta1Intent();
     o.intentDetectionConfidence = 42.0;
     o.languageCode = "foo";
-    o.outputContexts = buildUnnamed4407();
-    o.parameters = buildUnnamed4408();
+    o.outputContexts = buildUnnamed4317();
+    o.parameters = buildUnnamed4318();
     o.queryText = "foo";
     o.speechRecognitionConfidence = 42.0;
-    o.webhookPayload = buildUnnamed4409();
+    o.webhookPayload = buildUnnamed4319();
     o.webhookSource = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1QueryResult--;
@@ -3686,17 +3686,17 @@
   if (buildCounterGoogleCloudDialogflowV2beta1QueryResult < 3) {
     unittest.expect(o.action, unittest.equals('foo'));
     unittest.expect(o.allRequiredParamsPresent, unittest.isTrue);
-    checkUnnamed4405(o.diagnosticInfo);
-    checkUnnamed4406(o.fulfillmentMessages);
+    checkUnnamed4315(o.diagnosticInfo);
+    checkUnnamed4316(o.fulfillmentMessages);
     unittest.expect(o.fulfillmentText, unittest.equals('foo'));
     checkGoogleCloudDialogflowV2beta1Intent(o.intent);
     unittest.expect(o.intentDetectionConfidence, unittest.equals(42.0));
     unittest.expect(o.languageCode, unittest.equals('foo'));
-    checkUnnamed4407(o.outputContexts);
-    checkUnnamed4408(o.parameters);
+    checkUnnamed4317(o.outputContexts);
+    checkUnnamed4318(o.parameters);
     unittest.expect(o.queryText, unittest.equals('foo'));
     unittest.expect(o.speechRecognitionConfidence, unittest.equals(42.0));
-    checkUnnamed4409(o.webhookPayload);
+    checkUnnamed4319(o.webhookPayload);
     unittest.expect(o.webhookSource, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1QueryResult--;
@@ -3724,14 +3724,14 @@
   buildCounterGoogleCloudDialogflowV2beta1RestoreAgentRequest--;
 }
 
-buildUnnamed4410() {
+buildUnnamed4320() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1Agent>();
   o.add(buildGoogleCloudDialogflowV2beta1Agent());
   o.add(buildGoogleCloudDialogflowV2beta1Agent());
   return o;
 }
 
-checkUnnamed4410(core.List<api.GoogleCloudDialogflowV2beta1Agent> o) {
+checkUnnamed4320(core.List<api.GoogleCloudDialogflowV2beta1Agent> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1Agent(o[0]);
   checkGoogleCloudDialogflowV2beta1Agent(o[1]);
@@ -3742,7 +3742,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1SearchAgentsResponse();
   buildCounterGoogleCloudDialogflowV2beta1SearchAgentsResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1SearchAgentsResponse < 3) {
-    o.agents = buildUnnamed4410();
+    o.agents = buildUnnamed4320();
     o.nextPageToken = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1SearchAgentsResponse--;
@@ -3753,20 +3753,20 @@
     api.GoogleCloudDialogflowV2beta1SearchAgentsResponse o) {
   buildCounterGoogleCloudDialogflowV2beta1SearchAgentsResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1SearchAgentsResponse < 3) {
-    checkUnnamed4410(o.agents);
+    checkUnnamed4320(o.agents);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1SearchAgentsResponse--;
 }
 
-buildUnnamed4411() {
+buildUnnamed4321() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1EntityTypeEntity>();
   o.add(buildGoogleCloudDialogflowV2beta1EntityTypeEntity());
   o.add(buildGoogleCloudDialogflowV2beta1EntityTypeEntity());
   return o;
 }
 
-checkUnnamed4411(
+checkUnnamed4321(
     core.List<api.GoogleCloudDialogflowV2beta1EntityTypeEntity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1EntityTypeEntity(o[0]);
@@ -3778,7 +3778,7 @@
   var o = new api.GoogleCloudDialogflowV2beta1SessionEntityType();
   buildCounterGoogleCloudDialogflowV2beta1SessionEntityType++;
   if (buildCounterGoogleCloudDialogflowV2beta1SessionEntityType < 3) {
-    o.entities = buildUnnamed4411();
+    o.entities = buildUnnamed4321();
     o.entityOverrideMode = "foo";
     o.name = "foo";
   }
@@ -3790,7 +3790,7 @@
     api.GoogleCloudDialogflowV2beta1SessionEntityType o) {
   buildCounterGoogleCloudDialogflowV2beta1SessionEntityType++;
   if (buildCounterGoogleCloudDialogflowV2beta1SessionEntityType < 3) {
-    checkUnnamed4411(o.entities);
+    checkUnnamed4321(o.entities);
     unittest.expect(o.entityOverrideMode, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
   }
@@ -3863,33 +3863,33 @@
   buildCounterGoogleCloudDialogflowV2beta1WebhookRequest--;
 }
 
-buildUnnamed4412() {
+buildUnnamed4322() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1IntentMessage>();
   o.add(buildGoogleCloudDialogflowV2beta1IntentMessage());
   o.add(buildGoogleCloudDialogflowV2beta1IntentMessage());
   return o;
 }
 
-checkUnnamed4412(core.List<api.GoogleCloudDialogflowV2beta1IntentMessage> o) {
+checkUnnamed4322(core.List<api.GoogleCloudDialogflowV2beta1IntentMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1IntentMessage(o[0]);
   checkGoogleCloudDialogflowV2beta1IntentMessage(o[1]);
 }
 
-buildUnnamed4413() {
+buildUnnamed4323() {
   var o = new core.List<api.GoogleCloudDialogflowV2beta1Context>();
   o.add(buildGoogleCloudDialogflowV2beta1Context());
   o.add(buildGoogleCloudDialogflowV2beta1Context());
   return o;
 }
 
-checkUnnamed4413(core.List<api.GoogleCloudDialogflowV2beta1Context> o) {
+checkUnnamed4323(core.List<api.GoogleCloudDialogflowV2beta1Context> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudDialogflowV2beta1Context(o[0]);
   checkGoogleCloudDialogflowV2beta1Context(o[1]);
 }
 
-buildUnnamed4414() {
+buildUnnamed4324() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3904,7 +3904,7 @@
   return o;
 }
 
-checkUnnamed4414(core.Map<core.String, core.Object> o) {
+checkUnnamed4324(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted33 = (o["x"]) as core.Map;
   unittest.expect(casted33, unittest.hasLength(3));
@@ -3924,10 +3924,10 @@
   buildCounterGoogleCloudDialogflowV2beta1WebhookResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1WebhookResponse < 3) {
     o.followupEventInput = buildGoogleCloudDialogflowV2beta1EventInput();
-    o.fulfillmentMessages = buildUnnamed4412();
+    o.fulfillmentMessages = buildUnnamed4322();
     o.fulfillmentText = "foo";
-    o.outputContexts = buildUnnamed4413();
-    o.payload = buildUnnamed4414();
+    o.outputContexts = buildUnnamed4323();
+    o.payload = buildUnnamed4324();
     o.source = "foo";
   }
   buildCounterGoogleCloudDialogflowV2beta1WebhookResponse--;
@@ -3939,16 +3939,16 @@
   buildCounterGoogleCloudDialogflowV2beta1WebhookResponse++;
   if (buildCounterGoogleCloudDialogflowV2beta1WebhookResponse < 3) {
     checkGoogleCloudDialogflowV2beta1EventInput(o.followupEventInput);
-    checkUnnamed4412(o.fulfillmentMessages);
+    checkUnnamed4322(o.fulfillmentMessages);
     unittest.expect(o.fulfillmentText, unittest.equals('foo'));
-    checkUnnamed4413(o.outputContexts);
-    checkUnnamed4414(o.payload);
+    checkUnnamed4323(o.outputContexts);
+    checkUnnamed4324(o.payload);
     unittest.expect(o.source, unittest.equals('foo'));
   }
   buildCounterGoogleCloudDialogflowV2beta1WebhookResponse--;
 }
 
-buildUnnamed4415() {
+buildUnnamed4325() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3963,7 +3963,7 @@
   return o;
 }
 
-checkUnnamed4415(core.Map<core.String, core.Object> o) {
+checkUnnamed4325(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted35 = (o["x"]) as core.Map;
   unittest.expect(casted35, unittest.hasLength(3));
@@ -3977,7 +3977,7 @@
   unittest.expect(casted36["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4416() {
+buildUnnamed4326() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3992,7 +3992,7 @@
   return o;
 }
 
-checkUnnamed4416(core.Map<core.String, core.Object> o) {
+checkUnnamed4326(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted37 = (o["x"]) as core.Map;
   unittest.expect(casted37, unittest.hasLength(3));
@@ -4013,9 +4013,9 @@
   if (buildCounterGoogleLongrunningOperation < 3) {
     o.done = true;
     o.error = buildGoogleRpcStatus();
-    o.metadata = buildUnnamed4415();
+    o.metadata = buildUnnamed4325();
     o.name = "foo";
-    o.response = buildUnnamed4416();
+    o.response = buildUnnamed4326();
   }
   buildCounterGoogleLongrunningOperation--;
   return o;
@@ -4026,9 +4026,9 @@
   if (buildCounterGoogleLongrunningOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkGoogleRpcStatus(o.error);
-    checkUnnamed4415(o.metadata);
+    checkUnnamed4325(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4416(o.response);
+    checkUnnamed4326(o.response);
   }
   buildCounterGoogleLongrunningOperation--;
 }
@@ -4048,7 +4048,7 @@
   buildCounterGoogleProtobufEmpty--;
 }
 
-buildUnnamed4417() {
+buildUnnamed4327() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -4063,7 +4063,7 @@
   return o;
 }
 
-checkUnnamed4417(core.Map<core.String, core.Object> o) {
+checkUnnamed4327(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted39 = (o["x"]) as core.Map;
   unittest.expect(casted39, unittest.hasLength(3));
@@ -4077,17 +4077,17 @@
   unittest.expect(casted40["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4418() {
+buildUnnamed4328() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4417());
-  o.add(buildUnnamed4417());
+  o.add(buildUnnamed4327());
+  o.add(buildUnnamed4327());
   return o;
 }
 
-checkUnnamed4418(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4328(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4417(o[0]);
-  checkUnnamed4417(o[1]);
+  checkUnnamed4327(o[0]);
+  checkUnnamed4327(o[1]);
 }
 
 core.int buildCounterGoogleRpcStatus = 0;
@@ -4096,7 +4096,7 @@
   buildCounterGoogleRpcStatus++;
   if (buildCounterGoogleRpcStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed4418();
+    o.details = buildUnnamed4328();
     o.message = "foo";
   }
   buildCounterGoogleRpcStatus--;
@@ -4107,7 +4107,7 @@
   buildCounterGoogleRpcStatus++;
   if (buildCounterGoogleRpcStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed4418(o.details);
+    checkUnnamed4328(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterGoogleRpcStatus--;
@@ -5193,8 +5193,9 @@
             convert.JSON.encode(buildGoogleCloudDialogflowV2beta1Agent());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getAgent(arg_parent, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GoogleCloudDialogflowV2beta1Agent response) {
+      res
+          .getAgent(arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1Agent(response);
       })));
     });
@@ -5252,8 +5253,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.export(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .export(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -5309,8 +5311,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.import(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .import(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -5366,8 +5369,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.restore(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .restore(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -5429,8 +5433,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleCloudDialogflowV2beta1SearchAgentsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1SearchAgentsResponse(response);
       })));
     });
@@ -5486,8 +5489,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.train(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .train(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -5546,8 +5550,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchDelete(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .batchDelete(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -5604,8 +5609,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchUpdate(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .batchUpdate(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -5666,8 +5672,7 @@
       res
           .create(arg_request, arg_parent,
               languageCode: arg_languageCode, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleCloudDialogflowV2beta1EntityType response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1EntityType(response);
       })));
     });
@@ -5719,7 +5724,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -5775,8 +5780,7 @@
       }), true);
       res
           .get(arg_name, languageCode: arg_languageCode, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleCloudDialogflowV2beta1EntityType response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1EntityType(response);
       })));
     });
@@ -5842,9 +5846,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleCloudDialogflowV2beta1ListEntityTypesResponse
-                  response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1ListEntityTypesResponse(response);
       })));
     });
@@ -5910,8 +5912,7 @@
               languageCode: arg_languageCode,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleCloudDialogflowV2beta1EntityType response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1EntityType(response);
       })));
     });
@@ -5970,8 +5971,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchCreate(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .batchCreate(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -6028,8 +6030,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchDelete(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .batchDelete(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -6086,8 +6089,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchUpdate(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .batchUpdate(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -6146,8 +6150,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchDelete(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .batchDelete(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -6204,8 +6209,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchUpdate(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .batchUpdate(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -6271,8 +6277,7 @@
               languageCode: arg_languageCode,
               intentView: arg_intentView,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.GoogleCloudDialogflowV2beta1Intent response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1Intent(response);
       })));
     });
@@ -6324,7 +6329,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -6386,8 +6391,7 @@
               intentView: arg_intentView,
               languageCode: arg_languageCode,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.GoogleCloudDialogflowV2beta1Intent response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1Intent(response);
       })));
     });
@@ -6457,8 +6461,7 @@
               intentView: arg_intentView,
               languageCode: arg_languageCode,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleCloudDialogflowV2beta1ListIntentsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1ListIntentsResponse(response);
       })));
     });
@@ -6528,8 +6531,7 @@
               languageCode: arg_languageCode,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.GoogleCloudDialogflowV2beta1Intent response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1Intent(response);
       })));
     });
@@ -6583,7 +6585,7 @@
       }), true);
       res
           .deleteContexts(arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -6640,9 +6642,9 @@
             .encode(buildGoogleCloudDialogflowV2beta1DetectIntentResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.detectIntent(arg_request, arg_session, $fields: arg_$fields).then(
-          unittest.expectAsync1(
-              ((api.GoogleCloudDialogflowV2beta1DetectIntentResponse response) {
+      res
+          .detectIntent(arg_request, arg_session, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1DetectIntentResponse(response);
       })));
     });
@@ -6699,8 +6701,9 @@
             convert.JSON.encode(buildGoogleCloudDialogflowV2beta1Context());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, arg_parent, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GoogleCloudDialogflowV2beta1Context response) {
+      res
+          .create(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1Context(response);
       })));
     });
@@ -6752,7 +6755,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -6803,8 +6806,9 @@
             convert.JSON.encode(buildGoogleCloudDialogflowV2beta1Context());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GoogleCloudDialogflowV2beta1Context response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1Context(response);
       })));
     });
@@ -6866,8 +6870,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleCloudDialogflowV2beta1ListContextsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1ListContextsResponse(response);
       })));
     });
@@ -6928,8 +6931,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleCloudDialogflowV2beta1Context response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1Context(response);
       })));
     });
@@ -6988,9 +6990,9 @@
             .encode(buildGoogleCloudDialogflowV2beta1SessionEntityType());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, arg_parent, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.GoogleCloudDialogflowV2beta1SessionEntityType response) {
+      res
+          .create(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1SessionEntityType(response);
       })));
     });
@@ -7042,7 +7044,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -7093,8 +7095,9 @@
             .encode(buildGoogleCloudDialogflowV2beta1SessionEntityType());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(unittest.expectAsync1(
-          ((api.GoogleCloudDialogflowV2beta1SessionEntityType response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1SessionEntityType(response);
       })));
     });
@@ -7156,9 +7159,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleCloudDialogflowV2beta1ListSessionEntityTypesResponse
-                  response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1ListSessionEntityTypesResponse(
             response);
       })));
@@ -7222,8 +7223,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleCloudDialogflowV2beta1SessionEntityType response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleCloudDialogflowV2beta1SessionEntityType(response);
       })));
     });
@@ -7275,8 +7275,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/dlp/v2beta1_test.dart b/generated/googleapis_beta/test/dlp/v2beta1_test.dart
index 265745b..9290f98 100644
--- a/generated/googleapis_beta/test/dlp/v2beta1_test.dart
+++ b/generated/googleapis_beta/test/dlp/v2beta1_test.dart
@@ -66,14 +66,14 @@
   buildCounterGoogleLongrunningCancelOperationRequest--;
 }
 
-buildUnnamed4454() {
+buildUnnamed3822() {
   var o = new core.List<api.GoogleLongrunningOperation>();
   o.add(buildGoogleLongrunningOperation());
   o.add(buildGoogleLongrunningOperation());
   return o;
 }
 
-checkUnnamed4454(core.List<api.GoogleLongrunningOperation> o) {
+checkUnnamed3822(core.List<api.GoogleLongrunningOperation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleLongrunningOperation(o[0]);
   checkGoogleLongrunningOperation(o[1]);
@@ -85,7 +85,7 @@
   buildCounterGoogleLongrunningListOperationsResponse++;
   if (buildCounterGoogleLongrunningListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed4454();
+    o.operations = buildUnnamed3822();
   }
   buildCounterGoogleLongrunningListOperationsResponse--;
   return o;
@@ -96,12 +96,12 @@
   buildCounterGoogleLongrunningListOperationsResponse++;
   if (buildCounterGoogleLongrunningListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4454(o.operations);
+    checkUnnamed3822(o.operations);
   }
   buildCounterGoogleLongrunningListOperationsResponse--;
 }
 
-buildUnnamed4455() {
+buildUnnamed3823() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -116,7 +116,7 @@
   return o;
 }
 
-checkUnnamed4455(core.Map<core.String, core.Object> o) {
+checkUnnamed3823(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -130,7 +130,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4456() {
+buildUnnamed3824() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -145,7 +145,7 @@
   return o;
 }
 
-checkUnnamed4456(core.Map<core.String, core.Object> o) {
+checkUnnamed3824(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -166,9 +166,9 @@
   if (buildCounterGoogleLongrunningOperation < 3) {
     o.done = true;
     o.error = buildGoogleRpcStatus();
-    o.metadata = buildUnnamed4455();
+    o.metadata = buildUnnamed3823();
     o.name = "foo";
-    o.response = buildUnnamed4456();
+    o.response = buildUnnamed3824();
   }
   buildCounterGoogleLongrunningOperation--;
   return o;
@@ -179,9 +179,9 @@
   if (buildCounterGoogleLongrunningOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkGoogleRpcStatus(o.error);
-    checkUnnamed4455(o.metadata);
+    checkUnnamed3823(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4456(o.response);
+    checkUnnamed3824(o.response);
   }
   buildCounterGoogleLongrunningOperation--;
 }
@@ -208,14 +208,14 @@
   buildCounterGooglePrivacyDlpV2beta1AnalyzeDataSourceRiskRequest--;
 }
 
-buildUnnamed4457() {
+buildUnnamed3825() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1QuasiIdField>();
   o.add(buildGooglePrivacyDlpV2beta1QuasiIdField());
   o.add(buildGooglePrivacyDlpV2beta1QuasiIdField());
   return o;
 }
 
-checkUnnamed4457(core.List<api.GooglePrivacyDlpV2beta1QuasiIdField> o) {
+checkUnnamed3825(core.List<api.GooglePrivacyDlpV2beta1QuasiIdField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1QuasiIdField(o[0]);
   checkGooglePrivacyDlpV2beta1QuasiIdField(o[1]);
@@ -226,7 +226,7 @@
   var o = new api.GooglePrivacyDlpV2beta1AuxiliaryTable();
   buildCounterGooglePrivacyDlpV2beta1AuxiliaryTable++;
   if (buildCounterGooglePrivacyDlpV2beta1AuxiliaryTable < 3) {
-    o.quasiIds = buildUnnamed4457();
+    o.quasiIds = buildUnnamed3825();
     o.relativeFrequency = buildGooglePrivacyDlpV2beta1FieldId();
     o.table = buildGooglePrivacyDlpV2beta1BigQueryTable();
   }
@@ -238,21 +238,21 @@
     api.GooglePrivacyDlpV2beta1AuxiliaryTable o) {
   buildCounterGooglePrivacyDlpV2beta1AuxiliaryTable++;
   if (buildCounterGooglePrivacyDlpV2beta1AuxiliaryTable < 3) {
-    checkUnnamed4457(o.quasiIds);
+    checkUnnamed3825(o.quasiIds);
     checkGooglePrivacyDlpV2beta1FieldId(o.relativeFrequency);
     checkGooglePrivacyDlpV2beta1BigQueryTable(o.table);
   }
   buildCounterGooglePrivacyDlpV2beta1AuxiliaryTable--;
 }
 
-buildUnnamed4458() {
+buildUnnamed3826() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1FieldId>();
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   return o;
 }
 
-checkUnnamed4458(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
+checkUnnamed3826(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1FieldId(o[0]);
   checkGooglePrivacyDlpV2beta1FieldId(o[1]);
@@ -263,7 +263,7 @@
   var o = new api.GooglePrivacyDlpV2beta1BigQueryOptions();
   buildCounterGooglePrivacyDlpV2beta1BigQueryOptions++;
   if (buildCounterGooglePrivacyDlpV2beta1BigQueryOptions < 3) {
-    o.identifyingFields = buildUnnamed4458();
+    o.identifyingFields = buildUnnamed3826();
     o.tableReference = buildGooglePrivacyDlpV2beta1BigQueryTable();
   }
   buildCounterGooglePrivacyDlpV2beta1BigQueryOptions--;
@@ -274,7 +274,7 @@
     api.GooglePrivacyDlpV2beta1BigQueryOptions o) {
   buildCounterGooglePrivacyDlpV2beta1BigQueryOptions++;
   if (buildCounterGooglePrivacyDlpV2beta1BigQueryOptions < 3) {
-    checkUnnamed4458(o.identifyingFields);
+    checkUnnamed3826(o.identifyingFields);
     checkGooglePrivacyDlpV2beta1BigQueryTable(o.tableReference);
   }
   buildCounterGooglePrivacyDlpV2beta1BigQueryOptions--;
@@ -327,14 +327,14 @@
   buildCounterGooglePrivacyDlpV2beta1Bucket--;
 }
 
-buildUnnamed4459() {
+buildUnnamed3827() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Bucket>();
   o.add(buildGooglePrivacyDlpV2beta1Bucket());
   o.add(buildGooglePrivacyDlpV2beta1Bucket());
   return o;
 }
 
-checkUnnamed4459(core.List<api.GooglePrivacyDlpV2beta1Bucket> o) {
+checkUnnamed3827(core.List<api.GooglePrivacyDlpV2beta1Bucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Bucket(o[0]);
   checkGooglePrivacyDlpV2beta1Bucket(o[1]);
@@ -345,7 +345,7 @@
   var o = new api.GooglePrivacyDlpV2beta1BucketingConfig();
   buildCounterGooglePrivacyDlpV2beta1BucketingConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1BucketingConfig < 3) {
-    o.buckets = buildUnnamed4459();
+    o.buckets = buildUnnamed3827();
   }
   buildCounterGooglePrivacyDlpV2beta1BucketingConfig--;
   return o;
@@ -355,7 +355,7 @@
     api.GooglePrivacyDlpV2beta1BucketingConfig o) {
   buildCounterGooglePrivacyDlpV2beta1BucketingConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1BucketingConfig < 3) {
-    checkUnnamed4459(o.buckets);
+    checkUnnamed3827(o.buckets);
   }
   buildCounterGooglePrivacyDlpV2beta1BucketingConfig--;
 }
@@ -380,14 +380,14 @@
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsConfig--;
 }
 
-buildUnnamed4460() {
+buildUnnamed3828() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1ValueFrequency>();
   o.add(buildGooglePrivacyDlpV2beta1ValueFrequency());
   o.add(buildGooglePrivacyDlpV2beta1ValueFrequency());
   return o;
 }
 
-checkUnnamed4460(core.List<api.GooglePrivacyDlpV2beta1ValueFrequency> o) {
+checkUnnamed3828(core.List<api.GooglePrivacyDlpV2beta1ValueFrequency> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1ValueFrequency(o[0]);
   checkGooglePrivacyDlpV2beta1ValueFrequency(o[1]);
@@ -399,7 +399,7 @@
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket < 3) {
     o.bucketSize = "foo";
-    o.bucketValues = buildUnnamed4460();
+    o.bucketValues = buildUnnamed3828();
     o.valueFrequencyLowerBound = "foo";
     o.valueFrequencyUpperBound = "foo";
   }
@@ -412,14 +412,14 @@
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket < 3) {
     unittest.expect(o.bucketSize, unittest.equals('foo'));
-    checkUnnamed4460(o.bucketValues);
+    checkUnnamed3828(o.bucketValues);
     unittest.expect(o.valueFrequencyLowerBound, unittest.equals('foo'));
     unittest.expect(o.valueFrequencyUpperBound, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket--;
 }
 
-buildUnnamed4461() {
+buildUnnamed3829() {
   var o = new core
       .List<api.GooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket>();
   o.add(buildGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket());
@@ -427,7 +427,7 @@
   return o;
 }
 
-checkUnnamed4461(
+checkUnnamed3829(
     core.List<api.GooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket(o[0]);
@@ -439,7 +439,7 @@
   var o = new api.GooglePrivacyDlpV2beta1CategoricalStatsResult();
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsResult++;
   if (buildCounterGooglePrivacyDlpV2beta1CategoricalStatsResult < 3) {
-    o.valueFrequencyHistogramBuckets = buildUnnamed4461();
+    o.valueFrequencyHistogramBuckets = buildUnnamed3829();
   }
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsResult--;
   return o;
@@ -449,7 +449,7 @@
     api.GooglePrivacyDlpV2beta1CategoricalStatsResult o) {
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsResult++;
   if (buildCounterGooglePrivacyDlpV2beta1CategoricalStatsResult < 3) {
-    checkUnnamed4461(o.valueFrequencyHistogramBuckets);
+    checkUnnamed3829(o.valueFrequencyHistogramBuckets);
   }
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsResult--;
 }
@@ -476,14 +476,14 @@
   buildCounterGooglePrivacyDlpV2beta1CategoryDescription--;
 }
 
-buildUnnamed4462() {
+buildUnnamed3830() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1CharsToIgnore>();
   o.add(buildGooglePrivacyDlpV2beta1CharsToIgnore());
   o.add(buildGooglePrivacyDlpV2beta1CharsToIgnore());
   return o;
 }
 
-checkUnnamed4462(core.List<api.GooglePrivacyDlpV2beta1CharsToIgnore> o) {
+checkUnnamed3830(core.List<api.GooglePrivacyDlpV2beta1CharsToIgnore> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1CharsToIgnore(o[0]);
   checkGooglePrivacyDlpV2beta1CharsToIgnore(o[1]);
@@ -494,7 +494,7 @@
   var o = new api.GooglePrivacyDlpV2beta1CharacterMaskConfig();
   buildCounterGooglePrivacyDlpV2beta1CharacterMaskConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1CharacterMaskConfig < 3) {
-    o.charactersToIgnore = buildUnnamed4462();
+    o.charactersToIgnore = buildUnnamed3830();
     o.maskingCharacter = "foo";
     o.numberToMask = 42;
     o.reverseOrder = true;
@@ -507,7 +507,7 @@
     api.GooglePrivacyDlpV2beta1CharacterMaskConfig o) {
   buildCounterGooglePrivacyDlpV2beta1CharacterMaskConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1CharacterMaskConfig < 3) {
-    checkUnnamed4462(o.charactersToIgnore);
+    checkUnnamed3830(o.charactersToIgnore);
     unittest.expect(o.maskingCharacter, unittest.equals('foo'));
     unittest.expect(o.numberToMask, unittest.equals(42));
     unittest.expect(o.reverseOrder, unittest.isTrue);
@@ -645,14 +645,14 @@
   buildCounterGooglePrivacyDlpV2beta1Condition--;
 }
 
-buildUnnamed4463() {
+buildUnnamed3831() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Condition>();
   o.add(buildGooglePrivacyDlpV2beta1Condition());
   o.add(buildGooglePrivacyDlpV2beta1Condition());
   return o;
 }
 
-checkUnnamed4463(core.List<api.GooglePrivacyDlpV2beta1Condition> o) {
+checkUnnamed3831(core.List<api.GooglePrivacyDlpV2beta1Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Condition(o[0]);
   checkGooglePrivacyDlpV2beta1Condition(o[1]);
@@ -663,7 +663,7 @@
   var o = new api.GooglePrivacyDlpV2beta1Conditions();
   buildCounterGooglePrivacyDlpV2beta1Conditions++;
   if (buildCounterGooglePrivacyDlpV2beta1Conditions < 3) {
-    o.conditions = buildUnnamed4463();
+    o.conditions = buildUnnamed3831();
   }
   buildCounterGooglePrivacyDlpV2beta1Conditions--;
   return o;
@@ -673,7 +673,7 @@
     api.GooglePrivacyDlpV2beta1Conditions o) {
   buildCounterGooglePrivacyDlpV2beta1Conditions++;
   if (buildCounterGooglePrivacyDlpV2beta1Conditions < 3) {
-    checkUnnamed4463(o.conditions);
+    checkUnnamed3831(o.conditions);
   }
   buildCounterGooglePrivacyDlpV2beta1Conditions--;
 }
@@ -847,14 +847,14 @@
   buildCounterGooglePrivacyDlpV2beta1DatastoreKey--;
 }
 
-buildUnnamed4464() {
+buildUnnamed3832() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Projection>();
   o.add(buildGooglePrivacyDlpV2beta1Projection());
   o.add(buildGooglePrivacyDlpV2beta1Projection());
   return o;
 }
 
-checkUnnamed4464(core.List<api.GooglePrivacyDlpV2beta1Projection> o) {
+checkUnnamed3832(core.List<api.GooglePrivacyDlpV2beta1Projection> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Projection(o[0]);
   checkGooglePrivacyDlpV2beta1Projection(o[1]);
@@ -867,7 +867,7 @@
   if (buildCounterGooglePrivacyDlpV2beta1DatastoreOptions < 3) {
     o.kind = buildGooglePrivacyDlpV2beta1KindExpression();
     o.partitionId = buildGooglePrivacyDlpV2beta1PartitionId();
-    o.projection = buildUnnamed4464();
+    o.projection = buildUnnamed3832();
   }
   buildCounterGooglePrivacyDlpV2beta1DatastoreOptions--;
   return o;
@@ -879,19 +879,19 @@
   if (buildCounterGooglePrivacyDlpV2beta1DatastoreOptions < 3) {
     checkGooglePrivacyDlpV2beta1KindExpression(o.kind);
     checkGooglePrivacyDlpV2beta1PartitionId(o.partitionId);
-    checkUnnamed4464(o.projection);
+    checkUnnamed3832(o.projection);
   }
   buildCounterGooglePrivacyDlpV2beta1DatastoreOptions--;
 }
 
-buildUnnamed4465() {
+buildUnnamed3833() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1TransformationSummary>();
   o.add(buildGooglePrivacyDlpV2beta1TransformationSummary());
   o.add(buildGooglePrivacyDlpV2beta1TransformationSummary());
   return o;
 }
 
-checkUnnamed4465(
+checkUnnamed3833(
     core.List<api.GooglePrivacyDlpV2beta1TransformationSummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1TransformationSummary(o[0]);
@@ -903,7 +903,7 @@
   var o = new api.GooglePrivacyDlpV2beta1DeidentificationSummary();
   buildCounterGooglePrivacyDlpV2beta1DeidentificationSummary++;
   if (buildCounterGooglePrivacyDlpV2beta1DeidentificationSummary < 3) {
-    o.transformationSummaries = buildUnnamed4465();
+    o.transformationSummaries = buildUnnamed3833();
     o.transformedBytes = "foo";
   }
   buildCounterGooglePrivacyDlpV2beta1DeidentificationSummary--;
@@ -914,7 +914,7 @@
     api.GooglePrivacyDlpV2beta1DeidentificationSummary o) {
   buildCounterGooglePrivacyDlpV2beta1DeidentificationSummary++;
   if (buildCounterGooglePrivacyDlpV2beta1DeidentificationSummary < 3) {
-    checkUnnamed4465(o.transformationSummaries);
+    checkUnnamed3833(o.transformationSummaries);
     unittest.expect(o.transformedBytes, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta1DeidentificationSummary--;
@@ -945,14 +945,14 @@
   buildCounterGooglePrivacyDlpV2beta1DeidentifyConfig--;
 }
 
-buildUnnamed4466() {
+buildUnnamed3834() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1ContentItem>();
   o.add(buildGooglePrivacyDlpV2beta1ContentItem());
   o.add(buildGooglePrivacyDlpV2beta1ContentItem());
   return o;
 }
 
-checkUnnamed4466(core.List<api.GooglePrivacyDlpV2beta1ContentItem> o) {
+checkUnnamed3834(core.List<api.GooglePrivacyDlpV2beta1ContentItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1ContentItem(o[0]);
   checkGooglePrivacyDlpV2beta1ContentItem(o[1]);
@@ -965,7 +965,7 @@
   if (buildCounterGooglePrivacyDlpV2beta1DeidentifyContentRequest < 3) {
     o.deidentifyConfig = buildGooglePrivacyDlpV2beta1DeidentifyConfig();
     o.inspectConfig = buildGooglePrivacyDlpV2beta1InspectConfig();
-    o.items = buildUnnamed4466();
+    o.items = buildUnnamed3834();
   }
   buildCounterGooglePrivacyDlpV2beta1DeidentifyContentRequest--;
   return o;
@@ -977,32 +977,32 @@
   if (buildCounterGooglePrivacyDlpV2beta1DeidentifyContentRequest < 3) {
     checkGooglePrivacyDlpV2beta1DeidentifyConfig(o.deidentifyConfig);
     checkGooglePrivacyDlpV2beta1InspectConfig(o.inspectConfig);
-    checkUnnamed4466(o.items);
+    checkUnnamed3834(o.items);
   }
   buildCounterGooglePrivacyDlpV2beta1DeidentifyContentRequest--;
 }
 
-buildUnnamed4467() {
+buildUnnamed3835() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1ContentItem>();
   o.add(buildGooglePrivacyDlpV2beta1ContentItem());
   o.add(buildGooglePrivacyDlpV2beta1ContentItem());
   return o;
 }
 
-checkUnnamed4467(core.List<api.GooglePrivacyDlpV2beta1ContentItem> o) {
+checkUnnamed3835(core.List<api.GooglePrivacyDlpV2beta1ContentItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1ContentItem(o[0]);
   checkGooglePrivacyDlpV2beta1ContentItem(o[1]);
 }
 
-buildUnnamed4468() {
+buildUnnamed3836() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1DeidentificationSummary>();
   o.add(buildGooglePrivacyDlpV2beta1DeidentificationSummary());
   o.add(buildGooglePrivacyDlpV2beta1DeidentificationSummary());
   return o;
 }
 
-checkUnnamed4468(
+checkUnnamed3836(
     core.List<api.GooglePrivacyDlpV2beta1DeidentificationSummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1DeidentificationSummary(o[0]);
@@ -1014,8 +1014,8 @@
   var o = new api.GooglePrivacyDlpV2beta1DeidentifyContentResponse();
   buildCounterGooglePrivacyDlpV2beta1DeidentifyContentResponse++;
   if (buildCounterGooglePrivacyDlpV2beta1DeidentifyContentResponse < 3) {
-    o.items = buildUnnamed4467();
-    o.summaries = buildUnnamed4468();
+    o.items = buildUnnamed3835();
+    o.summaries = buildUnnamed3836();
   }
   buildCounterGooglePrivacyDlpV2beta1DeidentifyContentResponse--;
   return o;
@@ -1025,8 +1025,8 @@
     api.GooglePrivacyDlpV2beta1DeidentifyContentResponse o) {
   buildCounterGooglePrivacyDlpV2beta1DeidentifyContentResponse++;
   if (buildCounterGooglePrivacyDlpV2beta1DeidentifyContentResponse < 3) {
-    checkUnnamed4467(o.items);
-    checkUnnamed4468(o.summaries);
+    checkUnnamed3835(o.items);
+    checkUnnamed3836(o.summaries);
   }
   buildCounterGooglePrivacyDlpV2beta1DeidentifyContentResponse--;
 }
@@ -1111,14 +1111,14 @@
   buildCounterGooglePrivacyDlpV2beta1FieldId--;
 }
 
-buildUnnamed4469() {
+buildUnnamed3837() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1FieldId>();
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   return o;
 }
 
-checkUnnamed4469(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
+checkUnnamed3837(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1FieldId(o[0]);
   checkGooglePrivacyDlpV2beta1FieldId(o[1]);
@@ -1130,7 +1130,7 @@
   buildCounterGooglePrivacyDlpV2beta1FieldTransformation++;
   if (buildCounterGooglePrivacyDlpV2beta1FieldTransformation < 3) {
     o.condition = buildGooglePrivacyDlpV2beta1RecordCondition();
-    o.fields = buildUnnamed4469();
+    o.fields = buildUnnamed3837();
     o.infoTypeTransformations =
         buildGooglePrivacyDlpV2beta1InfoTypeTransformations();
     o.primitiveTransformation =
@@ -1145,7 +1145,7 @@
   buildCounterGooglePrivacyDlpV2beta1FieldTransformation++;
   if (buildCounterGooglePrivacyDlpV2beta1FieldTransformation < 3) {
     checkGooglePrivacyDlpV2beta1RecordCondition(o.condition);
-    checkUnnamed4469(o.fields);
+    checkUnnamed3837(o.fields);
     checkGooglePrivacyDlpV2beta1InfoTypeTransformations(
         o.infoTypeTransformations);
     checkGooglePrivacyDlpV2beta1PrimitiveTransformation(
@@ -1293,14 +1293,14 @@
   buildCounterGooglePrivacyDlpV2beta1InfoType--;
 }
 
-buildUnnamed4470() {
+buildUnnamed3838() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1CategoryDescription>();
   o.add(buildGooglePrivacyDlpV2beta1CategoryDescription());
   o.add(buildGooglePrivacyDlpV2beta1CategoryDescription());
   return o;
 }
 
-checkUnnamed4470(core.List<api.GooglePrivacyDlpV2beta1CategoryDescription> o) {
+checkUnnamed3838(core.List<api.GooglePrivacyDlpV2beta1CategoryDescription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1CategoryDescription(o[0]);
   checkGooglePrivacyDlpV2beta1CategoryDescription(o[1]);
@@ -1311,7 +1311,7 @@
   var o = new api.GooglePrivacyDlpV2beta1InfoTypeDescription();
   buildCounterGooglePrivacyDlpV2beta1InfoTypeDescription++;
   if (buildCounterGooglePrivacyDlpV2beta1InfoTypeDescription < 3) {
-    o.categories = buildUnnamed4470();
+    o.categories = buildUnnamed3838();
     o.displayName = "foo";
     o.name = "foo";
   }
@@ -1323,7 +1323,7 @@
     api.GooglePrivacyDlpV2beta1InfoTypeDescription o) {
   buildCounterGooglePrivacyDlpV2beta1InfoTypeDescription++;
   if (buildCounterGooglePrivacyDlpV2beta1InfoTypeDescription < 3) {
-    checkUnnamed4470(o.categories);
+    checkUnnamed3838(o.categories);
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
   }
@@ -1374,14 +1374,14 @@
   buildCounterGooglePrivacyDlpV2beta1InfoTypeStatistics--;
 }
 
-buildUnnamed4471() {
+buildUnnamed3839() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1InfoType>();
   o.add(buildGooglePrivacyDlpV2beta1InfoType());
   o.add(buildGooglePrivacyDlpV2beta1InfoType());
   return o;
 }
 
-checkUnnamed4471(core.List<api.GooglePrivacyDlpV2beta1InfoType> o) {
+checkUnnamed3839(core.List<api.GooglePrivacyDlpV2beta1InfoType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1InfoType(o[0]);
   checkGooglePrivacyDlpV2beta1InfoType(o[1]);
@@ -1392,7 +1392,7 @@
   var o = new api.GooglePrivacyDlpV2beta1InfoTypeTransformation();
   buildCounterGooglePrivacyDlpV2beta1InfoTypeTransformation++;
   if (buildCounterGooglePrivacyDlpV2beta1InfoTypeTransformation < 3) {
-    o.infoTypes = buildUnnamed4471();
+    o.infoTypes = buildUnnamed3839();
     o.primitiveTransformation =
         buildGooglePrivacyDlpV2beta1PrimitiveTransformation();
   }
@@ -1404,21 +1404,21 @@
     api.GooglePrivacyDlpV2beta1InfoTypeTransformation o) {
   buildCounterGooglePrivacyDlpV2beta1InfoTypeTransformation++;
   if (buildCounterGooglePrivacyDlpV2beta1InfoTypeTransformation < 3) {
-    checkUnnamed4471(o.infoTypes);
+    checkUnnamed3839(o.infoTypes);
     checkGooglePrivacyDlpV2beta1PrimitiveTransformation(
         o.primitiveTransformation);
   }
   buildCounterGooglePrivacyDlpV2beta1InfoTypeTransformation--;
 }
 
-buildUnnamed4472() {
+buildUnnamed3840() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1InfoTypeTransformation>();
   o.add(buildGooglePrivacyDlpV2beta1InfoTypeTransformation());
   o.add(buildGooglePrivacyDlpV2beta1InfoTypeTransformation());
   return o;
 }
 
-checkUnnamed4472(
+checkUnnamed3840(
     core.List<api.GooglePrivacyDlpV2beta1InfoTypeTransformation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1InfoTypeTransformation(o[0]);
@@ -1430,7 +1430,7 @@
   var o = new api.GooglePrivacyDlpV2beta1InfoTypeTransformations();
   buildCounterGooglePrivacyDlpV2beta1InfoTypeTransformations++;
   if (buildCounterGooglePrivacyDlpV2beta1InfoTypeTransformations < 3) {
-    o.transformations = buildUnnamed4472();
+    o.transformations = buildUnnamed3840();
   }
   buildCounterGooglePrivacyDlpV2beta1InfoTypeTransformations--;
   return o;
@@ -1440,45 +1440,45 @@
     api.GooglePrivacyDlpV2beta1InfoTypeTransformations o) {
   buildCounterGooglePrivacyDlpV2beta1InfoTypeTransformations++;
   if (buildCounterGooglePrivacyDlpV2beta1InfoTypeTransformations < 3) {
-    checkUnnamed4472(o.transformations);
+    checkUnnamed3840(o.transformations);
   }
   buildCounterGooglePrivacyDlpV2beta1InfoTypeTransformations--;
 }
 
-buildUnnamed4473() {
+buildUnnamed3841() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1CustomInfoType>();
   o.add(buildGooglePrivacyDlpV2beta1CustomInfoType());
   o.add(buildGooglePrivacyDlpV2beta1CustomInfoType());
   return o;
 }
 
-checkUnnamed4473(core.List<api.GooglePrivacyDlpV2beta1CustomInfoType> o) {
+checkUnnamed3841(core.List<api.GooglePrivacyDlpV2beta1CustomInfoType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1CustomInfoType(o[0]);
   checkGooglePrivacyDlpV2beta1CustomInfoType(o[1]);
 }
 
-buildUnnamed4474() {
+buildUnnamed3842() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1InfoTypeLimit>();
   o.add(buildGooglePrivacyDlpV2beta1InfoTypeLimit());
   o.add(buildGooglePrivacyDlpV2beta1InfoTypeLimit());
   return o;
 }
 
-checkUnnamed4474(core.List<api.GooglePrivacyDlpV2beta1InfoTypeLimit> o) {
+checkUnnamed3842(core.List<api.GooglePrivacyDlpV2beta1InfoTypeLimit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1InfoTypeLimit(o[0]);
   checkGooglePrivacyDlpV2beta1InfoTypeLimit(o[1]);
 }
 
-buildUnnamed4475() {
+buildUnnamed3843() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1InfoType>();
   o.add(buildGooglePrivacyDlpV2beta1InfoType());
   o.add(buildGooglePrivacyDlpV2beta1InfoType());
   return o;
 }
 
-checkUnnamed4475(core.List<api.GooglePrivacyDlpV2beta1InfoType> o) {
+checkUnnamed3843(core.List<api.GooglePrivacyDlpV2beta1InfoType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1InfoType(o[0]);
   checkGooglePrivacyDlpV2beta1InfoType(o[1]);
@@ -1489,11 +1489,11 @@
   var o = new api.GooglePrivacyDlpV2beta1InspectConfig();
   buildCounterGooglePrivacyDlpV2beta1InspectConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectConfig < 3) {
-    o.customInfoTypes = buildUnnamed4473();
+    o.customInfoTypes = buildUnnamed3841();
     o.excludeTypes = true;
     o.includeQuote = true;
-    o.infoTypeLimits = buildUnnamed4474();
-    o.infoTypes = buildUnnamed4475();
+    o.infoTypeLimits = buildUnnamed3842();
+    o.infoTypes = buildUnnamed3843();
     o.maxFindings = 42;
     o.minLikelihood = "foo";
   }
@@ -1505,25 +1505,25 @@
     api.GooglePrivacyDlpV2beta1InspectConfig o) {
   buildCounterGooglePrivacyDlpV2beta1InspectConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectConfig < 3) {
-    checkUnnamed4473(o.customInfoTypes);
+    checkUnnamed3841(o.customInfoTypes);
     unittest.expect(o.excludeTypes, unittest.isTrue);
     unittest.expect(o.includeQuote, unittest.isTrue);
-    checkUnnamed4474(o.infoTypeLimits);
-    checkUnnamed4475(o.infoTypes);
+    checkUnnamed3842(o.infoTypeLimits);
+    checkUnnamed3843(o.infoTypes);
     unittest.expect(o.maxFindings, unittest.equals(42));
     unittest.expect(o.minLikelihood, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta1InspectConfig--;
 }
 
-buildUnnamed4476() {
+buildUnnamed3844() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1ContentItem>();
   o.add(buildGooglePrivacyDlpV2beta1ContentItem());
   o.add(buildGooglePrivacyDlpV2beta1ContentItem());
   return o;
 }
 
-checkUnnamed4476(core.List<api.GooglePrivacyDlpV2beta1ContentItem> o) {
+checkUnnamed3844(core.List<api.GooglePrivacyDlpV2beta1ContentItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1ContentItem(o[0]);
   checkGooglePrivacyDlpV2beta1ContentItem(o[1]);
@@ -1535,7 +1535,7 @@
   buildCounterGooglePrivacyDlpV2beta1InspectContentRequest++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectContentRequest < 3) {
     o.inspectConfig = buildGooglePrivacyDlpV2beta1InspectConfig();
-    o.items = buildUnnamed4476();
+    o.items = buildUnnamed3844();
   }
   buildCounterGooglePrivacyDlpV2beta1InspectContentRequest--;
   return o;
@@ -1546,19 +1546,19 @@
   buildCounterGooglePrivacyDlpV2beta1InspectContentRequest++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectContentRequest < 3) {
     checkGooglePrivacyDlpV2beta1InspectConfig(o.inspectConfig);
-    checkUnnamed4476(o.items);
+    checkUnnamed3844(o.items);
   }
   buildCounterGooglePrivacyDlpV2beta1InspectContentRequest--;
 }
 
-buildUnnamed4477() {
+buildUnnamed3845() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1InspectResult>();
   o.add(buildGooglePrivacyDlpV2beta1InspectResult());
   o.add(buildGooglePrivacyDlpV2beta1InspectResult());
   return o;
 }
 
-checkUnnamed4477(core.List<api.GooglePrivacyDlpV2beta1InspectResult> o) {
+checkUnnamed3845(core.List<api.GooglePrivacyDlpV2beta1InspectResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1InspectResult(o[0]);
   checkGooglePrivacyDlpV2beta1InspectResult(o[1]);
@@ -1569,7 +1569,7 @@
   var o = new api.GooglePrivacyDlpV2beta1InspectContentResponse();
   buildCounterGooglePrivacyDlpV2beta1InspectContentResponse++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectContentResponse < 3) {
-    o.results = buildUnnamed4477();
+    o.results = buildUnnamed3845();
   }
   buildCounterGooglePrivacyDlpV2beta1InspectContentResponse--;
   return o;
@@ -1579,19 +1579,19 @@
     api.GooglePrivacyDlpV2beta1InspectContentResponse o) {
   buildCounterGooglePrivacyDlpV2beta1InspectContentResponse++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectContentResponse < 3) {
-    checkUnnamed4477(o.results);
+    checkUnnamed3845(o.results);
   }
   buildCounterGooglePrivacyDlpV2beta1InspectContentResponse--;
 }
 
-buildUnnamed4478() {
+buildUnnamed3846() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1InfoTypeStatistics>();
   o.add(buildGooglePrivacyDlpV2beta1InfoTypeStatistics());
   o.add(buildGooglePrivacyDlpV2beta1InfoTypeStatistics());
   return o;
 }
 
-checkUnnamed4478(core.List<api.GooglePrivacyDlpV2beta1InfoTypeStatistics> o) {
+checkUnnamed3846(core.List<api.GooglePrivacyDlpV2beta1InfoTypeStatistics> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1InfoTypeStatistics(o[0]);
   checkGooglePrivacyDlpV2beta1InfoTypeStatistics(o[1]);
@@ -1603,7 +1603,7 @@
   buildCounterGooglePrivacyDlpV2beta1InspectOperationMetadata++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectOperationMetadata < 3) {
     o.createTime = "foo";
-    o.infoTypeStats = buildUnnamed4478();
+    o.infoTypeStats = buildUnnamed3846();
     o.processedBytes = "foo";
     o.requestInspectConfig = buildGooglePrivacyDlpV2beta1InspectConfig();
     o.requestOutputConfig = buildGooglePrivacyDlpV2beta1OutputStorageConfig();
@@ -1619,7 +1619,7 @@
   buildCounterGooglePrivacyDlpV2beta1InspectOperationMetadata++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectOperationMetadata < 3) {
     unittest.expect(o.createTime, unittest.equals('foo'));
-    checkUnnamed4478(o.infoTypeStats);
+    checkUnnamed3846(o.infoTypeStats);
     unittest.expect(o.processedBytes, unittest.equals('foo'));
     checkGooglePrivacyDlpV2beta1InspectConfig(o.requestInspectConfig);
     checkGooglePrivacyDlpV2beta1OutputStorageConfig(o.requestOutputConfig);
@@ -1649,14 +1649,14 @@
   buildCounterGooglePrivacyDlpV2beta1InspectOperationResult--;
 }
 
-buildUnnamed4479() {
+buildUnnamed3847() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Finding>();
   o.add(buildGooglePrivacyDlpV2beta1Finding());
   o.add(buildGooglePrivacyDlpV2beta1Finding());
   return o;
 }
 
-checkUnnamed4479(core.List<api.GooglePrivacyDlpV2beta1Finding> o) {
+checkUnnamed3847(core.List<api.GooglePrivacyDlpV2beta1Finding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Finding(o[0]);
   checkGooglePrivacyDlpV2beta1Finding(o[1]);
@@ -1667,7 +1667,7 @@
   var o = new api.GooglePrivacyDlpV2beta1InspectResult();
   buildCounterGooglePrivacyDlpV2beta1InspectResult++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectResult < 3) {
-    o.findings = buildUnnamed4479();
+    o.findings = buildUnnamed3847();
     o.findingsTruncated = true;
   }
   buildCounterGooglePrivacyDlpV2beta1InspectResult--;
@@ -1678,20 +1678,20 @@
     api.GooglePrivacyDlpV2beta1InspectResult o) {
   buildCounterGooglePrivacyDlpV2beta1InspectResult++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectResult < 3) {
-    checkUnnamed4479(o.findings);
+    checkUnnamed3847(o.findings);
     unittest.expect(o.findingsTruncated, unittest.isTrue);
   }
   buildCounterGooglePrivacyDlpV2beta1InspectResult--;
 }
 
-buildUnnamed4480() {
+buildUnnamed3848() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1FieldId>();
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   return o;
 }
 
-checkUnnamed4480(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
+checkUnnamed3848(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1FieldId(o[0]);
   checkGooglePrivacyDlpV2beta1FieldId(o[1]);
@@ -1703,7 +1703,7 @@
   buildCounterGooglePrivacyDlpV2beta1KAnonymityConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityConfig < 3) {
     o.entityId = buildGooglePrivacyDlpV2beta1EntityId();
-    o.quasiIds = buildUnnamed4480();
+    o.quasiIds = buildUnnamed3848();
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityConfig--;
   return o;
@@ -1714,19 +1714,19 @@
   buildCounterGooglePrivacyDlpV2beta1KAnonymityConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityConfig < 3) {
     checkGooglePrivacyDlpV2beta1EntityId(o.entityId);
-    checkUnnamed4480(o.quasiIds);
+    checkUnnamed3848(o.quasiIds);
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityConfig--;
 }
 
-buildUnnamed4481() {
+buildUnnamed3849() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Value>();
   o.add(buildGooglePrivacyDlpV2beta1Value());
   o.add(buildGooglePrivacyDlpV2beta1Value());
   return o;
 }
 
-checkUnnamed4481(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
+checkUnnamed3849(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Value(o[0]);
   checkGooglePrivacyDlpV2beta1Value(o[1]);
@@ -1738,7 +1738,7 @@
   buildCounterGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass < 3) {
     o.equivalenceClassSize = "foo";
-    o.quasiIdsValues = buildUnnamed4481();
+    o.quasiIdsValues = buildUnnamed3849();
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass--;
   return o;
@@ -1749,12 +1749,12 @@
   buildCounterGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass < 3) {
     unittest.expect(o.equivalenceClassSize, unittest.equals('foo'));
-    checkUnnamed4481(o.quasiIdsValues);
+    checkUnnamed3849(o.quasiIdsValues);
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass--;
 }
 
-buildUnnamed4482() {
+buildUnnamed3850() {
   var o =
       new core.List<api.GooglePrivacyDlpV2beta1KAnonymityEquivalenceClass>();
   o.add(buildGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass());
@@ -1762,7 +1762,7 @@
   return o;
 }
 
-checkUnnamed4482(
+checkUnnamed3850(
     core.List<api.GooglePrivacyDlpV2beta1KAnonymityEquivalenceClass> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass(o[0]);
@@ -1775,7 +1775,7 @@
   buildCounterGooglePrivacyDlpV2beta1KAnonymityHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityHistogramBucket < 3) {
     o.bucketSize = "foo";
-    o.bucketValues = buildUnnamed4482();
+    o.bucketValues = buildUnnamed3850();
     o.equivalenceClassSizeLowerBound = "foo";
     o.equivalenceClassSizeUpperBound = "foo";
   }
@@ -1788,21 +1788,21 @@
   buildCounterGooglePrivacyDlpV2beta1KAnonymityHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityHistogramBucket < 3) {
     unittest.expect(o.bucketSize, unittest.equals('foo'));
-    checkUnnamed4482(o.bucketValues);
+    checkUnnamed3850(o.bucketValues);
     unittest.expect(o.equivalenceClassSizeLowerBound, unittest.equals('foo'));
     unittest.expect(o.equivalenceClassSizeUpperBound, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityHistogramBucket--;
 }
 
-buildUnnamed4483() {
+buildUnnamed3851() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1KAnonymityHistogramBucket>();
   o.add(buildGooglePrivacyDlpV2beta1KAnonymityHistogramBucket());
   o.add(buildGooglePrivacyDlpV2beta1KAnonymityHistogramBucket());
   return o;
 }
 
-checkUnnamed4483(
+checkUnnamed3851(
     core.List<api.GooglePrivacyDlpV2beta1KAnonymityHistogramBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1KAnonymityHistogramBucket(o[0]);
@@ -1814,7 +1814,7 @@
   var o = new api.GooglePrivacyDlpV2beta1KAnonymityResult();
   buildCounterGooglePrivacyDlpV2beta1KAnonymityResult++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityResult < 3) {
-    o.equivalenceClassHistogramBuckets = buildUnnamed4483();
+    o.equivalenceClassHistogramBuckets = buildUnnamed3851();
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityResult--;
   return o;
@@ -1824,32 +1824,32 @@
     api.GooglePrivacyDlpV2beta1KAnonymityResult o) {
   buildCounterGooglePrivacyDlpV2beta1KAnonymityResult++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityResult < 3) {
-    checkUnnamed4483(o.equivalenceClassHistogramBuckets);
+    checkUnnamed3851(o.equivalenceClassHistogramBuckets);
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityResult--;
 }
 
-buildUnnamed4484() {
+buildUnnamed3852() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1AuxiliaryTable>();
   o.add(buildGooglePrivacyDlpV2beta1AuxiliaryTable());
   o.add(buildGooglePrivacyDlpV2beta1AuxiliaryTable());
   return o;
 }
 
-checkUnnamed4484(core.List<api.GooglePrivacyDlpV2beta1AuxiliaryTable> o) {
+checkUnnamed3852(core.List<api.GooglePrivacyDlpV2beta1AuxiliaryTable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1AuxiliaryTable(o[0]);
   checkGooglePrivacyDlpV2beta1AuxiliaryTable(o[1]);
 }
 
-buildUnnamed4485() {
+buildUnnamed3853() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1TaggedField>();
   o.add(buildGooglePrivacyDlpV2beta1TaggedField());
   o.add(buildGooglePrivacyDlpV2beta1TaggedField());
   return o;
 }
 
-checkUnnamed4485(core.List<api.GooglePrivacyDlpV2beta1TaggedField> o) {
+checkUnnamed3853(core.List<api.GooglePrivacyDlpV2beta1TaggedField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1TaggedField(o[0]);
   checkGooglePrivacyDlpV2beta1TaggedField(o[1]);
@@ -1860,8 +1860,8 @@
   var o = new api.GooglePrivacyDlpV2beta1KMapEstimationConfig();
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationConfig < 3) {
-    o.auxiliaryTables = buildUnnamed4484();
-    o.quasiIds = buildUnnamed4485();
+    o.auxiliaryTables = buildUnnamed3852();
+    o.quasiIds = buildUnnamed3853();
     o.regionCode = "foo";
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationConfig--;
@@ -1872,14 +1872,14 @@
     api.GooglePrivacyDlpV2beta1KMapEstimationConfig o) {
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationConfig < 3) {
-    checkUnnamed4484(o.auxiliaryTables);
-    checkUnnamed4485(o.quasiIds);
+    checkUnnamed3852(o.auxiliaryTables);
+    checkUnnamed3853(o.quasiIds);
     unittest.expect(o.regionCode, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationConfig--;
 }
 
-buildUnnamed4486() {
+buildUnnamed3854() {
   var o =
       new core.List<api.GooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues>();
   o.add(buildGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues());
@@ -1887,7 +1887,7 @@
   return o;
 }
 
-checkUnnamed4486(
+checkUnnamed3854(
     core.List<api.GooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues(o[0]);
@@ -1900,7 +1900,7 @@
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket < 3) {
     o.bucketSize = "foo";
-    o.bucketValues = buildUnnamed4486();
+    o.bucketValues = buildUnnamed3854();
     o.maxAnonymity = "foo";
     o.minAnonymity = "foo";
   }
@@ -1913,21 +1913,21 @@
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket < 3) {
     unittest.expect(o.bucketSize, unittest.equals('foo'));
-    checkUnnamed4486(o.bucketValues);
+    checkUnnamed3854(o.bucketValues);
     unittest.expect(o.maxAnonymity, unittest.equals('foo'));
     unittest.expect(o.minAnonymity, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket--;
 }
 
-buildUnnamed4487() {
+buildUnnamed3855() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Value>();
   o.add(buildGooglePrivacyDlpV2beta1Value());
   o.add(buildGooglePrivacyDlpV2beta1Value());
   return o;
 }
 
-checkUnnamed4487(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
+checkUnnamed3855(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Value(o[0]);
   checkGooglePrivacyDlpV2beta1Value(o[1]);
@@ -1939,7 +1939,7 @@
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues < 3) {
     o.estimatedAnonymity = "foo";
-    o.quasiIdsValues = buildUnnamed4487();
+    o.quasiIdsValues = buildUnnamed3855();
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues--;
   return o;
@@ -1950,12 +1950,12 @@
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues < 3) {
     unittest.expect(o.estimatedAnonymity, unittest.equals('foo'));
-    checkUnnamed4487(o.quasiIdsValues);
+    checkUnnamed3855(o.quasiIdsValues);
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues--;
 }
 
-buildUnnamed4488() {
+buildUnnamed3856() {
   var o =
       new core.List<api.GooglePrivacyDlpV2beta1KMapEstimationHistogramBucket>();
   o.add(buildGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket());
@@ -1963,7 +1963,7 @@
   return o;
 }
 
-checkUnnamed4488(
+checkUnnamed3856(
     core.List<api.GooglePrivacyDlpV2beta1KMapEstimationHistogramBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket(o[0]);
@@ -1975,7 +1975,7 @@
   var o = new api.GooglePrivacyDlpV2beta1KMapEstimationResult();
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationResult++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationResult < 3) {
-    o.kMapEstimationHistogram = buildUnnamed4488();
+    o.kMapEstimationHistogram = buildUnnamed3856();
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationResult--;
   return o;
@@ -1985,19 +1985,19 @@
     api.GooglePrivacyDlpV2beta1KMapEstimationResult o) {
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationResult++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationResult < 3) {
-    checkUnnamed4488(o.kMapEstimationHistogram);
+    checkUnnamed3856(o.kMapEstimationHistogram);
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationResult--;
 }
 
-buildUnnamed4489() {
+buildUnnamed3857() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1PathElement>();
   o.add(buildGooglePrivacyDlpV2beta1PathElement());
   o.add(buildGooglePrivacyDlpV2beta1PathElement());
   return o;
 }
 
-checkUnnamed4489(core.List<api.GooglePrivacyDlpV2beta1PathElement> o) {
+checkUnnamed3857(core.List<api.GooglePrivacyDlpV2beta1PathElement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1PathElement(o[0]);
   checkGooglePrivacyDlpV2beta1PathElement(o[1]);
@@ -2009,7 +2009,7 @@
   buildCounterGooglePrivacyDlpV2beta1Key++;
   if (buildCounterGooglePrivacyDlpV2beta1Key < 3) {
     o.partitionId = buildGooglePrivacyDlpV2beta1PartitionId();
-    o.path = buildUnnamed4489();
+    o.path = buildUnnamed3857();
   }
   buildCounterGooglePrivacyDlpV2beta1Key--;
   return o;
@@ -2019,7 +2019,7 @@
   buildCounterGooglePrivacyDlpV2beta1Key++;
   if (buildCounterGooglePrivacyDlpV2beta1Key < 3) {
     checkGooglePrivacyDlpV2beta1PartitionId(o.partitionId);
-    checkUnnamed4489(o.path);
+    checkUnnamed3857(o.path);
   }
   buildCounterGooglePrivacyDlpV2beta1Key--;
 }
@@ -2066,14 +2066,14 @@
   buildCounterGooglePrivacyDlpV2beta1KmsWrappedCryptoKey--;
 }
 
-buildUnnamed4490() {
+buildUnnamed3858() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1FieldId>();
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   return o;
 }
 
-checkUnnamed4490(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
+checkUnnamed3858(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1FieldId(o[0]);
   checkGooglePrivacyDlpV2beta1FieldId(o[1]);
@@ -2084,7 +2084,7 @@
   var o = new api.GooglePrivacyDlpV2beta1LDiversityConfig();
   buildCounterGooglePrivacyDlpV2beta1LDiversityConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityConfig < 3) {
-    o.quasiIds = buildUnnamed4490();
+    o.quasiIds = buildUnnamed3858();
     o.sensitiveAttribute = buildGooglePrivacyDlpV2beta1FieldId();
   }
   buildCounterGooglePrivacyDlpV2beta1LDiversityConfig--;
@@ -2095,33 +2095,33 @@
     api.GooglePrivacyDlpV2beta1LDiversityConfig o) {
   buildCounterGooglePrivacyDlpV2beta1LDiversityConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityConfig < 3) {
-    checkUnnamed4490(o.quasiIds);
+    checkUnnamed3858(o.quasiIds);
     checkGooglePrivacyDlpV2beta1FieldId(o.sensitiveAttribute);
   }
   buildCounterGooglePrivacyDlpV2beta1LDiversityConfig--;
 }
 
-buildUnnamed4491() {
+buildUnnamed3859() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Value>();
   o.add(buildGooglePrivacyDlpV2beta1Value());
   o.add(buildGooglePrivacyDlpV2beta1Value());
   return o;
 }
 
-checkUnnamed4491(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
+checkUnnamed3859(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Value(o[0]);
   checkGooglePrivacyDlpV2beta1Value(o[1]);
 }
 
-buildUnnamed4492() {
+buildUnnamed3860() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1ValueFrequency>();
   o.add(buildGooglePrivacyDlpV2beta1ValueFrequency());
   o.add(buildGooglePrivacyDlpV2beta1ValueFrequency());
   return o;
 }
 
-checkUnnamed4492(core.List<api.GooglePrivacyDlpV2beta1ValueFrequency> o) {
+checkUnnamed3860(core.List<api.GooglePrivacyDlpV2beta1ValueFrequency> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1ValueFrequency(o[0]);
   checkGooglePrivacyDlpV2beta1ValueFrequency(o[1]);
@@ -2134,8 +2134,8 @@
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityEquivalenceClass < 3) {
     o.equivalenceClassSize = "foo";
     o.numDistinctSensitiveValues = "foo";
-    o.quasiIdsValues = buildUnnamed4491();
-    o.topSensitiveValues = buildUnnamed4492();
+    o.quasiIdsValues = buildUnnamed3859();
+    o.topSensitiveValues = buildUnnamed3860();
   }
   buildCounterGooglePrivacyDlpV2beta1LDiversityEquivalenceClass--;
   return o;
@@ -2147,13 +2147,13 @@
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityEquivalenceClass < 3) {
     unittest.expect(o.equivalenceClassSize, unittest.equals('foo'));
     unittest.expect(o.numDistinctSensitiveValues, unittest.equals('foo'));
-    checkUnnamed4491(o.quasiIdsValues);
-    checkUnnamed4492(o.topSensitiveValues);
+    checkUnnamed3859(o.quasiIdsValues);
+    checkUnnamed3860(o.topSensitiveValues);
   }
   buildCounterGooglePrivacyDlpV2beta1LDiversityEquivalenceClass--;
 }
 
-buildUnnamed4493() {
+buildUnnamed3861() {
   var o =
       new core.List<api.GooglePrivacyDlpV2beta1LDiversityEquivalenceClass>();
   o.add(buildGooglePrivacyDlpV2beta1LDiversityEquivalenceClass());
@@ -2161,7 +2161,7 @@
   return o;
 }
 
-checkUnnamed4493(
+checkUnnamed3861(
     core.List<api.GooglePrivacyDlpV2beta1LDiversityEquivalenceClass> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1LDiversityEquivalenceClass(o[0]);
@@ -2174,7 +2174,7 @@
   buildCounterGooglePrivacyDlpV2beta1LDiversityHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityHistogramBucket < 3) {
     o.bucketSize = "foo";
-    o.bucketValues = buildUnnamed4493();
+    o.bucketValues = buildUnnamed3861();
     o.sensitiveValueFrequencyLowerBound = "foo";
     o.sensitiveValueFrequencyUpperBound = "foo";
   }
@@ -2187,7 +2187,7 @@
   buildCounterGooglePrivacyDlpV2beta1LDiversityHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityHistogramBucket < 3) {
     unittest.expect(o.bucketSize, unittest.equals('foo'));
-    checkUnnamed4493(o.bucketValues);
+    checkUnnamed3861(o.bucketValues);
     unittest.expect(
         o.sensitiveValueFrequencyLowerBound, unittest.equals('foo'));
     unittest.expect(
@@ -2196,14 +2196,14 @@
   buildCounterGooglePrivacyDlpV2beta1LDiversityHistogramBucket--;
 }
 
-buildUnnamed4494() {
+buildUnnamed3862() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1LDiversityHistogramBucket>();
   o.add(buildGooglePrivacyDlpV2beta1LDiversityHistogramBucket());
   o.add(buildGooglePrivacyDlpV2beta1LDiversityHistogramBucket());
   return o;
 }
 
-checkUnnamed4494(
+checkUnnamed3862(
     core.List<api.GooglePrivacyDlpV2beta1LDiversityHistogramBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1LDiversityHistogramBucket(o[0]);
@@ -2215,7 +2215,7 @@
   var o = new api.GooglePrivacyDlpV2beta1LDiversityResult();
   buildCounterGooglePrivacyDlpV2beta1LDiversityResult++;
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityResult < 3) {
-    o.sensitiveValueFrequencyHistogramBuckets = buildUnnamed4494();
+    o.sensitiveValueFrequencyHistogramBuckets = buildUnnamed3862();
   }
   buildCounterGooglePrivacyDlpV2beta1LDiversityResult--;
   return o;
@@ -2225,19 +2225,19 @@
     api.GooglePrivacyDlpV2beta1LDiversityResult o) {
   buildCounterGooglePrivacyDlpV2beta1LDiversityResult++;
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityResult < 3) {
-    checkUnnamed4494(o.sensitiveValueFrequencyHistogramBuckets);
+    checkUnnamed3862(o.sensitiveValueFrequencyHistogramBuckets);
   }
   buildCounterGooglePrivacyDlpV2beta1LDiversityResult--;
 }
 
-buildUnnamed4495() {
+buildUnnamed3863() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1InfoTypeDescription>();
   o.add(buildGooglePrivacyDlpV2beta1InfoTypeDescription());
   o.add(buildGooglePrivacyDlpV2beta1InfoTypeDescription());
   return o;
 }
 
-checkUnnamed4495(core.List<api.GooglePrivacyDlpV2beta1InfoTypeDescription> o) {
+checkUnnamed3863(core.List<api.GooglePrivacyDlpV2beta1InfoTypeDescription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1InfoTypeDescription(o[0]);
   checkGooglePrivacyDlpV2beta1InfoTypeDescription(o[1]);
@@ -2248,7 +2248,7 @@
   var o = new api.GooglePrivacyDlpV2beta1ListInfoTypesResponse();
   buildCounterGooglePrivacyDlpV2beta1ListInfoTypesResponse++;
   if (buildCounterGooglePrivacyDlpV2beta1ListInfoTypesResponse < 3) {
-    o.infoTypes = buildUnnamed4495();
+    o.infoTypes = buildUnnamed3863();
   }
   buildCounterGooglePrivacyDlpV2beta1ListInfoTypesResponse--;
   return o;
@@ -2258,7 +2258,7 @@
     api.GooglePrivacyDlpV2beta1ListInfoTypesResponse o) {
   buildCounterGooglePrivacyDlpV2beta1ListInfoTypesResponse++;
   if (buildCounterGooglePrivacyDlpV2beta1ListInfoTypesResponse < 3) {
-    checkUnnamed4495(o.infoTypes);
+    checkUnnamed3863(o.infoTypes);
   }
   buildCounterGooglePrivacyDlpV2beta1ListInfoTypesResponse--;
 }
@@ -2285,14 +2285,14 @@
   buildCounterGooglePrivacyDlpV2beta1ListInspectFindingsResponse--;
 }
 
-buildUnnamed4496() {
+buildUnnamed3864() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1CategoryDescription>();
   o.add(buildGooglePrivacyDlpV2beta1CategoryDescription());
   o.add(buildGooglePrivacyDlpV2beta1CategoryDescription());
   return o;
 }
 
-checkUnnamed4496(core.List<api.GooglePrivacyDlpV2beta1CategoryDescription> o) {
+checkUnnamed3864(core.List<api.GooglePrivacyDlpV2beta1CategoryDescription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1CategoryDescription(o[0]);
   checkGooglePrivacyDlpV2beta1CategoryDescription(o[1]);
@@ -2303,7 +2303,7 @@
   var o = new api.GooglePrivacyDlpV2beta1ListRootCategoriesResponse();
   buildCounterGooglePrivacyDlpV2beta1ListRootCategoriesResponse++;
   if (buildCounterGooglePrivacyDlpV2beta1ListRootCategoriesResponse < 3) {
-    o.categories = buildUnnamed4496();
+    o.categories = buildUnnamed3864();
   }
   buildCounterGooglePrivacyDlpV2beta1ListRootCategoriesResponse--;
   return o;
@@ -2313,19 +2313,19 @@
     api.GooglePrivacyDlpV2beta1ListRootCategoriesResponse o) {
   buildCounterGooglePrivacyDlpV2beta1ListRootCategoriesResponse++;
   if (buildCounterGooglePrivacyDlpV2beta1ListRootCategoriesResponse < 3) {
-    checkUnnamed4496(o.categories);
+    checkUnnamed3864(o.categories);
   }
   buildCounterGooglePrivacyDlpV2beta1ListRootCategoriesResponse--;
 }
 
-buildUnnamed4497() {
+buildUnnamed3865() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1ImageLocation>();
   o.add(buildGooglePrivacyDlpV2beta1ImageLocation());
   o.add(buildGooglePrivacyDlpV2beta1ImageLocation());
   return o;
 }
 
-checkUnnamed4497(core.List<api.GooglePrivacyDlpV2beta1ImageLocation> o) {
+checkUnnamed3865(core.List<api.GooglePrivacyDlpV2beta1ImageLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1ImageLocation(o[0]);
   checkGooglePrivacyDlpV2beta1ImageLocation(o[1]);
@@ -2339,7 +2339,7 @@
     o.byteRange = buildGooglePrivacyDlpV2beta1Range();
     o.codepointRange = buildGooglePrivacyDlpV2beta1Range();
     o.fieldId = buildGooglePrivacyDlpV2beta1FieldId();
-    o.imageBoxes = buildUnnamed4497();
+    o.imageBoxes = buildUnnamed3865();
     o.recordKey = buildGooglePrivacyDlpV2beta1RecordKey();
     o.tableLocation = buildGooglePrivacyDlpV2beta1TableLocation();
   }
@@ -2353,7 +2353,7 @@
     checkGooglePrivacyDlpV2beta1Range(o.byteRange);
     checkGooglePrivacyDlpV2beta1Range(o.codepointRange);
     checkGooglePrivacyDlpV2beta1FieldId(o.fieldId);
-    checkUnnamed4497(o.imageBoxes);
+    checkUnnamed3865(o.imageBoxes);
     checkGooglePrivacyDlpV2beta1RecordKey(o.recordKey);
     checkGooglePrivacyDlpV2beta1TableLocation(o.tableLocation);
   }
@@ -2380,14 +2380,14 @@
   buildCounterGooglePrivacyDlpV2beta1NumericalStatsConfig--;
 }
 
-buildUnnamed4498() {
+buildUnnamed3866() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Value>();
   o.add(buildGooglePrivacyDlpV2beta1Value());
   o.add(buildGooglePrivacyDlpV2beta1Value());
   return o;
 }
 
-checkUnnamed4498(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
+checkUnnamed3866(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Value(o[0]);
   checkGooglePrivacyDlpV2beta1Value(o[1]);
@@ -2400,7 +2400,7 @@
   if (buildCounterGooglePrivacyDlpV2beta1NumericalStatsResult < 3) {
     o.maxValue = buildGooglePrivacyDlpV2beta1Value();
     o.minValue = buildGooglePrivacyDlpV2beta1Value();
-    o.quantileValues = buildUnnamed4498();
+    o.quantileValues = buildUnnamed3866();
   }
   buildCounterGooglePrivacyDlpV2beta1NumericalStatsResult--;
   return o;
@@ -2412,7 +2412,7 @@
   if (buildCounterGooglePrivacyDlpV2beta1NumericalStatsResult < 3) {
     checkGooglePrivacyDlpV2beta1Value(o.maxValue);
     checkGooglePrivacyDlpV2beta1Value(o.minValue);
-    checkUnnamed4498(o.quantileValues);
+    checkUnnamed3866(o.quantileValues);
   }
   buildCounterGooglePrivacyDlpV2beta1NumericalStatsResult--;
 }
@@ -2721,27 +2721,27 @@
   buildCounterGooglePrivacyDlpV2beta1RecordSuppression--;
 }
 
-buildUnnamed4499() {
+buildUnnamed3867() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1FieldTransformation>();
   o.add(buildGooglePrivacyDlpV2beta1FieldTransformation());
   o.add(buildGooglePrivacyDlpV2beta1FieldTransformation());
   return o;
 }
 
-checkUnnamed4499(core.List<api.GooglePrivacyDlpV2beta1FieldTransformation> o) {
+checkUnnamed3867(core.List<api.GooglePrivacyDlpV2beta1FieldTransformation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1FieldTransformation(o[0]);
   checkGooglePrivacyDlpV2beta1FieldTransformation(o[1]);
 }
 
-buildUnnamed4500() {
+buildUnnamed3868() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1RecordSuppression>();
   o.add(buildGooglePrivacyDlpV2beta1RecordSuppression());
   o.add(buildGooglePrivacyDlpV2beta1RecordSuppression());
   return o;
 }
 
-checkUnnamed4500(core.List<api.GooglePrivacyDlpV2beta1RecordSuppression> o) {
+checkUnnamed3868(core.List<api.GooglePrivacyDlpV2beta1RecordSuppression> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1RecordSuppression(o[0]);
   checkGooglePrivacyDlpV2beta1RecordSuppression(o[1]);
@@ -2752,8 +2752,8 @@
   var o = new api.GooglePrivacyDlpV2beta1RecordTransformations();
   buildCounterGooglePrivacyDlpV2beta1RecordTransformations++;
   if (buildCounterGooglePrivacyDlpV2beta1RecordTransformations < 3) {
-    o.fieldTransformations = buildUnnamed4499();
-    o.recordSuppressions = buildUnnamed4500();
+    o.fieldTransformations = buildUnnamed3867();
+    o.recordSuppressions = buildUnnamed3868();
   }
   buildCounterGooglePrivacyDlpV2beta1RecordTransformations--;
   return o;
@@ -2763,8 +2763,8 @@
     api.GooglePrivacyDlpV2beta1RecordTransformations o) {
   buildCounterGooglePrivacyDlpV2beta1RecordTransformations++;
   if (buildCounterGooglePrivacyDlpV2beta1RecordTransformations < 3) {
-    checkUnnamed4499(o.fieldTransformations);
-    checkUnnamed4500(o.recordSuppressions);
+    checkUnnamed3867(o.fieldTransformations);
+    checkUnnamed3868(o.recordSuppressions);
   }
   buildCounterGooglePrivacyDlpV2beta1RecordTransformations--;
 }
@@ -2785,40 +2785,40 @@
   buildCounterGooglePrivacyDlpV2beta1RedactConfig--;
 }
 
-buildUnnamed4501() {
+buildUnnamed3869() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1ImageRedactionConfig>();
   o.add(buildGooglePrivacyDlpV2beta1ImageRedactionConfig());
   o.add(buildGooglePrivacyDlpV2beta1ImageRedactionConfig());
   return o;
 }
 
-checkUnnamed4501(core.List<api.GooglePrivacyDlpV2beta1ImageRedactionConfig> o) {
+checkUnnamed3869(core.List<api.GooglePrivacyDlpV2beta1ImageRedactionConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1ImageRedactionConfig(o[0]);
   checkGooglePrivacyDlpV2beta1ImageRedactionConfig(o[1]);
 }
 
-buildUnnamed4502() {
+buildUnnamed3870() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1ContentItem>();
   o.add(buildGooglePrivacyDlpV2beta1ContentItem());
   o.add(buildGooglePrivacyDlpV2beta1ContentItem());
   return o;
 }
 
-checkUnnamed4502(core.List<api.GooglePrivacyDlpV2beta1ContentItem> o) {
+checkUnnamed3870(core.List<api.GooglePrivacyDlpV2beta1ContentItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1ContentItem(o[0]);
   checkGooglePrivacyDlpV2beta1ContentItem(o[1]);
 }
 
-buildUnnamed4503() {
+buildUnnamed3871() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1ReplaceConfig>();
   o.add(buildGooglePrivacyDlpV2beta1ReplaceConfig());
   o.add(buildGooglePrivacyDlpV2beta1ReplaceConfig());
   return o;
 }
 
-checkUnnamed4503(core.List<api.GooglePrivacyDlpV2beta1ReplaceConfig> o) {
+checkUnnamed3871(core.List<api.GooglePrivacyDlpV2beta1ReplaceConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1ReplaceConfig(o[0]);
   checkGooglePrivacyDlpV2beta1ReplaceConfig(o[1]);
@@ -2829,10 +2829,10 @@
   var o = new api.GooglePrivacyDlpV2beta1RedactContentRequest();
   buildCounterGooglePrivacyDlpV2beta1RedactContentRequest++;
   if (buildCounterGooglePrivacyDlpV2beta1RedactContentRequest < 3) {
-    o.imageRedactionConfigs = buildUnnamed4501();
+    o.imageRedactionConfigs = buildUnnamed3869();
     o.inspectConfig = buildGooglePrivacyDlpV2beta1InspectConfig();
-    o.items = buildUnnamed4502();
-    o.replaceConfigs = buildUnnamed4503();
+    o.items = buildUnnamed3870();
+    o.replaceConfigs = buildUnnamed3871();
   }
   buildCounterGooglePrivacyDlpV2beta1RedactContentRequest--;
   return o;
@@ -2842,22 +2842,22 @@
     api.GooglePrivacyDlpV2beta1RedactContentRequest o) {
   buildCounterGooglePrivacyDlpV2beta1RedactContentRequest++;
   if (buildCounterGooglePrivacyDlpV2beta1RedactContentRequest < 3) {
-    checkUnnamed4501(o.imageRedactionConfigs);
+    checkUnnamed3869(o.imageRedactionConfigs);
     checkGooglePrivacyDlpV2beta1InspectConfig(o.inspectConfig);
-    checkUnnamed4502(o.items);
-    checkUnnamed4503(o.replaceConfigs);
+    checkUnnamed3870(o.items);
+    checkUnnamed3871(o.replaceConfigs);
   }
   buildCounterGooglePrivacyDlpV2beta1RedactContentRequest--;
 }
 
-buildUnnamed4504() {
+buildUnnamed3872() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1ContentItem>();
   o.add(buildGooglePrivacyDlpV2beta1ContentItem());
   o.add(buildGooglePrivacyDlpV2beta1ContentItem());
   return o;
 }
 
-checkUnnamed4504(core.List<api.GooglePrivacyDlpV2beta1ContentItem> o) {
+checkUnnamed3872(core.List<api.GooglePrivacyDlpV2beta1ContentItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1ContentItem(o[0]);
   checkGooglePrivacyDlpV2beta1ContentItem(o[1]);
@@ -2868,7 +2868,7 @@
   var o = new api.GooglePrivacyDlpV2beta1RedactContentResponse();
   buildCounterGooglePrivacyDlpV2beta1RedactContentResponse++;
   if (buildCounterGooglePrivacyDlpV2beta1RedactContentResponse < 3) {
-    o.items = buildUnnamed4504();
+    o.items = buildUnnamed3872();
   }
   buildCounterGooglePrivacyDlpV2beta1RedactContentResponse--;
   return o;
@@ -2878,7 +2878,7 @@
     api.GooglePrivacyDlpV2beta1RedactContentResponse o) {
   buildCounterGooglePrivacyDlpV2beta1RedactContentResponse++;
   if (buildCounterGooglePrivacyDlpV2beta1RedactContentResponse < 3) {
-    checkUnnamed4504(o.items);
+    checkUnnamed3872(o.items);
   }
   buildCounterGooglePrivacyDlpV2beta1RedactContentResponse--;
 }
@@ -2995,14 +2995,14 @@
   buildCounterGooglePrivacyDlpV2beta1RiskAnalysisOperationResult--;
 }
 
-buildUnnamed4505() {
+buildUnnamed3873() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Value>();
   o.add(buildGooglePrivacyDlpV2beta1Value());
   o.add(buildGooglePrivacyDlpV2beta1Value());
   return o;
 }
 
-checkUnnamed4505(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
+checkUnnamed3873(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Value(o[0]);
   checkGooglePrivacyDlpV2beta1Value(o[1]);
@@ -3013,7 +3013,7 @@
   var o = new api.GooglePrivacyDlpV2beta1Row();
   buildCounterGooglePrivacyDlpV2beta1Row++;
   if (buildCounterGooglePrivacyDlpV2beta1Row < 3) {
-    o.values = buildUnnamed4505();
+    o.values = buildUnnamed3873();
   }
   buildCounterGooglePrivacyDlpV2beta1Row--;
   return o;
@@ -3022,7 +3022,7 @@
 checkGooglePrivacyDlpV2beta1Row(api.GooglePrivacyDlpV2beta1Row o) {
   buildCounterGooglePrivacyDlpV2beta1Row++;
   if (buildCounterGooglePrivacyDlpV2beta1Row < 3) {
-    checkUnnamed4505(o.values);
+    checkUnnamed3873(o.values);
   }
   buildCounterGooglePrivacyDlpV2beta1Row--;
 }
@@ -3091,27 +3091,27 @@
   buildCounterGooglePrivacyDlpV2beta1SurrogateType--;
 }
 
-buildUnnamed4506() {
+buildUnnamed3874() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1FieldId>();
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   return o;
 }
 
-checkUnnamed4506(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
+checkUnnamed3874(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1FieldId(o[0]);
   checkGooglePrivacyDlpV2beta1FieldId(o[1]);
 }
 
-buildUnnamed4507() {
+buildUnnamed3875() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Row>();
   o.add(buildGooglePrivacyDlpV2beta1Row());
   o.add(buildGooglePrivacyDlpV2beta1Row());
   return o;
 }
 
-checkUnnamed4507(core.List<api.GooglePrivacyDlpV2beta1Row> o) {
+checkUnnamed3875(core.List<api.GooglePrivacyDlpV2beta1Row> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Row(o[0]);
   checkGooglePrivacyDlpV2beta1Row(o[1]);
@@ -3122,8 +3122,8 @@
   var o = new api.GooglePrivacyDlpV2beta1Table();
   buildCounterGooglePrivacyDlpV2beta1Table++;
   if (buildCounterGooglePrivacyDlpV2beta1Table < 3) {
-    o.headers = buildUnnamed4506();
-    o.rows = buildUnnamed4507();
+    o.headers = buildUnnamed3874();
+    o.rows = buildUnnamed3875();
   }
   buildCounterGooglePrivacyDlpV2beta1Table--;
   return o;
@@ -3132,8 +3132,8 @@
 checkGooglePrivacyDlpV2beta1Table(api.GooglePrivacyDlpV2beta1Table o) {
   buildCounterGooglePrivacyDlpV2beta1Table++;
   if (buildCounterGooglePrivacyDlpV2beta1Table < 3) {
-    checkUnnamed4506(o.headers);
-    checkUnnamed4507(o.rows);
+    checkUnnamed3874(o.headers);
+    checkUnnamed3875(o.rows);
   }
   buildCounterGooglePrivacyDlpV2beta1Table--;
 }
@@ -3204,27 +3204,27 @@
   buildCounterGooglePrivacyDlpV2beta1TimePartConfig--;
 }
 
-buildUnnamed4508() {
+buildUnnamed3876() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1FieldTransformation>();
   o.add(buildGooglePrivacyDlpV2beta1FieldTransformation());
   o.add(buildGooglePrivacyDlpV2beta1FieldTransformation());
   return o;
 }
 
-checkUnnamed4508(core.List<api.GooglePrivacyDlpV2beta1FieldTransformation> o) {
+checkUnnamed3876(core.List<api.GooglePrivacyDlpV2beta1FieldTransformation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1FieldTransformation(o[0]);
   checkGooglePrivacyDlpV2beta1FieldTransformation(o[1]);
 }
 
-buildUnnamed4509() {
+buildUnnamed3877() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1SummaryResult>();
   o.add(buildGooglePrivacyDlpV2beta1SummaryResult());
   o.add(buildGooglePrivacyDlpV2beta1SummaryResult());
   return o;
 }
 
-checkUnnamed4509(core.List<api.GooglePrivacyDlpV2beta1SummaryResult> o) {
+checkUnnamed3877(core.List<api.GooglePrivacyDlpV2beta1SummaryResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1SummaryResult(o[0]);
   checkGooglePrivacyDlpV2beta1SummaryResult(o[1]);
@@ -3236,10 +3236,10 @@
   buildCounterGooglePrivacyDlpV2beta1TransformationSummary++;
   if (buildCounterGooglePrivacyDlpV2beta1TransformationSummary < 3) {
     o.field = buildGooglePrivacyDlpV2beta1FieldId();
-    o.fieldTransformations = buildUnnamed4508();
+    o.fieldTransformations = buildUnnamed3876();
     o.infoType = buildGooglePrivacyDlpV2beta1InfoType();
     o.recordSuppress = buildGooglePrivacyDlpV2beta1RecordSuppression();
-    o.results = buildUnnamed4509();
+    o.results = buildUnnamed3877();
     o.transformation = buildGooglePrivacyDlpV2beta1PrimitiveTransformation();
     o.transformedBytes = "foo";
   }
@@ -3252,10 +3252,10 @@
   buildCounterGooglePrivacyDlpV2beta1TransformationSummary++;
   if (buildCounterGooglePrivacyDlpV2beta1TransformationSummary < 3) {
     checkGooglePrivacyDlpV2beta1FieldId(o.field);
-    checkUnnamed4508(o.fieldTransformations);
+    checkUnnamed3876(o.fieldTransformations);
     checkGooglePrivacyDlpV2beta1InfoType(o.infoType);
     checkGooglePrivacyDlpV2beta1RecordSuppression(o.recordSuppress);
-    checkUnnamed4509(o.results);
+    checkUnnamed3877(o.results);
     checkGooglePrivacyDlpV2beta1PrimitiveTransformation(o.transformation);
     unittest.expect(o.transformedBytes, unittest.equals('foo'));
   }
@@ -3355,14 +3355,14 @@
   buildCounterGooglePrivacyDlpV2beta1ValueFrequency--;
 }
 
-buildUnnamed4510() {
+buildUnnamed3878() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4510(core.List<core.String> o) {
+checkUnnamed3878(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -3373,7 +3373,7 @@
   var o = new api.GooglePrivacyDlpV2beta1WordList();
   buildCounterGooglePrivacyDlpV2beta1WordList++;
   if (buildCounterGooglePrivacyDlpV2beta1WordList < 3) {
-    o.words = buildUnnamed4510();
+    o.words = buildUnnamed3878();
   }
   buildCounterGooglePrivacyDlpV2beta1WordList--;
   return o;
@@ -3382,7 +3382,7 @@
 checkGooglePrivacyDlpV2beta1WordList(api.GooglePrivacyDlpV2beta1WordList o) {
   buildCounterGooglePrivacyDlpV2beta1WordList++;
   if (buildCounterGooglePrivacyDlpV2beta1WordList < 3) {
-    checkUnnamed4510(o.words);
+    checkUnnamed3878(o.words);
   }
   buildCounterGooglePrivacyDlpV2beta1WordList--;
 }
@@ -3402,7 +3402,7 @@
   buildCounterGoogleProtobufEmpty--;
 }
 
-buildUnnamed4511() {
+buildUnnamed3879() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -3417,7 +3417,7 @@
   return o;
 }
 
-checkUnnamed4511(core.Map<core.String, core.Object> o) {
+checkUnnamed3879(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -3431,17 +3431,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4512() {
+buildUnnamed3880() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4511());
-  o.add(buildUnnamed4511());
+  o.add(buildUnnamed3879());
+  o.add(buildUnnamed3879());
   return o;
 }
 
-checkUnnamed4512(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed3880(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4511(o[0]);
-  checkUnnamed4511(o[1]);
+  checkUnnamed3879(o[0]);
+  checkUnnamed3879(o[1]);
 }
 
 core.int buildCounterGoogleRpcStatus = 0;
@@ -3450,7 +3450,7 @@
   buildCounterGoogleRpcStatus++;
   if (buildCounterGoogleRpcStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed4512();
+    o.details = buildUnnamed3880();
     o.message = "foo";
   }
   buildCounterGoogleRpcStatus--;
@@ -3461,7 +3461,7 @@
   buildCounterGoogleRpcStatus++;
   if (buildCounterGoogleRpcStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed4512(o.details);
+    checkUnnamed3880(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterGoogleRpcStatus--;
@@ -4620,9 +4620,9 @@
             .encode(buildGooglePrivacyDlpV2beta1DeidentifyContentResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.deidentify(arg_request, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.GooglePrivacyDlpV2beta1DeidentifyContentResponse response) {
+      res
+          .deidentify(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta1DeidentifyContentResponse(response);
       })));
     });
@@ -4675,8 +4675,9 @@
             .encode(buildGooglePrivacyDlpV2beta1InspectContentResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.inspect(arg_request, $fields: arg_$fields).then(unittest.expectAsync1(
-          ((api.GooglePrivacyDlpV2beta1InspectContentResponse response) {
+      res
+          .inspect(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta1InspectContentResponse(response);
       })));
     });
@@ -4729,8 +4730,9 @@
             .encode(buildGooglePrivacyDlpV2beta1RedactContentResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.redact(arg_request, $fields: arg_$fields).then(unittest.expectAsync1(
-          ((api.GooglePrivacyDlpV2beta1RedactContentResponse response) {
+      res
+          .redact(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta1RedactContentResponse(response);
       })));
     });
@@ -4785,8 +4787,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.analyze(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .analyze(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -4845,7 +4848,7 @@
       }), true);
       res
           .cancel(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -4900,8 +4903,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .create(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -4953,7 +4957,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -5003,8 +5007,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -5069,8 +5074,7 @@
               filter: arg_filter,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleLongrunningListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningListOperationsResponse(response);
       })));
     });
@@ -5137,9 +5141,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GooglePrivacyDlpV2beta1ListInspectFindingsResponse
-                  response) {
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta1ListInspectFindingsResponse(response);
       })));
     });
@@ -5198,7 +5200,7 @@
       }), true);
       res
           .cancel(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -5250,7 +5252,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -5300,8 +5302,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });
@@ -5366,8 +5369,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GoogleLongrunningListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningListOperationsResponse(response);
       })));
     });
@@ -5420,10 +5422,9 @@
             .encode(buildGooglePrivacyDlpV2beta1ListRootCategoriesResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.list(languageCode: arg_languageCode, $fields: arg_$fields).then(
-          unittest.expectAsync1(
-              ((api.GooglePrivacyDlpV2beta1ListRootCategoriesResponse
-                  response) {
+      res
+          .list(languageCode: arg_languageCode, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta1ListRootCategoriesResponse(response);
       })));
     });
@@ -5482,8 +5483,7 @@
       res
           .list(arg_category,
               languageCode: arg_languageCode, $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GooglePrivacyDlpV2beta1ListInfoTypesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta1ListInfoTypesResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/dlp/v2beta2_test.dart b/generated/googleapis_beta/test/dlp/v2beta2_test.dart
index b4aa967..890a040 100644
--- a/generated/googleapis_beta/test/dlp/v2beta2_test.dart
+++ b/generated/googleapis_beta/test/dlp/v2beta2_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3742() {
+buildUnnamed4041() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1QuasiIdField>();
   o.add(buildGooglePrivacyDlpV2beta1QuasiIdField());
   o.add(buildGooglePrivacyDlpV2beta1QuasiIdField());
   return o;
 }
 
-checkUnnamed3742(core.List<api.GooglePrivacyDlpV2beta1QuasiIdField> o) {
+checkUnnamed4041(core.List<api.GooglePrivacyDlpV2beta1QuasiIdField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1QuasiIdField(o[0]);
   checkGooglePrivacyDlpV2beta1QuasiIdField(o[1]);
@@ -68,7 +68,7 @@
   var o = new api.GooglePrivacyDlpV2beta1AuxiliaryTable();
   buildCounterGooglePrivacyDlpV2beta1AuxiliaryTable++;
   if (buildCounterGooglePrivacyDlpV2beta1AuxiliaryTable < 3) {
-    o.quasiIds = buildUnnamed3742();
+    o.quasiIds = buildUnnamed4041();
     o.relativeFrequency = buildGooglePrivacyDlpV2beta1FieldId();
     o.table = buildGooglePrivacyDlpV2beta1BigQueryTable();
   }
@@ -80,21 +80,21 @@
     api.GooglePrivacyDlpV2beta1AuxiliaryTable o) {
   buildCounterGooglePrivacyDlpV2beta1AuxiliaryTable++;
   if (buildCounterGooglePrivacyDlpV2beta1AuxiliaryTable < 3) {
-    checkUnnamed3742(o.quasiIds);
+    checkUnnamed4041(o.quasiIds);
     checkGooglePrivacyDlpV2beta1FieldId(o.relativeFrequency);
     checkGooglePrivacyDlpV2beta1BigQueryTable(o.table);
   }
   buildCounterGooglePrivacyDlpV2beta1AuxiliaryTable--;
 }
 
-buildUnnamed3743() {
+buildUnnamed4042() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1FieldId>();
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   return o;
 }
 
-checkUnnamed3743(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
+checkUnnamed4042(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1FieldId(o[0]);
   checkGooglePrivacyDlpV2beta1FieldId(o[1]);
@@ -105,7 +105,7 @@
   var o = new api.GooglePrivacyDlpV2beta1BigQueryOptions();
   buildCounterGooglePrivacyDlpV2beta1BigQueryOptions++;
   if (buildCounterGooglePrivacyDlpV2beta1BigQueryOptions < 3) {
-    o.identifyingFields = buildUnnamed3743();
+    o.identifyingFields = buildUnnamed4042();
     o.tableReference = buildGooglePrivacyDlpV2beta1BigQueryTable();
   }
   buildCounterGooglePrivacyDlpV2beta1BigQueryOptions--;
@@ -116,7 +116,7 @@
     api.GooglePrivacyDlpV2beta1BigQueryOptions o) {
   buildCounterGooglePrivacyDlpV2beta1BigQueryOptions++;
   if (buildCounterGooglePrivacyDlpV2beta1BigQueryOptions < 3) {
-    checkUnnamed3743(o.identifyingFields);
+    checkUnnamed4042(o.identifyingFields);
     checkGooglePrivacyDlpV2beta1BigQueryTable(o.tableReference);
   }
   buildCounterGooglePrivacyDlpV2beta1BigQueryOptions--;
@@ -166,14 +166,14 @@
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsConfig--;
 }
 
-buildUnnamed3744() {
+buildUnnamed4043() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1ValueFrequency>();
   o.add(buildGooglePrivacyDlpV2beta1ValueFrequency());
   o.add(buildGooglePrivacyDlpV2beta1ValueFrequency());
   return o;
 }
 
-checkUnnamed3744(core.List<api.GooglePrivacyDlpV2beta1ValueFrequency> o) {
+checkUnnamed4043(core.List<api.GooglePrivacyDlpV2beta1ValueFrequency> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1ValueFrequency(o[0]);
   checkGooglePrivacyDlpV2beta1ValueFrequency(o[1]);
@@ -185,7 +185,7 @@
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket < 3) {
     o.bucketSize = "foo";
-    o.bucketValues = buildUnnamed3744();
+    o.bucketValues = buildUnnamed4043();
     o.valueFrequencyLowerBound = "foo";
     o.valueFrequencyUpperBound = "foo";
   }
@@ -198,14 +198,14 @@
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket < 3) {
     unittest.expect(o.bucketSize, unittest.equals('foo'));
-    checkUnnamed3744(o.bucketValues);
+    checkUnnamed4043(o.bucketValues);
     unittest.expect(o.valueFrequencyLowerBound, unittest.equals('foo'));
     unittest.expect(o.valueFrequencyUpperBound, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket--;
 }
 
-buildUnnamed3745() {
+buildUnnamed4044() {
   var o = new core
       .List<api.GooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket>();
   o.add(buildGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket());
@@ -213,7 +213,7 @@
   return o;
 }
 
-checkUnnamed3745(
+checkUnnamed4044(
     core.List<api.GooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1CategoricalStatsHistogramBucket(o[0]);
@@ -225,7 +225,7 @@
   var o = new api.GooglePrivacyDlpV2beta1CategoricalStatsResult();
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsResult++;
   if (buildCounterGooglePrivacyDlpV2beta1CategoricalStatsResult < 3) {
-    o.valueFrequencyHistogramBuckets = buildUnnamed3745();
+    o.valueFrequencyHistogramBuckets = buildUnnamed4044();
   }
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsResult--;
   return o;
@@ -235,7 +235,7 @@
     api.GooglePrivacyDlpV2beta1CategoricalStatsResult o) {
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsResult++;
   if (buildCounterGooglePrivacyDlpV2beta1CategoricalStatsResult < 3) {
-    checkUnnamed3745(o.valueFrequencyHistogramBuckets);
+    checkUnnamed4044(o.valueFrequencyHistogramBuckets);
   }
   buildCounterGooglePrivacyDlpV2beta1CategoricalStatsResult--;
 }
@@ -304,14 +304,14 @@
   buildCounterGooglePrivacyDlpV2beta1CustomInfoType--;
 }
 
-buildUnnamed3746() {
+buildUnnamed4045() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Projection>();
   o.add(buildGooglePrivacyDlpV2beta1Projection());
   o.add(buildGooglePrivacyDlpV2beta1Projection());
   return o;
 }
 
-checkUnnamed3746(core.List<api.GooglePrivacyDlpV2beta1Projection> o) {
+checkUnnamed4045(core.List<api.GooglePrivacyDlpV2beta1Projection> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Projection(o[0]);
   checkGooglePrivacyDlpV2beta1Projection(o[1]);
@@ -324,7 +324,7 @@
   if (buildCounterGooglePrivacyDlpV2beta1DatastoreOptions < 3) {
     o.kind = buildGooglePrivacyDlpV2beta1KindExpression();
     o.partitionId = buildGooglePrivacyDlpV2beta1PartitionId();
-    o.projection = buildUnnamed3746();
+    o.projection = buildUnnamed4045();
   }
   buildCounterGooglePrivacyDlpV2beta1DatastoreOptions--;
   return o;
@@ -336,7 +336,7 @@
   if (buildCounterGooglePrivacyDlpV2beta1DatastoreOptions < 3) {
     checkGooglePrivacyDlpV2beta1KindExpression(o.kind);
     checkGooglePrivacyDlpV2beta1PartitionId(o.partitionId);
-    checkUnnamed3746(o.projection);
+    checkUnnamed4045(o.projection);
   }
   buildCounterGooglePrivacyDlpV2beta1DatastoreOptions--;
 }
@@ -481,40 +481,40 @@
   buildCounterGooglePrivacyDlpV2beta1InfoTypeStatistics--;
 }
 
-buildUnnamed3747() {
+buildUnnamed4046() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1CustomInfoType>();
   o.add(buildGooglePrivacyDlpV2beta1CustomInfoType());
   o.add(buildGooglePrivacyDlpV2beta1CustomInfoType());
   return o;
 }
 
-checkUnnamed3747(core.List<api.GooglePrivacyDlpV2beta1CustomInfoType> o) {
+checkUnnamed4046(core.List<api.GooglePrivacyDlpV2beta1CustomInfoType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1CustomInfoType(o[0]);
   checkGooglePrivacyDlpV2beta1CustomInfoType(o[1]);
 }
 
-buildUnnamed3748() {
+buildUnnamed4047() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1InfoTypeLimit>();
   o.add(buildGooglePrivacyDlpV2beta1InfoTypeLimit());
   o.add(buildGooglePrivacyDlpV2beta1InfoTypeLimit());
   return o;
 }
 
-checkUnnamed3748(core.List<api.GooglePrivacyDlpV2beta1InfoTypeLimit> o) {
+checkUnnamed4047(core.List<api.GooglePrivacyDlpV2beta1InfoTypeLimit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1InfoTypeLimit(o[0]);
   checkGooglePrivacyDlpV2beta1InfoTypeLimit(o[1]);
 }
 
-buildUnnamed3749() {
+buildUnnamed4048() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1InfoType>();
   o.add(buildGooglePrivacyDlpV2beta1InfoType());
   o.add(buildGooglePrivacyDlpV2beta1InfoType());
   return o;
 }
 
-checkUnnamed3749(core.List<api.GooglePrivacyDlpV2beta1InfoType> o) {
+checkUnnamed4048(core.List<api.GooglePrivacyDlpV2beta1InfoType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1InfoType(o[0]);
   checkGooglePrivacyDlpV2beta1InfoType(o[1]);
@@ -525,11 +525,11 @@
   var o = new api.GooglePrivacyDlpV2beta1InspectConfig();
   buildCounterGooglePrivacyDlpV2beta1InspectConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectConfig < 3) {
-    o.customInfoTypes = buildUnnamed3747();
+    o.customInfoTypes = buildUnnamed4046();
     o.excludeTypes = true;
     o.includeQuote = true;
-    o.infoTypeLimits = buildUnnamed3748();
-    o.infoTypes = buildUnnamed3749();
+    o.infoTypeLimits = buildUnnamed4047();
+    o.infoTypes = buildUnnamed4048();
     o.maxFindings = 42;
     o.minLikelihood = "foo";
   }
@@ -541,25 +541,25 @@
     api.GooglePrivacyDlpV2beta1InspectConfig o) {
   buildCounterGooglePrivacyDlpV2beta1InspectConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectConfig < 3) {
-    checkUnnamed3747(o.customInfoTypes);
+    checkUnnamed4046(o.customInfoTypes);
     unittest.expect(o.excludeTypes, unittest.isTrue);
     unittest.expect(o.includeQuote, unittest.isTrue);
-    checkUnnamed3748(o.infoTypeLimits);
-    checkUnnamed3749(o.infoTypes);
+    checkUnnamed4047(o.infoTypeLimits);
+    checkUnnamed4048(o.infoTypes);
     unittest.expect(o.maxFindings, unittest.equals(42));
     unittest.expect(o.minLikelihood, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta1InspectConfig--;
 }
 
-buildUnnamed3750() {
+buildUnnamed4049() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1InfoTypeStatistics>();
   o.add(buildGooglePrivacyDlpV2beta1InfoTypeStatistics());
   o.add(buildGooglePrivacyDlpV2beta1InfoTypeStatistics());
   return o;
 }
 
-checkUnnamed3750(core.List<api.GooglePrivacyDlpV2beta1InfoTypeStatistics> o) {
+checkUnnamed4049(core.List<api.GooglePrivacyDlpV2beta1InfoTypeStatistics> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1InfoTypeStatistics(o[0]);
   checkGooglePrivacyDlpV2beta1InfoTypeStatistics(o[1]);
@@ -571,7 +571,7 @@
   buildCounterGooglePrivacyDlpV2beta1InspectOperationMetadata++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectOperationMetadata < 3) {
     o.createTime = "foo";
-    o.infoTypeStats = buildUnnamed3750();
+    o.infoTypeStats = buildUnnamed4049();
     o.processedBytes = "foo";
     o.requestInspectConfig = buildGooglePrivacyDlpV2beta1InspectConfig();
     o.requestOutputConfig = buildGooglePrivacyDlpV2beta1OutputStorageConfig();
@@ -587,7 +587,7 @@
   buildCounterGooglePrivacyDlpV2beta1InspectOperationMetadata++;
   if (buildCounterGooglePrivacyDlpV2beta1InspectOperationMetadata < 3) {
     unittest.expect(o.createTime, unittest.equals('foo'));
-    checkUnnamed3750(o.infoTypeStats);
+    checkUnnamed4049(o.infoTypeStats);
     unittest.expect(o.processedBytes, unittest.equals('foo'));
     checkGooglePrivacyDlpV2beta1InspectConfig(o.requestInspectConfig);
     checkGooglePrivacyDlpV2beta1OutputStorageConfig(o.requestOutputConfig);
@@ -617,14 +617,14 @@
   buildCounterGooglePrivacyDlpV2beta1InspectOperationResult--;
 }
 
-buildUnnamed3751() {
+buildUnnamed4050() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1FieldId>();
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   return o;
 }
 
-checkUnnamed3751(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
+checkUnnamed4050(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1FieldId(o[0]);
   checkGooglePrivacyDlpV2beta1FieldId(o[1]);
@@ -636,7 +636,7 @@
   buildCounterGooglePrivacyDlpV2beta1KAnonymityConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityConfig < 3) {
     o.entityId = buildGooglePrivacyDlpV2beta1EntityId();
-    o.quasiIds = buildUnnamed3751();
+    o.quasiIds = buildUnnamed4050();
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityConfig--;
   return o;
@@ -647,19 +647,19 @@
   buildCounterGooglePrivacyDlpV2beta1KAnonymityConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityConfig < 3) {
     checkGooglePrivacyDlpV2beta1EntityId(o.entityId);
-    checkUnnamed3751(o.quasiIds);
+    checkUnnamed4050(o.quasiIds);
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityConfig--;
 }
 
-buildUnnamed3752() {
+buildUnnamed4051() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Value>();
   o.add(buildGooglePrivacyDlpV2beta1Value());
   o.add(buildGooglePrivacyDlpV2beta1Value());
   return o;
 }
 
-checkUnnamed3752(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
+checkUnnamed4051(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Value(o[0]);
   checkGooglePrivacyDlpV2beta1Value(o[1]);
@@ -671,7 +671,7 @@
   buildCounterGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass < 3) {
     o.equivalenceClassSize = "foo";
-    o.quasiIdsValues = buildUnnamed3752();
+    o.quasiIdsValues = buildUnnamed4051();
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass--;
   return o;
@@ -682,12 +682,12 @@
   buildCounterGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass < 3) {
     unittest.expect(o.equivalenceClassSize, unittest.equals('foo'));
-    checkUnnamed3752(o.quasiIdsValues);
+    checkUnnamed4051(o.quasiIdsValues);
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass--;
 }
 
-buildUnnamed3753() {
+buildUnnamed4052() {
   var o =
       new core.List<api.GooglePrivacyDlpV2beta1KAnonymityEquivalenceClass>();
   o.add(buildGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass());
@@ -695,7 +695,7 @@
   return o;
 }
 
-checkUnnamed3753(
+checkUnnamed4052(
     core.List<api.GooglePrivacyDlpV2beta1KAnonymityEquivalenceClass> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1KAnonymityEquivalenceClass(o[0]);
@@ -708,7 +708,7 @@
   buildCounterGooglePrivacyDlpV2beta1KAnonymityHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityHistogramBucket < 3) {
     o.bucketSize = "foo";
-    o.bucketValues = buildUnnamed3753();
+    o.bucketValues = buildUnnamed4052();
     o.equivalenceClassSizeLowerBound = "foo";
     o.equivalenceClassSizeUpperBound = "foo";
   }
@@ -721,21 +721,21 @@
   buildCounterGooglePrivacyDlpV2beta1KAnonymityHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityHistogramBucket < 3) {
     unittest.expect(o.bucketSize, unittest.equals('foo'));
-    checkUnnamed3753(o.bucketValues);
+    checkUnnamed4052(o.bucketValues);
     unittest.expect(o.equivalenceClassSizeLowerBound, unittest.equals('foo'));
     unittest.expect(o.equivalenceClassSizeUpperBound, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityHistogramBucket--;
 }
 
-buildUnnamed3754() {
+buildUnnamed4053() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1KAnonymityHistogramBucket>();
   o.add(buildGooglePrivacyDlpV2beta1KAnonymityHistogramBucket());
   o.add(buildGooglePrivacyDlpV2beta1KAnonymityHistogramBucket());
   return o;
 }
 
-checkUnnamed3754(
+checkUnnamed4053(
     core.List<api.GooglePrivacyDlpV2beta1KAnonymityHistogramBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1KAnonymityHistogramBucket(o[0]);
@@ -747,7 +747,7 @@
   var o = new api.GooglePrivacyDlpV2beta1KAnonymityResult();
   buildCounterGooglePrivacyDlpV2beta1KAnonymityResult++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityResult < 3) {
-    o.equivalenceClassHistogramBuckets = buildUnnamed3754();
+    o.equivalenceClassHistogramBuckets = buildUnnamed4053();
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityResult--;
   return o;
@@ -757,32 +757,32 @@
     api.GooglePrivacyDlpV2beta1KAnonymityResult o) {
   buildCounterGooglePrivacyDlpV2beta1KAnonymityResult++;
   if (buildCounterGooglePrivacyDlpV2beta1KAnonymityResult < 3) {
-    checkUnnamed3754(o.equivalenceClassHistogramBuckets);
+    checkUnnamed4053(o.equivalenceClassHistogramBuckets);
   }
   buildCounterGooglePrivacyDlpV2beta1KAnonymityResult--;
 }
 
-buildUnnamed3755() {
+buildUnnamed4054() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1AuxiliaryTable>();
   o.add(buildGooglePrivacyDlpV2beta1AuxiliaryTable());
   o.add(buildGooglePrivacyDlpV2beta1AuxiliaryTable());
   return o;
 }
 
-checkUnnamed3755(core.List<api.GooglePrivacyDlpV2beta1AuxiliaryTable> o) {
+checkUnnamed4054(core.List<api.GooglePrivacyDlpV2beta1AuxiliaryTable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1AuxiliaryTable(o[0]);
   checkGooglePrivacyDlpV2beta1AuxiliaryTable(o[1]);
 }
 
-buildUnnamed3756() {
+buildUnnamed4055() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1TaggedField>();
   o.add(buildGooglePrivacyDlpV2beta1TaggedField());
   o.add(buildGooglePrivacyDlpV2beta1TaggedField());
   return o;
 }
 
-checkUnnamed3756(core.List<api.GooglePrivacyDlpV2beta1TaggedField> o) {
+checkUnnamed4055(core.List<api.GooglePrivacyDlpV2beta1TaggedField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1TaggedField(o[0]);
   checkGooglePrivacyDlpV2beta1TaggedField(o[1]);
@@ -793,8 +793,8 @@
   var o = new api.GooglePrivacyDlpV2beta1KMapEstimationConfig();
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationConfig < 3) {
-    o.auxiliaryTables = buildUnnamed3755();
-    o.quasiIds = buildUnnamed3756();
+    o.auxiliaryTables = buildUnnamed4054();
+    o.quasiIds = buildUnnamed4055();
     o.regionCode = "foo";
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationConfig--;
@@ -805,14 +805,14 @@
     api.GooglePrivacyDlpV2beta1KMapEstimationConfig o) {
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationConfig < 3) {
-    checkUnnamed3755(o.auxiliaryTables);
-    checkUnnamed3756(o.quasiIds);
+    checkUnnamed4054(o.auxiliaryTables);
+    checkUnnamed4055(o.quasiIds);
     unittest.expect(o.regionCode, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationConfig--;
 }
 
-buildUnnamed3757() {
+buildUnnamed4056() {
   var o =
       new core.List<api.GooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues>();
   o.add(buildGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues());
@@ -820,7 +820,7 @@
   return o;
 }
 
-checkUnnamed3757(
+checkUnnamed4056(
     core.List<api.GooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues(o[0]);
@@ -833,7 +833,7 @@
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket < 3) {
     o.bucketSize = "foo";
-    o.bucketValues = buildUnnamed3757();
+    o.bucketValues = buildUnnamed4056();
     o.maxAnonymity = "foo";
     o.minAnonymity = "foo";
   }
@@ -846,21 +846,21 @@
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket < 3) {
     unittest.expect(o.bucketSize, unittest.equals('foo'));
-    checkUnnamed3757(o.bucketValues);
+    checkUnnamed4056(o.bucketValues);
     unittest.expect(o.maxAnonymity, unittest.equals('foo'));
     unittest.expect(o.minAnonymity, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket--;
 }
 
-buildUnnamed3758() {
+buildUnnamed4057() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Value>();
   o.add(buildGooglePrivacyDlpV2beta1Value());
   o.add(buildGooglePrivacyDlpV2beta1Value());
   return o;
 }
 
-checkUnnamed3758(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
+checkUnnamed4057(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Value(o[0]);
   checkGooglePrivacyDlpV2beta1Value(o[1]);
@@ -872,7 +872,7 @@
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues < 3) {
     o.estimatedAnonymity = "foo";
-    o.quasiIdsValues = buildUnnamed3758();
+    o.quasiIdsValues = buildUnnamed4057();
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues--;
   return o;
@@ -883,12 +883,12 @@
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues < 3) {
     unittest.expect(o.estimatedAnonymity, unittest.equals('foo'));
-    checkUnnamed3758(o.quasiIdsValues);
+    checkUnnamed4057(o.quasiIdsValues);
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationQuasiIdValues--;
 }
 
-buildUnnamed3759() {
+buildUnnamed4058() {
   var o =
       new core.List<api.GooglePrivacyDlpV2beta1KMapEstimationHistogramBucket>();
   o.add(buildGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket());
@@ -896,7 +896,7 @@
   return o;
 }
 
-checkUnnamed3759(
+checkUnnamed4058(
     core.List<api.GooglePrivacyDlpV2beta1KMapEstimationHistogramBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1KMapEstimationHistogramBucket(o[0]);
@@ -908,7 +908,7 @@
   var o = new api.GooglePrivacyDlpV2beta1KMapEstimationResult();
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationResult++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationResult < 3) {
-    o.kMapEstimationHistogram = buildUnnamed3759();
+    o.kMapEstimationHistogram = buildUnnamed4058();
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationResult--;
   return o;
@@ -918,7 +918,7 @@
     api.GooglePrivacyDlpV2beta1KMapEstimationResult o) {
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationResult++;
   if (buildCounterGooglePrivacyDlpV2beta1KMapEstimationResult < 3) {
-    checkUnnamed3759(o.kMapEstimationHistogram);
+    checkUnnamed4058(o.kMapEstimationHistogram);
   }
   buildCounterGooglePrivacyDlpV2beta1KMapEstimationResult--;
 }
@@ -943,14 +943,14 @@
   buildCounterGooglePrivacyDlpV2beta1KindExpression--;
 }
 
-buildUnnamed3760() {
+buildUnnamed4059() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1FieldId>();
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   o.add(buildGooglePrivacyDlpV2beta1FieldId());
   return o;
 }
 
-checkUnnamed3760(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
+checkUnnamed4059(core.List<api.GooglePrivacyDlpV2beta1FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1FieldId(o[0]);
   checkGooglePrivacyDlpV2beta1FieldId(o[1]);
@@ -961,7 +961,7 @@
   var o = new api.GooglePrivacyDlpV2beta1LDiversityConfig();
   buildCounterGooglePrivacyDlpV2beta1LDiversityConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityConfig < 3) {
-    o.quasiIds = buildUnnamed3760();
+    o.quasiIds = buildUnnamed4059();
     o.sensitiveAttribute = buildGooglePrivacyDlpV2beta1FieldId();
   }
   buildCounterGooglePrivacyDlpV2beta1LDiversityConfig--;
@@ -972,33 +972,33 @@
     api.GooglePrivacyDlpV2beta1LDiversityConfig o) {
   buildCounterGooglePrivacyDlpV2beta1LDiversityConfig++;
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityConfig < 3) {
-    checkUnnamed3760(o.quasiIds);
+    checkUnnamed4059(o.quasiIds);
     checkGooglePrivacyDlpV2beta1FieldId(o.sensitiveAttribute);
   }
   buildCounterGooglePrivacyDlpV2beta1LDiversityConfig--;
 }
 
-buildUnnamed3761() {
+buildUnnamed4060() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Value>();
   o.add(buildGooglePrivacyDlpV2beta1Value());
   o.add(buildGooglePrivacyDlpV2beta1Value());
   return o;
 }
 
-checkUnnamed3761(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
+checkUnnamed4060(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Value(o[0]);
   checkGooglePrivacyDlpV2beta1Value(o[1]);
 }
 
-buildUnnamed3762() {
+buildUnnamed4061() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1ValueFrequency>();
   o.add(buildGooglePrivacyDlpV2beta1ValueFrequency());
   o.add(buildGooglePrivacyDlpV2beta1ValueFrequency());
   return o;
 }
 
-checkUnnamed3762(core.List<api.GooglePrivacyDlpV2beta1ValueFrequency> o) {
+checkUnnamed4061(core.List<api.GooglePrivacyDlpV2beta1ValueFrequency> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1ValueFrequency(o[0]);
   checkGooglePrivacyDlpV2beta1ValueFrequency(o[1]);
@@ -1011,8 +1011,8 @@
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityEquivalenceClass < 3) {
     o.equivalenceClassSize = "foo";
     o.numDistinctSensitiveValues = "foo";
-    o.quasiIdsValues = buildUnnamed3761();
-    o.topSensitiveValues = buildUnnamed3762();
+    o.quasiIdsValues = buildUnnamed4060();
+    o.topSensitiveValues = buildUnnamed4061();
   }
   buildCounterGooglePrivacyDlpV2beta1LDiversityEquivalenceClass--;
   return o;
@@ -1024,13 +1024,13 @@
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityEquivalenceClass < 3) {
     unittest.expect(o.equivalenceClassSize, unittest.equals('foo'));
     unittest.expect(o.numDistinctSensitiveValues, unittest.equals('foo'));
-    checkUnnamed3761(o.quasiIdsValues);
-    checkUnnamed3762(o.topSensitiveValues);
+    checkUnnamed4060(o.quasiIdsValues);
+    checkUnnamed4061(o.topSensitiveValues);
   }
   buildCounterGooglePrivacyDlpV2beta1LDiversityEquivalenceClass--;
 }
 
-buildUnnamed3763() {
+buildUnnamed4062() {
   var o =
       new core.List<api.GooglePrivacyDlpV2beta1LDiversityEquivalenceClass>();
   o.add(buildGooglePrivacyDlpV2beta1LDiversityEquivalenceClass());
@@ -1038,7 +1038,7 @@
   return o;
 }
 
-checkUnnamed3763(
+checkUnnamed4062(
     core.List<api.GooglePrivacyDlpV2beta1LDiversityEquivalenceClass> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1LDiversityEquivalenceClass(o[0]);
@@ -1051,7 +1051,7 @@
   buildCounterGooglePrivacyDlpV2beta1LDiversityHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityHistogramBucket < 3) {
     o.bucketSize = "foo";
-    o.bucketValues = buildUnnamed3763();
+    o.bucketValues = buildUnnamed4062();
     o.sensitiveValueFrequencyLowerBound = "foo";
     o.sensitiveValueFrequencyUpperBound = "foo";
   }
@@ -1064,7 +1064,7 @@
   buildCounterGooglePrivacyDlpV2beta1LDiversityHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityHistogramBucket < 3) {
     unittest.expect(o.bucketSize, unittest.equals('foo'));
-    checkUnnamed3763(o.bucketValues);
+    checkUnnamed4062(o.bucketValues);
     unittest.expect(
         o.sensitiveValueFrequencyLowerBound, unittest.equals('foo'));
     unittest.expect(
@@ -1073,14 +1073,14 @@
   buildCounterGooglePrivacyDlpV2beta1LDiversityHistogramBucket--;
 }
 
-buildUnnamed3764() {
+buildUnnamed4063() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1LDiversityHistogramBucket>();
   o.add(buildGooglePrivacyDlpV2beta1LDiversityHistogramBucket());
   o.add(buildGooglePrivacyDlpV2beta1LDiversityHistogramBucket());
   return o;
 }
 
-checkUnnamed3764(
+checkUnnamed4063(
     core.List<api.GooglePrivacyDlpV2beta1LDiversityHistogramBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1LDiversityHistogramBucket(o[0]);
@@ -1092,7 +1092,7 @@
   var o = new api.GooglePrivacyDlpV2beta1LDiversityResult();
   buildCounterGooglePrivacyDlpV2beta1LDiversityResult++;
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityResult < 3) {
-    o.sensitiveValueFrequencyHistogramBuckets = buildUnnamed3764();
+    o.sensitiveValueFrequencyHistogramBuckets = buildUnnamed4063();
   }
   buildCounterGooglePrivacyDlpV2beta1LDiversityResult--;
   return o;
@@ -1102,7 +1102,7 @@
     api.GooglePrivacyDlpV2beta1LDiversityResult o) {
   buildCounterGooglePrivacyDlpV2beta1LDiversityResult++;
   if (buildCounterGooglePrivacyDlpV2beta1LDiversityResult < 3) {
-    checkUnnamed3764(o.sensitiveValueFrequencyHistogramBuckets);
+    checkUnnamed4063(o.sensitiveValueFrequencyHistogramBuckets);
   }
   buildCounterGooglePrivacyDlpV2beta1LDiversityResult--;
 }
@@ -1127,14 +1127,14 @@
   buildCounterGooglePrivacyDlpV2beta1NumericalStatsConfig--;
 }
 
-buildUnnamed3765() {
+buildUnnamed4064() {
   var o = new core.List<api.GooglePrivacyDlpV2beta1Value>();
   o.add(buildGooglePrivacyDlpV2beta1Value());
   o.add(buildGooglePrivacyDlpV2beta1Value());
   return o;
 }
 
-checkUnnamed3765(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
+checkUnnamed4064(core.List<api.GooglePrivacyDlpV2beta1Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta1Value(o[0]);
   checkGooglePrivacyDlpV2beta1Value(o[1]);
@@ -1147,7 +1147,7 @@
   if (buildCounterGooglePrivacyDlpV2beta1NumericalStatsResult < 3) {
     o.maxValue = buildGooglePrivacyDlpV2beta1Value();
     o.minValue = buildGooglePrivacyDlpV2beta1Value();
-    o.quantileValues = buildUnnamed3765();
+    o.quantileValues = buildUnnamed4064();
   }
   buildCounterGooglePrivacyDlpV2beta1NumericalStatsResult--;
   return o;
@@ -1159,7 +1159,7 @@
   if (buildCounterGooglePrivacyDlpV2beta1NumericalStatsResult < 3) {
     checkGooglePrivacyDlpV2beta1Value(o.maxValue);
     checkGooglePrivacyDlpV2beta1Value(o.minValue);
-    checkUnnamed3765(o.quantileValues);
+    checkUnnamed4064(o.quantileValues);
   }
   buildCounterGooglePrivacyDlpV2beta1NumericalStatsResult--;
 }
@@ -1473,14 +1473,14 @@
   buildCounterGooglePrivacyDlpV2beta1ValueFrequency--;
 }
 
-buildUnnamed3766() {
+buildUnnamed4065() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3766(core.List<core.String> o) {
+checkUnnamed4065(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1491,7 +1491,7 @@
   var o = new api.GooglePrivacyDlpV2beta1WordList();
   buildCounterGooglePrivacyDlpV2beta1WordList++;
   if (buildCounterGooglePrivacyDlpV2beta1WordList < 3) {
-    o.words = buildUnnamed3766();
+    o.words = buildUnnamed4065();
   }
   buildCounterGooglePrivacyDlpV2beta1WordList--;
   return o;
@@ -1500,7 +1500,7 @@
 checkGooglePrivacyDlpV2beta1WordList(api.GooglePrivacyDlpV2beta1WordList o) {
   buildCounterGooglePrivacyDlpV2beta1WordList++;
   if (buildCounterGooglePrivacyDlpV2beta1WordList < 3) {
-    checkUnnamed3766(o.words);
+    checkUnnamed4065(o.words);
   }
   buildCounterGooglePrivacyDlpV2beta1WordList--;
 }
@@ -1582,14 +1582,14 @@
   buildCounterGooglePrivacyDlpV2beta2AnalyzeDataSourceRiskRequest--;
 }
 
-buildUnnamed3767() {
+buildUnnamed4066() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2QuasiIdField>();
   o.add(buildGooglePrivacyDlpV2beta2QuasiIdField());
   o.add(buildGooglePrivacyDlpV2beta2QuasiIdField());
   return o;
 }
 
-checkUnnamed3767(core.List<api.GooglePrivacyDlpV2beta2QuasiIdField> o) {
+checkUnnamed4066(core.List<api.GooglePrivacyDlpV2beta2QuasiIdField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2QuasiIdField(o[0]);
   checkGooglePrivacyDlpV2beta2QuasiIdField(o[1]);
@@ -1600,7 +1600,7 @@
   var o = new api.GooglePrivacyDlpV2beta2AuxiliaryTable();
   buildCounterGooglePrivacyDlpV2beta2AuxiliaryTable++;
   if (buildCounterGooglePrivacyDlpV2beta2AuxiliaryTable < 3) {
-    o.quasiIds = buildUnnamed3767();
+    o.quasiIds = buildUnnamed4066();
     o.relativeFrequency = buildGooglePrivacyDlpV2beta2FieldId();
     o.table = buildGooglePrivacyDlpV2beta2BigQueryTable();
   }
@@ -1612,21 +1612,21 @@
     api.GooglePrivacyDlpV2beta2AuxiliaryTable o) {
   buildCounterGooglePrivacyDlpV2beta2AuxiliaryTable++;
   if (buildCounterGooglePrivacyDlpV2beta2AuxiliaryTable < 3) {
-    checkUnnamed3767(o.quasiIds);
+    checkUnnamed4066(o.quasiIds);
     checkGooglePrivacyDlpV2beta2FieldId(o.relativeFrequency);
     checkGooglePrivacyDlpV2beta2BigQueryTable(o.table);
   }
   buildCounterGooglePrivacyDlpV2beta2AuxiliaryTable--;
 }
 
-buildUnnamed3768() {
+buildUnnamed4067() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2FieldId>();
   o.add(buildGooglePrivacyDlpV2beta2FieldId());
   o.add(buildGooglePrivacyDlpV2beta2FieldId());
   return o;
 }
 
-checkUnnamed3768(core.List<api.GooglePrivacyDlpV2beta2FieldId> o) {
+checkUnnamed4067(core.List<api.GooglePrivacyDlpV2beta2FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2FieldId(o[0]);
   checkGooglePrivacyDlpV2beta2FieldId(o[1]);
@@ -1637,7 +1637,7 @@
   var o = new api.GooglePrivacyDlpV2beta2BigQueryOptions();
   buildCounterGooglePrivacyDlpV2beta2BigQueryOptions++;
   if (buildCounterGooglePrivacyDlpV2beta2BigQueryOptions < 3) {
-    o.identifyingFields = buildUnnamed3768();
+    o.identifyingFields = buildUnnamed4067();
     o.tableReference = buildGooglePrivacyDlpV2beta2BigQueryTable();
   }
   buildCounterGooglePrivacyDlpV2beta2BigQueryOptions--;
@@ -1648,7 +1648,7 @@
     api.GooglePrivacyDlpV2beta2BigQueryOptions o) {
   buildCounterGooglePrivacyDlpV2beta2BigQueryOptions++;
   if (buildCounterGooglePrivacyDlpV2beta2BigQueryOptions < 3) {
-    checkUnnamed3768(o.identifyingFields);
+    checkUnnamed4067(o.identifyingFields);
     checkGooglePrivacyDlpV2beta2BigQueryTable(o.tableReference);
   }
   buildCounterGooglePrivacyDlpV2beta2BigQueryOptions--;
@@ -1701,14 +1701,14 @@
   buildCounterGooglePrivacyDlpV2beta2Bucket--;
 }
 
-buildUnnamed3769() {
+buildUnnamed4068() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Bucket>();
   o.add(buildGooglePrivacyDlpV2beta2Bucket());
   o.add(buildGooglePrivacyDlpV2beta2Bucket());
   return o;
 }
 
-checkUnnamed3769(core.List<api.GooglePrivacyDlpV2beta2Bucket> o) {
+checkUnnamed4068(core.List<api.GooglePrivacyDlpV2beta2Bucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Bucket(o[0]);
   checkGooglePrivacyDlpV2beta2Bucket(o[1]);
@@ -1719,7 +1719,7 @@
   var o = new api.GooglePrivacyDlpV2beta2BucketingConfig();
   buildCounterGooglePrivacyDlpV2beta2BucketingConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2BucketingConfig < 3) {
-    o.buckets = buildUnnamed3769();
+    o.buckets = buildUnnamed4068();
   }
   buildCounterGooglePrivacyDlpV2beta2BucketingConfig--;
   return o;
@@ -1729,7 +1729,7 @@
     api.GooglePrivacyDlpV2beta2BucketingConfig o) {
   buildCounterGooglePrivacyDlpV2beta2BucketingConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2BucketingConfig < 3) {
-    checkUnnamed3769(o.buckets);
+    checkUnnamed4068(o.buckets);
   }
   buildCounterGooglePrivacyDlpV2beta2BucketingConfig--;
 }
@@ -1770,14 +1770,14 @@
   buildCounterGooglePrivacyDlpV2beta2CategoricalStatsConfig--;
 }
 
-buildUnnamed3770() {
+buildUnnamed4069() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2ValueFrequency>();
   o.add(buildGooglePrivacyDlpV2beta2ValueFrequency());
   o.add(buildGooglePrivacyDlpV2beta2ValueFrequency());
   return o;
 }
 
-checkUnnamed3770(core.List<api.GooglePrivacyDlpV2beta2ValueFrequency> o) {
+checkUnnamed4069(core.List<api.GooglePrivacyDlpV2beta2ValueFrequency> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2ValueFrequency(o[0]);
   checkGooglePrivacyDlpV2beta2ValueFrequency(o[1]);
@@ -1789,7 +1789,7 @@
   buildCounterGooglePrivacyDlpV2beta2CategoricalStatsHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta2CategoricalStatsHistogramBucket < 3) {
     o.bucketSize = "foo";
-    o.bucketValues = buildUnnamed3770();
+    o.bucketValues = buildUnnamed4069();
     o.valueFrequencyLowerBound = "foo";
     o.valueFrequencyUpperBound = "foo";
   }
@@ -1802,14 +1802,14 @@
   buildCounterGooglePrivacyDlpV2beta2CategoricalStatsHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta2CategoricalStatsHistogramBucket < 3) {
     unittest.expect(o.bucketSize, unittest.equals('foo'));
-    checkUnnamed3770(o.bucketValues);
+    checkUnnamed4069(o.bucketValues);
     unittest.expect(o.valueFrequencyLowerBound, unittest.equals('foo'));
     unittest.expect(o.valueFrequencyUpperBound, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta2CategoricalStatsHistogramBucket--;
 }
 
-buildUnnamed3771() {
+buildUnnamed4070() {
   var o = new core
       .List<api.GooglePrivacyDlpV2beta2CategoricalStatsHistogramBucket>();
   o.add(buildGooglePrivacyDlpV2beta2CategoricalStatsHistogramBucket());
@@ -1817,7 +1817,7 @@
   return o;
 }
 
-checkUnnamed3771(
+checkUnnamed4070(
     core.List<api.GooglePrivacyDlpV2beta2CategoricalStatsHistogramBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2CategoricalStatsHistogramBucket(o[0]);
@@ -1829,7 +1829,7 @@
   var o = new api.GooglePrivacyDlpV2beta2CategoricalStatsResult();
   buildCounterGooglePrivacyDlpV2beta2CategoricalStatsResult++;
   if (buildCounterGooglePrivacyDlpV2beta2CategoricalStatsResult < 3) {
-    o.valueFrequencyHistogramBuckets = buildUnnamed3771();
+    o.valueFrequencyHistogramBuckets = buildUnnamed4070();
   }
   buildCounterGooglePrivacyDlpV2beta2CategoricalStatsResult--;
   return o;
@@ -1839,19 +1839,19 @@
     api.GooglePrivacyDlpV2beta2CategoricalStatsResult o) {
   buildCounterGooglePrivacyDlpV2beta2CategoricalStatsResult++;
   if (buildCounterGooglePrivacyDlpV2beta2CategoricalStatsResult < 3) {
-    checkUnnamed3771(o.valueFrequencyHistogramBuckets);
+    checkUnnamed4070(o.valueFrequencyHistogramBuckets);
   }
   buildCounterGooglePrivacyDlpV2beta2CategoricalStatsResult--;
 }
 
-buildUnnamed3772() {
+buildUnnamed4071() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2CharsToIgnore>();
   o.add(buildGooglePrivacyDlpV2beta2CharsToIgnore());
   o.add(buildGooglePrivacyDlpV2beta2CharsToIgnore());
   return o;
 }
 
-checkUnnamed3772(core.List<api.GooglePrivacyDlpV2beta2CharsToIgnore> o) {
+checkUnnamed4071(core.List<api.GooglePrivacyDlpV2beta2CharsToIgnore> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2CharsToIgnore(o[0]);
   checkGooglePrivacyDlpV2beta2CharsToIgnore(o[1]);
@@ -1862,7 +1862,7 @@
   var o = new api.GooglePrivacyDlpV2beta2CharacterMaskConfig();
   buildCounterGooglePrivacyDlpV2beta2CharacterMaskConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2CharacterMaskConfig < 3) {
-    o.charactersToIgnore = buildUnnamed3772();
+    o.charactersToIgnore = buildUnnamed4071();
     o.maskingCharacter = "foo";
     o.numberToMask = 42;
     o.reverseOrder = true;
@@ -1875,7 +1875,7 @@
     api.GooglePrivacyDlpV2beta2CharacterMaskConfig o) {
   buildCounterGooglePrivacyDlpV2beta2CharacterMaskConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2CharacterMaskConfig < 3) {
-    checkUnnamed3772(o.charactersToIgnore);
+    checkUnnamed4071(o.charactersToIgnore);
     unittest.expect(o.maskingCharacter, unittest.equals('foo'));
     unittest.expect(o.numberToMask, unittest.equals(42));
     unittest.expect(o.reverseOrder, unittest.isTrue);
@@ -1995,14 +1995,14 @@
   buildCounterGooglePrivacyDlpV2beta2Condition--;
 }
 
-buildUnnamed3773() {
+buildUnnamed4072() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Condition>();
   o.add(buildGooglePrivacyDlpV2beta2Condition());
   o.add(buildGooglePrivacyDlpV2beta2Condition());
   return o;
 }
 
-checkUnnamed3773(core.List<api.GooglePrivacyDlpV2beta2Condition> o) {
+checkUnnamed4072(core.List<api.GooglePrivacyDlpV2beta2Condition> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Condition(o[0]);
   checkGooglePrivacyDlpV2beta2Condition(o[1]);
@@ -2013,7 +2013,7 @@
   var o = new api.GooglePrivacyDlpV2beta2Conditions();
   buildCounterGooglePrivacyDlpV2beta2Conditions++;
   if (buildCounterGooglePrivacyDlpV2beta2Conditions < 3) {
-    o.conditions = buildUnnamed3773();
+    o.conditions = buildUnnamed4072();
   }
   buildCounterGooglePrivacyDlpV2beta2Conditions--;
   return o;
@@ -2023,7 +2023,7 @@
     api.GooglePrivacyDlpV2beta2Conditions o) {
   buildCounterGooglePrivacyDlpV2beta2Conditions++;
   if (buildCounterGooglePrivacyDlpV2beta2Conditions < 3) {
-    checkUnnamed3773(o.conditions);
+    checkUnnamed4072(o.conditions);
   }
   buildCounterGooglePrivacyDlpV2beta2Conditions--;
 }
@@ -2193,14 +2193,14 @@
   buildCounterGooglePrivacyDlpV2beta2CryptoReplaceFfxFpeConfig--;
 }
 
-buildUnnamed3774() {
+buildUnnamed4073() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2DetectionRule>();
   o.add(buildGooglePrivacyDlpV2beta2DetectionRule());
   o.add(buildGooglePrivacyDlpV2beta2DetectionRule());
   return o;
 }
 
-checkUnnamed3774(core.List<api.GooglePrivacyDlpV2beta2DetectionRule> o) {
+checkUnnamed4073(core.List<api.GooglePrivacyDlpV2beta2DetectionRule> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2DetectionRule(o[0]);
   checkGooglePrivacyDlpV2beta2DetectionRule(o[1]);
@@ -2211,7 +2211,7 @@
   var o = new api.GooglePrivacyDlpV2beta2CustomInfoType();
   buildCounterGooglePrivacyDlpV2beta2CustomInfoType++;
   if (buildCounterGooglePrivacyDlpV2beta2CustomInfoType < 3) {
-    o.detectionRules = buildUnnamed3774();
+    o.detectionRules = buildUnnamed4073();
     o.dictionary = buildGooglePrivacyDlpV2beta2Dictionary();
     o.infoType = buildGooglePrivacyDlpV2beta2InfoType();
     o.likelihood = "foo";
@@ -2226,7 +2226,7 @@
     api.GooglePrivacyDlpV2beta2CustomInfoType o) {
   buildCounterGooglePrivacyDlpV2beta2CustomInfoType++;
   if (buildCounterGooglePrivacyDlpV2beta2CustomInfoType < 3) {
-    checkUnnamed3774(o.detectionRules);
+    checkUnnamed4073(o.detectionRules);
     checkGooglePrivacyDlpV2beta2Dictionary(o.dictionary);
     checkGooglePrivacyDlpV2beta2InfoType(o.infoType);
     unittest.expect(o.likelihood, unittest.equals('foo'));
@@ -2423,14 +2423,14 @@
   buildCounterGooglePrivacyDlpV2beta2Dictionary--;
 }
 
-buildUnnamed3775() {
+buildUnnamed4074() {
   var o = new core.List<api.GoogleRpcStatus>();
   o.add(buildGoogleRpcStatus());
   o.add(buildGoogleRpcStatus());
   return o;
 }
 
-checkUnnamed3775(core.List<api.GoogleRpcStatus> o) {
+checkUnnamed4074(core.List<api.GoogleRpcStatus> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleRpcStatus(o[0]);
   checkGoogleRpcStatus(o[1]);
@@ -2443,7 +2443,7 @@
   if (buildCounterGooglePrivacyDlpV2beta2DlpJob < 3) {
     o.createTime = "foo";
     o.endTime = "foo";
-    o.errorResults = buildUnnamed3775();
+    o.errorResults = buildUnnamed4074();
     o.inspectDetails = buildGooglePrivacyDlpV2beta2InspectDataSourceDetails();
     o.jobTriggerName = "foo";
     o.name = "foo";
@@ -2461,7 +2461,7 @@
   if (buildCounterGooglePrivacyDlpV2beta2DlpJob < 3) {
     unittest.expect(o.createTime, unittest.equals('foo'));
     unittest.expect(o.endTime, unittest.equals('foo'));
-    checkUnnamed3775(o.errorResults);
+    checkUnnamed4074(o.errorResults);
     checkGooglePrivacyDlpV2beta2InspectDataSourceDetails(o.inspectDetails);
     unittest.expect(o.jobTriggerName, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
@@ -2492,14 +2492,14 @@
   buildCounterGooglePrivacyDlpV2beta2EntityId--;
 }
 
-buildUnnamed3776() {
+buildUnnamed4075() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3776(core.List<core.String> o) {
+checkUnnamed4075(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2511,7 +2511,7 @@
   buildCounterGooglePrivacyDlpV2beta2Error++;
   if (buildCounterGooglePrivacyDlpV2beta2Error < 3) {
     o.details = buildGoogleRpcStatus();
-    o.timestamps = buildUnnamed3776();
+    o.timestamps = buildUnnamed4075();
   }
   buildCounterGooglePrivacyDlpV2beta2Error--;
   return o;
@@ -2521,7 +2521,7 @@
   buildCounterGooglePrivacyDlpV2beta2Error++;
   if (buildCounterGooglePrivacyDlpV2beta2Error < 3) {
     checkGoogleRpcStatus(o.details);
-    checkUnnamed3776(o.timestamps);
+    checkUnnamed4075(o.timestamps);
   }
   buildCounterGooglePrivacyDlpV2beta2Error--;
 }
@@ -2567,14 +2567,14 @@
   buildCounterGooglePrivacyDlpV2beta2FieldId--;
 }
 
-buildUnnamed3777() {
+buildUnnamed4076() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2FieldId>();
   o.add(buildGooglePrivacyDlpV2beta2FieldId());
   o.add(buildGooglePrivacyDlpV2beta2FieldId());
   return o;
 }
 
-checkUnnamed3777(core.List<api.GooglePrivacyDlpV2beta2FieldId> o) {
+checkUnnamed4076(core.List<api.GooglePrivacyDlpV2beta2FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2FieldId(o[0]);
   checkGooglePrivacyDlpV2beta2FieldId(o[1]);
@@ -2586,7 +2586,7 @@
   buildCounterGooglePrivacyDlpV2beta2FieldTransformation++;
   if (buildCounterGooglePrivacyDlpV2beta2FieldTransformation < 3) {
     o.condition = buildGooglePrivacyDlpV2beta2RecordCondition();
-    o.fields = buildUnnamed3777();
+    o.fields = buildUnnamed4076();
     o.infoTypeTransformations =
         buildGooglePrivacyDlpV2beta2InfoTypeTransformations();
     o.primitiveTransformation =
@@ -2601,7 +2601,7 @@
   buildCounterGooglePrivacyDlpV2beta2FieldTransformation++;
   if (buildCounterGooglePrivacyDlpV2beta2FieldTransformation < 3) {
     checkGooglePrivacyDlpV2beta2RecordCondition(o.condition);
-    checkUnnamed3777(o.fields);
+    checkUnnamed4076(o.fields);
     checkGooglePrivacyDlpV2beta2InfoTypeTransformations(
         o.infoTypeTransformations);
     checkGooglePrivacyDlpV2beta2PrimitiveTransformation(
@@ -2656,14 +2656,14 @@
   buildCounterGooglePrivacyDlpV2beta2Finding--;
 }
 
-buildUnnamed3778() {
+buildUnnamed4077() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2InfoTypeLimit>();
   o.add(buildGooglePrivacyDlpV2beta2InfoTypeLimit());
   o.add(buildGooglePrivacyDlpV2beta2InfoTypeLimit());
   return o;
 }
 
-checkUnnamed3778(core.List<api.GooglePrivacyDlpV2beta2InfoTypeLimit> o) {
+checkUnnamed4077(core.List<api.GooglePrivacyDlpV2beta2InfoTypeLimit> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2InfoTypeLimit(o[0]);
   checkGooglePrivacyDlpV2beta2InfoTypeLimit(o[1]);
@@ -2674,7 +2674,7 @@
   var o = new api.GooglePrivacyDlpV2beta2FindingLimits();
   buildCounterGooglePrivacyDlpV2beta2FindingLimits++;
   if (buildCounterGooglePrivacyDlpV2beta2FindingLimits < 3) {
-    o.maxFindingsPerInfoType = buildUnnamed3778();
+    o.maxFindingsPerInfoType = buildUnnamed4077();
     o.maxFindingsPerItem = 42;
     o.maxFindingsPerRequest = 42;
   }
@@ -2686,7 +2686,7 @@
     api.GooglePrivacyDlpV2beta2FindingLimits o) {
   buildCounterGooglePrivacyDlpV2beta2FindingLimits++;
   if (buildCounterGooglePrivacyDlpV2beta2FindingLimits < 3) {
-    checkUnnamed3778(o.maxFindingsPerInfoType);
+    checkUnnamed4077(o.maxFindingsPerInfoType);
     unittest.expect(o.maxFindingsPerItem, unittest.equals(42));
     unittest.expect(o.maxFindingsPerRequest, unittest.equals(42));
   }
@@ -2810,14 +2810,14 @@
   buildCounterGooglePrivacyDlpV2beta2InfoType--;
 }
 
-buildUnnamed3779() {
+buildUnnamed4078() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3779(core.List<core.String> o) {
+checkUnnamed4078(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2830,7 +2830,7 @@
   if (buildCounterGooglePrivacyDlpV2beta2InfoTypeDescription < 3) {
     o.displayName = "foo";
     o.name = "foo";
-    o.supportedBy = buildUnnamed3779();
+    o.supportedBy = buildUnnamed4078();
   }
   buildCounterGooglePrivacyDlpV2beta2InfoTypeDescription--;
   return o;
@@ -2842,7 +2842,7 @@
   if (buildCounterGooglePrivacyDlpV2beta2InfoTypeDescription < 3) {
     unittest.expect(o.displayName, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3779(o.supportedBy);
+    checkUnnamed4078(o.supportedBy);
   }
   buildCounterGooglePrivacyDlpV2beta2InfoTypeDescription--;
 }
@@ -2891,14 +2891,14 @@
   buildCounterGooglePrivacyDlpV2beta2InfoTypeStatistics--;
 }
 
-buildUnnamed3780() {
+buildUnnamed4079() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2InfoType>();
   o.add(buildGooglePrivacyDlpV2beta2InfoType());
   o.add(buildGooglePrivacyDlpV2beta2InfoType());
   return o;
 }
 
-checkUnnamed3780(core.List<api.GooglePrivacyDlpV2beta2InfoType> o) {
+checkUnnamed4079(core.List<api.GooglePrivacyDlpV2beta2InfoType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2InfoType(o[0]);
   checkGooglePrivacyDlpV2beta2InfoType(o[1]);
@@ -2909,7 +2909,7 @@
   var o = new api.GooglePrivacyDlpV2beta2InfoTypeTransformation();
   buildCounterGooglePrivacyDlpV2beta2InfoTypeTransformation++;
   if (buildCounterGooglePrivacyDlpV2beta2InfoTypeTransformation < 3) {
-    o.infoTypes = buildUnnamed3780();
+    o.infoTypes = buildUnnamed4079();
     o.primitiveTransformation =
         buildGooglePrivacyDlpV2beta2PrimitiveTransformation();
   }
@@ -2921,21 +2921,21 @@
     api.GooglePrivacyDlpV2beta2InfoTypeTransformation o) {
   buildCounterGooglePrivacyDlpV2beta2InfoTypeTransformation++;
   if (buildCounterGooglePrivacyDlpV2beta2InfoTypeTransformation < 3) {
-    checkUnnamed3780(o.infoTypes);
+    checkUnnamed4079(o.infoTypes);
     checkGooglePrivacyDlpV2beta2PrimitiveTransformation(
         o.primitiveTransformation);
   }
   buildCounterGooglePrivacyDlpV2beta2InfoTypeTransformation--;
 }
 
-buildUnnamed3781() {
+buildUnnamed4080() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2InfoTypeTransformation>();
   o.add(buildGooglePrivacyDlpV2beta2InfoTypeTransformation());
   o.add(buildGooglePrivacyDlpV2beta2InfoTypeTransformation());
   return o;
 }
 
-checkUnnamed3781(
+checkUnnamed4080(
     core.List<api.GooglePrivacyDlpV2beta2InfoTypeTransformation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2InfoTypeTransformation(o[0]);
@@ -2947,7 +2947,7 @@
   var o = new api.GooglePrivacyDlpV2beta2InfoTypeTransformations();
   buildCounterGooglePrivacyDlpV2beta2InfoTypeTransformations++;
   if (buildCounterGooglePrivacyDlpV2beta2InfoTypeTransformations < 3) {
-    o.transformations = buildUnnamed3781();
+    o.transformations = buildUnnamed4080();
   }
   buildCounterGooglePrivacyDlpV2beta2InfoTypeTransformations--;
   return o;
@@ -2957,32 +2957,32 @@
     api.GooglePrivacyDlpV2beta2InfoTypeTransformations o) {
   buildCounterGooglePrivacyDlpV2beta2InfoTypeTransformations++;
   if (buildCounterGooglePrivacyDlpV2beta2InfoTypeTransformations < 3) {
-    checkUnnamed3781(o.transformations);
+    checkUnnamed4080(o.transformations);
   }
   buildCounterGooglePrivacyDlpV2beta2InfoTypeTransformations--;
 }
 
-buildUnnamed3782() {
+buildUnnamed4081() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2CustomInfoType>();
   o.add(buildGooglePrivacyDlpV2beta2CustomInfoType());
   o.add(buildGooglePrivacyDlpV2beta2CustomInfoType());
   return o;
 }
 
-checkUnnamed3782(core.List<api.GooglePrivacyDlpV2beta2CustomInfoType> o) {
+checkUnnamed4081(core.List<api.GooglePrivacyDlpV2beta2CustomInfoType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2CustomInfoType(o[0]);
   checkGooglePrivacyDlpV2beta2CustomInfoType(o[1]);
 }
 
-buildUnnamed3783() {
+buildUnnamed4082() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2InfoType>();
   o.add(buildGooglePrivacyDlpV2beta2InfoType());
   o.add(buildGooglePrivacyDlpV2beta2InfoType());
   return o;
 }
 
-checkUnnamed3783(core.List<api.GooglePrivacyDlpV2beta2InfoType> o) {
+checkUnnamed4082(core.List<api.GooglePrivacyDlpV2beta2InfoType> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2InfoType(o[0]);
   checkGooglePrivacyDlpV2beta2InfoType(o[1]);
@@ -2993,10 +2993,10 @@
   var o = new api.GooglePrivacyDlpV2beta2InspectConfig();
   buildCounterGooglePrivacyDlpV2beta2InspectConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2InspectConfig < 3) {
-    o.customInfoTypes = buildUnnamed3782();
+    o.customInfoTypes = buildUnnamed4081();
     o.excludeInfoTypes = true;
     o.includeQuote = true;
-    o.infoTypes = buildUnnamed3783();
+    o.infoTypes = buildUnnamed4082();
     o.limits = buildGooglePrivacyDlpV2beta2FindingLimits();
     o.minLikelihood = "foo";
   }
@@ -3008,10 +3008,10 @@
     api.GooglePrivacyDlpV2beta2InspectConfig o) {
   buildCounterGooglePrivacyDlpV2beta2InspectConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2InspectConfig < 3) {
-    checkUnnamed3782(o.customInfoTypes);
+    checkUnnamed4081(o.customInfoTypes);
     unittest.expect(o.excludeInfoTypes, unittest.isTrue);
     unittest.expect(o.includeQuote, unittest.isTrue);
-    checkUnnamed3783(o.infoTypes);
+    checkUnnamed4082(o.infoTypes);
     checkGooglePrivacyDlpV2beta2FindingLimits(o.limits);
     unittest.expect(o.minLikelihood, unittest.equals('foo'));
   }
@@ -3106,14 +3106,14 @@
   buildCounterGooglePrivacyDlpV2beta2InspectDataSourceRequest--;
 }
 
-buildUnnamed3784() {
+buildUnnamed4083() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Action>();
   o.add(buildGooglePrivacyDlpV2beta2Action());
   o.add(buildGooglePrivacyDlpV2beta2Action());
   return o;
 }
 
-checkUnnamed3784(core.List<api.GooglePrivacyDlpV2beta2Action> o) {
+checkUnnamed4083(core.List<api.GooglePrivacyDlpV2beta2Action> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Action(o[0]);
   checkGooglePrivacyDlpV2beta2Action(o[1]);
@@ -3124,7 +3124,7 @@
   var o = new api.GooglePrivacyDlpV2beta2InspectJobConfig();
   buildCounterGooglePrivacyDlpV2beta2InspectJobConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2InspectJobConfig < 3) {
-    o.actions = buildUnnamed3784();
+    o.actions = buildUnnamed4083();
     o.inspectConfig = buildGooglePrivacyDlpV2beta2InspectConfig();
     o.inspectTemplateName = "foo";
     o.outputConfig = buildGooglePrivacyDlpV2beta2OutputStorageConfig();
@@ -3138,7 +3138,7 @@
     api.GooglePrivacyDlpV2beta2InspectJobConfig o) {
   buildCounterGooglePrivacyDlpV2beta2InspectJobConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2InspectJobConfig < 3) {
-    checkUnnamed3784(o.actions);
+    checkUnnamed4083(o.actions);
     checkGooglePrivacyDlpV2beta2InspectConfig(o.inspectConfig);
     unittest.expect(o.inspectTemplateName, unittest.equals('foo'));
     checkGooglePrivacyDlpV2beta2OutputStorageConfig(o.outputConfig);
@@ -3147,14 +3147,14 @@
   buildCounterGooglePrivacyDlpV2beta2InspectJobConfig--;
 }
 
-buildUnnamed3785() {
+buildUnnamed4084() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Finding>();
   o.add(buildGooglePrivacyDlpV2beta2Finding());
   o.add(buildGooglePrivacyDlpV2beta2Finding());
   return o;
 }
 
-checkUnnamed3785(core.List<api.GooglePrivacyDlpV2beta2Finding> o) {
+checkUnnamed4084(core.List<api.GooglePrivacyDlpV2beta2Finding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Finding(o[0]);
   checkGooglePrivacyDlpV2beta2Finding(o[1]);
@@ -3165,7 +3165,7 @@
   var o = new api.GooglePrivacyDlpV2beta2InspectResult();
   buildCounterGooglePrivacyDlpV2beta2InspectResult++;
   if (buildCounterGooglePrivacyDlpV2beta2InspectResult < 3) {
-    o.findings = buildUnnamed3785();
+    o.findings = buildUnnamed4084();
     o.findingsTruncated = true;
   }
   buildCounterGooglePrivacyDlpV2beta2InspectResult--;
@@ -3176,7 +3176,7 @@
     api.GooglePrivacyDlpV2beta2InspectResult o) {
   buildCounterGooglePrivacyDlpV2beta2InspectResult++;
   if (buildCounterGooglePrivacyDlpV2beta2InspectResult < 3) {
-    checkUnnamed3785(o.findings);
+    checkUnnamed4084(o.findings);
     unittest.expect(o.findingsTruncated, unittest.isTrue);
   }
   buildCounterGooglePrivacyDlpV2beta2InspectResult--;
@@ -3212,27 +3212,27 @@
   buildCounterGooglePrivacyDlpV2beta2InspectTemplate--;
 }
 
-buildUnnamed3786() {
+buildUnnamed4085() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Error>();
   o.add(buildGooglePrivacyDlpV2beta2Error());
   o.add(buildGooglePrivacyDlpV2beta2Error());
   return o;
 }
 
-checkUnnamed3786(core.List<api.GooglePrivacyDlpV2beta2Error> o) {
+checkUnnamed4085(core.List<api.GooglePrivacyDlpV2beta2Error> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Error(o[0]);
   checkGooglePrivacyDlpV2beta2Error(o[1]);
 }
 
-buildUnnamed3787() {
+buildUnnamed4086() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Trigger>();
   o.add(buildGooglePrivacyDlpV2beta2Trigger());
   o.add(buildGooglePrivacyDlpV2beta2Trigger());
   return o;
 }
 
-checkUnnamed3787(core.List<api.GooglePrivacyDlpV2beta2Trigger> o) {
+checkUnnamed4086(core.List<api.GooglePrivacyDlpV2beta2Trigger> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Trigger(o[0]);
   checkGooglePrivacyDlpV2beta2Trigger(o[1]);
@@ -3246,12 +3246,12 @@
     o.createTime = "foo";
     o.description = "foo";
     o.displayName = "foo";
-    o.errors = buildUnnamed3786();
+    o.errors = buildUnnamed4085();
     o.inspectJob = buildGooglePrivacyDlpV2beta2InspectJobConfig();
     o.lastRunTime = "foo";
     o.name = "foo";
     o.status = "foo";
-    o.triggers = buildUnnamed3787();
+    o.triggers = buildUnnamed4086();
     o.updateTime = "foo";
   }
   buildCounterGooglePrivacyDlpV2beta2JobTrigger--;
@@ -3265,25 +3265,25 @@
     unittest.expect(o.createTime, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed3786(o.errors);
+    checkUnnamed4085(o.errors);
     checkGooglePrivacyDlpV2beta2InspectJobConfig(o.inspectJob);
     unittest.expect(o.lastRunTime, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
-    checkUnnamed3787(o.triggers);
+    checkUnnamed4086(o.triggers);
     unittest.expect(o.updateTime, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta2JobTrigger--;
 }
 
-buildUnnamed3788() {
+buildUnnamed4087() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2FieldId>();
   o.add(buildGooglePrivacyDlpV2beta2FieldId());
   o.add(buildGooglePrivacyDlpV2beta2FieldId());
   return o;
 }
 
-checkUnnamed3788(core.List<api.GooglePrivacyDlpV2beta2FieldId> o) {
+checkUnnamed4087(core.List<api.GooglePrivacyDlpV2beta2FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2FieldId(o[0]);
   checkGooglePrivacyDlpV2beta2FieldId(o[1]);
@@ -3295,7 +3295,7 @@
   buildCounterGooglePrivacyDlpV2beta2KAnonymityConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2KAnonymityConfig < 3) {
     o.entityId = buildGooglePrivacyDlpV2beta2EntityId();
-    o.quasiIds = buildUnnamed3788();
+    o.quasiIds = buildUnnamed4087();
   }
   buildCounterGooglePrivacyDlpV2beta2KAnonymityConfig--;
   return o;
@@ -3306,19 +3306,19 @@
   buildCounterGooglePrivacyDlpV2beta2KAnonymityConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2KAnonymityConfig < 3) {
     checkGooglePrivacyDlpV2beta2EntityId(o.entityId);
-    checkUnnamed3788(o.quasiIds);
+    checkUnnamed4087(o.quasiIds);
   }
   buildCounterGooglePrivacyDlpV2beta2KAnonymityConfig--;
 }
 
-buildUnnamed3789() {
+buildUnnamed4088() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Value>();
   o.add(buildGooglePrivacyDlpV2beta2Value());
   o.add(buildGooglePrivacyDlpV2beta2Value());
   return o;
 }
 
-checkUnnamed3789(core.List<api.GooglePrivacyDlpV2beta2Value> o) {
+checkUnnamed4088(core.List<api.GooglePrivacyDlpV2beta2Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Value(o[0]);
   checkGooglePrivacyDlpV2beta2Value(o[1]);
@@ -3330,7 +3330,7 @@
   buildCounterGooglePrivacyDlpV2beta2KAnonymityEquivalenceClass++;
   if (buildCounterGooglePrivacyDlpV2beta2KAnonymityEquivalenceClass < 3) {
     o.equivalenceClassSize = "foo";
-    o.quasiIdsValues = buildUnnamed3789();
+    o.quasiIdsValues = buildUnnamed4088();
   }
   buildCounterGooglePrivacyDlpV2beta2KAnonymityEquivalenceClass--;
   return o;
@@ -3341,12 +3341,12 @@
   buildCounterGooglePrivacyDlpV2beta2KAnonymityEquivalenceClass++;
   if (buildCounterGooglePrivacyDlpV2beta2KAnonymityEquivalenceClass < 3) {
     unittest.expect(o.equivalenceClassSize, unittest.equals('foo'));
-    checkUnnamed3789(o.quasiIdsValues);
+    checkUnnamed4088(o.quasiIdsValues);
   }
   buildCounterGooglePrivacyDlpV2beta2KAnonymityEquivalenceClass--;
 }
 
-buildUnnamed3790() {
+buildUnnamed4089() {
   var o =
       new core.List<api.GooglePrivacyDlpV2beta2KAnonymityEquivalenceClass>();
   o.add(buildGooglePrivacyDlpV2beta2KAnonymityEquivalenceClass());
@@ -3354,7 +3354,7 @@
   return o;
 }
 
-checkUnnamed3790(
+checkUnnamed4089(
     core.List<api.GooglePrivacyDlpV2beta2KAnonymityEquivalenceClass> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2KAnonymityEquivalenceClass(o[0]);
@@ -3367,7 +3367,7 @@
   buildCounterGooglePrivacyDlpV2beta2KAnonymityHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta2KAnonymityHistogramBucket < 3) {
     o.bucketSize = "foo";
-    o.bucketValues = buildUnnamed3790();
+    o.bucketValues = buildUnnamed4089();
     o.equivalenceClassSizeLowerBound = "foo";
     o.equivalenceClassSizeUpperBound = "foo";
   }
@@ -3380,21 +3380,21 @@
   buildCounterGooglePrivacyDlpV2beta2KAnonymityHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta2KAnonymityHistogramBucket < 3) {
     unittest.expect(o.bucketSize, unittest.equals('foo'));
-    checkUnnamed3790(o.bucketValues);
+    checkUnnamed4089(o.bucketValues);
     unittest.expect(o.equivalenceClassSizeLowerBound, unittest.equals('foo'));
     unittest.expect(o.equivalenceClassSizeUpperBound, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta2KAnonymityHistogramBucket--;
 }
 
-buildUnnamed3791() {
+buildUnnamed4090() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2KAnonymityHistogramBucket>();
   o.add(buildGooglePrivacyDlpV2beta2KAnonymityHistogramBucket());
   o.add(buildGooglePrivacyDlpV2beta2KAnonymityHistogramBucket());
   return o;
 }
 
-checkUnnamed3791(
+checkUnnamed4090(
     core.List<api.GooglePrivacyDlpV2beta2KAnonymityHistogramBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2KAnonymityHistogramBucket(o[0]);
@@ -3406,7 +3406,7 @@
   var o = new api.GooglePrivacyDlpV2beta2KAnonymityResult();
   buildCounterGooglePrivacyDlpV2beta2KAnonymityResult++;
   if (buildCounterGooglePrivacyDlpV2beta2KAnonymityResult < 3) {
-    o.equivalenceClassHistogramBuckets = buildUnnamed3791();
+    o.equivalenceClassHistogramBuckets = buildUnnamed4090();
   }
   buildCounterGooglePrivacyDlpV2beta2KAnonymityResult--;
   return o;
@@ -3416,32 +3416,32 @@
     api.GooglePrivacyDlpV2beta2KAnonymityResult o) {
   buildCounterGooglePrivacyDlpV2beta2KAnonymityResult++;
   if (buildCounterGooglePrivacyDlpV2beta2KAnonymityResult < 3) {
-    checkUnnamed3791(o.equivalenceClassHistogramBuckets);
+    checkUnnamed4090(o.equivalenceClassHistogramBuckets);
   }
   buildCounterGooglePrivacyDlpV2beta2KAnonymityResult--;
 }
 
-buildUnnamed3792() {
+buildUnnamed4091() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2AuxiliaryTable>();
   o.add(buildGooglePrivacyDlpV2beta2AuxiliaryTable());
   o.add(buildGooglePrivacyDlpV2beta2AuxiliaryTable());
   return o;
 }
 
-checkUnnamed3792(core.List<api.GooglePrivacyDlpV2beta2AuxiliaryTable> o) {
+checkUnnamed4091(core.List<api.GooglePrivacyDlpV2beta2AuxiliaryTable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2AuxiliaryTable(o[0]);
   checkGooglePrivacyDlpV2beta2AuxiliaryTable(o[1]);
 }
 
-buildUnnamed3793() {
+buildUnnamed4092() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2TaggedField>();
   o.add(buildGooglePrivacyDlpV2beta2TaggedField());
   o.add(buildGooglePrivacyDlpV2beta2TaggedField());
   return o;
 }
 
-checkUnnamed3793(core.List<api.GooglePrivacyDlpV2beta2TaggedField> o) {
+checkUnnamed4092(core.List<api.GooglePrivacyDlpV2beta2TaggedField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2TaggedField(o[0]);
   checkGooglePrivacyDlpV2beta2TaggedField(o[1]);
@@ -3452,8 +3452,8 @@
   var o = new api.GooglePrivacyDlpV2beta2KMapEstimationConfig();
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2KMapEstimationConfig < 3) {
-    o.auxiliaryTables = buildUnnamed3792();
-    o.quasiIds = buildUnnamed3793();
+    o.auxiliaryTables = buildUnnamed4091();
+    o.quasiIds = buildUnnamed4092();
     o.regionCode = "foo";
   }
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationConfig--;
@@ -3464,14 +3464,14 @@
     api.GooglePrivacyDlpV2beta2KMapEstimationConfig o) {
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2KMapEstimationConfig < 3) {
-    checkUnnamed3792(o.auxiliaryTables);
-    checkUnnamed3793(o.quasiIds);
+    checkUnnamed4091(o.auxiliaryTables);
+    checkUnnamed4092(o.quasiIds);
     unittest.expect(o.regionCode, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationConfig--;
 }
 
-buildUnnamed3794() {
+buildUnnamed4093() {
   var o =
       new core.List<api.GooglePrivacyDlpV2beta2KMapEstimationQuasiIdValues>();
   o.add(buildGooglePrivacyDlpV2beta2KMapEstimationQuasiIdValues());
@@ -3479,7 +3479,7 @@
   return o;
 }
 
-checkUnnamed3794(
+checkUnnamed4093(
     core.List<api.GooglePrivacyDlpV2beta2KMapEstimationQuasiIdValues> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2KMapEstimationQuasiIdValues(o[0]);
@@ -3492,7 +3492,7 @@
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta2KMapEstimationHistogramBucket < 3) {
     o.bucketSize = "foo";
-    o.bucketValues = buildUnnamed3794();
+    o.bucketValues = buildUnnamed4093();
     o.maxAnonymity = "foo";
     o.minAnonymity = "foo";
   }
@@ -3505,21 +3505,21 @@
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta2KMapEstimationHistogramBucket < 3) {
     unittest.expect(o.bucketSize, unittest.equals('foo'));
-    checkUnnamed3794(o.bucketValues);
+    checkUnnamed4093(o.bucketValues);
     unittest.expect(o.maxAnonymity, unittest.equals('foo'));
     unittest.expect(o.minAnonymity, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationHistogramBucket--;
 }
 
-buildUnnamed3795() {
+buildUnnamed4094() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Value>();
   o.add(buildGooglePrivacyDlpV2beta2Value());
   o.add(buildGooglePrivacyDlpV2beta2Value());
   return o;
 }
 
-checkUnnamed3795(core.List<api.GooglePrivacyDlpV2beta2Value> o) {
+checkUnnamed4094(core.List<api.GooglePrivacyDlpV2beta2Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Value(o[0]);
   checkGooglePrivacyDlpV2beta2Value(o[1]);
@@ -3531,7 +3531,7 @@
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationQuasiIdValues++;
   if (buildCounterGooglePrivacyDlpV2beta2KMapEstimationQuasiIdValues < 3) {
     o.estimatedAnonymity = "foo";
-    o.quasiIdsValues = buildUnnamed3795();
+    o.quasiIdsValues = buildUnnamed4094();
   }
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationQuasiIdValues--;
   return o;
@@ -3542,12 +3542,12 @@
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationQuasiIdValues++;
   if (buildCounterGooglePrivacyDlpV2beta2KMapEstimationQuasiIdValues < 3) {
     unittest.expect(o.estimatedAnonymity, unittest.equals('foo'));
-    checkUnnamed3795(o.quasiIdsValues);
+    checkUnnamed4094(o.quasiIdsValues);
   }
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationQuasiIdValues--;
 }
 
-buildUnnamed3796() {
+buildUnnamed4095() {
   var o =
       new core.List<api.GooglePrivacyDlpV2beta2KMapEstimationHistogramBucket>();
   o.add(buildGooglePrivacyDlpV2beta2KMapEstimationHistogramBucket());
@@ -3555,7 +3555,7 @@
   return o;
 }
 
-checkUnnamed3796(
+checkUnnamed4095(
     core.List<api.GooglePrivacyDlpV2beta2KMapEstimationHistogramBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2KMapEstimationHistogramBucket(o[0]);
@@ -3567,7 +3567,7 @@
   var o = new api.GooglePrivacyDlpV2beta2KMapEstimationResult();
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationResult++;
   if (buildCounterGooglePrivacyDlpV2beta2KMapEstimationResult < 3) {
-    o.kMapEstimationHistogram = buildUnnamed3796();
+    o.kMapEstimationHistogram = buildUnnamed4095();
   }
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationResult--;
   return o;
@@ -3577,19 +3577,19 @@
     api.GooglePrivacyDlpV2beta2KMapEstimationResult o) {
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationResult++;
   if (buildCounterGooglePrivacyDlpV2beta2KMapEstimationResult < 3) {
-    checkUnnamed3796(o.kMapEstimationHistogram);
+    checkUnnamed4095(o.kMapEstimationHistogram);
   }
   buildCounterGooglePrivacyDlpV2beta2KMapEstimationResult--;
 }
 
-buildUnnamed3797() {
+buildUnnamed4096() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2PathElement>();
   o.add(buildGooglePrivacyDlpV2beta2PathElement());
   o.add(buildGooglePrivacyDlpV2beta2PathElement());
   return o;
 }
 
-checkUnnamed3797(core.List<api.GooglePrivacyDlpV2beta2PathElement> o) {
+checkUnnamed4096(core.List<api.GooglePrivacyDlpV2beta2PathElement> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2PathElement(o[0]);
   checkGooglePrivacyDlpV2beta2PathElement(o[1]);
@@ -3601,7 +3601,7 @@
   buildCounterGooglePrivacyDlpV2beta2Key++;
   if (buildCounterGooglePrivacyDlpV2beta2Key < 3) {
     o.partitionId = buildGooglePrivacyDlpV2beta2PartitionId();
-    o.path = buildUnnamed3797();
+    o.path = buildUnnamed4096();
   }
   buildCounterGooglePrivacyDlpV2beta2Key--;
   return o;
@@ -3611,7 +3611,7 @@
   buildCounterGooglePrivacyDlpV2beta2Key++;
   if (buildCounterGooglePrivacyDlpV2beta2Key < 3) {
     checkGooglePrivacyDlpV2beta2PartitionId(o.partitionId);
-    checkUnnamed3797(o.path);
+    checkUnnamed4096(o.path);
   }
   buildCounterGooglePrivacyDlpV2beta2Key--;
 }
@@ -3658,14 +3658,14 @@
   buildCounterGooglePrivacyDlpV2beta2KmsWrappedCryptoKey--;
 }
 
-buildUnnamed3798() {
+buildUnnamed4097() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2FieldId>();
   o.add(buildGooglePrivacyDlpV2beta2FieldId());
   o.add(buildGooglePrivacyDlpV2beta2FieldId());
   return o;
 }
 
-checkUnnamed3798(core.List<api.GooglePrivacyDlpV2beta2FieldId> o) {
+checkUnnamed4097(core.List<api.GooglePrivacyDlpV2beta2FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2FieldId(o[0]);
   checkGooglePrivacyDlpV2beta2FieldId(o[1]);
@@ -3676,7 +3676,7 @@
   var o = new api.GooglePrivacyDlpV2beta2LDiversityConfig();
   buildCounterGooglePrivacyDlpV2beta2LDiversityConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2LDiversityConfig < 3) {
-    o.quasiIds = buildUnnamed3798();
+    o.quasiIds = buildUnnamed4097();
     o.sensitiveAttribute = buildGooglePrivacyDlpV2beta2FieldId();
   }
   buildCounterGooglePrivacyDlpV2beta2LDiversityConfig--;
@@ -3687,33 +3687,33 @@
     api.GooglePrivacyDlpV2beta2LDiversityConfig o) {
   buildCounterGooglePrivacyDlpV2beta2LDiversityConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2LDiversityConfig < 3) {
-    checkUnnamed3798(o.quasiIds);
+    checkUnnamed4097(o.quasiIds);
     checkGooglePrivacyDlpV2beta2FieldId(o.sensitiveAttribute);
   }
   buildCounterGooglePrivacyDlpV2beta2LDiversityConfig--;
 }
 
-buildUnnamed3799() {
+buildUnnamed4098() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Value>();
   o.add(buildGooglePrivacyDlpV2beta2Value());
   o.add(buildGooglePrivacyDlpV2beta2Value());
   return o;
 }
 
-checkUnnamed3799(core.List<api.GooglePrivacyDlpV2beta2Value> o) {
+checkUnnamed4098(core.List<api.GooglePrivacyDlpV2beta2Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Value(o[0]);
   checkGooglePrivacyDlpV2beta2Value(o[1]);
 }
 
-buildUnnamed3800() {
+buildUnnamed4099() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2ValueFrequency>();
   o.add(buildGooglePrivacyDlpV2beta2ValueFrequency());
   o.add(buildGooglePrivacyDlpV2beta2ValueFrequency());
   return o;
 }
 
-checkUnnamed3800(core.List<api.GooglePrivacyDlpV2beta2ValueFrequency> o) {
+checkUnnamed4099(core.List<api.GooglePrivacyDlpV2beta2ValueFrequency> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2ValueFrequency(o[0]);
   checkGooglePrivacyDlpV2beta2ValueFrequency(o[1]);
@@ -3726,8 +3726,8 @@
   if (buildCounterGooglePrivacyDlpV2beta2LDiversityEquivalenceClass < 3) {
     o.equivalenceClassSize = "foo";
     o.numDistinctSensitiveValues = "foo";
-    o.quasiIdsValues = buildUnnamed3799();
-    o.topSensitiveValues = buildUnnamed3800();
+    o.quasiIdsValues = buildUnnamed4098();
+    o.topSensitiveValues = buildUnnamed4099();
   }
   buildCounterGooglePrivacyDlpV2beta2LDiversityEquivalenceClass--;
   return o;
@@ -3739,13 +3739,13 @@
   if (buildCounterGooglePrivacyDlpV2beta2LDiversityEquivalenceClass < 3) {
     unittest.expect(o.equivalenceClassSize, unittest.equals('foo'));
     unittest.expect(o.numDistinctSensitiveValues, unittest.equals('foo'));
-    checkUnnamed3799(o.quasiIdsValues);
-    checkUnnamed3800(o.topSensitiveValues);
+    checkUnnamed4098(o.quasiIdsValues);
+    checkUnnamed4099(o.topSensitiveValues);
   }
   buildCounterGooglePrivacyDlpV2beta2LDiversityEquivalenceClass--;
 }
 
-buildUnnamed3801() {
+buildUnnamed4100() {
   var o =
       new core.List<api.GooglePrivacyDlpV2beta2LDiversityEquivalenceClass>();
   o.add(buildGooglePrivacyDlpV2beta2LDiversityEquivalenceClass());
@@ -3753,7 +3753,7 @@
   return o;
 }
 
-checkUnnamed3801(
+checkUnnamed4100(
     core.List<api.GooglePrivacyDlpV2beta2LDiversityEquivalenceClass> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2LDiversityEquivalenceClass(o[0]);
@@ -3766,7 +3766,7 @@
   buildCounterGooglePrivacyDlpV2beta2LDiversityHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta2LDiversityHistogramBucket < 3) {
     o.bucketSize = "foo";
-    o.bucketValues = buildUnnamed3801();
+    o.bucketValues = buildUnnamed4100();
     o.sensitiveValueFrequencyLowerBound = "foo";
     o.sensitiveValueFrequencyUpperBound = "foo";
   }
@@ -3779,7 +3779,7 @@
   buildCounterGooglePrivacyDlpV2beta2LDiversityHistogramBucket++;
   if (buildCounterGooglePrivacyDlpV2beta2LDiversityHistogramBucket < 3) {
     unittest.expect(o.bucketSize, unittest.equals('foo'));
-    checkUnnamed3801(o.bucketValues);
+    checkUnnamed4100(o.bucketValues);
     unittest.expect(
         o.sensitiveValueFrequencyLowerBound, unittest.equals('foo'));
     unittest.expect(
@@ -3788,14 +3788,14 @@
   buildCounterGooglePrivacyDlpV2beta2LDiversityHistogramBucket--;
 }
 
-buildUnnamed3802() {
+buildUnnamed4101() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2LDiversityHistogramBucket>();
   o.add(buildGooglePrivacyDlpV2beta2LDiversityHistogramBucket());
   o.add(buildGooglePrivacyDlpV2beta2LDiversityHistogramBucket());
   return o;
 }
 
-checkUnnamed3802(
+checkUnnamed4101(
     core.List<api.GooglePrivacyDlpV2beta2LDiversityHistogramBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2LDiversityHistogramBucket(o[0]);
@@ -3807,7 +3807,7 @@
   var o = new api.GooglePrivacyDlpV2beta2LDiversityResult();
   buildCounterGooglePrivacyDlpV2beta2LDiversityResult++;
   if (buildCounterGooglePrivacyDlpV2beta2LDiversityResult < 3) {
-    o.sensitiveValueFrequencyHistogramBuckets = buildUnnamed3802();
+    o.sensitiveValueFrequencyHistogramBuckets = buildUnnamed4101();
   }
   buildCounterGooglePrivacyDlpV2beta2LDiversityResult--;
   return o;
@@ -3817,7 +3817,7 @@
     api.GooglePrivacyDlpV2beta2LDiversityResult o) {
   buildCounterGooglePrivacyDlpV2beta2LDiversityResult++;
   if (buildCounterGooglePrivacyDlpV2beta2LDiversityResult < 3) {
-    checkUnnamed3802(o.sensitiveValueFrequencyHistogramBuckets);
+    checkUnnamed4101(o.sensitiveValueFrequencyHistogramBuckets);
   }
   buildCounterGooglePrivacyDlpV2beta2LDiversityResult--;
 }
@@ -3844,14 +3844,14 @@
   buildCounterGooglePrivacyDlpV2beta2LikelihoodAdjustment--;
 }
 
-buildUnnamed3803() {
+buildUnnamed4102() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2DeidentifyTemplate>();
   o.add(buildGooglePrivacyDlpV2beta2DeidentifyTemplate());
   o.add(buildGooglePrivacyDlpV2beta2DeidentifyTemplate());
   return o;
 }
 
-checkUnnamed3803(core.List<api.GooglePrivacyDlpV2beta2DeidentifyTemplate> o) {
+checkUnnamed4102(core.List<api.GooglePrivacyDlpV2beta2DeidentifyTemplate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2DeidentifyTemplate(o[0]);
   checkGooglePrivacyDlpV2beta2DeidentifyTemplate(o[1]);
@@ -3862,7 +3862,7 @@
   var o = new api.GooglePrivacyDlpV2beta2ListDeidentifyTemplatesResponse();
   buildCounterGooglePrivacyDlpV2beta2ListDeidentifyTemplatesResponse++;
   if (buildCounterGooglePrivacyDlpV2beta2ListDeidentifyTemplatesResponse < 3) {
-    o.deidentifyTemplates = buildUnnamed3803();
+    o.deidentifyTemplates = buildUnnamed4102();
     o.nextPageToken = "foo";
   }
   buildCounterGooglePrivacyDlpV2beta2ListDeidentifyTemplatesResponse--;
@@ -3873,20 +3873,20 @@
     api.GooglePrivacyDlpV2beta2ListDeidentifyTemplatesResponse o) {
   buildCounterGooglePrivacyDlpV2beta2ListDeidentifyTemplatesResponse++;
   if (buildCounterGooglePrivacyDlpV2beta2ListDeidentifyTemplatesResponse < 3) {
-    checkUnnamed3803(o.deidentifyTemplates);
+    checkUnnamed4102(o.deidentifyTemplates);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta2ListDeidentifyTemplatesResponse--;
 }
 
-buildUnnamed3804() {
+buildUnnamed4103() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2DlpJob>();
   o.add(buildGooglePrivacyDlpV2beta2DlpJob());
   o.add(buildGooglePrivacyDlpV2beta2DlpJob());
   return o;
 }
 
-checkUnnamed3804(core.List<api.GooglePrivacyDlpV2beta2DlpJob> o) {
+checkUnnamed4103(core.List<api.GooglePrivacyDlpV2beta2DlpJob> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2DlpJob(o[0]);
   checkGooglePrivacyDlpV2beta2DlpJob(o[1]);
@@ -3897,7 +3897,7 @@
   var o = new api.GooglePrivacyDlpV2beta2ListDlpJobsResponse();
   buildCounterGooglePrivacyDlpV2beta2ListDlpJobsResponse++;
   if (buildCounterGooglePrivacyDlpV2beta2ListDlpJobsResponse < 3) {
-    o.jobs = buildUnnamed3804();
+    o.jobs = buildUnnamed4103();
     o.nextPageToken = "foo";
   }
   buildCounterGooglePrivacyDlpV2beta2ListDlpJobsResponse--;
@@ -3908,20 +3908,20 @@
     api.GooglePrivacyDlpV2beta2ListDlpJobsResponse o) {
   buildCounterGooglePrivacyDlpV2beta2ListDlpJobsResponse++;
   if (buildCounterGooglePrivacyDlpV2beta2ListDlpJobsResponse < 3) {
-    checkUnnamed3804(o.jobs);
+    checkUnnamed4103(o.jobs);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta2ListDlpJobsResponse--;
 }
 
-buildUnnamed3805() {
+buildUnnamed4104() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2InfoTypeDescription>();
   o.add(buildGooglePrivacyDlpV2beta2InfoTypeDescription());
   o.add(buildGooglePrivacyDlpV2beta2InfoTypeDescription());
   return o;
 }
 
-checkUnnamed3805(core.List<api.GooglePrivacyDlpV2beta2InfoTypeDescription> o) {
+checkUnnamed4104(core.List<api.GooglePrivacyDlpV2beta2InfoTypeDescription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2InfoTypeDescription(o[0]);
   checkGooglePrivacyDlpV2beta2InfoTypeDescription(o[1]);
@@ -3932,7 +3932,7 @@
   var o = new api.GooglePrivacyDlpV2beta2ListInfoTypesResponse();
   buildCounterGooglePrivacyDlpV2beta2ListInfoTypesResponse++;
   if (buildCounterGooglePrivacyDlpV2beta2ListInfoTypesResponse < 3) {
-    o.infoTypes = buildUnnamed3805();
+    o.infoTypes = buildUnnamed4104();
   }
   buildCounterGooglePrivacyDlpV2beta2ListInfoTypesResponse--;
   return o;
@@ -3942,19 +3942,19 @@
     api.GooglePrivacyDlpV2beta2ListInfoTypesResponse o) {
   buildCounterGooglePrivacyDlpV2beta2ListInfoTypesResponse++;
   if (buildCounterGooglePrivacyDlpV2beta2ListInfoTypesResponse < 3) {
-    checkUnnamed3805(o.infoTypes);
+    checkUnnamed4104(o.infoTypes);
   }
   buildCounterGooglePrivacyDlpV2beta2ListInfoTypesResponse--;
 }
 
-buildUnnamed3806() {
+buildUnnamed4105() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2InspectTemplate>();
   o.add(buildGooglePrivacyDlpV2beta2InspectTemplate());
   o.add(buildGooglePrivacyDlpV2beta2InspectTemplate());
   return o;
 }
 
-checkUnnamed3806(core.List<api.GooglePrivacyDlpV2beta2InspectTemplate> o) {
+checkUnnamed4105(core.List<api.GooglePrivacyDlpV2beta2InspectTemplate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2InspectTemplate(o[0]);
   checkGooglePrivacyDlpV2beta2InspectTemplate(o[1]);
@@ -3965,7 +3965,7 @@
   var o = new api.GooglePrivacyDlpV2beta2ListInspectTemplatesResponse();
   buildCounterGooglePrivacyDlpV2beta2ListInspectTemplatesResponse++;
   if (buildCounterGooglePrivacyDlpV2beta2ListInspectTemplatesResponse < 3) {
-    o.inspectTemplates = buildUnnamed3806();
+    o.inspectTemplates = buildUnnamed4105();
     o.nextPageToken = "foo";
   }
   buildCounterGooglePrivacyDlpV2beta2ListInspectTemplatesResponse--;
@@ -3976,20 +3976,20 @@
     api.GooglePrivacyDlpV2beta2ListInspectTemplatesResponse o) {
   buildCounterGooglePrivacyDlpV2beta2ListInspectTemplatesResponse++;
   if (buildCounterGooglePrivacyDlpV2beta2ListInspectTemplatesResponse < 3) {
-    checkUnnamed3806(o.inspectTemplates);
+    checkUnnamed4105(o.inspectTemplates);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta2ListInspectTemplatesResponse--;
 }
 
-buildUnnamed3807() {
+buildUnnamed4106() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2JobTrigger>();
   o.add(buildGooglePrivacyDlpV2beta2JobTrigger());
   o.add(buildGooglePrivacyDlpV2beta2JobTrigger());
   return o;
 }
 
-checkUnnamed3807(core.List<api.GooglePrivacyDlpV2beta2JobTrigger> o) {
+checkUnnamed4106(core.List<api.GooglePrivacyDlpV2beta2JobTrigger> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2JobTrigger(o[0]);
   checkGooglePrivacyDlpV2beta2JobTrigger(o[1]);
@@ -4000,7 +4000,7 @@
   var o = new api.GooglePrivacyDlpV2beta2ListJobTriggersResponse();
   buildCounterGooglePrivacyDlpV2beta2ListJobTriggersResponse++;
   if (buildCounterGooglePrivacyDlpV2beta2ListJobTriggersResponse < 3) {
-    o.jobTriggers = buildUnnamed3807();
+    o.jobTriggers = buildUnnamed4106();
     o.nextPageToken = "foo";
   }
   buildCounterGooglePrivacyDlpV2beta2ListJobTriggersResponse--;
@@ -4011,20 +4011,20 @@
     api.GooglePrivacyDlpV2beta2ListJobTriggersResponse o) {
   buildCounterGooglePrivacyDlpV2beta2ListJobTriggersResponse++;
   if (buildCounterGooglePrivacyDlpV2beta2ListJobTriggersResponse < 3) {
-    checkUnnamed3807(o.jobTriggers);
+    checkUnnamed4106(o.jobTriggers);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta2ListJobTriggersResponse--;
 }
 
-buildUnnamed3808() {
+buildUnnamed4107() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2ImageLocation>();
   o.add(buildGooglePrivacyDlpV2beta2ImageLocation());
   o.add(buildGooglePrivacyDlpV2beta2ImageLocation());
   return o;
 }
 
-checkUnnamed3808(core.List<api.GooglePrivacyDlpV2beta2ImageLocation> o) {
+checkUnnamed4107(core.List<api.GooglePrivacyDlpV2beta2ImageLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2ImageLocation(o[0]);
   checkGooglePrivacyDlpV2beta2ImageLocation(o[1]);
@@ -4038,7 +4038,7 @@
     o.byteRange = buildGooglePrivacyDlpV2beta2Range();
     o.codepointRange = buildGooglePrivacyDlpV2beta2Range();
     o.fieldId = buildGooglePrivacyDlpV2beta2FieldId();
-    o.imageBoxes = buildUnnamed3808();
+    o.imageBoxes = buildUnnamed4107();
     o.recordKey = buildGooglePrivacyDlpV2beta2RecordKey();
     o.tableLocation = buildGooglePrivacyDlpV2beta2TableLocation();
   }
@@ -4052,7 +4052,7 @@
     checkGooglePrivacyDlpV2beta2Range(o.byteRange);
     checkGooglePrivacyDlpV2beta2Range(o.codepointRange);
     checkGooglePrivacyDlpV2beta2FieldId(o.fieldId);
-    checkUnnamed3808(o.imageBoxes);
+    checkUnnamed4107(o.imageBoxes);
     checkGooglePrivacyDlpV2beta2RecordKey(o.recordKey);
     checkGooglePrivacyDlpV2beta2TableLocation(o.tableLocation);
   }
@@ -4079,14 +4079,14 @@
   buildCounterGooglePrivacyDlpV2beta2NumericalStatsConfig--;
 }
 
-buildUnnamed3809() {
+buildUnnamed4108() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Value>();
   o.add(buildGooglePrivacyDlpV2beta2Value());
   o.add(buildGooglePrivacyDlpV2beta2Value());
   return o;
 }
 
-checkUnnamed3809(core.List<api.GooglePrivacyDlpV2beta2Value> o) {
+checkUnnamed4108(core.List<api.GooglePrivacyDlpV2beta2Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Value(o[0]);
   checkGooglePrivacyDlpV2beta2Value(o[1]);
@@ -4099,7 +4099,7 @@
   if (buildCounterGooglePrivacyDlpV2beta2NumericalStatsResult < 3) {
     o.maxValue = buildGooglePrivacyDlpV2beta2Value();
     o.minValue = buildGooglePrivacyDlpV2beta2Value();
-    o.quantileValues = buildUnnamed3809();
+    o.quantileValues = buildUnnamed4108();
   }
   buildCounterGooglePrivacyDlpV2beta2NumericalStatsResult--;
   return o;
@@ -4111,7 +4111,7 @@
   if (buildCounterGooglePrivacyDlpV2beta2NumericalStatsResult < 3) {
     checkGooglePrivacyDlpV2beta2Value(o.maxValue);
     checkGooglePrivacyDlpV2beta2Value(o.minValue);
-    checkUnnamed3809(o.quantileValues);
+    checkUnnamed4108(o.quantileValues);
   }
   buildCounterGooglePrivacyDlpV2beta2NumericalStatsResult--;
 }
@@ -4399,27 +4399,27 @@
   buildCounterGooglePrivacyDlpV2beta2RecordSuppression--;
 }
 
-buildUnnamed3810() {
+buildUnnamed4109() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2FieldTransformation>();
   o.add(buildGooglePrivacyDlpV2beta2FieldTransformation());
   o.add(buildGooglePrivacyDlpV2beta2FieldTransformation());
   return o;
 }
 
-checkUnnamed3810(core.List<api.GooglePrivacyDlpV2beta2FieldTransformation> o) {
+checkUnnamed4109(core.List<api.GooglePrivacyDlpV2beta2FieldTransformation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2FieldTransformation(o[0]);
   checkGooglePrivacyDlpV2beta2FieldTransformation(o[1]);
 }
 
-buildUnnamed3811() {
+buildUnnamed4110() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2RecordSuppression>();
   o.add(buildGooglePrivacyDlpV2beta2RecordSuppression());
   o.add(buildGooglePrivacyDlpV2beta2RecordSuppression());
   return o;
 }
 
-checkUnnamed3811(core.List<api.GooglePrivacyDlpV2beta2RecordSuppression> o) {
+checkUnnamed4110(core.List<api.GooglePrivacyDlpV2beta2RecordSuppression> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2RecordSuppression(o[0]);
   checkGooglePrivacyDlpV2beta2RecordSuppression(o[1]);
@@ -4430,8 +4430,8 @@
   var o = new api.GooglePrivacyDlpV2beta2RecordTransformations();
   buildCounterGooglePrivacyDlpV2beta2RecordTransformations++;
   if (buildCounterGooglePrivacyDlpV2beta2RecordTransformations < 3) {
-    o.fieldTransformations = buildUnnamed3810();
-    o.recordSuppressions = buildUnnamed3811();
+    o.fieldTransformations = buildUnnamed4109();
+    o.recordSuppressions = buildUnnamed4110();
   }
   buildCounterGooglePrivacyDlpV2beta2RecordTransformations--;
   return o;
@@ -4441,8 +4441,8 @@
     api.GooglePrivacyDlpV2beta2RecordTransformations o) {
   buildCounterGooglePrivacyDlpV2beta2RecordTransformations++;
   if (buildCounterGooglePrivacyDlpV2beta2RecordTransformations < 3) {
-    checkUnnamed3810(o.fieldTransformations);
-    checkUnnamed3811(o.recordSuppressions);
+    checkUnnamed4109(o.fieldTransformations);
+    checkUnnamed4110(o.recordSuppressions);
   }
   buildCounterGooglePrivacyDlpV2beta2RecordTransformations--;
 }
@@ -4463,14 +4463,14 @@
   buildCounterGooglePrivacyDlpV2beta2RedactConfig--;
 }
 
-buildUnnamed3812() {
+buildUnnamed4111() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2ImageRedactionConfig>();
   o.add(buildGooglePrivacyDlpV2beta2ImageRedactionConfig());
   o.add(buildGooglePrivacyDlpV2beta2ImageRedactionConfig());
   return o;
 }
 
-checkUnnamed3812(core.List<api.GooglePrivacyDlpV2beta2ImageRedactionConfig> o) {
+checkUnnamed4111(core.List<api.GooglePrivacyDlpV2beta2ImageRedactionConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2ImageRedactionConfig(o[0]);
   checkGooglePrivacyDlpV2beta2ImageRedactionConfig(o[1]);
@@ -4482,7 +4482,7 @@
   buildCounterGooglePrivacyDlpV2beta2RedactImageRequest++;
   if (buildCounterGooglePrivacyDlpV2beta2RedactImageRequest < 3) {
     o.imageData = "foo";
-    o.imageRedactionConfigs = buildUnnamed3812();
+    o.imageRedactionConfigs = buildUnnamed4111();
     o.imageType = "foo";
     o.inspectConfig = buildGooglePrivacyDlpV2beta2InspectConfig();
   }
@@ -4495,7 +4495,7 @@
   buildCounterGooglePrivacyDlpV2beta2RedactImageRequest++;
   if (buildCounterGooglePrivacyDlpV2beta2RedactImageRequest < 3) {
     unittest.expect(o.imageData, unittest.equals('foo'));
-    checkUnnamed3812(o.imageRedactionConfigs);
+    checkUnnamed4111(o.imageRedactionConfigs);
     unittest.expect(o.imageType, unittest.equals('foo'));
     checkGooglePrivacyDlpV2beta2InspectConfig(o.inspectConfig);
   }
@@ -4651,14 +4651,14 @@
   buildCounterGooglePrivacyDlpV2beta2RequestedOptions--;
 }
 
-buildUnnamed3813() {
+buildUnnamed4112() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2InfoTypeStatistics>();
   o.add(buildGooglePrivacyDlpV2beta2InfoTypeStatistics());
   o.add(buildGooglePrivacyDlpV2beta2InfoTypeStatistics());
   return o;
 }
 
-checkUnnamed3813(core.List<api.GooglePrivacyDlpV2beta2InfoTypeStatistics> o) {
+checkUnnamed4112(core.List<api.GooglePrivacyDlpV2beta2InfoTypeStatistics> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2InfoTypeStatistics(o[0]);
   checkGooglePrivacyDlpV2beta2InfoTypeStatistics(o[1]);
@@ -4669,7 +4669,7 @@
   var o = new api.GooglePrivacyDlpV2beta2Result();
   buildCounterGooglePrivacyDlpV2beta2Result++;
   if (buildCounterGooglePrivacyDlpV2beta2Result < 3) {
-    o.infoTypeStats = buildUnnamed3813();
+    o.infoTypeStats = buildUnnamed4112();
     o.processedBytes = "foo";
     o.totalEstimatedBytes = "foo";
   }
@@ -4680,21 +4680,21 @@
 checkGooglePrivacyDlpV2beta2Result(api.GooglePrivacyDlpV2beta2Result o) {
   buildCounterGooglePrivacyDlpV2beta2Result++;
   if (buildCounterGooglePrivacyDlpV2beta2Result < 3) {
-    checkUnnamed3813(o.infoTypeStats);
+    checkUnnamed4112(o.infoTypeStats);
     unittest.expect(o.processedBytes, unittest.equals('foo'));
     unittest.expect(o.totalEstimatedBytes, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta2Result--;
 }
 
-buildUnnamed3814() {
+buildUnnamed4113() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Action>();
   o.add(buildGooglePrivacyDlpV2beta2Action());
   o.add(buildGooglePrivacyDlpV2beta2Action());
   return o;
 }
 
-checkUnnamed3814(core.List<api.GooglePrivacyDlpV2beta2Action> o) {
+checkUnnamed4113(core.List<api.GooglePrivacyDlpV2beta2Action> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Action(o[0]);
   checkGooglePrivacyDlpV2beta2Action(o[1]);
@@ -4705,7 +4705,7 @@
   var o = new api.GooglePrivacyDlpV2beta2RiskAnalysisJobConfig();
   buildCounterGooglePrivacyDlpV2beta2RiskAnalysisJobConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2RiskAnalysisJobConfig < 3) {
-    o.actions = buildUnnamed3814();
+    o.actions = buildUnnamed4113();
     o.privacyMetric = buildGooglePrivacyDlpV2beta2PrivacyMetric();
     o.sourceTable = buildGooglePrivacyDlpV2beta2BigQueryTable();
   }
@@ -4717,21 +4717,21 @@
     api.GooglePrivacyDlpV2beta2RiskAnalysisJobConfig o) {
   buildCounterGooglePrivacyDlpV2beta2RiskAnalysisJobConfig++;
   if (buildCounterGooglePrivacyDlpV2beta2RiskAnalysisJobConfig < 3) {
-    checkUnnamed3814(o.actions);
+    checkUnnamed4113(o.actions);
     checkGooglePrivacyDlpV2beta2PrivacyMetric(o.privacyMetric);
     checkGooglePrivacyDlpV2beta2BigQueryTable(o.sourceTable);
   }
   buildCounterGooglePrivacyDlpV2beta2RiskAnalysisJobConfig--;
 }
 
-buildUnnamed3815() {
+buildUnnamed4114() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Value>();
   o.add(buildGooglePrivacyDlpV2beta2Value());
   o.add(buildGooglePrivacyDlpV2beta2Value());
   return o;
 }
 
-checkUnnamed3815(core.List<api.GooglePrivacyDlpV2beta2Value> o) {
+checkUnnamed4114(core.List<api.GooglePrivacyDlpV2beta2Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Value(o[0]);
   checkGooglePrivacyDlpV2beta2Value(o[1]);
@@ -4742,7 +4742,7 @@
   var o = new api.GooglePrivacyDlpV2beta2Row();
   buildCounterGooglePrivacyDlpV2beta2Row++;
   if (buildCounterGooglePrivacyDlpV2beta2Row < 3) {
-    o.values = buildUnnamed3815();
+    o.values = buildUnnamed4114();
   }
   buildCounterGooglePrivacyDlpV2beta2Row--;
   return o;
@@ -4751,7 +4751,7 @@
 checkGooglePrivacyDlpV2beta2Row(api.GooglePrivacyDlpV2beta2Row o) {
   buildCounterGooglePrivacyDlpV2beta2Row++;
   if (buildCounterGooglePrivacyDlpV2beta2Row < 3) {
-    checkUnnamed3815(o.values);
+    checkUnnamed4114(o.values);
   }
   buildCounterGooglePrivacyDlpV2beta2Row--;
 }
@@ -4861,27 +4861,27 @@
   buildCounterGooglePrivacyDlpV2beta2SurrogateType--;
 }
 
-buildUnnamed3816() {
+buildUnnamed4115() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2FieldId>();
   o.add(buildGooglePrivacyDlpV2beta2FieldId());
   o.add(buildGooglePrivacyDlpV2beta2FieldId());
   return o;
 }
 
-checkUnnamed3816(core.List<api.GooglePrivacyDlpV2beta2FieldId> o) {
+checkUnnamed4115(core.List<api.GooglePrivacyDlpV2beta2FieldId> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2FieldId(o[0]);
   checkGooglePrivacyDlpV2beta2FieldId(o[1]);
 }
 
-buildUnnamed3817() {
+buildUnnamed4116() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2Row>();
   o.add(buildGooglePrivacyDlpV2beta2Row());
   o.add(buildGooglePrivacyDlpV2beta2Row());
   return o;
 }
 
-checkUnnamed3817(core.List<api.GooglePrivacyDlpV2beta2Row> o) {
+checkUnnamed4116(core.List<api.GooglePrivacyDlpV2beta2Row> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2Row(o[0]);
   checkGooglePrivacyDlpV2beta2Row(o[1]);
@@ -4892,8 +4892,8 @@
   var o = new api.GooglePrivacyDlpV2beta2Table();
   buildCounterGooglePrivacyDlpV2beta2Table++;
   if (buildCounterGooglePrivacyDlpV2beta2Table < 3) {
-    o.headers = buildUnnamed3816();
-    o.rows = buildUnnamed3817();
+    o.headers = buildUnnamed4115();
+    o.rows = buildUnnamed4116();
   }
   buildCounterGooglePrivacyDlpV2beta2Table--;
   return o;
@@ -4902,8 +4902,8 @@
 checkGooglePrivacyDlpV2beta2Table(api.GooglePrivacyDlpV2beta2Table o) {
   buildCounterGooglePrivacyDlpV2beta2Table++;
   if (buildCounterGooglePrivacyDlpV2beta2Table < 3) {
-    checkUnnamed3816(o.headers);
-    checkUnnamed3817(o.rows);
+    checkUnnamed4115(o.headers);
+    checkUnnamed4116(o.rows);
   }
   buildCounterGooglePrivacyDlpV2beta2Table--;
 }
@@ -4998,14 +4998,14 @@
   buildCounterGooglePrivacyDlpV2beta2TimespanConfig--;
 }
 
-buildUnnamed3818() {
+buildUnnamed4117() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2TransformationSummary>();
   o.add(buildGooglePrivacyDlpV2beta2TransformationSummary());
   o.add(buildGooglePrivacyDlpV2beta2TransformationSummary());
   return o;
 }
 
-checkUnnamed3818(
+checkUnnamed4117(
     core.List<api.GooglePrivacyDlpV2beta2TransformationSummary> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2TransformationSummary(o[0]);
@@ -5017,7 +5017,7 @@
   var o = new api.GooglePrivacyDlpV2beta2TransformationOverview();
   buildCounterGooglePrivacyDlpV2beta2TransformationOverview++;
   if (buildCounterGooglePrivacyDlpV2beta2TransformationOverview < 3) {
-    o.transformationSummaries = buildUnnamed3818();
+    o.transformationSummaries = buildUnnamed4117();
     o.transformedBytes = "foo";
   }
   buildCounterGooglePrivacyDlpV2beta2TransformationOverview--;
@@ -5028,33 +5028,33 @@
     api.GooglePrivacyDlpV2beta2TransformationOverview o) {
   buildCounterGooglePrivacyDlpV2beta2TransformationOverview++;
   if (buildCounterGooglePrivacyDlpV2beta2TransformationOverview < 3) {
-    checkUnnamed3818(o.transformationSummaries);
+    checkUnnamed4117(o.transformationSummaries);
     unittest.expect(o.transformedBytes, unittest.equals('foo'));
   }
   buildCounterGooglePrivacyDlpV2beta2TransformationOverview--;
 }
 
-buildUnnamed3819() {
+buildUnnamed4118() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2FieldTransformation>();
   o.add(buildGooglePrivacyDlpV2beta2FieldTransformation());
   o.add(buildGooglePrivacyDlpV2beta2FieldTransformation());
   return o;
 }
 
-checkUnnamed3819(core.List<api.GooglePrivacyDlpV2beta2FieldTransformation> o) {
+checkUnnamed4118(core.List<api.GooglePrivacyDlpV2beta2FieldTransformation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2FieldTransformation(o[0]);
   checkGooglePrivacyDlpV2beta2FieldTransformation(o[1]);
 }
 
-buildUnnamed3820() {
+buildUnnamed4119() {
   var o = new core.List<api.GooglePrivacyDlpV2beta2SummaryResult>();
   o.add(buildGooglePrivacyDlpV2beta2SummaryResult());
   o.add(buildGooglePrivacyDlpV2beta2SummaryResult());
   return o;
 }
 
-checkUnnamed3820(core.List<api.GooglePrivacyDlpV2beta2SummaryResult> o) {
+checkUnnamed4119(core.List<api.GooglePrivacyDlpV2beta2SummaryResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGooglePrivacyDlpV2beta2SummaryResult(o[0]);
   checkGooglePrivacyDlpV2beta2SummaryResult(o[1]);
@@ -5066,10 +5066,10 @@
   buildCounterGooglePrivacyDlpV2beta2TransformationSummary++;
   if (buildCounterGooglePrivacyDlpV2beta2TransformationSummary < 3) {
     o.field = buildGooglePrivacyDlpV2beta2FieldId();
-    o.fieldTransformations = buildUnnamed3819();
+    o.fieldTransformations = buildUnnamed4118();
     o.infoType = buildGooglePrivacyDlpV2beta2InfoType();
     o.recordSuppress = buildGooglePrivacyDlpV2beta2RecordSuppression();
-    o.results = buildUnnamed3820();
+    o.results = buildUnnamed4119();
     o.transformation = buildGooglePrivacyDlpV2beta2PrimitiveTransformation();
     o.transformedBytes = "foo";
   }
@@ -5082,10 +5082,10 @@
   buildCounterGooglePrivacyDlpV2beta2TransformationSummary++;
   if (buildCounterGooglePrivacyDlpV2beta2TransformationSummary < 3) {
     checkGooglePrivacyDlpV2beta2FieldId(o.field);
-    checkUnnamed3819(o.fieldTransformations);
+    checkUnnamed4118(o.fieldTransformations);
     checkGooglePrivacyDlpV2beta2InfoType(o.infoType);
     checkGooglePrivacyDlpV2beta2RecordSuppression(o.recordSuppress);
-    checkUnnamed3820(o.results);
+    checkUnnamed4119(o.results);
     checkGooglePrivacyDlpV2beta2PrimitiveTransformation(o.transformation);
     unittest.expect(o.transformedBytes, unittest.equals('foo'));
   }
@@ -5270,14 +5270,14 @@
   buildCounterGooglePrivacyDlpV2beta2ValueFrequency--;
 }
 
-buildUnnamed3821() {
+buildUnnamed4120() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3821(core.List<core.String> o) {
+checkUnnamed4120(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -5288,7 +5288,7 @@
   var o = new api.GooglePrivacyDlpV2beta2WordList();
   buildCounterGooglePrivacyDlpV2beta2WordList++;
   if (buildCounterGooglePrivacyDlpV2beta2WordList < 3) {
-    o.words = buildUnnamed3821();
+    o.words = buildUnnamed4120();
   }
   buildCounterGooglePrivacyDlpV2beta2WordList--;
   return o;
@@ -5297,7 +5297,7 @@
 checkGooglePrivacyDlpV2beta2WordList(api.GooglePrivacyDlpV2beta2WordList o) {
   buildCounterGooglePrivacyDlpV2beta2WordList++;
   if (buildCounterGooglePrivacyDlpV2beta2WordList < 3) {
-    checkUnnamed3821(o.words);
+    checkUnnamed4120(o.words);
   }
   buildCounterGooglePrivacyDlpV2beta2WordList--;
 }
@@ -5317,7 +5317,7 @@
   buildCounterGoogleProtobufEmpty--;
 }
 
-buildUnnamed3822() {
+buildUnnamed4121() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -5332,7 +5332,7 @@
   return o;
 }
 
-checkUnnamed3822(core.Map<core.String, core.Object> o) {
+checkUnnamed4121(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -5346,17 +5346,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3823() {
+buildUnnamed4122() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3822());
-  o.add(buildUnnamed3822());
+  o.add(buildUnnamed4121());
+  o.add(buildUnnamed4121());
   return o;
 }
 
-checkUnnamed3823(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4122(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3822(o[0]);
-  checkUnnamed3822(o[1]);
+  checkUnnamed4121(o[0]);
+  checkUnnamed4121(o[1]);
 }
 
 core.int buildCounterGoogleRpcStatus = 0;
@@ -5365,7 +5365,7 @@
   buildCounterGoogleRpcStatus++;
   if (buildCounterGoogleRpcStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed3823();
+    o.details = buildUnnamed4122();
     o.message = "foo";
   }
   buildCounterGoogleRpcStatus--;
@@ -5376,7 +5376,7 @@
   buildCounterGoogleRpcStatus++;
   if (buildCounterGoogleRpcStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed3823(o.details);
+    checkUnnamed4122(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterGoogleRpcStatus--;
@@ -7181,8 +7181,7 @@
               languageCode: arg_languageCode,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2ListInfoTypesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2ListInfoTypesResponse(response);
       })));
     });
@@ -7242,9 +7241,9 @@
             .encode(buildGooglePrivacyDlpV2beta2DeidentifyTemplate());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, arg_parent, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2DeidentifyTemplate response) {
+      res
+          .create(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2DeidentifyTemplate(response);
       })));
     });
@@ -7296,7 +7295,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -7347,8 +7346,9 @@
             .encode(buildGooglePrivacyDlpV2beta2DeidentifyTemplate());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(unittest.expectAsync1(
-          ((api.GooglePrivacyDlpV2beta2DeidentifyTemplate response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2DeidentifyTemplate(response);
       })));
     });
@@ -7410,9 +7410,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2ListDeidentifyTemplatesResponse
-                  response) {
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2ListDeidentifyTemplatesResponse(response);
       })));
     });
@@ -7470,9 +7468,9 @@
             .encode(buildGooglePrivacyDlpV2beta2DeidentifyTemplate());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_name, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2DeidentifyTemplate response) {
+      res
+          .patch(arg_request, arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2DeidentifyTemplate(response);
       })));
     });
@@ -7531,8 +7529,9 @@
             convert.JSON.encode(buildGooglePrivacyDlpV2beta2InspectTemplate());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, arg_parent, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GooglePrivacyDlpV2beta2InspectTemplate response) {
+      res
+          .create(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2InspectTemplate(response);
       })));
     });
@@ -7584,7 +7583,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -7635,8 +7634,9 @@
             convert.JSON.encode(buildGooglePrivacyDlpV2beta2InspectTemplate());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GooglePrivacyDlpV2beta2InspectTemplate response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2InspectTemplate(response);
       })));
     });
@@ -7698,9 +7698,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2ListInspectTemplatesResponse
-                  response) {
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2ListInspectTemplatesResponse(response);
       })));
     });
@@ -7757,8 +7755,9 @@
             convert.JSON.encode(buildGooglePrivacyDlpV2beta2InspectTemplate());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_name, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GooglePrivacyDlpV2beta2InspectTemplate response) {
+      res
+          .patch(arg_request, arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2InspectTemplate(response);
       })));
     });
@@ -7817,9 +7816,9 @@
             .encode(buildGooglePrivacyDlpV2beta2DeidentifyContentResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.deidentify(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2DeidentifyContentResponse response) {
+      res
+          .deidentify(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2DeidentifyContentResponse(response);
       })));
     });
@@ -7875,9 +7874,9 @@
             .encode(buildGooglePrivacyDlpV2beta2InspectContentResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.inspect(arg_request, arg_parent, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2InspectContentResponse response) {
+      res
+          .inspect(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2InspectContentResponse(response);
       })));
     });
@@ -7934,9 +7933,9 @@
             .encode(buildGooglePrivacyDlpV2beta2ReidentifyContentResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.reidentify(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2ReidentifyContentResponse response) {
+      res
+          .reidentify(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2ReidentifyContentResponse(response);
       })));
     });
@@ -7994,8 +7993,9 @@
         var resp = convert.JSON.encode(buildGooglePrivacyDlpV2beta2DlpJob());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.analyze(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GooglePrivacyDlpV2beta2DlpJob response) {
+      res
+          .analyze(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2DlpJob(response);
       })));
     });
@@ -8051,8 +8051,9 @@
         var resp = convert.JSON.encode(buildGooglePrivacyDlpV2beta2DlpJob());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.inspect(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GooglePrivacyDlpV2beta2DlpJob response) {
+      res
+          .inspect(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2DlpJob(response);
       })));
     });
@@ -8112,9 +8113,9 @@
             .encode(buildGooglePrivacyDlpV2beta2DeidentifyTemplate());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, arg_parent, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2DeidentifyTemplate response) {
+      res
+          .create(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2DeidentifyTemplate(response);
       })));
     });
@@ -8166,7 +8167,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -8217,8 +8218,9 @@
             .encode(buildGooglePrivacyDlpV2beta2DeidentifyTemplate());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(unittest.expectAsync1(
-          ((api.GooglePrivacyDlpV2beta2DeidentifyTemplate response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2DeidentifyTemplate(response);
       })));
     });
@@ -8280,9 +8282,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2ListDeidentifyTemplatesResponse
-                  response) {
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2ListDeidentifyTemplatesResponse(response);
       })));
     });
@@ -8340,9 +8340,9 @@
             .encode(buildGooglePrivacyDlpV2beta2DeidentifyTemplate());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_name, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2DeidentifyTemplate response) {
+      res
+          .patch(arg_request, arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2DeidentifyTemplate(response);
       })));
     });
@@ -8401,7 +8401,7 @@
       }), true);
       res
           .cancel(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -8453,7 +8453,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -8503,8 +8503,9 @@
         var resp = convert.JSON.encode(buildGooglePrivacyDlpV2beta2DlpJob());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GooglePrivacyDlpV2beta2DlpJob response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2DlpJob(response);
       })));
     });
@@ -8572,8 +8573,7 @@
               pageSize: arg_pageSize,
               type: arg_type,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2ListDlpJobsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2ListDlpJobsResponse(response);
       })));
     });
@@ -8630,9 +8630,9 @@
             .encode(buildGooglePrivacyDlpV2beta2RedactImageResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.redact(arg_request, arg_parent, $fields: arg_$fields).then(unittest
-          .expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2RedactImageResponse response) {
+      res
+          .redact(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2RedactImageResponse(response);
       })));
     });
@@ -8691,8 +8691,9 @@
             convert.JSON.encode(buildGooglePrivacyDlpV2beta2InspectTemplate());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, arg_parent, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GooglePrivacyDlpV2beta2InspectTemplate response) {
+      res
+          .create(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2InspectTemplate(response);
       })));
     });
@@ -8744,7 +8745,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -8795,8 +8796,9 @@
             convert.JSON.encode(buildGooglePrivacyDlpV2beta2InspectTemplate());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GooglePrivacyDlpV2beta2InspectTemplate response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2InspectTemplate(response);
       })));
     });
@@ -8858,9 +8860,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2ListInspectTemplatesResponse
-                  response) {
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2ListInspectTemplatesResponse(response);
       })));
     });
@@ -8917,8 +8917,9 @@
             convert.JSON.encode(buildGooglePrivacyDlpV2beta2InspectTemplate());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_name, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GooglePrivacyDlpV2beta2InspectTemplate response) {
+      res
+          .patch(arg_request, arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2InspectTemplate(response);
       })));
     });
@@ -8977,8 +8978,9 @@
             convert.JSON.encode(buildGooglePrivacyDlpV2beta2JobTrigger());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.create(arg_request, arg_parent, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GooglePrivacyDlpV2beta2JobTrigger response) {
+      res
+          .create(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2JobTrigger(response);
       })));
     });
@@ -9030,7 +9032,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.GoogleProtobufEmpty response) {
+          .then(unittest.expectAsync1(((response) {
         checkGoogleProtobufEmpty(response);
       })));
     });
@@ -9081,8 +9083,9 @@
             convert.JSON.encode(buildGooglePrivacyDlpV2beta2JobTrigger());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.get(arg_name, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GooglePrivacyDlpV2beta2JobTrigger response) {
+      res
+          .get(arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2JobTrigger(response);
       })));
     });
@@ -9148,8 +9151,7 @@
               orderBy: arg_orderBy,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.GooglePrivacyDlpV2beta2ListJobTriggersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2ListJobTriggersResponse(response);
       })));
     });
@@ -9206,8 +9208,9 @@
             convert.JSON.encode(buildGooglePrivacyDlpV2beta2JobTrigger());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.patch(arg_request, arg_name, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GooglePrivacyDlpV2beta2JobTrigger response) {
+      res
+          .patch(arg_request, arg_name, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGooglePrivacyDlpV2beta2JobTrigger(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/dns/v2beta1_test.dart b/generated/googleapis_beta/test/dns/v2beta1_test.dart
index 942a267..96e1ca7 100644
--- a/generated/googleapis_beta/test/dns/v2beta1_test.dart
+++ b/generated/googleapis_beta/test/dns/v2beta1_test.dart
@@ -50,27 +50,27 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed4532() {
+buildUnnamed3799() {
   var o = new core.List<api.ResourceRecordSet>();
   o.add(buildResourceRecordSet());
   o.add(buildResourceRecordSet());
   return o;
 }
 
-checkUnnamed4532(core.List<api.ResourceRecordSet> o) {
+checkUnnamed3799(core.List<api.ResourceRecordSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceRecordSet(o[0]);
   checkResourceRecordSet(o[1]);
 }
 
-buildUnnamed4533() {
+buildUnnamed3800() {
   var o = new core.List<api.ResourceRecordSet>();
   o.add(buildResourceRecordSet());
   o.add(buildResourceRecordSet());
   return o;
 }
 
-checkUnnamed4533(core.List<api.ResourceRecordSet> o) {
+checkUnnamed3800(core.List<api.ResourceRecordSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceRecordSet(o[0]);
   checkResourceRecordSet(o[1]);
@@ -81,8 +81,8 @@
   var o = new api.Change();
   buildCounterChange++;
   if (buildCounterChange < 3) {
-    o.additions = buildUnnamed4532();
-    o.deletions = buildUnnamed4533();
+    o.additions = buildUnnamed3799();
+    o.deletions = buildUnnamed3800();
     o.id = "foo";
     o.isServing = true;
     o.kind = "foo";
@@ -96,8 +96,8 @@
 checkChange(api.Change o) {
   buildCounterChange++;
   if (buildCounterChange < 3) {
-    checkUnnamed4532(o.additions);
-    checkUnnamed4533(o.deletions);
+    checkUnnamed3799(o.additions);
+    checkUnnamed3800(o.deletions);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.isServing, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -107,14 +107,14 @@
   buildCounterChange--;
 }
 
-buildUnnamed4534() {
+buildUnnamed3801() {
   var o = new core.List<api.Change>();
   o.add(buildChange());
   o.add(buildChange());
   return o;
 }
 
-checkUnnamed4534(core.List<api.Change> o) {
+checkUnnamed3801(core.List<api.Change> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkChange(o[0]);
   checkChange(o[1]);
@@ -125,7 +125,7 @@
   var o = new api.ChangesListResponse();
   buildCounterChangesListResponse++;
   if (buildCounterChangesListResponse < 3) {
-    o.changes = buildUnnamed4534();
+    o.changes = buildUnnamed3801();
     o.header = buildResponseHeader();
     o.kind = "foo";
     o.nextPageToken = "foo";
@@ -137,7 +137,7 @@
 checkChangesListResponse(api.ChangesListResponse o) {
   buildCounterChangesListResponse++;
   if (buildCounterChangesListResponse < 3) {
-    checkUnnamed4534(o.changes);
+    checkUnnamed3801(o.changes);
     checkResponseHeader(o.header);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -145,14 +145,14 @@
   buildCounterChangesListResponse--;
 }
 
-buildUnnamed4535() {
+buildUnnamed3802() {
   var o = new core.List<api.DnsKeyDigest>();
   o.add(buildDnsKeyDigest());
   o.add(buildDnsKeyDigest());
   return o;
 }
 
-checkUnnamed4535(core.List<api.DnsKeyDigest> o) {
+checkUnnamed3802(core.List<api.DnsKeyDigest> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDnsKeyDigest(o[0]);
   checkDnsKeyDigest(o[1]);
@@ -166,7 +166,7 @@
     o.algorithm = "foo";
     o.creationTime = "foo";
     o.description = "foo";
-    o.digests = buildUnnamed4535();
+    o.digests = buildUnnamed3802();
     o.id = "foo";
     o.isActive = true;
     o.keyLength = 42;
@@ -185,7 +185,7 @@
     unittest.expect(o.algorithm, unittest.equals('foo'));
     unittest.expect(o.creationTime, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed4535(o.digests);
+    checkUnnamed3802(o.digests);
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.isActive, unittest.isTrue);
     unittest.expect(o.keyLength, unittest.equals(42));
@@ -243,14 +243,14 @@
   buildCounterDnsKeySpec--;
 }
 
-buildUnnamed4536() {
+buildUnnamed3803() {
   var o = new core.List<api.DnsKey>();
   o.add(buildDnsKey());
   o.add(buildDnsKey());
   return o;
 }
 
-checkUnnamed4536(core.List<api.DnsKey> o) {
+checkUnnamed3803(core.List<api.DnsKey> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDnsKey(o[0]);
   checkDnsKey(o[1]);
@@ -261,7 +261,7 @@
   var o = new api.DnsKeysListResponse();
   buildCounterDnsKeysListResponse++;
   if (buildCounterDnsKeysListResponse < 3) {
-    o.dnsKeys = buildUnnamed4536();
+    o.dnsKeys = buildUnnamed3803();
     o.header = buildResponseHeader();
     o.kind = "foo";
     o.nextPageToken = "foo";
@@ -273,7 +273,7 @@
 checkDnsKeysListResponse(api.DnsKeysListResponse o) {
   buildCounterDnsKeysListResponse++;
   if (buildCounterDnsKeysListResponse < 3) {
-    checkUnnamed4536(o.dnsKeys);
+    checkUnnamed3803(o.dnsKeys);
     checkResponseHeader(o.header);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
@@ -281,14 +281,14 @@
   buildCounterDnsKeysListResponse--;
 }
 
-buildUnnamed4537() {
+buildUnnamed3804() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4537(core.List<core.String> o) {
+checkUnnamed3804(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -307,7 +307,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.nameServerSet = "foo";
-    o.nameServers = buildUnnamed4537();
+    o.nameServers = buildUnnamed3804();
   }
   buildCounterManagedZone--;
   return o;
@@ -324,19 +324,19 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.nameServerSet, unittest.equals('foo'));
-    checkUnnamed4537(o.nameServers);
+    checkUnnamed3804(o.nameServers);
   }
   buildCounterManagedZone--;
 }
 
-buildUnnamed4538() {
+buildUnnamed3805() {
   var o = new core.List<api.DnsKeySpec>();
   o.add(buildDnsKeySpec());
   o.add(buildDnsKeySpec());
   return o;
 }
 
-checkUnnamed4538(core.List<api.DnsKeySpec> o) {
+checkUnnamed3805(core.List<api.DnsKeySpec> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDnsKeySpec(o[0]);
   checkDnsKeySpec(o[1]);
@@ -347,7 +347,7 @@
   var o = new api.ManagedZoneDnsSecConfig();
   buildCounterManagedZoneDnsSecConfig++;
   if (buildCounterManagedZoneDnsSecConfig < 3) {
-    o.defaultKeySpecs = buildUnnamed4538();
+    o.defaultKeySpecs = buildUnnamed3805();
     o.kind = "foo";
     o.nonExistence = "foo";
     o.state = "foo";
@@ -359,7 +359,7 @@
 checkManagedZoneDnsSecConfig(api.ManagedZoneDnsSecConfig o) {
   buildCounterManagedZoneDnsSecConfig++;
   if (buildCounterManagedZoneDnsSecConfig < 3) {
-    checkUnnamed4538(o.defaultKeySpecs);
+    checkUnnamed3805(o.defaultKeySpecs);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nonExistence, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
@@ -367,14 +367,14 @@
   buildCounterManagedZoneDnsSecConfig--;
 }
 
-buildUnnamed4539() {
+buildUnnamed3806() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed4539(core.List<api.Operation> o) {
+checkUnnamed3806(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -388,7 +388,7 @@
     o.header = buildResponseHeader();
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed4539();
+    o.operations = buildUnnamed3806();
   }
   buildCounterManagedZoneOperationsListResponse--;
   return o;
@@ -401,7 +401,7 @@
     checkResponseHeader(o.header);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4539(o.operations);
+    checkUnnamed3806(o.operations);
   }
   buildCounterManagedZoneOperationsListResponse--;
 }
@@ -425,14 +425,14 @@
   buildCounterManagedZonesDeleteResponse--;
 }
 
-buildUnnamed4540() {
+buildUnnamed3807() {
   var o = new core.List<api.ManagedZone>();
   o.add(buildManagedZone());
   o.add(buildManagedZone());
   return o;
 }
 
-checkUnnamed4540(core.List<api.ManagedZone> o) {
+checkUnnamed3807(core.List<api.ManagedZone> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkManagedZone(o[0]);
   checkManagedZone(o[1]);
@@ -445,7 +445,7 @@
   if (buildCounterManagedZonesListResponse < 3) {
     o.header = buildResponseHeader();
     o.kind = "foo";
-    o.managedZones = buildUnnamed4540();
+    o.managedZones = buildUnnamed3807();
     o.nextPageToken = "foo";
   }
   buildCounterManagedZonesListResponse--;
@@ -457,7 +457,7 @@
   if (buildCounterManagedZonesListResponse < 3) {
     checkResponseHeader(o.header);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed4540(o.managedZones);
+    checkUnnamed3807(o.managedZones);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterManagedZonesListResponse--;
@@ -563,14 +563,14 @@
   buildCounterProject--;
 }
 
-buildUnnamed4541() {
+buildUnnamed3808() {
   var o = new core.List<api.DnsKeySpec>();
   o.add(buildDnsKeySpec());
   o.add(buildDnsKeySpec());
   return o;
 }
 
-checkUnnamed4541(core.List<api.DnsKeySpec> o) {
+checkUnnamed3808(core.List<api.DnsKeySpec> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDnsKeySpec(o[0]);
   checkDnsKeySpec(o[1]);
@@ -589,7 +589,7 @@
     o.rrsetDeletionsPerChange = 42;
     o.rrsetsPerManagedZone = 42;
     o.totalRrdataSizePerChange = 42;
-    o.whitelistedKeySpecs = buildUnnamed4541();
+    o.whitelistedKeySpecs = buildUnnamed3808();
   }
   buildCounterQuota--;
   return o;
@@ -606,32 +606,32 @@
     unittest.expect(o.rrsetDeletionsPerChange, unittest.equals(42));
     unittest.expect(o.rrsetsPerManagedZone, unittest.equals(42));
     unittest.expect(o.totalRrdataSizePerChange, unittest.equals(42));
-    checkUnnamed4541(o.whitelistedKeySpecs);
+    checkUnnamed3808(o.whitelistedKeySpecs);
   }
   buildCounterQuota--;
 }
 
-buildUnnamed4542() {
+buildUnnamed3809() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4542(core.List<core.String> o) {
+checkUnnamed3809(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4543() {
+buildUnnamed3810() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4543(core.List<core.String> o) {
+checkUnnamed3810(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -644,8 +644,8 @@
   if (buildCounterResourceRecordSet < 3) {
     o.kind = "foo";
     o.name = "foo";
-    o.rrdatas = buildUnnamed4542();
-    o.signatureRrdatas = buildUnnamed4543();
+    o.rrdatas = buildUnnamed3809();
+    o.signatureRrdatas = buildUnnamed3810();
     o.ttl = 42;
     o.type = "foo";
   }
@@ -658,22 +658,22 @@
   if (buildCounterResourceRecordSet < 3) {
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4542(o.rrdatas);
-    checkUnnamed4543(o.signatureRrdatas);
+    checkUnnamed3809(o.rrdatas);
+    checkUnnamed3810(o.signatureRrdatas);
     unittest.expect(o.ttl, unittest.equals(42));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterResourceRecordSet--;
 }
 
-buildUnnamed4544() {
+buildUnnamed3811() {
   var o = new core.List<api.ResourceRecordSet>();
   o.add(buildResourceRecordSet());
   o.add(buildResourceRecordSet());
   return o;
 }
 
-checkUnnamed4544(core.List<api.ResourceRecordSet> o) {
+checkUnnamed3811(core.List<api.ResourceRecordSet> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceRecordSet(o[0]);
   checkResourceRecordSet(o[1]);
@@ -687,7 +687,7 @@
     o.header = buildResponseHeader();
     o.kind = "foo";
     o.nextPageToken = "foo";
-    o.rrsets = buildUnnamed4544();
+    o.rrsets = buildUnnamed3811();
   }
   buildCounterResourceRecordSetsListResponse--;
   return o;
@@ -699,7 +699,7 @@
     checkResponseHeader(o.header);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4544(o.rrsets);
+    checkUnnamed3811(o.rrsets);
   }
   buildCounterResourceRecordSetsListResponse--;
 }
@@ -928,7 +928,7 @@
       res
           .create(arg_request, arg_project, arg_managedZone,
               clientOperationId: arg_clientOperationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Change response) {
+          .then(unittest.expectAsync1(((response) {
         checkChange(response);
       })));
     });
@@ -981,7 +981,7 @@
       res
           .get(arg_project, arg_managedZone, arg_changeId,
               clientOperationId: arg_clientOperationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Change response) {
+          .then(unittest.expectAsync1(((response) {
         checkChange(response);
       })));
     });
@@ -1045,7 +1045,7 @@
               sortBy: arg_sortBy,
               sortOrder: arg_sortOrder,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ChangesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkChangesListResponse(response);
       })));
     });
@@ -1105,7 +1105,7 @@
               clientOperationId: arg_clientOperationId,
               digestType: arg_digestType,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DnsKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkDnsKey(response);
       })));
     });
@@ -1166,7 +1166,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DnsKeysListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDnsKeysListResponse(response);
       })));
     });
@@ -1222,7 +1222,7 @@
       res
           .get(arg_project, arg_managedZone, arg_operation,
               clientOperationId: arg_clientOperationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1284,8 +1284,7 @@
               pageToken: arg_pageToken,
               sortBy: arg_sortBy,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ManagedZoneOperationsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedZoneOperationsListResponse(response);
       })));
     });
@@ -1342,7 +1341,7 @@
       res
           .create(arg_request, arg_project,
               clientOperationId: arg_clientOperationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedZone response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedZone(response);
       })));
     });
@@ -1394,8 +1393,7 @@
       res
           .delete(arg_project, arg_managedZone,
               clientOperationId: arg_clientOperationId, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ManagedZonesDeleteResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedZonesDeleteResponse(response);
       })));
     });
@@ -1447,7 +1445,7 @@
       res
           .get(arg_project, arg_managedZone,
               clientOperationId: arg_clientOperationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedZone response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedZone(response);
       })));
     });
@@ -1507,7 +1505,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ManagedZonesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkManagedZonesListResponse(response);
       })));
     });
@@ -1563,7 +1561,7 @@
       res
           .patch(arg_request, arg_project, arg_managedZone,
               clientOperationId: arg_clientOperationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1619,7 +1617,7 @@
       res
           .update(arg_request, arg_project, arg_managedZone,
               clientOperationId: arg_clientOperationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1672,7 +1670,7 @@
       res
           .get(arg_project,
               clientOperationId: arg_clientOperationId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Project response) {
+          .then(unittest.expectAsync1(((response) {
         checkProject(response);
       })));
     });
@@ -1738,8 +1736,7 @@
               pageToken: arg_pageToken,
               type: arg_type,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ResourceRecordSetsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkResourceRecordSetsListResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/firestore/v1beta1_test.dart b/generated/googleapis_beta/test/firestore/v1beta1_test.dart
index 2af2221..c713e78 100644
--- a/generated/googleapis_beta/test/firestore/v1beta1_test.dart
+++ b/generated/googleapis_beta/test/firestore/v1beta1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed4123() {
+buildUnnamed3883() {
   var o = new core.List<api.Value>();
   o.add(buildValue());
   o.add(buildValue());
   return o;
 }
 
-checkUnnamed4123(core.List<api.Value> o) {
+checkUnnamed3883(core.List<api.Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValue(o[0]);
   checkValue(o[1]);
@@ -68,7 +68,7 @@
   var o = new api.ArrayValue();
   buildCounterArrayValue++;
   if (buildCounterArrayValue < 3) {
-    o.values = buildUnnamed4123();
+    o.values = buildUnnamed3883();
   }
   buildCounterArrayValue--;
   return o;
@@ -77,19 +77,19 @@
 checkArrayValue(api.ArrayValue o) {
   buildCounterArrayValue++;
   if (buildCounterArrayValue < 3) {
-    checkUnnamed4123(o.values);
+    checkUnnamed3883(o.values);
   }
   buildCounterArrayValue--;
 }
 
-buildUnnamed4124() {
+buildUnnamed3884() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4124(core.List<core.String> o) {
+checkUnnamed3884(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -100,7 +100,7 @@
   var o = new api.BatchGetDocumentsRequest();
   buildCounterBatchGetDocumentsRequest++;
   if (buildCounterBatchGetDocumentsRequest < 3) {
-    o.documents = buildUnnamed4124();
+    o.documents = buildUnnamed3884();
     o.mask = buildDocumentMask();
     o.newTransaction = buildTransactionOptions();
     o.readTime = "foo";
@@ -113,7 +113,7 @@
 checkBatchGetDocumentsRequest(api.BatchGetDocumentsRequest o) {
   buildCounterBatchGetDocumentsRequest++;
   if (buildCounterBatchGetDocumentsRequest < 3) {
-    checkUnnamed4124(o.documents);
+    checkUnnamed3884(o.documents);
     checkDocumentMask(o.mask);
     checkTransactionOptions(o.newTransaction);
     unittest.expect(o.readTime, unittest.equals('foo'));
@@ -206,14 +206,14 @@
   buildCounterCollectionSelector--;
 }
 
-buildUnnamed4125() {
+buildUnnamed3885() {
   var o = new core.List<api.Write>();
   o.add(buildWrite());
   o.add(buildWrite());
   return o;
 }
 
-checkUnnamed4125(core.List<api.Write> o) {
+checkUnnamed3885(core.List<api.Write> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWrite(o[0]);
   checkWrite(o[1]);
@@ -225,7 +225,7 @@
   buildCounterCommitRequest++;
   if (buildCounterCommitRequest < 3) {
     o.transaction = "foo";
-    o.writes = buildUnnamed4125();
+    o.writes = buildUnnamed3885();
   }
   buildCounterCommitRequest--;
   return o;
@@ -235,19 +235,19 @@
   buildCounterCommitRequest++;
   if (buildCounterCommitRequest < 3) {
     unittest.expect(o.transaction, unittest.equals('foo'));
-    checkUnnamed4125(o.writes);
+    checkUnnamed3885(o.writes);
   }
   buildCounterCommitRequest--;
 }
 
-buildUnnamed4126() {
+buildUnnamed3886() {
   var o = new core.List<api.WriteResult>();
   o.add(buildWriteResult());
   o.add(buildWriteResult());
   return o;
 }
 
-checkUnnamed4126(core.List<api.WriteResult> o) {
+checkUnnamed3886(core.List<api.WriteResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWriteResult(o[0]);
   checkWriteResult(o[1]);
@@ -259,7 +259,7 @@
   buildCounterCommitResponse++;
   if (buildCounterCommitResponse < 3) {
     o.commitTime = "foo";
-    o.writeResults = buildUnnamed4126();
+    o.writeResults = buildUnnamed3886();
   }
   buildCounterCommitResponse--;
   return o;
@@ -269,19 +269,19 @@
   buildCounterCommitResponse++;
   if (buildCounterCommitResponse < 3) {
     unittest.expect(o.commitTime, unittest.equals('foo'));
-    checkUnnamed4126(o.writeResults);
+    checkUnnamed3886(o.writeResults);
   }
   buildCounterCommitResponse--;
 }
 
-buildUnnamed4127() {
+buildUnnamed3887() {
   var o = new core.List<api.Filter>();
   o.add(buildFilter());
   o.add(buildFilter());
   return o;
 }
 
-checkUnnamed4127(core.List<api.Filter> o) {
+checkUnnamed3887(core.List<api.Filter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFilter(o[0]);
   checkFilter(o[1]);
@@ -292,7 +292,7 @@
   var o = new api.CompositeFilter();
   buildCounterCompositeFilter++;
   if (buildCounterCompositeFilter < 3) {
-    o.filters = buildUnnamed4127();
+    o.filters = buildUnnamed3887();
     o.op = "foo";
   }
   buildCounterCompositeFilter--;
@@ -302,20 +302,20 @@
 checkCompositeFilter(api.CompositeFilter o) {
   buildCounterCompositeFilter++;
   if (buildCounterCompositeFilter < 3) {
-    checkUnnamed4127(o.filters);
+    checkUnnamed3887(o.filters);
     unittest.expect(o.op, unittest.equals('foo'));
   }
   buildCounterCompositeFilter--;
 }
 
-buildUnnamed4128() {
+buildUnnamed3888() {
   var o = new core.List<api.Value>();
   o.add(buildValue());
   o.add(buildValue());
   return o;
 }
 
-checkUnnamed4128(core.List<api.Value> o) {
+checkUnnamed3888(core.List<api.Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValue(o[0]);
   checkValue(o[1]);
@@ -327,7 +327,7 @@
   buildCounterCursor++;
   if (buildCounterCursor < 3) {
     o.before = true;
-    o.values = buildUnnamed4128();
+    o.values = buildUnnamed3888();
   }
   buildCounterCursor--;
   return o;
@@ -337,19 +337,19 @@
   buildCounterCursor++;
   if (buildCounterCursor < 3) {
     unittest.expect(o.before, unittest.isTrue);
-    checkUnnamed4128(o.values);
+    checkUnnamed3888(o.values);
   }
   buildCounterCursor--;
 }
 
-buildUnnamed4129() {
+buildUnnamed3889() {
   var o = new core.Map<core.String, api.Value>();
   o["x"] = buildValue();
   o["y"] = buildValue();
   return o;
 }
 
-checkUnnamed4129(core.Map<core.String, api.Value> o) {
+checkUnnamed3889(core.Map<core.String, api.Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValue(o["x"]);
   checkValue(o["y"]);
@@ -361,7 +361,7 @@
   buildCounterDocument++;
   if (buildCounterDocument < 3) {
     o.createTime = "foo";
-    o.fields = buildUnnamed4129();
+    o.fields = buildUnnamed3889();
     o.name = "foo";
     o.updateTime = "foo";
   }
@@ -373,34 +373,34 @@
   buildCounterDocument++;
   if (buildCounterDocument < 3) {
     unittest.expect(o.createTime, unittest.equals('foo'));
-    checkUnnamed4129(o.fields);
+    checkUnnamed3889(o.fields);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.updateTime, unittest.equals('foo'));
   }
   buildCounterDocument--;
 }
 
-buildUnnamed4130() {
+buildUnnamed3890() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed4130(core.List<core.int> o) {
+checkUnnamed3890(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed4131() {
+buildUnnamed3891() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed4131(core.List<core.int> o) {
+checkUnnamed3891(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -412,8 +412,8 @@
   buildCounterDocumentChange++;
   if (buildCounterDocumentChange < 3) {
     o.document = buildDocument();
-    o.removedTargetIds = buildUnnamed4130();
-    o.targetIds = buildUnnamed4131();
+    o.removedTargetIds = buildUnnamed3890();
+    o.targetIds = buildUnnamed3891();
   }
   buildCounterDocumentChange--;
   return o;
@@ -423,20 +423,20 @@
   buildCounterDocumentChange++;
   if (buildCounterDocumentChange < 3) {
     checkDocument(o.document);
-    checkUnnamed4130(o.removedTargetIds);
-    checkUnnamed4131(o.targetIds);
+    checkUnnamed3890(o.removedTargetIds);
+    checkUnnamed3891(o.targetIds);
   }
   buildCounterDocumentChange--;
 }
 
-buildUnnamed4132() {
+buildUnnamed3892() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed4132(core.List<core.int> o) {
+checkUnnamed3892(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -449,7 +449,7 @@
   if (buildCounterDocumentDelete < 3) {
     o.document = "foo";
     o.readTime = "foo";
-    o.removedTargetIds = buildUnnamed4132();
+    o.removedTargetIds = buildUnnamed3892();
   }
   buildCounterDocumentDelete--;
   return o;
@@ -460,19 +460,19 @@
   if (buildCounterDocumentDelete < 3) {
     unittest.expect(o.document, unittest.equals('foo'));
     unittest.expect(o.readTime, unittest.equals('foo'));
-    checkUnnamed4132(o.removedTargetIds);
+    checkUnnamed3892(o.removedTargetIds);
   }
   buildCounterDocumentDelete--;
 }
 
-buildUnnamed4133() {
+buildUnnamed3893() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4133(core.List<core.String> o) {
+checkUnnamed3893(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -483,7 +483,7 @@
   var o = new api.DocumentMask();
   buildCounterDocumentMask++;
   if (buildCounterDocumentMask < 3) {
-    o.fieldPaths = buildUnnamed4133();
+    o.fieldPaths = buildUnnamed3893();
   }
   buildCounterDocumentMask--;
   return o;
@@ -492,19 +492,19 @@
 checkDocumentMask(api.DocumentMask o) {
   buildCounterDocumentMask++;
   if (buildCounterDocumentMask < 3) {
-    checkUnnamed4133(o.fieldPaths);
+    checkUnnamed3893(o.fieldPaths);
   }
   buildCounterDocumentMask--;
 }
 
-buildUnnamed4134() {
+buildUnnamed3894() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed4134(core.List<core.int> o) {
+checkUnnamed3894(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -517,7 +517,7 @@
   if (buildCounterDocumentRemove < 3) {
     o.document = "foo";
     o.readTime = "foo";
-    o.removedTargetIds = buildUnnamed4134();
+    o.removedTargetIds = buildUnnamed3894();
   }
   buildCounterDocumentRemove--;
   return o;
@@ -528,19 +528,19 @@
   if (buildCounterDocumentRemove < 3) {
     unittest.expect(o.document, unittest.equals('foo'));
     unittest.expect(o.readTime, unittest.equals('foo'));
-    checkUnnamed4134(o.removedTargetIds);
+    checkUnnamed3894(o.removedTargetIds);
   }
   buildCounterDocumentRemove--;
 }
 
-buildUnnamed4135() {
+buildUnnamed3895() {
   var o = new core.List<api.FieldTransform>();
   o.add(buildFieldTransform());
   o.add(buildFieldTransform());
   return o;
 }
 
-checkUnnamed4135(core.List<api.FieldTransform> o) {
+checkUnnamed3895(core.List<api.FieldTransform> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFieldTransform(o[0]);
   checkFieldTransform(o[1]);
@@ -552,7 +552,7 @@
   buildCounterDocumentTransform++;
   if (buildCounterDocumentTransform < 3) {
     o.document = "foo";
-    o.fieldTransforms = buildUnnamed4135();
+    o.fieldTransforms = buildUnnamed3895();
   }
   buildCounterDocumentTransform--;
   return o;
@@ -562,19 +562,19 @@
   buildCounterDocumentTransform++;
   if (buildCounterDocumentTransform < 3) {
     unittest.expect(o.document, unittest.equals('foo'));
-    checkUnnamed4135(o.fieldTransforms);
+    checkUnnamed3895(o.fieldTransforms);
   }
   buildCounterDocumentTransform--;
 }
 
-buildUnnamed4136() {
+buildUnnamed3896() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4136(core.List<core.String> o) {
+checkUnnamed3896(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -585,7 +585,7 @@
   var o = new api.DocumentsTarget();
   buildCounterDocumentsTarget++;
   if (buildCounterDocumentsTarget < 3) {
-    o.documents = buildUnnamed4136();
+    o.documents = buildUnnamed3896();
   }
   buildCounterDocumentsTarget--;
   return o;
@@ -594,7 +594,7 @@
 checkDocumentsTarget(api.DocumentsTarget o) {
   buildCounterDocumentsTarget++;
   if (buildCounterDocumentsTarget < 3) {
-    checkUnnamed4136(o.documents);
+    checkUnnamed3896(o.documents);
   }
   buildCounterDocumentsTarget--;
 }
@@ -721,14 +721,14 @@
   buildCounterFilter--;
 }
 
-buildUnnamed4137() {
+buildUnnamed3897() {
   var o = new core.List<api.IndexField>();
   o.add(buildIndexField());
   o.add(buildIndexField());
   return o;
 }
 
-checkUnnamed4137(core.List<api.IndexField> o) {
+checkUnnamed3897(core.List<api.IndexField> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkIndexField(o[0]);
   checkIndexField(o[1]);
@@ -740,7 +740,7 @@
   buildCounterIndex++;
   if (buildCounterIndex < 3) {
     o.collectionId = "foo";
-    o.fields = buildUnnamed4137();
+    o.fields = buildUnnamed3897();
     o.name = "foo";
     o.state = "foo";
   }
@@ -752,7 +752,7 @@
   buildCounterIndex++;
   if (buildCounterIndex < 3) {
     unittest.expect(o.collectionId, unittest.equals('foo'));
-    checkUnnamed4137(o.fields);
+    checkUnnamed3897(o.fields);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
   }
@@ -822,14 +822,14 @@
   buildCounterListCollectionIdsRequest--;
 }
 
-buildUnnamed4138() {
+buildUnnamed3898() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4138(core.List<core.String> o) {
+checkUnnamed3898(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -840,7 +840,7 @@
   var o = new api.ListCollectionIdsResponse();
   buildCounterListCollectionIdsResponse++;
   if (buildCounterListCollectionIdsResponse < 3) {
-    o.collectionIds = buildUnnamed4138();
+    o.collectionIds = buildUnnamed3898();
     o.nextPageToken = "foo";
   }
   buildCounterListCollectionIdsResponse--;
@@ -850,20 +850,20 @@
 checkListCollectionIdsResponse(api.ListCollectionIdsResponse o) {
   buildCounterListCollectionIdsResponse++;
   if (buildCounterListCollectionIdsResponse < 3) {
-    checkUnnamed4138(o.collectionIds);
+    checkUnnamed3898(o.collectionIds);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListCollectionIdsResponse--;
 }
 
-buildUnnamed4139() {
+buildUnnamed3899() {
   var o = new core.List<api.Document>();
   o.add(buildDocument());
   o.add(buildDocument());
   return o;
 }
 
-checkUnnamed4139(core.List<api.Document> o) {
+checkUnnamed3899(core.List<api.Document> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDocument(o[0]);
   checkDocument(o[1]);
@@ -874,7 +874,7 @@
   var o = new api.ListDocumentsResponse();
   buildCounterListDocumentsResponse++;
   if (buildCounterListDocumentsResponse < 3) {
-    o.documents = buildUnnamed4139();
+    o.documents = buildUnnamed3899();
     o.nextPageToken = "foo";
   }
   buildCounterListDocumentsResponse--;
@@ -884,20 +884,20 @@
 checkListDocumentsResponse(api.ListDocumentsResponse o) {
   buildCounterListDocumentsResponse++;
   if (buildCounterListDocumentsResponse < 3) {
-    checkUnnamed4139(o.documents);
+    checkUnnamed3899(o.documents);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDocumentsResponse--;
 }
 
-buildUnnamed4140() {
+buildUnnamed3900() {
   var o = new core.List<api.Index>();
   o.add(buildIndex());
   o.add(buildIndex());
   return o;
 }
 
-checkUnnamed4140(core.List<api.Index> o) {
+checkUnnamed3900(core.List<api.Index> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkIndex(o[0]);
   checkIndex(o[1]);
@@ -908,7 +908,7 @@
   var o = new api.ListIndexesResponse();
   buildCounterListIndexesResponse++;
   if (buildCounterListIndexesResponse < 3) {
-    o.indexes = buildUnnamed4140();
+    o.indexes = buildUnnamed3900();
     o.nextPageToken = "foo";
   }
   buildCounterListIndexesResponse--;
@@ -918,20 +918,20 @@
 checkListIndexesResponse(api.ListIndexesResponse o) {
   buildCounterListIndexesResponse++;
   if (buildCounterListIndexesResponse < 3) {
-    checkUnnamed4140(o.indexes);
+    checkUnnamed3900(o.indexes);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListIndexesResponse--;
 }
 
-buildUnnamed4141() {
+buildUnnamed3901() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4141(core.Map<core.String, core.String> o) {
+checkUnnamed3901(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -943,7 +943,7 @@
   buildCounterListenRequest++;
   if (buildCounterListenRequest < 3) {
     o.addTarget = buildTarget();
-    o.labels = buildUnnamed4141();
+    o.labels = buildUnnamed3901();
     o.removeTarget = 42;
   }
   buildCounterListenRequest--;
@@ -954,7 +954,7 @@
   buildCounterListenRequest++;
   if (buildCounterListenRequest < 3) {
     checkTarget(o.addTarget);
-    checkUnnamed4141(o.labels);
+    checkUnnamed3901(o.labels);
     unittest.expect(o.removeTarget, unittest.equals(42));
   }
   buildCounterListenRequest--;
@@ -987,14 +987,14 @@
   buildCounterListenResponse--;
 }
 
-buildUnnamed4142() {
+buildUnnamed3902() {
   var o = new core.Map<core.String, api.Value>();
   o["x"] = buildValue();
   o["y"] = buildValue();
   return o;
 }
 
-checkUnnamed4142(core.Map<core.String, api.Value> o) {
+checkUnnamed3902(core.Map<core.String, api.Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValue(o["x"]);
   checkValue(o["y"]);
@@ -1005,7 +1005,7 @@
   var o = new api.MapValue();
   buildCounterMapValue++;
   if (buildCounterMapValue < 3) {
-    o.fields = buildUnnamed4142();
+    o.fields = buildUnnamed3902();
   }
   buildCounterMapValue--;
   return o;
@@ -1014,12 +1014,12 @@
 checkMapValue(api.MapValue o) {
   buildCounterMapValue++;
   if (buildCounterMapValue < 3) {
-    checkUnnamed4142(o.fields);
+    checkUnnamed3902(o.fields);
   }
   buildCounterMapValue--;
 }
 
-buildUnnamed4143() {
+buildUnnamed3903() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1034,7 +1034,7 @@
   return o;
 }
 
-checkUnnamed4143(core.Map<core.String, core.Object> o) {
+checkUnnamed3903(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1048,7 +1048,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4144() {
+buildUnnamed3904() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1063,7 +1063,7 @@
   return o;
 }
 
-checkUnnamed4144(core.Map<core.String, core.Object> o) {
+checkUnnamed3904(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -1084,9 +1084,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed4143();
+    o.metadata = buildUnnamed3903();
     o.name = "foo";
-    o.response = buildUnnamed4144();
+    o.response = buildUnnamed3904();
   }
   buildCounterOperation--;
   return o;
@@ -1097,9 +1097,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed4143(o.metadata);
+    checkUnnamed3903(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4144(o.response);
+    checkUnnamed3904(o.response);
   }
   buildCounterOperation--;
 }
@@ -1146,14 +1146,14 @@
   buildCounterPrecondition--;
 }
 
-buildUnnamed4145() {
+buildUnnamed3905() {
   var o = new core.List<api.FieldReference>();
   o.add(buildFieldReference());
   o.add(buildFieldReference());
   return o;
 }
 
-checkUnnamed4145(core.List<api.FieldReference> o) {
+checkUnnamed3905(core.List<api.FieldReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFieldReference(o[0]);
   checkFieldReference(o[1]);
@@ -1164,7 +1164,7 @@
   var o = new api.Projection();
   buildCounterProjection++;
   if (buildCounterProjection < 3) {
-    o.fields = buildUnnamed4145();
+    o.fields = buildUnnamed3905();
   }
   buildCounterProjection--;
   return o;
@@ -1173,7 +1173,7 @@
 checkProjection(api.Projection o) {
   buildCounterProjection++;
   if (buildCounterProjection < 3) {
-    checkUnnamed4145(o.fields);
+    checkUnnamed3905(o.fields);
   }
   buildCounterProjection--;
 }
@@ -1306,7 +1306,7 @@
   buildCounterRunQueryResponse--;
 }
 
-buildUnnamed4146() {
+buildUnnamed3906() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1321,7 +1321,7 @@
   return o;
 }
 
-checkUnnamed4146(core.Map<core.String, core.Object> o) {
+checkUnnamed3906(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1335,17 +1335,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4147() {
+buildUnnamed3907() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4146());
-  o.add(buildUnnamed4146());
+  o.add(buildUnnamed3906());
+  o.add(buildUnnamed3906());
   return o;
 }
 
-checkUnnamed4147(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed3907(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4146(o[0]);
-  checkUnnamed4146(o[1]);
+  checkUnnamed3906(o[0]);
+  checkUnnamed3906(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -1354,7 +1354,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed4147();
+    o.details = buildUnnamed3907();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1365,33 +1365,33 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed4147(o.details);
+    checkUnnamed3907(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed4148() {
+buildUnnamed3908() {
   var o = new core.List<api.CollectionSelector>();
   o.add(buildCollectionSelector());
   o.add(buildCollectionSelector());
   return o;
 }
 
-checkUnnamed4148(core.List<api.CollectionSelector> o) {
+checkUnnamed3908(core.List<api.CollectionSelector> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkCollectionSelector(o[0]);
   checkCollectionSelector(o[1]);
 }
 
-buildUnnamed4149() {
+buildUnnamed3909() {
   var o = new core.List<api.Order>();
   o.add(buildOrder());
   o.add(buildOrder());
   return o;
 }
 
-checkUnnamed4149(core.List<api.Order> o) {
+checkUnnamed3909(core.List<api.Order> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOrder(o[0]);
   checkOrder(o[1]);
@@ -1403,10 +1403,10 @@
   buildCounterStructuredQuery++;
   if (buildCounterStructuredQuery < 3) {
     o.endAt = buildCursor();
-    o.from = buildUnnamed4148();
+    o.from = buildUnnamed3908();
     o.limit = 42;
     o.offset = 42;
-    o.orderBy = buildUnnamed4149();
+    o.orderBy = buildUnnamed3909();
     o.select = buildProjection();
     o.startAt = buildCursor();
     o.where = buildFilter();
@@ -1419,10 +1419,10 @@
   buildCounterStructuredQuery++;
   if (buildCounterStructuredQuery < 3) {
     checkCursor(o.endAt);
-    checkUnnamed4148(o.from);
+    checkUnnamed3908(o.from);
     unittest.expect(o.limit, unittest.equals(42));
     unittest.expect(o.offset, unittest.equals(42));
-    checkUnnamed4149(o.orderBy);
+    checkUnnamed3909(o.orderBy);
     checkProjection(o.select);
     checkCursor(o.startAt);
     checkFilter(o.where);
@@ -1459,14 +1459,14 @@
   buildCounterTarget--;
 }
 
-buildUnnamed4150() {
+buildUnnamed3910() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed4150(core.List<core.int> o) {
+checkUnnamed3910(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
@@ -1481,7 +1481,7 @@
     o.readTime = "foo";
     o.resumeToken = "foo";
     o.targetChangeType = "foo";
-    o.targetIds = buildUnnamed4150();
+    o.targetIds = buildUnnamed3910();
   }
   buildCounterTargetChange--;
   return o;
@@ -1494,7 +1494,7 @@
     unittest.expect(o.readTime, unittest.equals('foo'));
     unittest.expect(o.resumeToken, unittest.equals('foo'));
     unittest.expect(o.targetChangeType, unittest.equals('foo'));
-    checkUnnamed4150(o.targetIds);
+    checkUnnamed3910(o.targetIds);
   }
   buildCounterTargetChange--;
 }
@@ -1607,27 +1607,27 @@
   buildCounterWrite--;
 }
 
-buildUnnamed4151() {
+buildUnnamed3911() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4151(core.Map<core.String, core.String> o) {
+checkUnnamed3911(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed4152() {
+buildUnnamed3912() {
   var o = new core.List<api.Write>();
   o.add(buildWrite());
   o.add(buildWrite());
   return o;
 }
 
-checkUnnamed4152(core.List<api.Write> o) {
+checkUnnamed3912(core.List<api.Write> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWrite(o[0]);
   checkWrite(o[1]);
@@ -1638,10 +1638,10 @@
   var o = new api.WriteRequest();
   buildCounterWriteRequest++;
   if (buildCounterWriteRequest < 3) {
-    o.labels = buildUnnamed4151();
+    o.labels = buildUnnamed3911();
     o.streamId = "foo";
     o.streamToken = "foo";
-    o.writes = buildUnnamed4152();
+    o.writes = buildUnnamed3912();
   }
   buildCounterWriteRequest--;
   return o;
@@ -1650,22 +1650,22 @@
 checkWriteRequest(api.WriteRequest o) {
   buildCounterWriteRequest++;
   if (buildCounterWriteRequest < 3) {
-    checkUnnamed4151(o.labels);
+    checkUnnamed3911(o.labels);
     unittest.expect(o.streamId, unittest.equals('foo'));
     unittest.expect(o.streamToken, unittest.equals('foo'));
-    checkUnnamed4152(o.writes);
+    checkUnnamed3912(o.writes);
   }
   buildCounterWriteRequest--;
 }
 
-buildUnnamed4153() {
+buildUnnamed3913() {
   var o = new core.List<api.WriteResult>();
   o.add(buildWriteResult());
   o.add(buildWriteResult());
   return o;
 }
 
-checkUnnamed4153(core.List<api.WriteResult> o) {
+checkUnnamed3913(core.List<api.WriteResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWriteResult(o[0]);
   checkWriteResult(o[1]);
@@ -1679,7 +1679,7 @@
     o.commitTime = "foo";
     o.streamId = "foo";
     o.streamToken = "foo";
-    o.writeResults = buildUnnamed4153();
+    o.writeResults = buildUnnamed3913();
   }
   buildCounterWriteResponse--;
   return o;
@@ -1691,19 +1691,19 @@
     unittest.expect(o.commitTime, unittest.equals('foo'));
     unittest.expect(o.streamId, unittest.equals('foo'));
     unittest.expect(o.streamToken, unittest.equals('foo'));
-    checkUnnamed4153(o.writeResults);
+    checkUnnamed3913(o.writeResults);
   }
   buildCounterWriteResponse--;
 }
 
-buildUnnamed4154() {
+buildUnnamed3914() {
   var o = new core.List<api.Value>();
   o.add(buildValue());
   o.add(buildValue());
   return o;
 }
 
-checkUnnamed4154(core.List<api.Value> o) {
+checkUnnamed3914(core.List<api.Value> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkValue(o[0]);
   checkValue(o[1]);
@@ -1714,7 +1714,7 @@
   var o = new api.WriteResult();
   buildCounterWriteResult++;
   if (buildCounterWriteResult < 3) {
-    o.transformResults = buildUnnamed4154();
+    o.transformResults = buildUnnamed3914();
     o.updateTime = "foo";
   }
   buildCounterWriteResult--;
@@ -1724,72 +1724,72 @@
 checkWriteResult(api.WriteResult o) {
   buildCounterWriteResult++;
   if (buildCounterWriteResult < 3) {
-    checkUnnamed4154(o.transformResults);
+    checkUnnamed3914(o.transformResults);
     unittest.expect(o.updateTime, unittest.equals('foo'));
   }
   buildCounterWriteResult--;
 }
 
-buildUnnamed4155() {
+buildUnnamed3915() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4155(core.List<core.String> o) {
+checkUnnamed3915(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4156() {
+buildUnnamed3916() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4156(core.List<core.String> o) {
+checkUnnamed3916(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4157() {
+buildUnnamed3917() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4157(core.List<core.String> o) {
+checkUnnamed3917(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4158() {
+buildUnnamed3918() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4158(core.List<core.String> o) {
+checkUnnamed3918(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4159() {
+buildUnnamed3919() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4159(core.List<core.String> o) {
+checkUnnamed3919(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2278,8 +2278,9 @@
         var resp = convert.JSON.encode(buildBatchGetDocumentsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.batchGet(arg_request, arg_database, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.BatchGetDocumentsResponse response) {
+      res
+          .batchGet(arg_request, arg_database, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkBatchGetDocumentsResponse(response);
       })));
     });
@@ -2335,7 +2336,7 @@
       }), true);
       res
           .beginTransaction(arg_request, arg_database, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BeginTransactionResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBeginTransactionResponse(response);
       })));
     });
@@ -2391,7 +2392,7 @@
       }), true);
       res
           .commit(arg_request, arg_database, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.CommitResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkCommitResponse(response);
       })));
     });
@@ -2403,7 +2404,7 @@
       var arg_request = buildDocument();
       var arg_parent = "foo";
       var arg_collectionId = "foo";
-      var arg_mask_fieldPaths = buildUnnamed4155();
+      var arg_mask_fieldPaths = buildUnnamed3915();
       var arg_documentId = "foo";
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
@@ -2457,7 +2458,7 @@
               mask_fieldPaths: arg_mask_fieldPaths,
               documentId: arg_documentId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Document response) {
+          .then(unittest.expectAsync1(((response) {
         checkDocument(response);
       })));
     });
@@ -2518,7 +2519,7 @@
               currentDocument_exists: arg_currentDocument_exists,
               currentDocument_updateTime: arg_currentDocument_updateTime,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2528,7 +2529,7 @@
       api.ProjectsDatabasesDocumentsResourceApi res =
           new api.FirestoreApi(mock).projects.databases.documents;
       var arg_name = "foo";
-      var arg_mask_fieldPaths = buildUnnamed4156();
+      var arg_mask_fieldPaths = buildUnnamed3916();
       var arg_readTime = "foo";
       var arg_transaction = "foo";
       var arg_$fields = "foo";
@@ -2583,7 +2584,7 @@
               readTime: arg_readTime,
               transaction: arg_transaction,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Document response) {
+          .then(unittest.expectAsync1(((response) {
         checkDocument(response);
       })));
     });
@@ -2595,7 +2596,7 @@
       var arg_parent = "foo";
       var arg_collectionId = "foo";
       var arg_showMissing = true;
-      var arg_mask_fieldPaths = buildUnnamed4157();
+      var arg_mask_fieldPaths = buildUnnamed3917();
       var arg_pageToken = "foo";
       var arg_pageSize = 42;
       var arg_transaction = "foo";
@@ -2665,7 +2666,7 @@
               orderBy: arg_orderBy,
               readTime: arg_readTime,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDocumentsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDocumentsResponse(response);
       })));
     });
@@ -2719,8 +2720,9 @@
         var resp = convert.JSON.encode(buildListCollectionIdsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.listCollectionIds(arg_request, arg_parent, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.ListCollectionIdsResponse response) {
+      res
+          .listCollectionIds(arg_request, arg_parent, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkListCollectionIdsResponse(response);
       })));
     });
@@ -2776,7 +2778,7 @@
       }), true);
       res
           .listen(arg_request, arg_database, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListenResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListenResponse(response);
       })));
     });
@@ -2789,8 +2791,8 @@
       var arg_name = "foo";
       var arg_currentDocument_updateTime = "foo";
       var arg_currentDocument_exists = true;
-      var arg_updateMask_fieldPaths = buildUnnamed4158();
-      var arg_mask_fieldPaths = buildUnnamed4159();
+      var arg_updateMask_fieldPaths = buildUnnamed3918();
+      var arg_mask_fieldPaths = buildUnnamed3919();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var obj = new api.Document.fromJson(json);
@@ -2849,7 +2851,7 @@
               updateMask_fieldPaths: arg_updateMask_fieldPaths,
               mask_fieldPaths: arg_mask_fieldPaths,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Document response) {
+          .then(unittest.expectAsync1(((response) {
         checkDocument(response);
       })));
     });
@@ -2905,7 +2907,7 @@
       }), true);
       res
           .rollback(arg_request, arg_database, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2961,7 +2963,7 @@
       }), true);
       res
           .runQuery(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RunQueryResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRunQueryResponse(response);
       })));
     });
@@ -3017,7 +3019,7 @@
       }), true);
       res
           .write(arg_request, arg_database, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WriteResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkWriteResponse(response);
       })));
     });
@@ -3075,7 +3077,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3127,7 +3129,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -3179,7 +3181,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Index response) {
+          .then(unittest.expectAsync1(((response) {
         checkIndex(response);
       })));
     });
@@ -3243,7 +3245,7 @@
               filter: arg_filter,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListIndexesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListIndexesResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/language/v1beta1_test.dart b/generated/googleapis_beta/test/language/v1beta1_test.dart
index a090f78..3065e4c 100644
--- a/generated/googleapis_beta/test/language/v1beta1_test.dart
+++ b/generated/googleapis_beta/test/language/v1beta1_test.dart
@@ -71,14 +71,14 @@
   buildCounterAnalyzeEntitiesRequest--;
 }
 
-buildUnnamed4443() {
+buildUnnamed4123() {
   var o = new core.List<api.Entity>();
   o.add(buildEntity());
   o.add(buildEntity());
   return o;
 }
 
-checkUnnamed4443(core.List<api.Entity> o) {
+checkUnnamed4123(core.List<api.Entity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntity(o[0]);
   checkEntity(o[1]);
@@ -89,7 +89,7 @@
   var o = new api.AnalyzeEntitiesResponse();
   buildCounterAnalyzeEntitiesResponse++;
   if (buildCounterAnalyzeEntitiesResponse < 3) {
-    o.entities = buildUnnamed4443();
+    o.entities = buildUnnamed4123();
     o.language = "foo";
   }
   buildCounterAnalyzeEntitiesResponse--;
@@ -99,7 +99,7 @@
 checkAnalyzeEntitiesResponse(api.AnalyzeEntitiesResponse o) {
   buildCounterAnalyzeEntitiesResponse++;
   if (buildCounterAnalyzeEntitiesResponse < 3) {
-    checkUnnamed4443(o.entities);
+    checkUnnamed4123(o.entities);
     unittest.expect(o.language, unittest.equals('foo'));
   }
   buildCounterAnalyzeEntitiesResponse--;
@@ -126,14 +126,14 @@
   buildCounterAnalyzeSentimentRequest--;
 }
 
-buildUnnamed4444() {
+buildUnnamed4124() {
   var o = new core.List<api.Sentence>();
   o.add(buildSentence());
   o.add(buildSentence());
   return o;
 }
 
-checkUnnamed4444(core.List<api.Sentence> o) {
+checkUnnamed4124(core.List<api.Sentence> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSentence(o[0]);
   checkSentence(o[1]);
@@ -146,7 +146,7 @@
   if (buildCounterAnalyzeSentimentResponse < 3) {
     o.documentSentiment = buildSentiment();
     o.language = "foo";
-    o.sentences = buildUnnamed4444();
+    o.sentences = buildUnnamed4124();
   }
   buildCounterAnalyzeSentimentResponse--;
   return o;
@@ -157,7 +157,7 @@
   if (buildCounterAnalyzeSentimentResponse < 3) {
     checkSentiment(o.documentSentiment);
     unittest.expect(o.language, unittest.equals('foo'));
-    checkUnnamed4444(o.sentences);
+    checkUnnamed4124(o.sentences);
   }
   buildCounterAnalyzeSentimentResponse--;
 }
@@ -183,27 +183,27 @@
   buildCounterAnalyzeSyntaxRequest--;
 }
 
-buildUnnamed4445() {
+buildUnnamed4125() {
   var o = new core.List<api.Sentence>();
   o.add(buildSentence());
   o.add(buildSentence());
   return o;
 }
 
-checkUnnamed4445(core.List<api.Sentence> o) {
+checkUnnamed4125(core.List<api.Sentence> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSentence(o[0]);
   checkSentence(o[1]);
 }
 
-buildUnnamed4446() {
+buildUnnamed4126() {
   var o = new core.List<api.Token>();
   o.add(buildToken());
   o.add(buildToken());
   return o;
 }
 
-checkUnnamed4446(core.List<api.Token> o) {
+checkUnnamed4126(core.List<api.Token> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkToken(o[0]);
   checkToken(o[1]);
@@ -215,8 +215,8 @@
   buildCounterAnalyzeSyntaxResponse++;
   if (buildCounterAnalyzeSyntaxResponse < 3) {
     o.language = "foo";
-    o.sentences = buildUnnamed4445();
-    o.tokens = buildUnnamed4446();
+    o.sentences = buildUnnamed4125();
+    o.tokens = buildUnnamed4126();
   }
   buildCounterAnalyzeSyntaxResponse--;
   return o;
@@ -226,8 +226,8 @@
   buildCounterAnalyzeSyntaxResponse++;
   if (buildCounterAnalyzeSyntaxResponse < 3) {
     unittest.expect(o.language, unittest.equals('foo'));
-    checkUnnamed4445(o.sentences);
-    checkUnnamed4446(o.tokens);
+    checkUnnamed4125(o.sentences);
+    checkUnnamed4126(o.tokens);
   }
   buildCounterAnalyzeSyntaxResponse--;
 }
@@ -255,40 +255,40 @@
   buildCounterAnnotateTextRequest--;
 }
 
-buildUnnamed4447() {
+buildUnnamed4127() {
   var o = new core.List<api.Entity>();
   o.add(buildEntity());
   o.add(buildEntity());
   return o;
 }
 
-checkUnnamed4447(core.List<api.Entity> o) {
+checkUnnamed4127(core.List<api.Entity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntity(o[0]);
   checkEntity(o[1]);
 }
 
-buildUnnamed4448() {
+buildUnnamed4128() {
   var o = new core.List<api.Sentence>();
   o.add(buildSentence());
   o.add(buildSentence());
   return o;
 }
 
-checkUnnamed4448(core.List<api.Sentence> o) {
+checkUnnamed4128(core.List<api.Sentence> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSentence(o[0]);
   checkSentence(o[1]);
 }
 
-buildUnnamed4449() {
+buildUnnamed4129() {
   var o = new core.List<api.Token>();
   o.add(buildToken());
   o.add(buildToken());
   return o;
 }
 
-checkUnnamed4449(core.List<api.Token> o) {
+checkUnnamed4129(core.List<api.Token> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkToken(o[0]);
   checkToken(o[1]);
@@ -300,10 +300,10 @@
   buildCounterAnnotateTextResponse++;
   if (buildCounterAnnotateTextResponse < 3) {
     o.documentSentiment = buildSentiment();
-    o.entities = buildUnnamed4447();
+    o.entities = buildUnnamed4127();
     o.language = "foo";
-    o.sentences = buildUnnamed4448();
-    o.tokens = buildUnnamed4449();
+    o.sentences = buildUnnamed4128();
+    o.tokens = buildUnnamed4129();
   }
   buildCounterAnnotateTextResponse--;
   return o;
@@ -313,10 +313,10 @@
   buildCounterAnnotateTextResponse++;
   if (buildCounterAnnotateTextResponse < 3) {
     checkSentiment(o.documentSentiment);
-    checkUnnamed4447(o.entities);
+    checkUnnamed4127(o.entities);
     unittest.expect(o.language, unittest.equals('foo'));
-    checkUnnamed4448(o.sentences);
-    checkUnnamed4449(o.tokens);
+    checkUnnamed4128(o.sentences);
+    checkUnnamed4129(o.tokens);
   }
   buildCounterAnnotateTextResponse--;
 }
@@ -367,27 +367,27 @@
   buildCounterDocument--;
 }
 
-buildUnnamed4450() {
+buildUnnamed4130() {
   var o = new core.List<api.EntityMention>();
   o.add(buildEntityMention());
   o.add(buildEntityMention());
   return o;
 }
 
-checkUnnamed4450(core.List<api.EntityMention> o) {
+checkUnnamed4130(core.List<api.EntityMention> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityMention(o[0]);
   checkEntityMention(o[1]);
 }
 
-buildUnnamed4451() {
+buildUnnamed4131() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4451(core.Map<core.String, core.String> o) {
+checkUnnamed4131(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -398,8 +398,8 @@
   var o = new api.Entity();
   buildCounterEntity++;
   if (buildCounterEntity < 3) {
-    o.mentions = buildUnnamed4450();
-    o.metadata = buildUnnamed4451();
+    o.mentions = buildUnnamed4130();
+    o.metadata = buildUnnamed4131();
     o.name = "foo";
     o.salience = 42.0;
     o.type = "foo";
@@ -411,8 +411,8 @@
 checkEntity(api.Entity o) {
   buildCounterEntity++;
   if (buildCounterEntity < 3) {
-    checkUnnamed4450(o.mentions);
-    checkUnnamed4451(o.metadata);
+    checkUnnamed4130(o.mentions);
+    checkUnnamed4131(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.salience, unittest.equals(42.0));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -549,7 +549,7 @@
   buildCounterSentiment--;
 }
 
-buildUnnamed4452() {
+buildUnnamed4132() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -564,7 +564,7 @@
   return o;
 }
 
-checkUnnamed4452(core.Map<core.String, core.Object> o) {
+checkUnnamed4132(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -578,17 +578,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4453() {
+buildUnnamed4133() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4452());
-  o.add(buildUnnamed4452());
+  o.add(buildUnnamed4132());
+  o.add(buildUnnamed4132());
   return o;
 }
 
-checkUnnamed4453(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4133(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4452(o[0]);
-  checkUnnamed4452(o[1]);
+  checkUnnamed4132(o[0]);
+  checkUnnamed4132(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -597,7 +597,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed4453();
+    o.details = buildUnnamed4133();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -608,7 +608,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed4453(o.details);
+    checkUnnamed4133(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -862,7 +862,7 @@
       }), true);
       res
           .analyzeEntities(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnalyzeEntitiesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnalyzeEntitiesResponse(response);
       })));
     });
@@ -915,7 +915,7 @@
       }), true);
       res
           .analyzeSentiment(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnalyzeSentimentResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnalyzeSentimentResponse(response);
       })));
     });
@@ -968,7 +968,7 @@
       }), true);
       res
           .analyzeSyntax(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnalyzeSyntaxResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnalyzeSyntaxResponse(response);
       })));
     });
@@ -1021,7 +1021,7 @@
       }), true);
       res
           .annotateText(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnnotateTextResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotateTextResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/language/v1beta2_test.dart b/generated/googleapis_beta/test/language/v1beta2_test.dart
index 370f66e..972639e 100644
--- a/generated/googleapis_beta/test/language/v1beta2_test.dart
+++ b/generated/googleapis_beta/test/language/v1beta2_test.dart
@@ -71,14 +71,14 @@
   buildCounterAnalyzeEntitiesRequest--;
 }
 
-buildUnnamed4244() {
+buildUnnamed4020() {
   var o = new core.List<api.Entity>();
   o.add(buildEntity());
   o.add(buildEntity());
   return o;
 }
 
-checkUnnamed4244(core.List<api.Entity> o) {
+checkUnnamed4020(core.List<api.Entity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntity(o[0]);
   checkEntity(o[1]);
@@ -89,7 +89,7 @@
   var o = new api.AnalyzeEntitiesResponse();
   buildCounterAnalyzeEntitiesResponse++;
   if (buildCounterAnalyzeEntitiesResponse < 3) {
-    o.entities = buildUnnamed4244();
+    o.entities = buildUnnamed4020();
     o.language = "foo";
   }
   buildCounterAnalyzeEntitiesResponse--;
@@ -99,7 +99,7 @@
 checkAnalyzeEntitiesResponse(api.AnalyzeEntitiesResponse o) {
   buildCounterAnalyzeEntitiesResponse++;
   if (buildCounterAnalyzeEntitiesResponse < 3) {
-    checkUnnamed4244(o.entities);
+    checkUnnamed4020(o.entities);
     unittest.expect(o.language, unittest.equals('foo'));
   }
   buildCounterAnalyzeEntitiesResponse--;
@@ -126,14 +126,14 @@
   buildCounterAnalyzeEntitySentimentRequest--;
 }
 
-buildUnnamed4245() {
+buildUnnamed4021() {
   var o = new core.List<api.Entity>();
   o.add(buildEntity());
   o.add(buildEntity());
   return o;
 }
 
-checkUnnamed4245(core.List<api.Entity> o) {
+checkUnnamed4021(core.List<api.Entity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntity(o[0]);
   checkEntity(o[1]);
@@ -144,7 +144,7 @@
   var o = new api.AnalyzeEntitySentimentResponse();
   buildCounterAnalyzeEntitySentimentResponse++;
   if (buildCounterAnalyzeEntitySentimentResponse < 3) {
-    o.entities = buildUnnamed4245();
+    o.entities = buildUnnamed4021();
     o.language = "foo";
   }
   buildCounterAnalyzeEntitySentimentResponse--;
@@ -154,7 +154,7 @@
 checkAnalyzeEntitySentimentResponse(api.AnalyzeEntitySentimentResponse o) {
   buildCounterAnalyzeEntitySentimentResponse++;
   if (buildCounterAnalyzeEntitySentimentResponse < 3) {
-    checkUnnamed4245(o.entities);
+    checkUnnamed4021(o.entities);
     unittest.expect(o.language, unittest.equals('foo'));
   }
   buildCounterAnalyzeEntitySentimentResponse--;
@@ -181,14 +181,14 @@
   buildCounterAnalyzeSentimentRequest--;
 }
 
-buildUnnamed4246() {
+buildUnnamed4022() {
   var o = new core.List<api.Sentence>();
   o.add(buildSentence());
   o.add(buildSentence());
   return o;
 }
 
-checkUnnamed4246(core.List<api.Sentence> o) {
+checkUnnamed4022(core.List<api.Sentence> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSentence(o[0]);
   checkSentence(o[1]);
@@ -201,7 +201,7 @@
   if (buildCounterAnalyzeSentimentResponse < 3) {
     o.documentSentiment = buildSentiment();
     o.language = "foo";
-    o.sentences = buildUnnamed4246();
+    o.sentences = buildUnnamed4022();
   }
   buildCounterAnalyzeSentimentResponse--;
   return o;
@@ -212,7 +212,7 @@
   if (buildCounterAnalyzeSentimentResponse < 3) {
     checkSentiment(o.documentSentiment);
     unittest.expect(o.language, unittest.equals('foo'));
-    checkUnnamed4246(o.sentences);
+    checkUnnamed4022(o.sentences);
   }
   buildCounterAnalyzeSentimentResponse--;
 }
@@ -238,27 +238,27 @@
   buildCounterAnalyzeSyntaxRequest--;
 }
 
-buildUnnamed4247() {
+buildUnnamed4023() {
   var o = new core.List<api.Sentence>();
   o.add(buildSentence());
   o.add(buildSentence());
   return o;
 }
 
-checkUnnamed4247(core.List<api.Sentence> o) {
+checkUnnamed4023(core.List<api.Sentence> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSentence(o[0]);
   checkSentence(o[1]);
 }
 
-buildUnnamed4248() {
+buildUnnamed4024() {
   var o = new core.List<api.Token>();
   o.add(buildToken());
   o.add(buildToken());
   return o;
 }
 
-checkUnnamed4248(core.List<api.Token> o) {
+checkUnnamed4024(core.List<api.Token> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkToken(o[0]);
   checkToken(o[1]);
@@ -270,8 +270,8 @@
   buildCounterAnalyzeSyntaxResponse++;
   if (buildCounterAnalyzeSyntaxResponse < 3) {
     o.language = "foo";
-    o.sentences = buildUnnamed4247();
-    o.tokens = buildUnnamed4248();
+    o.sentences = buildUnnamed4023();
+    o.tokens = buildUnnamed4024();
   }
   buildCounterAnalyzeSyntaxResponse--;
   return o;
@@ -281,8 +281,8 @@
   buildCounterAnalyzeSyntaxResponse++;
   if (buildCounterAnalyzeSyntaxResponse < 3) {
     unittest.expect(o.language, unittest.equals('foo'));
-    checkUnnamed4247(o.sentences);
-    checkUnnamed4248(o.tokens);
+    checkUnnamed4023(o.sentences);
+    checkUnnamed4024(o.tokens);
   }
   buildCounterAnalyzeSyntaxResponse--;
 }
@@ -310,53 +310,53 @@
   buildCounterAnnotateTextRequest--;
 }
 
-buildUnnamed4249() {
+buildUnnamed4025() {
   var o = new core.List<api.ClassificationCategory>();
   o.add(buildClassificationCategory());
   o.add(buildClassificationCategory());
   return o;
 }
 
-checkUnnamed4249(core.List<api.ClassificationCategory> o) {
+checkUnnamed4025(core.List<api.ClassificationCategory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClassificationCategory(o[0]);
   checkClassificationCategory(o[1]);
 }
 
-buildUnnamed4250() {
+buildUnnamed4026() {
   var o = new core.List<api.Entity>();
   o.add(buildEntity());
   o.add(buildEntity());
   return o;
 }
 
-checkUnnamed4250(core.List<api.Entity> o) {
+checkUnnamed4026(core.List<api.Entity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntity(o[0]);
   checkEntity(o[1]);
 }
 
-buildUnnamed4251() {
+buildUnnamed4027() {
   var o = new core.List<api.Sentence>();
   o.add(buildSentence());
   o.add(buildSentence());
   return o;
 }
 
-checkUnnamed4251(core.List<api.Sentence> o) {
+checkUnnamed4027(core.List<api.Sentence> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSentence(o[0]);
   checkSentence(o[1]);
 }
 
-buildUnnamed4252() {
+buildUnnamed4028() {
   var o = new core.List<api.Token>();
   o.add(buildToken());
   o.add(buildToken());
   return o;
 }
 
-checkUnnamed4252(core.List<api.Token> o) {
+checkUnnamed4028(core.List<api.Token> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkToken(o[0]);
   checkToken(o[1]);
@@ -367,12 +367,12 @@
   var o = new api.AnnotateTextResponse();
   buildCounterAnnotateTextResponse++;
   if (buildCounterAnnotateTextResponse < 3) {
-    o.categories = buildUnnamed4249();
+    o.categories = buildUnnamed4025();
     o.documentSentiment = buildSentiment();
-    o.entities = buildUnnamed4250();
+    o.entities = buildUnnamed4026();
     o.language = "foo";
-    o.sentences = buildUnnamed4251();
-    o.tokens = buildUnnamed4252();
+    o.sentences = buildUnnamed4027();
+    o.tokens = buildUnnamed4028();
   }
   buildCounterAnnotateTextResponse--;
   return o;
@@ -381,12 +381,12 @@
 checkAnnotateTextResponse(api.AnnotateTextResponse o) {
   buildCounterAnnotateTextResponse++;
   if (buildCounterAnnotateTextResponse < 3) {
-    checkUnnamed4249(o.categories);
+    checkUnnamed4025(o.categories);
     checkSentiment(o.documentSentiment);
-    checkUnnamed4250(o.entities);
+    checkUnnamed4026(o.entities);
     unittest.expect(o.language, unittest.equals('foo'));
-    checkUnnamed4251(o.sentences);
-    checkUnnamed4252(o.tokens);
+    checkUnnamed4027(o.sentences);
+    checkUnnamed4028(o.tokens);
   }
   buildCounterAnnotateTextResponse--;
 }
@@ -431,14 +431,14 @@
   buildCounterClassifyTextRequest--;
 }
 
-buildUnnamed4253() {
+buildUnnamed4029() {
   var o = new core.List<api.ClassificationCategory>();
   o.add(buildClassificationCategory());
   o.add(buildClassificationCategory());
   return o;
 }
 
-checkUnnamed4253(core.List<api.ClassificationCategory> o) {
+checkUnnamed4029(core.List<api.ClassificationCategory> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkClassificationCategory(o[0]);
   checkClassificationCategory(o[1]);
@@ -449,7 +449,7 @@
   var o = new api.ClassifyTextResponse();
   buildCounterClassifyTextResponse++;
   if (buildCounterClassifyTextResponse < 3) {
-    o.categories = buildUnnamed4253();
+    o.categories = buildUnnamed4029();
   }
   buildCounterClassifyTextResponse--;
   return o;
@@ -458,7 +458,7 @@
 checkClassifyTextResponse(api.ClassifyTextResponse o) {
   buildCounterClassifyTextResponse++;
   if (buildCounterClassifyTextResponse < 3) {
-    checkUnnamed4253(o.categories);
+    checkUnnamed4029(o.categories);
   }
   buildCounterClassifyTextResponse--;
 }
@@ -509,27 +509,27 @@
   buildCounterDocument--;
 }
 
-buildUnnamed4254() {
+buildUnnamed4030() {
   var o = new core.List<api.EntityMention>();
   o.add(buildEntityMention());
   o.add(buildEntityMention());
   return o;
 }
 
-checkUnnamed4254(core.List<api.EntityMention> o) {
+checkUnnamed4030(core.List<api.EntityMention> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkEntityMention(o[0]);
   checkEntityMention(o[1]);
 }
 
-buildUnnamed4255() {
+buildUnnamed4031() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4255(core.Map<core.String, core.String> o) {
+checkUnnamed4031(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -540,8 +540,8 @@
   var o = new api.Entity();
   buildCounterEntity++;
   if (buildCounterEntity < 3) {
-    o.mentions = buildUnnamed4254();
-    o.metadata = buildUnnamed4255();
+    o.mentions = buildUnnamed4030();
+    o.metadata = buildUnnamed4031();
     o.name = "foo";
     o.salience = 42.0;
     o.sentiment = buildSentiment();
@@ -554,8 +554,8 @@
 checkEntity(api.Entity o) {
   buildCounterEntity++;
   if (buildCounterEntity < 3) {
-    checkUnnamed4254(o.mentions);
-    checkUnnamed4255(o.metadata);
+    checkUnnamed4030(o.mentions);
+    checkUnnamed4031(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.salience, unittest.equals(42.0));
     checkSentiment(o.sentiment);
@@ -697,7 +697,7 @@
   buildCounterSentiment--;
 }
 
-buildUnnamed4256() {
+buildUnnamed4032() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -712,7 +712,7 @@
   return o;
 }
 
-checkUnnamed4256(core.Map<core.String, core.Object> o) {
+checkUnnamed4032(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -726,17 +726,17 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4257() {
+buildUnnamed4033() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4256());
-  o.add(buildUnnamed4256());
+  o.add(buildUnnamed4032());
+  o.add(buildUnnamed4032());
   return o;
 }
 
-checkUnnamed4257(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4033(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4256(o[0]);
-  checkUnnamed4256(o[1]);
+  checkUnnamed4032(o[0]);
+  checkUnnamed4032(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -745,7 +745,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed4257();
+    o.details = buildUnnamed4033();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -756,7 +756,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed4257(o.details);
+    checkUnnamed4033(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -1050,7 +1050,7 @@
       }), true);
       res
           .analyzeEntities(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnalyzeEntitiesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnalyzeEntitiesResponse(response);
       })));
     });
@@ -1101,8 +1101,9 @@
         var resp = convert.JSON.encode(buildAnalyzeEntitySentimentResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.analyzeEntitySentiment(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.AnalyzeEntitySentimentResponse response) {
+      res
+          .analyzeEntitySentiment(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkAnalyzeEntitySentimentResponse(response);
       })));
     });
@@ -1155,7 +1156,7 @@
       }), true);
       res
           .analyzeSentiment(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnalyzeSentimentResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnalyzeSentimentResponse(response);
       })));
     });
@@ -1208,7 +1209,7 @@
       }), true);
       res
           .analyzeSyntax(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnalyzeSyntaxResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnalyzeSyntaxResponse(response);
       })));
     });
@@ -1261,7 +1262,7 @@
       }), true);
       res
           .annotateText(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.AnnotateTextResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkAnnotateTextResponse(response);
       })));
     });
@@ -1314,7 +1315,7 @@
       }), true);
       res
           .classifyText(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ClassifyTextResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkClassifyTextResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/logging/v2beta1_test.dart b/generated/googleapis_beta/test/logging/v2beta1_test.dart
index 9ad3db4..5830e8e 100644
--- a/generated/googleapis_beta/test/logging/v2beta1_test.dart
+++ b/generated/googleapis_beta/test/logging/v2beta1_test.dart
@@ -88,14 +88,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed3901() {
+buildUnnamed4497() {
   var o = new core.List<core.double>();
   o.add(42.0);
   o.add(42.0);
   return o;
 }
 
-checkUnnamed3901(core.List<core.double> o) {
+checkUnnamed4497(core.List<core.double> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42.0));
   unittest.expect(o[1], unittest.equals(42.0));
@@ -106,7 +106,7 @@
   var o = new api.Explicit();
   buildCounterExplicit++;
   if (buildCounterExplicit < 3) {
-    o.bounds = buildUnnamed3901();
+    o.bounds = buildUnnamed4497();
   }
   buildCounterExplicit--;
   return o;
@@ -115,7 +115,7 @@
 checkExplicit(api.Explicit o) {
   buildCounterExplicit++;
   if (buildCounterExplicit < 3) {
-    checkUnnamed3901(o.bounds);
+    checkUnnamed4497(o.bounds);
   }
   buildCounterExplicit--;
 }
@@ -236,27 +236,27 @@
   buildCounterLinear--;
 }
 
-buildUnnamed3902() {
+buildUnnamed4498() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3902(core.List<core.String> o) {
+checkUnnamed4498(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3903() {
+buildUnnamed4499() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3903(core.List<core.String> o) {
+checkUnnamed4499(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -271,8 +271,8 @@
     o.orderBy = "foo";
     o.pageSize = 42;
     o.pageToken = "foo";
-    o.projectIds = buildUnnamed3902();
-    o.resourceNames = buildUnnamed3903();
+    o.projectIds = buildUnnamed4498();
+    o.resourceNames = buildUnnamed4499();
   }
   buildCounterListLogEntriesRequest--;
   return o;
@@ -285,20 +285,20 @@
     unittest.expect(o.orderBy, unittest.equals('foo'));
     unittest.expect(o.pageSize, unittest.equals(42));
     unittest.expect(o.pageToken, unittest.equals('foo'));
-    checkUnnamed3902(o.projectIds);
-    checkUnnamed3903(o.resourceNames);
+    checkUnnamed4498(o.projectIds);
+    checkUnnamed4499(o.resourceNames);
   }
   buildCounterListLogEntriesRequest--;
 }
 
-buildUnnamed3904() {
+buildUnnamed4500() {
   var o = new core.List<api.LogEntry>();
   o.add(buildLogEntry());
   o.add(buildLogEntry());
   return o;
 }
 
-checkUnnamed3904(core.List<api.LogEntry> o) {
+checkUnnamed4500(core.List<api.LogEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogEntry(o[0]);
   checkLogEntry(o[1]);
@@ -309,7 +309,7 @@
   var o = new api.ListLogEntriesResponse();
   buildCounterListLogEntriesResponse++;
   if (buildCounterListLogEntriesResponse < 3) {
-    o.entries = buildUnnamed3904();
+    o.entries = buildUnnamed4500();
     o.nextPageToken = "foo";
   }
   buildCounterListLogEntriesResponse--;
@@ -319,20 +319,20 @@
 checkListLogEntriesResponse(api.ListLogEntriesResponse o) {
   buildCounterListLogEntriesResponse++;
   if (buildCounterListLogEntriesResponse < 3) {
-    checkUnnamed3904(o.entries);
+    checkUnnamed4500(o.entries);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLogEntriesResponse--;
 }
 
-buildUnnamed3905() {
+buildUnnamed4501() {
   var o = new core.List<api.LogMetric>();
   o.add(buildLogMetric());
   o.add(buildLogMetric());
   return o;
 }
 
-checkUnnamed3905(core.List<api.LogMetric> o) {
+checkUnnamed4501(core.List<api.LogMetric> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogMetric(o[0]);
   checkLogMetric(o[1]);
@@ -343,7 +343,7 @@
   var o = new api.ListLogMetricsResponse();
   buildCounterListLogMetricsResponse++;
   if (buildCounterListLogMetricsResponse < 3) {
-    o.metrics = buildUnnamed3905();
+    o.metrics = buildUnnamed4501();
     o.nextPageToken = "foo";
   }
   buildCounterListLogMetricsResponse--;
@@ -353,20 +353,20 @@
 checkListLogMetricsResponse(api.ListLogMetricsResponse o) {
   buildCounterListLogMetricsResponse++;
   if (buildCounterListLogMetricsResponse < 3) {
-    checkUnnamed3905(o.metrics);
+    checkUnnamed4501(o.metrics);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLogMetricsResponse--;
 }
 
-buildUnnamed3906() {
+buildUnnamed4502() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3906(core.List<core.String> o) {
+checkUnnamed4502(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -377,7 +377,7 @@
   var o = new api.ListLogsResponse();
   buildCounterListLogsResponse++;
   if (buildCounterListLogsResponse < 3) {
-    o.logNames = buildUnnamed3906();
+    o.logNames = buildUnnamed4502();
     o.nextPageToken = "foo";
   }
   buildCounterListLogsResponse--;
@@ -387,20 +387,20 @@
 checkListLogsResponse(api.ListLogsResponse o) {
   buildCounterListLogsResponse++;
   if (buildCounterListLogsResponse < 3) {
-    checkUnnamed3906(o.logNames);
+    checkUnnamed4502(o.logNames);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLogsResponse--;
 }
 
-buildUnnamed3907() {
+buildUnnamed4503() {
   var o = new core.List<api.MonitoredResourceDescriptor>();
   o.add(buildMonitoredResourceDescriptor());
   o.add(buildMonitoredResourceDescriptor());
   return o;
 }
 
-checkUnnamed3907(core.List<api.MonitoredResourceDescriptor> o) {
+checkUnnamed4503(core.List<api.MonitoredResourceDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkMonitoredResourceDescriptor(o[0]);
   checkMonitoredResourceDescriptor(o[1]);
@@ -412,7 +412,7 @@
   buildCounterListMonitoredResourceDescriptorsResponse++;
   if (buildCounterListMonitoredResourceDescriptorsResponse < 3) {
     o.nextPageToken = "foo";
-    o.resourceDescriptors = buildUnnamed3907();
+    o.resourceDescriptors = buildUnnamed4503();
   }
   buildCounterListMonitoredResourceDescriptorsResponse--;
   return o;
@@ -423,19 +423,19 @@
   buildCounterListMonitoredResourceDescriptorsResponse++;
   if (buildCounterListMonitoredResourceDescriptorsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3907(o.resourceDescriptors);
+    checkUnnamed4503(o.resourceDescriptors);
   }
   buildCounterListMonitoredResourceDescriptorsResponse--;
 }
 
-buildUnnamed3908() {
+buildUnnamed4504() {
   var o = new core.List<api.LogSink>();
   o.add(buildLogSink());
   o.add(buildLogSink());
   return o;
 }
 
-checkUnnamed3908(core.List<api.LogSink> o) {
+checkUnnamed4504(core.List<api.LogSink> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogSink(o[0]);
   checkLogSink(o[1]);
@@ -447,7 +447,7 @@
   buildCounterListSinksResponse++;
   if (buildCounterListSinksResponse < 3) {
     o.nextPageToken = "foo";
-    o.sinks = buildUnnamed3908();
+    o.sinks = buildUnnamed4504();
   }
   buildCounterListSinksResponse--;
   return o;
@@ -457,12 +457,12 @@
   buildCounterListSinksResponse++;
   if (buildCounterListSinksResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3908(o.sinks);
+    checkUnnamed4504(o.sinks);
   }
   buildCounterListSinksResponse--;
 }
 
-buildUnnamed3909() {
+buildUnnamed4505() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -477,7 +477,7 @@
   return o;
 }
 
-checkUnnamed3909(core.Map<core.String, core.Object> o) {
+checkUnnamed4505(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -491,20 +491,20 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3910() {
+buildUnnamed4506() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3910(core.Map<core.String, core.String> o) {
+checkUnnamed4506(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed3911() {
+buildUnnamed4507() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -519,7 +519,7 @@
   return o;
 }
 
-checkUnnamed3911(core.Map<core.String, core.Object> o) {
+checkUnnamed4507(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -540,11 +540,11 @@
   if (buildCounterLogEntry < 3) {
     o.httpRequest = buildHttpRequest();
     o.insertId = "foo";
-    o.jsonPayload = buildUnnamed3909();
-    o.labels = buildUnnamed3910();
+    o.jsonPayload = buildUnnamed4505();
+    o.labels = buildUnnamed4506();
     o.logName = "foo";
     o.operation = buildLogEntryOperation();
-    o.protoPayload = buildUnnamed3911();
+    o.protoPayload = buildUnnamed4507();
     o.receiveTimestamp = "foo";
     o.resource = buildMonitoredResource();
     o.severity = "foo";
@@ -563,11 +563,11 @@
   if (buildCounterLogEntry < 3) {
     checkHttpRequest(o.httpRequest);
     unittest.expect(o.insertId, unittest.equals('foo'));
-    checkUnnamed3909(o.jsonPayload);
-    checkUnnamed3910(o.labels);
+    checkUnnamed4505(o.jsonPayload);
+    checkUnnamed4506(o.labels);
     unittest.expect(o.logName, unittest.equals('foo'));
     checkLogEntryOperation(o.operation);
-    checkUnnamed3911(o.protoPayload);
+    checkUnnamed4507(o.protoPayload);
     unittest.expect(o.receiveTimestamp, unittest.equals('foo'));
     checkMonitoredResource(o.resource);
     unittest.expect(o.severity, unittest.equals('foo'));
@@ -653,14 +653,14 @@
   buildCounterLogLine--;
 }
 
-buildUnnamed3912() {
+buildUnnamed4508() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3912(core.Map<core.String, core.String> o) {
+checkUnnamed4508(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -674,7 +674,7 @@
     o.bucketOptions = buildBucketOptions();
     o.description = "foo";
     o.filter = "foo";
-    o.labelExtractors = buildUnnamed3912();
+    o.labelExtractors = buildUnnamed4508();
     o.metricDescriptor = buildMetricDescriptor();
     o.name = "foo";
     o.valueExtractor = "foo";
@@ -690,7 +690,7 @@
     checkBucketOptions(o.bucketOptions);
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.filter, unittest.equals('foo'));
-    checkUnnamed3912(o.labelExtractors);
+    checkUnnamed4508(o.labelExtractors);
     checkMetricDescriptor(o.metricDescriptor);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.valueExtractor, unittest.equals('foo'));
@@ -732,14 +732,14 @@
   buildCounterLogSink--;
 }
 
-buildUnnamed3913() {
+buildUnnamed4509() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed3913(core.List<api.LabelDescriptor> o) {
+checkUnnamed4509(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -752,7 +752,7 @@
   if (buildCounterMetricDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed3913();
+    o.labels = buildUnnamed4509();
     o.metricKind = "foo";
     o.name = "foo";
     o.type = "foo";
@@ -768,7 +768,7 @@
   if (buildCounterMetricDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed3913(o.labels);
+    checkUnnamed4509(o.labels);
     unittest.expect(o.metricKind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
@@ -778,14 +778,14 @@
   buildCounterMetricDescriptor--;
 }
 
-buildUnnamed3914() {
+buildUnnamed4510() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3914(core.Map<core.String, core.String> o) {
+checkUnnamed4510(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -796,7 +796,7 @@
   var o = new api.MonitoredResource();
   buildCounterMonitoredResource++;
   if (buildCounterMonitoredResource < 3) {
-    o.labels = buildUnnamed3914();
+    o.labels = buildUnnamed4510();
     o.type = "foo";
   }
   buildCounterMonitoredResource--;
@@ -806,20 +806,20 @@
 checkMonitoredResource(api.MonitoredResource o) {
   buildCounterMonitoredResource++;
   if (buildCounterMonitoredResource < 3) {
-    checkUnnamed3914(o.labels);
+    checkUnnamed4510(o.labels);
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMonitoredResource--;
 }
 
-buildUnnamed3915() {
+buildUnnamed4511() {
   var o = new core.List<api.LabelDescriptor>();
   o.add(buildLabelDescriptor());
   o.add(buildLabelDescriptor());
   return o;
 }
 
-checkUnnamed3915(core.List<api.LabelDescriptor> o) {
+checkUnnamed4511(core.List<api.LabelDescriptor> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabelDescriptor(o[0]);
   checkLabelDescriptor(o[1]);
@@ -832,7 +832,7 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     o.description = "foo";
     o.displayName = "foo";
-    o.labels = buildUnnamed3915();
+    o.labels = buildUnnamed4511();
     o.name = "foo";
     o.type = "foo";
   }
@@ -845,34 +845,34 @@
   if (buildCounterMonitoredResourceDescriptor < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.displayName, unittest.equals('foo'));
-    checkUnnamed3915(o.labels);
+    checkUnnamed4511(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.type, unittest.equals('foo'));
   }
   buildCounterMonitoredResourceDescriptor--;
 }
 
-buildUnnamed3916() {
+buildUnnamed4512() {
   var o = new core.List<api.LogLine>();
   o.add(buildLogLine());
   o.add(buildLogLine());
   return o;
 }
 
-checkUnnamed3916(core.List<api.LogLine> o) {
+checkUnnamed4512(core.List<api.LogLine> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogLine(o[0]);
   checkLogLine(o[1]);
 }
 
-buildUnnamed3917() {
+buildUnnamed4513() {
   var o = new core.List<api.SourceReference>();
   o.add(buildSourceReference());
   o.add(buildSourceReference());
   return o;
 }
 
-checkUnnamed3917(core.List<api.SourceReference> o) {
+checkUnnamed4513(core.List<api.SourceReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSourceReference(o[0]);
   checkSourceReference(o[1]);
@@ -895,7 +895,7 @@
     o.instanceIndex = 42;
     o.ip = "foo";
     o.latency = "foo";
-    o.line = buildUnnamed3916();
+    o.line = buildUnnamed4512();
     o.megaCycles = "foo";
     o.method = "foo";
     o.moduleId = "foo";
@@ -905,7 +905,7 @@
     o.requestId = "foo";
     o.resource = "foo";
     o.responseSize = "foo";
-    o.sourceReference = buildUnnamed3917();
+    o.sourceReference = buildUnnamed4513();
     o.startTime = "foo";
     o.status = 42;
     o.taskName = "foo";
@@ -935,7 +935,7 @@
     unittest.expect(o.instanceIndex, unittest.equals(42));
     unittest.expect(o.ip, unittest.equals('foo'));
     unittest.expect(o.latency, unittest.equals('foo'));
-    checkUnnamed3916(o.line);
+    checkUnnamed4512(o.line);
     unittest.expect(o.megaCycles, unittest.equals('foo'));
     unittest.expect(o.method, unittest.equals('foo'));
     unittest.expect(o.moduleId, unittest.equals('foo'));
@@ -945,7 +945,7 @@
     unittest.expect(o.requestId, unittest.equals('foo'));
     unittest.expect(o.resource, unittest.equals('foo'));
     unittest.expect(o.responseSize, unittest.equals('foo'));
-    checkUnnamed3917(o.sourceReference);
+    checkUnnamed4513(o.sourceReference);
     unittest.expect(o.startTime, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals(42));
     unittest.expect(o.taskName, unittest.equals('foo'));
@@ -1003,27 +1003,27 @@
   buildCounterSourceReference--;
 }
 
-buildUnnamed3918() {
+buildUnnamed4514() {
   var o = new core.List<api.LogEntry>();
   o.add(buildLogEntry());
   o.add(buildLogEntry());
   return o;
 }
 
-checkUnnamed3918(core.List<api.LogEntry> o) {
+checkUnnamed4514(core.List<api.LogEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLogEntry(o[0]);
   checkLogEntry(o[1]);
 }
 
-buildUnnamed3919() {
+buildUnnamed4515() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed3919(core.Map<core.String, core.String> o) {
+checkUnnamed4515(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1035,8 +1035,8 @@
   buildCounterWriteLogEntriesRequest++;
   if (buildCounterWriteLogEntriesRequest < 3) {
     o.dryRun = true;
-    o.entries = buildUnnamed3918();
-    o.labels = buildUnnamed3919();
+    o.entries = buildUnnamed4514();
+    o.labels = buildUnnamed4515();
     o.logName = "foo";
     o.partialSuccess = true;
     o.resource = buildMonitoredResource();
@@ -1049,8 +1049,8 @@
   buildCounterWriteLogEntriesRequest++;
   if (buildCounterWriteLogEntriesRequest < 3) {
     unittest.expect(o.dryRun, unittest.isTrue);
-    checkUnnamed3918(o.entries);
-    checkUnnamed3919(o.labels);
+    checkUnnamed4514(o.entries);
+    checkUnnamed4515(o.labels);
     unittest.expect(o.logName, unittest.equals('foo'));
     unittest.expect(o.partialSuccess, unittest.isTrue);
     checkMonitoredResource(o.resource);
@@ -1339,7 +1339,7 @@
       }), true);
       res
           .delete(arg_logName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1400,7 +1400,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLogsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLogsResponse(response);
       })));
     });
@@ -1455,7 +1455,7 @@
       }), true);
       res
           .list(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLogEntriesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLogEntriesResponse(response);
       })));
     });
@@ -1508,7 +1508,7 @@
       }), true);
       res
           .write(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.WriteLogEntriesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkWriteLogEntriesResponse(response);
       })));
     });
@@ -1570,8 +1570,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(
-              ((api.ListMonitoredResourceDescriptorsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListMonitoredResourceDescriptorsResponse(response);
       })));
     });
@@ -1625,7 +1624,7 @@
       }), true);
       res
           .delete(arg_logName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1686,7 +1685,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLogsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLogsResponse(response);
       })));
     });
@@ -1739,7 +1738,7 @@
       }), true);
       res
           .delete(arg_logName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1799,7 +1798,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLogsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLogsResponse(response);
       })));
     });
@@ -1857,7 +1856,7 @@
       }), true);
       res
           .create(arg_request, arg_parent, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogMetric response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogMetric(response);
       })));
     });
@@ -1909,7 +1908,7 @@
       }), true);
       res
           .delete(arg_metricName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1961,7 +1960,7 @@
       }), true);
       res
           .get(arg_metricName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogMetric response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogMetric(response);
       })));
     });
@@ -2022,7 +2021,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLogMetricsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLogMetricsResponse(response);
       })));
     });
@@ -2078,7 +2077,7 @@
       }), true);
       res
           .update(arg_request, arg_metricName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogMetric response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogMetric(response);
       })));
     });
@@ -2141,7 +2140,7 @@
           .create(arg_request, arg_parent,
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -2193,7 +2192,7 @@
       }), true);
       res
           .delete(arg_sinkName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -2245,7 +2244,7 @@
       }), true);
       res
           .get(arg_sinkName, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
@@ -2306,7 +2305,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListSinksResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSinksResponse(response);
       })));
     });
@@ -2371,7 +2370,7 @@
               uniqueWriterIdentity: arg_uniqueWriterIdentity,
               updateMask: arg_updateMask,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LogSink response) {
+          .then(unittest.expectAsync1(((response) {
         checkLogSink(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/oslogin/v1alpha_test.dart b/generated/googleapis_beta/test/oslogin/v1alpha_test.dart
index 5ae9770..acb47c6 100644
--- a/generated/googleapis_beta/test/oslogin/v1alpha_test.dart
+++ b/generated/googleapis_beta/test/oslogin/v1alpha_test.dart
@@ -84,27 +84,27 @@
   buildCounterImportSshPublicKeyResponse--;
 }
 
-buildUnnamed4229() {
+buildUnnamed4390() {
   var o = new core.List<api.PosixAccount>();
   o.add(buildPosixAccount());
   o.add(buildPosixAccount());
   return o;
 }
 
-checkUnnamed4229(core.List<api.PosixAccount> o) {
+checkUnnamed4390(core.List<api.PosixAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPosixAccount(o[0]);
   checkPosixAccount(o[1]);
 }
 
-buildUnnamed4230() {
+buildUnnamed4391() {
   var o = new core.Map<core.String, api.SshPublicKey>();
   o["x"] = buildSshPublicKey();
   o["y"] = buildSshPublicKey();
   return o;
 }
 
-checkUnnamed4230(core.Map<core.String, api.SshPublicKey> o) {
+checkUnnamed4391(core.Map<core.String, api.SshPublicKey> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSshPublicKey(o["x"]);
   checkSshPublicKey(o["y"]);
@@ -116,8 +116,8 @@
   buildCounterLoginProfile++;
   if (buildCounterLoginProfile < 3) {
     o.name = "foo";
-    o.posixAccounts = buildUnnamed4229();
-    o.sshPublicKeys = buildUnnamed4230();
+    o.posixAccounts = buildUnnamed4390();
+    o.sshPublicKeys = buildUnnamed4391();
   }
   buildCounterLoginProfile--;
   return o;
@@ -127,8 +127,8 @@
   buildCounterLoginProfile++;
   if (buildCounterLoginProfile < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4229(o.posixAccounts);
-    checkUnnamed4230(o.sshPublicKeys);
+    checkUnnamed4390(o.posixAccounts);
+    checkUnnamed4391(o.sshPublicKeys);
   }
   buildCounterLoginProfile--;
 }
@@ -279,7 +279,7 @@
       }), true);
       res
           .getLoginProfile(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LoginProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkLoginProfile(response);
       })));
     });
@@ -338,8 +338,7 @@
       res
           .importSshPublicKey(arg_request, arg_parent,
               projectId: arg_projectId, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ImportSshPublicKeyResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkImportSshPublicKeyResponse(response);
       })));
     });
@@ -393,7 +392,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -447,7 +446,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -499,7 +498,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SshPublicKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkSshPublicKey(response);
       })));
     });
@@ -559,7 +558,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SshPublicKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkSshPublicKey(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/oslogin/v1beta_test.dart b/generated/googleapis_beta/test/oslogin/v1beta_test.dart
index f95e4bd..ae7e3e7 100644
--- a/generated/googleapis_beta/test/oslogin/v1beta_test.dart
+++ b/generated/googleapis_beta/test/oslogin/v1beta_test.dart
@@ -84,27 +84,27 @@
   buildCounterImportSshPublicKeyResponse--;
 }
 
-buildUnnamed4426() {
+buildUnnamed3881() {
   var o = new core.List<api.PosixAccount>();
   o.add(buildPosixAccount());
   o.add(buildPosixAccount());
   return o;
 }
 
-checkUnnamed4426(core.List<api.PosixAccount> o) {
+checkUnnamed3881(core.List<api.PosixAccount> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPosixAccount(o[0]);
   checkPosixAccount(o[1]);
 }
 
-buildUnnamed4427() {
+buildUnnamed3882() {
   var o = new core.Map<core.String, api.SshPublicKey>();
   o["x"] = buildSshPublicKey();
   o["y"] = buildSshPublicKey();
   return o;
 }
 
-checkUnnamed4427(core.Map<core.String, api.SshPublicKey> o) {
+checkUnnamed3882(core.Map<core.String, api.SshPublicKey> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSshPublicKey(o["x"]);
   checkSshPublicKey(o["y"]);
@@ -116,8 +116,8 @@
   buildCounterLoginProfile++;
   if (buildCounterLoginProfile < 3) {
     o.name = "foo";
-    o.posixAccounts = buildUnnamed4426();
-    o.sshPublicKeys = buildUnnamed4427();
+    o.posixAccounts = buildUnnamed3881();
+    o.sshPublicKeys = buildUnnamed3882();
   }
   buildCounterLoginProfile--;
   return o;
@@ -127,8 +127,8 @@
   buildCounterLoginProfile++;
   if (buildCounterLoginProfile < 3) {
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4426(o.posixAccounts);
-    checkUnnamed4427(o.sshPublicKeys);
+    checkUnnamed3881(o.posixAccounts);
+    checkUnnamed3882(o.sshPublicKeys);
   }
   buildCounterLoginProfile--;
 }
@@ -279,7 +279,7 @@
       }), true);
       res
           .getLoginProfile(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.LoginProfile response) {
+          .then(unittest.expectAsync1(((response) {
         checkLoginProfile(response);
       })));
     });
@@ -338,8 +338,7 @@
       res
           .importSshPublicKey(arg_request, arg_parent,
               projectId: arg_projectId, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ImportSshPublicKeyResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkImportSshPublicKeyResponse(response);
       })));
     });
@@ -393,7 +392,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -447,7 +446,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -499,7 +498,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SshPublicKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkSshPublicKey(response);
       })));
     });
@@ -559,7 +558,7 @@
       res
           .patch(arg_request, arg_name,
               updateMask: arg_updateMask, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SshPublicKey response) {
+          .then(unittest.expectAsync1(((response) {
         checkSshPublicKey(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/proximitybeacon/v1beta1_test.dart b/generated/googleapis_beta/test/proximitybeacon/v1beta1_test.dart
index dc8e90d..b4dddd2 100644
--- a/generated/googleapis_beta/test/proximitybeacon/v1beta1_test.dart
+++ b/generated/googleapis_beta/test/proximitybeacon/v1beta1_test.dart
@@ -94,14 +94,14 @@
   buildCounterAttachmentInfo--;
 }
 
-buildUnnamed4545() {
+buildUnnamed4010() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4545(core.Map<core.String, core.String> o) {
+checkUnnamed4010(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -120,7 +120,7 @@
     o.indoorLevel = buildIndoorLevel();
     o.latLng = buildLatLng();
     o.placeId = "foo";
-    o.properties = buildUnnamed4545();
+    o.properties = buildUnnamed4010();
     o.provisioningKey = "foo";
     o.status = "foo";
   }
@@ -139,7 +139,7 @@
     checkIndoorLevel(o.indoorLevel);
     checkLatLng(o.latLng);
     unittest.expect(o.placeId, unittest.equals('foo'));
-    checkUnnamed4545(o.properties);
+    checkUnnamed4010(o.properties);
     unittest.expect(o.provisioningKey, unittest.equals('foo'));
     unittest.expect(o.status, unittest.equals('foo'));
   }
@@ -173,14 +173,14 @@
   buildCounterBeaconAttachment--;
 }
 
-buildUnnamed4546() {
+buildUnnamed4011() {
   var o = new core.List<api.AttachmentInfo>();
   o.add(buildAttachmentInfo());
   o.add(buildAttachmentInfo());
   return o;
 }
 
-checkUnnamed4546(core.List<api.AttachmentInfo> o) {
+checkUnnamed4011(core.List<api.AttachmentInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAttachmentInfo(o[0]);
   checkAttachmentInfo(o[1]);
@@ -192,7 +192,7 @@
   buildCounterBeaconInfo++;
   if (buildCounterBeaconInfo < 3) {
     o.advertisedId = buildAdvertisedId();
-    o.attachments = buildUnnamed4546();
+    o.attachments = buildUnnamed4011();
     o.beaconName = "foo";
   }
   buildCounterBeaconInfo--;
@@ -203,7 +203,7 @@
   buildCounterBeaconInfo++;
   if (buildCounterBeaconInfo < 3) {
     checkAdvertisedId(o.advertisedId);
-    checkUnnamed4546(o.attachments);
+    checkUnnamed4011(o.attachments);
     unittest.expect(o.beaconName, unittest.equals('foo'));
   }
   buildCounterBeaconInfo--;
@@ -251,14 +251,14 @@
   buildCounterDeleteAttachmentsResponse--;
 }
 
-buildUnnamed4547() {
+buildUnnamed4012() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4547(core.List<core.String> o) {
+checkUnnamed4012(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -269,7 +269,7 @@
   var o = new api.Diagnostics();
   buildCounterDiagnostics++;
   if (buildCounterDiagnostics < 3) {
-    o.alerts = buildUnnamed4547();
+    o.alerts = buildUnnamed4012();
     o.beaconName = "foo";
     o.estimatedLowBatteryDate = buildDate();
   }
@@ -280,7 +280,7 @@
 checkDiagnostics(api.Diagnostics o) {
   buildCounterDiagnostics++;
   if (buildCounterDiagnostics < 3) {
-    checkUnnamed4547(o.alerts);
+    checkUnnamed4012(o.alerts);
     unittest.expect(o.beaconName, unittest.equals('foo'));
     checkDate(o.estimatedLowBatteryDate);
   }
@@ -354,27 +354,27 @@
   buildCounterEphemeralIdRegistrationParams--;
 }
 
-buildUnnamed4548() {
+buildUnnamed4013() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4548(core.List<core.String> o) {
+checkUnnamed4013(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4549() {
+buildUnnamed4014() {
   var o = new core.List<api.Observation>();
   o.add(buildObservation());
   o.add(buildObservation());
   return o;
 }
 
-checkUnnamed4549(core.List<api.Observation> o) {
+checkUnnamed4014(core.List<api.Observation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkObservation(o[0]);
   checkObservation(o[1]);
@@ -385,8 +385,8 @@
   var o = new api.GetInfoForObservedBeaconsRequest();
   buildCounterGetInfoForObservedBeaconsRequest++;
   if (buildCounterGetInfoForObservedBeaconsRequest < 3) {
-    o.namespacedTypes = buildUnnamed4548();
-    o.observations = buildUnnamed4549();
+    o.namespacedTypes = buildUnnamed4013();
+    o.observations = buildUnnamed4014();
   }
   buildCounterGetInfoForObservedBeaconsRequest--;
   return o;
@@ -395,20 +395,20 @@
 checkGetInfoForObservedBeaconsRequest(api.GetInfoForObservedBeaconsRequest o) {
   buildCounterGetInfoForObservedBeaconsRequest++;
   if (buildCounterGetInfoForObservedBeaconsRequest < 3) {
-    checkUnnamed4548(o.namespacedTypes);
-    checkUnnamed4549(o.observations);
+    checkUnnamed4013(o.namespacedTypes);
+    checkUnnamed4014(o.observations);
   }
   buildCounterGetInfoForObservedBeaconsRequest--;
 }
 
-buildUnnamed4550() {
+buildUnnamed4015() {
   var o = new core.List<api.BeaconInfo>();
   o.add(buildBeaconInfo());
   o.add(buildBeaconInfo());
   return o;
 }
 
-checkUnnamed4550(core.List<api.BeaconInfo> o) {
+checkUnnamed4015(core.List<api.BeaconInfo> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBeaconInfo(o[0]);
   checkBeaconInfo(o[1]);
@@ -419,7 +419,7 @@
   var o = new api.GetInfoForObservedBeaconsResponse();
   buildCounterGetInfoForObservedBeaconsResponse++;
   if (buildCounterGetInfoForObservedBeaconsResponse < 3) {
-    o.beacons = buildUnnamed4550();
+    o.beacons = buildUnnamed4015();
   }
   buildCounterGetInfoForObservedBeaconsResponse--;
   return o;
@@ -429,7 +429,7 @@
     api.GetInfoForObservedBeaconsResponse o) {
   buildCounterGetInfoForObservedBeaconsResponse++;
   if (buildCounterGetInfoForObservedBeaconsResponse < 3) {
-    checkUnnamed4550(o.beacons);
+    checkUnnamed4015(o.beacons);
   }
   buildCounterGetInfoForObservedBeaconsResponse--;
 }
@@ -474,14 +474,14 @@
   buildCounterLatLng--;
 }
 
-buildUnnamed4551() {
+buildUnnamed4016() {
   var o = new core.List<api.BeaconAttachment>();
   o.add(buildBeaconAttachment());
   o.add(buildBeaconAttachment());
   return o;
 }
 
-checkUnnamed4551(core.List<api.BeaconAttachment> o) {
+checkUnnamed4016(core.List<api.BeaconAttachment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBeaconAttachment(o[0]);
   checkBeaconAttachment(o[1]);
@@ -492,7 +492,7 @@
   var o = new api.ListBeaconAttachmentsResponse();
   buildCounterListBeaconAttachmentsResponse++;
   if (buildCounterListBeaconAttachmentsResponse < 3) {
-    o.attachments = buildUnnamed4551();
+    o.attachments = buildUnnamed4016();
   }
   buildCounterListBeaconAttachmentsResponse--;
   return o;
@@ -501,19 +501,19 @@
 checkListBeaconAttachmentsResponse(api.ListBeaconAttachmentsResponse o) {
   buildCounterListBeaconAttachmentsResponse++;
   if (buildCounterListBeaconAttachmentsResponse < 3) {
-    checkUnnamed4551(o.attachments);
+    checkUnnamed4016(o.attachments);
   }
   buildCounterListBeaconAttachmentsResponse--;
 }
 
-buildUnnamed4552() {
+buildUnnamed4017() {
   var o = new core.List<api.Beacon>();
   o.add(buildBeacon());
   o.add(buildBeacon());
   return o;
 }
 
-checkUnnamed4552(core.List<api.Beacon> o) {
+checkUnnamed4017(core.List<api.Beacon> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBeacon(o[0]);
   checkBeacon(o[1]);
@@ -524,7 +524,7 @@
   var o = new api.ListBeaconsResponse();
   buildCounterListBeaconsResponse++;
   if (buildCounterListBeaconsResponse < 3) {
-    o.beacons = buildUnnamed4552();
+    o.beacons = buildUnnamed4017();
     o.nextPageToken = "foo";
     o.totalCount = "foo";
   }
@@ -535,21 +535,21 @@
 checkListBeaconsResponse(api.ListBeaconsResponse o) {
   buildCounterListBeaconsResponse++;
   if (buildCounterListBeaconsResponse < 3) {
-    checkUnnamed4552(o.beacons);
+    checkUnnamed4017(o.beacons);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.totalCount, unittest.equals('foo'));
   }
   buildCounterListBeaconsResponse--;
 }
 
-buildUnnamed4553() {
+buildUnnamed4018() {
   var o = new core.List<api.Diagnostics>();
   o.add(buildDiagnostics());
   o.add(buildDiagnostics());
   return o;
 }
 
-checkUnnamed4553(core.List<api.Diagnostics> o) {
+checkUnnamed4018(core.List<api.Diagnostics> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDiagnostics(o[0]);
   checkDiagnostics(o[1]);
@@ -560,7 +560,7 @@
   var o = new api.ListDiagnosticsResponse();
   buildCounterListDiagnosticsResponse++;
   if (buildCounterListDiagnosticsResponse < 3) {
-    o.diagnostics = buildUnnamed4553();
+    o.diagnostics = buildUnnamed4018();
     o.nextPageToken = "foo";
   }
   buildCounterListDiagnosticsResponse--;
@@ -570,20 +570,20 @@
 checkListDiagnosticsResponse(api.ListDiagnosticsResponse o) {
   buildCounterListDiagnosticsResponse++;
   if (buildCounterListDiagnosticsResponse < 3) {
-    checkUnnamed4553(o.diagnostics);
+    checkUnnamed4018(o.diagnostics);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListDiagnosticsResponse--;
 }
 
-buildUnnamed4554() {
+buildUnnamed4019() {
   var o = new core.List<api.Namespace>();
   o.add(buildNamespace());
   o.add(buildNamespace());
   return o;
 }
 
-checkUnnamed4554(core.List<api.Namespace> o) {
+checkUnnamed4019(core.List<api.Namespace> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNamespace(o[0]);
   checkNamespace(o[1]);
@@ -594,7 +594,7 @@
   var o = new api.ListNamespacesResponse();
   buildCounterListNamespacesResponse++;
   if (buildCounterListNamespacesResponse < 3) {
-    o.namespaces = buildUnnamed4554();
+    o.namespaces = buildUnnamed4019();
   }
   buildCounterListNamespacesResponse--;
   return o;
@@ -603,7 +603,7 @@
 checkListNamespacesResponse(api.ListNamespacesResponse o) {
   buildCounterListNamespacesResponse++;
   if (buildCounterListNamespacesResponse < 3) {
-    checkUnnamed4554(o.namespaces);
+    checkUnnamed4019(o.namespaces);
   }
   buildCounterListNamespacesResponse--;
 }
@@ -870,8 +870,9 @@
             convert.JSON.encode(buildGetInfoForObservedBeaconsResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getforobserved(arg_request, $fields: arg_$fields).then(unittest
-          .expectAsync1(((api.GetInfoForObservedBeaconsResponse response) {
+      res
+          .getforobserved(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGetInfoForObservedBeaconsResponse(response);
       })));
     });
@@ -928,7 +929,7 @@
       res
           .activate(arg_beaconName,
               projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -983,7 +984,7 @@
       res
           .deactivate(arg_beaconName,
               projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1038,7 +1039,7 @@
       res
           .decommission(arg_beaconName,
               projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1093,7 +1094,7 @@
       res
           .delete(arg_beaconName,
               projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1147,7 +1148,7 @@
       }), true);
       res
           .get(arg_beaconName, projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Beacon response) {
+          .then(unittest.expectAsync1(((response) {
         checkBeacon(response);
       })));
     });
@@ -1212,7 +1213,7 @@
               projectId: arg_projectId,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListBeaconsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListBeaconsResponse(response);
       })));
     });
@@ -1268,7 +1269,7 @@
       }), true);
       res
           .register(arg_request, projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Beacon response) {
+          .then(unittest.expectAsync1(((response) {
         checkBeacon(response);
       })));
     });
@@ -1327,7 +1328,7 @@
       res
           .update(arg_request, arg_beaconName,
               projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Beacon response) {
+          .then(unittest.expectAsync1(((response) {
         checkBeacon(response);
       })));
     });
@@ -1390,8 +1391,7 @@
               namespacedType: arg_namespacedType,
               projectId: arg_projectId,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.DeleteAttachmentsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDeleteAttachmentsResponse(response);
       })));
     });
@@ -1451,7 +1451,7 @@
       res
           .create(arg_request, arg_beaconName,
               projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BeaconAttachment response) {
+          .then(unittest.expectAsync1(((response) {
         checkBeaconAttachment(response);
       })));
     });
@@ -1507,7 +1507,7 @@
       res
           .delete(arg_attachmentName,
               projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1568,8 +1568,7 @@
               namespacedType: arg_namespacedType,
               projectId: arg_projectId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListBeaconAttachmentsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListBeaconAttachmentsResponse(response);
       })));
     });
@@ -1640,7 +1639,7 @@
               alertFilter: arg_alertFilter,
               projectId: arg_projectId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListDiagnosticsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListDiagnosticsResponse(response);
       })));
     });
@@ -1695,7 +1694,7 @@
       }), true);
       res
           .list(projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListNamespacesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListNamespacesResponse(response);
       })));
     });
@@ -1755,7 +1754,7 @@
       res
           .update(arg_request, arg_namespaceName,
               projectId: arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Namespace response) {
+          .then(unittest.expectAsync1(((response) {
         checkNamespace(response);
       })));
     });
@@ -1804,8 +1803,9 @@
         var resp = convert.JSON.encode(buildEphemeralIdRegistrationParams());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.getEidparams($fields: arg_$fields).then(
-          unittest.expectAsync1(((api.EphemeralIdRegistrationParams response) {
+      res
+          .getEidparams($fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkEphemeralIdRegistrationParams(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/pubsub/v1beta2_test.dart b/generated/googleapis_beta/test/pubsub/v1beta2_test.dart
index 9ffae2d..5e9147f 100644
--- a/generated/googleapis_beta/test/pubsub/v1beta2_test.dart
+++ b/generated/googleapis_beta/test/pubsub/v1beta2_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed4285() {
+buildUnnamed4478() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4285(core.List<core.String> o) {
+checkUnnamed4478(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -68,7 +68,7 @@
   var o = new api.AcknowledgeRequest();
   buildCounterAcknowledgeRequest++;
   if (buildCounterAcknowledgeRequest < 3) {
-    o.ackIds = buildUnnamed4285();
+    o.ackIds = buildUnnamed4478();
   }
   buildCounterAcknowledgeRequest--;
   return o;
@@ -77,19 +77,19 @@
 checkAcknowledgeRequest(api.AcknowledgeRequest o) {
   buildCounterAcknowledgeRequest++;
   if (buildCounterAcknowledgeRequest < 3) {
-    checkUnnamed4285(o.ackIds);
+    checkUnnamed4478(o.ackIds);
   }
   buildCounterAcknowledgeRequest--;
 }
 
-buildUnnamed4286() {
+buildUnnamed4479() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4286(core.List<core.String> o) {
+checkUnnamed4479(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -100,7 +100,7 @@
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed4286();
+    o.members = buildUnnamed4479();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -110,7 +110,7 @@
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed4286(o.members);
+    checkUnnamed4479(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
@@ -131,14 +131,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed4287() {
+buildUnnamed4480() {
   var o = new core.List<api.Subscription>();
   o.add(buildSubscription());
   o.add(buildSubscription());
   return o;
 }
 
-checkUnnamed4287(core.List<api.Subscription> o) {
+checkUnnamed4480(core.List<api.Subscription> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSubscription(o[0]);
   checkSubscription(o[1]);
@@ -150,7 +150,7 @@
   buildCounterListSubscriptionsResponse++;
   if (buildCounterListSubscriptionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.subscriptions = buildUnnamed4287();
+    o.subscriptions = buildUnnamed4480();
   }
   buildCounterListSubscriptionsResponse--;
   return o;
@@ -160,19 +160,19 @@
   buildCounterListSubscriptionsResponse++;
   if (buildCounterListSubscriptionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4287(o.subscriptions);
+    checkUnnamed4480(o.subscriptions);
   }
   buildCounterListSubscriptionsResponse--;
 }
 
-buildUnnamed4288() {
+buildUnnamed4481() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4288(core.List<core.String> o) {
+checkUnnamed4481(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -184,7 +184,7 @@
   buildCounterListTopicSubscriptionsResponse++;
   if (buildCounterListTopicSubscriptionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.subscriptions = buildUnnamed4288();
+    o.subscriptions = buildUnnamed4481();
   }
   buildCounterListTopicSubscriptionsResponse--;
   return o;
@@ -194,19 +194,19 @@
   buildCounterListTopicSubscriptionsResponse++;
   if (buildCounterListTopicSubscriptionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4288(o.subscriptions);
+    checkUnnamed4481(o.subscriptions);
   }
   buildCounterListTopicSubscriptionsResponse--;
 }
 
-buildUnnamed4289() {
+buildUnnamed4482() {
   var o = new core.List<api.Topic>();
   o.add(buildTopic());
   o.add(buildTopic());
   return o;
 }
 
-checkUnnamed4289(core.List<api.Topic> o) {
+checkUnnamed4482(core.List<api.Topic> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTopic(o[0]);
   checkTopic(o[1]);
@@ -218,7 +218,7 @@
   buildCounterListTopicsResponse++;
   if (buildCounterListTopicsResponse < 3) {
     o.nextPageToken = "foo";
-    o.topics = buildUnnamed4289();
+    o.topics = buildUnnamed4482();
   }
   buildCounterListTopicsResponse--;
   return o;
@@ -228,19 +228,19 @@
   buildCounterListTopicsResponse++;
   if (buildCounterListTopicsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4289(o.topics);
+    checkUnnamed4482(o.topics);
   }
   buildCounterListTopicsResponse--;
 }
 
-buildUnnamed4290() {
+buildUnnamed4483() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4290(core.List<core.String> o) {
+checkUnnamed4483(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -253,7 +253,7 @@
   if (buildCounterModifyAckDeadlineRequest < 3) {
     o.ackDeadlineSeconds = 42;
     o.ackId = "foo";
-    o.ackIds = buildUnnamed4290();
+    o.ackIds = buildUnnamed4483();
   }
   buildCounterModifyAckDeadlineRequest--;
   return o;
@@ -264,7 +264,7 @@
   if (buildCounterModifyAckDeadlineRequest < 3) {
     unittest.expect(o.ackDeadlineSeconds, unittest.equals(42));
     unittest.expect(o.ackId, unittest.equals('foo'));
-    checkUnnamed4290(o.ackIds);
+    checkUnnamed4483(o.ackIds);
   }
   buildCounterModifyAckDeadlineRequest--;
 }
@@ -288,14 +288,14 @@
   buildCounterModifyPushConfigRequest--;
 }
 
-buildUnnamed4291() {
+buildUnnamed4484() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed4291(core.List<api.Binding> o) {
+checkUnnamed4484(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -306,7 +306,7 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.bindings = buildUnnamed4291();
+    o.bindings = buildUnnamed4484();
     o.etag = "foo";
     o.version = 42;
   }
@@ -317,21 +317,21 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed4291(o.bindings);
+    checkUnnamed4484(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
   buildCounterPolicy--;
 }
 
-buildUnnamed4292() {
+buildUnnamed4485() {
   var o = new core.List<api.PubsubMessage>();
   o.add(buildPubsubMessage());
   o.add(buildPubsubMessage());
   return o;
 }
 
-checkUnnamed4292(core.List<api.PubsubMessage> o) {
+checkUnnamed4485(core.List<api.PubsubMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPubsubMessage(o[0]);
   checkPubsubMessage(o[1]);
@@ -342,7 +342,7 @@
   var o = new api.PublishRequest();
   buildCounterPublishRequest++;
   if (buildCounterPublishRequest < 3) {
-    o.messages = buildUnnamed4292();
+    o.messages = buildUnnamed4485();
   }
   buildCounterPublishRequest--;
   return o;
@@ -351,19 +351,19 @@
 checkPublishRequest(api.PublishRequest o) {
   buildCounterPublishRequest++;
   if (buildCounterPublishRequest < 3) {
-    checkUnnamed4292(o.messages);
+    checkUnnamed4485(o.messages);
   }
   buildCounterPublishRequest--;
 }
 
-buildUnnamed4293() {
+buildUnnamed4486() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4293(core.List<core.String> o) {
+checkUnnamed4486(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -374,7 +374,7 @@
   var o = new api.PublishResponse();
   buildCounterPublishResponse++;
   if (buildCounterPublishResponse < 3) {
-    o.messageIds = buildUnnamed4293();
+    o.messageIds = buildUnnamed4486();
   }
   buildCounterPublishResponse--;
   return o;
@@ -383,19 +383,19 @@
 checkPublishResponse(api.PublishResponse o) {
   buildCounterPublishResponse++;
   if (buildCounterPublishResponse < 3) {
-    checkUnnamed4293(o.messageIds);
+    checkUnnamed4486(o.messageIds);
   }
   buildCounterPublishResponse--;
 }
 
-buildUnnamed4294() {
+buildUnnamed4487() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4294(core.Map<core.String, core.String> o) {
+checkUnnamed4487(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -406,7 +406,7 @@
   var o = new api.PubsubMessage();
   buildCounterPubsubMessage++;
   if (buildCounterPubsubMessage < 3) {
-    o.attributes = buildUnnamed4294();
+    o.attributes = buildUnnamed4487();
     o.data = "foo";
     o.messageId = "foo";
     o.publishTime = "foo";
@@ -418,7 +418,7 @@
 checkPubsubMessage(api.PubsubMessage o) {
   buildCounterPubsubMessage++;
   if (buildCounterPubsubMessage < 3) {
-    checkUnnamed4294(o.attributes);
+    checkUnnamed4487(o.attributes);
     unittest.expect(o.data, unittest.equals('foo'));
     unittest.expect(o.messageId, unittest.equals('foo'));
     unittest.expect(o.publishTime, unittest.equals('foo'));
@@ -447,14 +447,14 @@
   buildCounterPullRequest--;
 }
 
-buildUnnamed4295() {
+buildUnnamed4488() {
   var o = new core.List<api.ReceivedMessage>();
   o.add(buildReceivedMessage());
   o.add(buildReceivedMessage());
   return o;
 }
 
-checkUnnamed4295(core.List<api.ReceivedMessage> o) {
+checkUnnamed4488(core.List<api.ReceivedMessage> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReceivedMessage(o[0]);
   checkReceivedMessage(o[1]);
@@ -465,7 +465,7 @@
   var o = new api.PullResponse();
   buildCounterPullResponse++;
   if (buildCounterPullResponse < 3) {
-    o.receivedMessages = buildUnnamed4295();
+    o.receivedMessages = buildUnnamed4488();
   }
   buildCounterPullResponse--;
   return o;
@@ -474,19 +474,19 @@
 checkPullResponse(api.PullResponse o) {
   buildCounterPullResponse++;
   if (buildCounterPullResponse < 3) {
-    checkUnnamed4295(o.receivedMessages);
+    checkUnnamed4488(o.receivedMessages);
   }
   buildCounterPullResponse--;
 }
 
-buildUnnamed4296() {
+buildUnnamed4489() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4296(core.Map<core.String, core.String> o) {
+checkUnnamed4489(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -497,7 +497,7 @@
   var o = new api.PushConfig();
   buildCounterPushConfig++;
   if (buildCounterPushConfig < 3) {
-    o.attributes = buildUnnamed4296();
+    o.attributes = buildUnnamed4489();
     o.pushEndpoint = "foo";
   }
   buildCounterPushConfig--;
@@ -507,7 +507,7 @@
 checkPushConfig(api.PushConfig o) {
   buildCounterPushConfig++;
   if (buildCounterPushConfig < 3) {
-    checkUnnamed4296(o.attributes);
+    checkUnnamed4489(o.attributes);
     unittest.expect(o.pushEndpoint, unittest.equals('foo'));
   }
   buildCounterPushConfig--;
@@ -578,14 +578,14 @@
   buildCounterSubscription--;
 }
 
-buildUnnamed4297() {
+buildUnnamed4490() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4297(core.List<core.String> o) {
+checkUnnamed4490(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -596,7 +596,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed4297();
+    o.permissions = buildUnnamed4490();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -605,19 +605,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed4297(o.permissions);
+    checkUnnamed4490(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed4298() {
+buildUnnamed4491() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4298(core.List<core.String> o) {
+checkUnnamed4491(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -628,7 +628,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed4298();
+    o.permissions = buildUnnamed4491();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -637,7 +637,7 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed4298(o.permissions);
+    checkUnnamed4491(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
@@ -882,7 +882,7 @@
       }), true);
       res
           .acknowledge(arg_request, arg_subscription, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -938,7 +938,7 @@
       }), true);
       res
           .create(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -990,7 +990,7 @@
       }), true);
       res
           .delete(arg_subscription, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1042,7 +1042,7 @@
       }), true);
       res
           .get(arg_subscription, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Subscription response) {
+          .then(unittest.expectAsync1(((response) {
         checkSubscription(response);
       })));
     });
@@ -1094,7 +1094,7 @@
       }), true);
       res
           .getIamPolicy(arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1155,8 +1155,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListSubscriptionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListSubscriptionsResponse(response);
       })));
     });
@@ -1213,7 +1212,7 @@
       res
           .modifyAckDeadline(arg_request, arg_subscription,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1269,7 +1268,7 @@
       }), true);
       res
           .modifyPushConfig(arg_request, arg_subscription, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1325,7 +1324,7 @@
       }), true);
       res
           .pull(arg_request, arg_subscription, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PullResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPullResponse(response);
       })));
     });
@@ -1381,7 +1380,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1437,8 +1436,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -1496,7 +1494,7 @@
       }), true);
       res
           .create(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Topic response) {
+          .then(unittest.expectAsync1(((response) {
         checkTopic(response);
       })));
     });
@@ -1548,7 +1546,7 @@
       }), true);
       res
           .delete(arg_topic, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1600,7 +1598,7 @@
       }), true);
       res
           .get(arg_topic, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Topic response) {
+          .then(unittest.expectAsync1(((response) {
         checkTopic(response);
       })));
     });
@@ -1652,7 +1650,7 @@
       }), true);
       res
           .getIamPolicy(arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1713,7 +1711,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListTopicsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTopicsResponse(response);
       })));
     });
@@ -1769,7 +1767,7 @@
       }), true);
       res
           .publish(arg_request, arg_topic, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PublishResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkPublishResponse(response);
       })));
     });
@@ -1825,7 +1823,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1881,8 +1879,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -1945,8 +1942,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListTopicSubscriptionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTopicSubscriptionsResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/replicapool/v1beta2_test.dart b/generated/googleapis_beta/test/replicapool/v1beta2_test.dart
index 1c4b76e..7947a63 100644
--- a/generated/googleapis_beta/test/replicapool/v1beta2_test.dart
+++ b/generated/googleapis_beta/test/replicapool/v1beta2_test.dart
@@ -50,27 +50,27 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed4274() {
+buildUnnamed4516() {
   var o = new core.List<api.ReplicaPoolAutoHealingPolicy>();
   o.add(buildReplicaPoolAutoHealingPolicy());
   o.add(buildReplicaPoolAutoHealingPolicy());
   return o;
 }
 
-checkUnnamed4274(core.List<api.ReplicaPoolAutoHealingPolicy> o) {
+checkUnnamed4516(core.List<api.ReplicaPoolAutoHealingPolicy> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkReplicaPoolAutoHealingPolicy(o[0]);
   checkReplicaPoolAutoHealingPolicy(o[1]);
 }
 
-buildUnnamed4275() {
+buildUnnamed4517() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4275(core.List<core.String> o) {
+checkUnnamed4517(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -81,7 +81,7 @@
   var o = new api.InstanceGroupManager();
   buildCounterInstanceGroupManager++;
   if (buildCounterInstanceGroupManager < 3) {
-    o.autoHealingPolicies = buildUnnamed4274();
+    o.autoHealingPolicies = buildUnnamed4516();
     o.baseInstanceName = "foo";
     o.creationTimestamp = "foo";
     o.currentSize = 42;
@@ -93,7 +93,7 @@
     o.kind = "foo";
     o.name = "foo";
     o.selfLink = "foo";
-    o.targetPools = buildUnnamed4275();
+    o.targetPools = buildUnnamed4517();
     o.targetSize = 42;
   }
   buildCounterInstanceGroupManager--;
@@ -103,7 +103,7 @@
 checkInstanceGroupManager(api.InstanceGroupManager o) {
   buildCounterInstanceGroupManager++;
   if (buildCounterInstanceGroupManager < 3) {
-    checkUnnamed4274(o.autoHealingPolicies);
+    checkUnnamed4516(o.autoHealingPolicies);
     unittest.expect(o.baseInstanceName, unittest.equals('foo'));
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.currentSize, unittest.equals(42));
@@ -115,20 +115,20 @@
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
-    checkUnnamed4275(o.targetPools);
+    checkUnnamed4517(o.targetPools);
     unittest.expect(o.targetSize, unittest.equals(42));
   }
   buildCounterInstanceGroupManager--;
 }
 
-buildUnnamed4276() {
+buildUnnamed4518() {
   var o = new core.List<api.InstanceGroupManager>();
   o.add(buildInstanceGroupManager());
   o.add(buildInstanceGroupManager());
   return o;
 }
 
-checkUnnamed4276(core.List<api.InstanceGroupManager> o) {
+checkUnnamed4518(core.List<api.InstanceGroupManager> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceGroupManager(o[0]);
   checkInstanceGroupManager(o[1]);
@@ -140,7 +140,7 @@
   buildCounterInstanceGroupManagerList++;
   if (buildCounterInstanceGroupManagerList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed4276();
+    o.items = buildUnnamed4518();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -153,7 +153,7 @@
   buildCounterInstanceGroupManagerList++;
   if (buildCounterInstanceGroupManagerList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed4276(o.items);
+    checkUnnamed4518(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -161,14 +161,14 @@
   buildCounterInstanceGroupManagerList--;
 }
 
-buildUnnamed4277() {
+buildUnnamed4519() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4277(core.List<core.String> o) {
+checkUnnamed4519(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -179,7 +179,7 @@
   var o = new api.InstanceGroupManagersAbandonInstancesRequest();
   buildCounterInstanceGroupManagersAbandonInstancesRequest++;
   if (buildCounterInstanceGroupManagersAbandonInstancesRequest < 3) {
-    o.instances = buildUnnamed4277();
+    o.instances = buildUnnamed4519();
   }
   buildCounterInstanceGroupManagersAbandonInstancesRequest--;
   return o;
@@ -189,19 +189,19 @@
     api.InstanceGroupManagersAbandonInstancesRequest o) {
   buildCounterInstanceGroupManagersAbandonInstancesRequest++;
   if (buildCounterInstanceGroupManagersAbandonInstancesRequest < 3) {
-    checkUnnamed4277(o.instances);
+    checkUnnamed4519(o.instances);
   }
   buildCounterInstanceGroupManagersAbandonInstancesRequest--;
 }
 
-buildUnnamed4278() {
+buildUnnamed4520() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4278(core.List<core.String> o) {
+checkUnnamed4520(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -212,7 +212,7 @@
   var o = new api.InstanceGroupManagersDeleteInstancesRequest();
   buildCounterInstanceGroupManagersDeleteInstancesRequest++;
   if (buildCounterInstanceGroupManagersDeleteInstancesRequest < 3) {
-    o.instances = buildUnnamed4278();
+    o.instances = buildUnnamed4520();
   }
   buildCounterInstanceGroupManagersDeleteInstancesRequest--;
   return o;
@@ -222,19 +222,19 @@
     api.InstanceGroupManagersDeleteInstancesRequest o) {
   buildCounterInstanceGroupManagersDeleteInstancesRequest++;
   if (buildCounterInstanceGroupManagersDeleteInstancesRequest < 3) {
-    checkUnnamed4278(o.instances);
+    checkUnnamed4520(o.instances);
   }
   buildCounterInstanceGroupManagersDeleteInstancesRequest--;
 }
 
-buildUnnamed4279() {
+buildUnnamed4521() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4279(core.List<core.String> o) {
+checkUnnamed4521(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -245,7 +245,7 @@
   var o = new api.InstanceGroupManagersRecreateInstancesRequest();
   buildCounterInstanceGroupManagersRecreateInstancesRequest++;
   if (buildCounterInstanceGroupManagersRecreateInstancesRequest < 3) {
-    o.instances = buildUnnamed4279();
+    o.instances = buildUnnamed4521();
   }
   buildCounterInstanceGroupManagersRecreateInstancesRequest--;
   return o;
@@ -255,7 +255,7 @@
     api.InstanceGroupManagersRecreateInstancesRequest o) {
   buildCounterInstanceGroupManagersRecreateInstancesRequest++;
   if (buildCounterInstanceGroupManagersRecreateInstancesRequest < 3) {
-    checkUnnamed4279(o.instances);
+    checkUnnamed4521(o.instances);
   }
   buildCounterInstanceGroupManagersRecreateInstancesRequest--;
 }
@@ -280,14 +280,14 @@
   buildCounterInstanceGroupManagersSetInstanceTemplateRequest--;
 }
 
-buildUnnamed4280() {
+buildUnnamed4522() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4280(core.List<core.String> o) {
+checkUnnamed4522(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -299,7 +299,7 @@
   buildCounterInstanceGroupManagersSetTargetPoolsRequest++;
   if (buildCounterInstanceGroupManagersSetTargetPoolsRequest < 3) {
     o.fingerprint = "foo";
-    o.targetPools = buildUnnamed4280();
+    o.targetPools = buildUnnamed4522();
   }
   buildCounterInstanceGroupManagersSetTargetPoolsRequest--;
   return o;
@@ -310,7 +310,7 @@
   buildCounterInstanceGroupManagersSetTargetPoolsRequest++;
   if (buildCounterInstanceGroupManagersSetTargetPoolsRequest < 3) {
     unittest.expect(o.fingerprint, unittest.equals('foo'));
-    checkUnnamed4280(o.targetPools);
+    checkUnnamed4522(o.targetPools);
   }
   buildCounterInstanceGroupManagersSetTargetPoolsRequest--;
 }
@@ -338,14 +338,14 @@
   buildCounterOperationErrorErrors--;
 }
 
-buildUnnamed4281() {
+buildUnnamed4523() {
   var o = new core.List<api.OperationErrorErrors>();
   o.add(buildOperationErrorErrors());
   o.add(buildOperationErrorErrors());
   return o;
 }
 
-checkUnnamed4281(core.List<api.OperationErrorErrors> o) {
+checkUnnamed4523(core.List<api.OperationErrorErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationErrorErrors(o[0]);
   checkOperationErrorErrors(o[1]);
@@ -356,7 +356,7 @@
   var o = new api.OperationError();
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    o.errors = buildUnnamed4281();
+    o.errors = buildUnnamed4523();
   }
   buildCounterOperationError--;
   return o;
@@ -365,7 +365,7 @@
 checkOperationError(api.OperationError o) {
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    checkUnnamed4281(o.errors);
+    checkUnnamed4523(o.errors);
   }
   buildCounterOperationError--;
 }
@@ -391,14 +391,14 @@
   buildCounterOperationWarningsData--;
 }
 
-buildUnnamed4282() {
+buildUnnamed4524() {
   var o = new core.List<api.OperationWarningsData>();
   o.add(buildOperationWarningsData());
   o.add(buildOperationWarningsData());
   return o;
 }
 
-checkUnnamed4282(core.List<api.OperationWarningsData> o) {
+checkUnnamed4524(core.List<api.OperationWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarningsData(o[0]);
   checkOperationWarningsData(o[1]);
@@ -410,7 +410,7 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed4282();
+    o.data = buildUnnamed4524();
     o.message = "foo";
   }
   buildCounterOperationWarnings--;
@@ -421,20 +421,20 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed4282(o.data);
+    checkUnnamed4524(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterOperationWarnings--;
 }
 
-buildUnnamed4283() {
+buildUnnamed4525() {
   var o = new core.List<api.OperationWarnings>();
   o.add(buildOperationWarnings());
   o.add(buildOperationWarnings());
   return o;
 }
 
-checkUnnamed4283(core.List<api.OperationWarnings> o) {
+checkUnnamed4525(core.List<api.OperationWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarnings(o[0]);
   checkOperationWarnings(o[1]);
@@ -465,7 +465,7 @@
     o.targetId = "foo";
     o.targetLink = "foo";
     o.user = "foo";
-    o.warnings = buildUnnamed4283();
+    o.warnings = buildUnnamed4525();
     o.zone = "foo";
   }
   buildCounterOperation--;
@@ -495,20 +495,20 @@
     unittest.expect(o.targetId, unittest.equals('foo'));
     unittest.expect(o.targetLink, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed4283(o.warnings);
+    checkUnnamed4525(o.warnings);
     unittest.expect(o.zone, unittest.equals('foo'));
   }
   buildCounterOperation--;
 }
 
-buildUnnamed4284() {
+buildUnnamed4526() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed4284(core.List<api.Operation> o) {
+checkUnnamed4526(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -520,7 +520,7 @@
   buildCounterOperationList++;
   if (buildCounterOperationList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed4284();
+    o.items = buildUnnamed4526();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -533,7 +533,7 @@
   buildCounterOperationList++;
   if (buildCounterOperationList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed4284(o.items);
+    checkUnnamed4526(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -735,7 +735,7 @@
           .abandonInstances(
               arg_request, arg_project, arg_zone, arg_instanceGroupManager,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -786,7 +786,7 @@
       res
           .delete(arg_project, arg_zone, arg_instanceGroupManager,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -843,7 +843,7 @@
           .deleteInstances(
               arg_request, arg_project, arg_zone, arg_instanceGroupManager,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -894,7 +894,7 @@
       res
           .get(arg_project, arg_zone, arg_instanceGroupManager,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceGroupManager response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceGroupManager(response);
       })));
     });
@@ -951,7 +951,7 @@
       res
           .insert(arg_request, arg_project, arg_zone, arg_size,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1012,7 +1012,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceGroupManagerList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceGroupManagerList(response);
       })));
     });
@@ -1070,7 +1070,7 @@
           .recreateInstances(
               arg_request, arg_project, arg_zone, arg_instanceGroupManager,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1124,7 +1124,7 @@
       res
           .resize(arg_project, arg_zone, arg_instanceGroupManager, arg_size,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1182,7 +1182,7 @@
           .setInstanceTemplate(
               arg_request, arg_project, arg_zone, arg_instanceGroupManager,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1239,7 +1239,7 @@
           .setTargetPools(
               arg_request, arg_project, arg_zone, arg_instanceGroupManager,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1291,7 +1291,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_operation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1352,7 +1352,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperationList response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperationList(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/replicapoolupdater/v1beta1_test.dart b/generated/googleapis_beta/test/replicapoolupdater/v1beta1_test.dart
index 931b80a..6a01b3c 100644
--- a/generated/googleapis_beta/test/replicapoolupdater/v1beta1_test.dart
+++ b/generated/googleapis_beta/test/replicapoolupdater/v1beta1_test.dart
@@ -73,14 +73,14 @@
   buildCounterInstanceUpdateErrorErrors--;
 }
 
-buildUnnamed4081() {
+buildUnnamed4002() {
   var o = new core.List<api.InstanceUpdateErrorErrors>();
   o.add(buildInstanceUpdateErrorErrors());
   o.add(buildInstanceUpdateErrorErrors());
   return o;
 }
 
-checkUnnamed4081(core.List<api.InstanceUpdateErrorErrors> o) {
+checkUnnamed4002(core.List<api.InstanceUpdateErrorErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceUpdateErrorErrors(o[0]);
   checkInstanceUpdateErrorErrors(o[1]);
@@ -91,7 +91,7 @@
   var o = new api.InstanceUpdateError();
   buildCounterInstanceUpdateError++;
   if (buildCounterInstanceUpdateError < 3) {
-    o.errors = buildUnnamed4081();
+    o.errors = buildUnnamed4002();
   }
   buildCounterInstanceUpdateError--;
   return o;
@@ -100,7 +100,7 @@
 checkInstanceUpdateError(api.InstanceUpdateError o) {
   buildCounterInstanceUpdateError++;
   if (buildCounterInstanceUpdateError < 3) {
-    checkUnnamed4081(o.errors);
+    checkUnnamed4002(o.errors);
   }
   buildCounterInstanceUpdateError--;
 }
@@ -128,14 +128,14 @@
   buildCounterInstanceUpdate--;
 }
 
-buildUnnamed4082() {
+buildUnnamed4003() {
   var o = new core.List<api.InstanceUpdate>();
   o.add(buildInstanceUpdate());
   o.add(buildInstanceUpdate());
   return o;
 }
 
-checkUnnamed4082(core.List<api.InstanceUpdate> o) {
+checkUnnamed4003(core.List<api.InstanceUpdate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceUpdate(o[0]);
   checkInstanceUpdate(o[1]);
@@ -146,7 +146,7 @@
   var o = new api.InstanceUpdateList();
   buildCounterInstanceUpdateList++;
   if (buildCounterInstanceUpdateList < 3) {
-    o.items = buildUnnamed4082();
+    o.items = buildUnnamed4003();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -158,7 +158,7 @@
 checkInstanceUpdateList(api.InstanceUpdateList o) {
   buildCounterInstanceUpdateList++;
   if (buildCounterInstanceUpdateList < 3) {
-    checkUnnamed4082(o.items);
+    checkUnnamed4003(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -189,14 +189,14 @@
   buildCounterOperationErrorErrors--;
 }
 
-buildUnnamed4083() {
+buildUnnamed4004() {
   var o = new core.List<api.OperationErrorErrors>();
   o.add(buildOperationErrorErrors());
   o.add(buildOperationErrorErrors());
   return o;
 }
 
-checkUnnamed4083(core.List<api.OperationErrorErrors> o) {
+checkUnnamed4004(core.List<api.OperationErrorErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationErrorErrors(o[0]);
   checkOperationErrorErrors(o[1]);
@@ -207,7 +207,7 @@
   var o = new api.OperationError();
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    o.errors = buildUnnamed4083();
+    o.errors = buildUnnamed4004();
   }
   buildCounterOperationError--;
   return o;
@@ -216,7 +216,7 @@
 checkOperationError(api.OperationError o) {
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    checkUnnamed4083(o.errors);
+    checkUnnamed4004(o.errors);
   }
   buildCounterOperationError--;
 }
@@ -242,14 +242,14 @@
   buildCounterOperationWarningsData--;
 }
 
-buildUnnamed4084() {
+buildUnnamed4005() {
   var o = new core.List<api.OperationWarningsData>();
   o.add(buildOperationWarningsData());
   o.add(buildOperationWarningsData());
   return o;
 }
 
-checkUnnamed4084(core.List<api.OperationWarningsData> o) {
+checkUnnamed4005(core.List<api.OperationWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarningsData(o[0]);
   checkOperationWarningsData(o[1]);
@@ -261,7 +261,7 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed4084();
+    o.data = buildUnnamed4005();
     o.message = "foo";
   }
   buildCounterOperationWarnings--;
@@ -272,20 +272,20 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed4084(o.data);
+    checkUnnamed4005(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterOperationWarnings--;
 }
 
-buildUnnamed4085() {
+buildUnnamed4006() {
   var o = new core.List<api.OperationWarnings>();
   o.add(buildOperationWarnings());
   o.add(buildOperationWarnings());
   return o;
 }
 
-checkUnnamed4085(core.List<api.OperationWarnings> o) {
+checkUnnamed4006(core.List<api.OperationWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarnings(o[0]);
   checkOperationWarnings(o[1]);
@@ -316,7 +316,7 @@
     o.targetId = "foo";
     o.targetLink = "foo";
     o.user = "foo";
-    o.warnings = buildUnnamed4085();
+    o.warnings = buildUnnamed4006();
     o.zone = "foo";
   }
   buildCounterOperation--;
@@ -346,20 +346,20 @@
     unittest.expect(o.targetId, unittest.equals('foo'));
     unittest.expect(o.targetLink, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed4085(o.warnings);
+    checkUnnamed4006(o.warnings);
     unittest.expect(o.zone, unittest.equals('foo'));
   }
   buildCounterOperation--;
 }
 
-buildUnnamed4086() {
+buildUnnamed4007() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed4086(core.List<api.Operation> o) {
+checkUnnamed4007(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -371,7 +371,7 @@
   buildCounterOperationList++;
   if (buildCounterOperationList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed4086();
+    o.items = buildUnnamed4007();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -384,7 +384,7 @@
   buildCounterOperationList++;
   if (buildCounterOperationList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed4086(o.items);
+    checkUnnamed4007(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -415,14 +415,14 @@
   buildCounterRollingUpdateErrorErrors--;
 }
 
-buildUnnamed4087() {
+buildUnnamed4008() {
   var o = new core.List<api.RollingUpdateErrorErrors>();
   o.add(buildRollingUpdateErrorErrors());
   o.add(buildRollingUpdateErrorErrors());
   return o;
 }
 
-checkUnnamed4087(core.List<api.RollingUpdateErrorErrors> o) {
+checkUnnamed4008(core.List<api.RollingUpdateErrorErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRollingUpdateErrorErrors(o[0]);
   checkRollingUpdateErrorErrors(o[1]);
@@ -433,7 +433,7 @@
   var o = new api.RollingUpdateError();
   buildCounterRollingUpdateError++;
   if (buildCounterRollingUpdateError < 3) {
-    o.errors = buildUnnamed4087();
+    o.errors = buildUnnamed4008();
   }
   buildCounterRollingUpdateError--;
   return o;
@@ -442,7 +442,7 @@
 checkRollingUpdateError(api.RollingUpdateError o) {
   buildCounterRollingUpdateError++;
   if (buildCounterRollingUpdateError < 3) {
-    checkUnnamed4087(o.errors);
+    checkUnnamed4008(o.errors);
   }
   buildCounterRollingUpdateError--;
 }
@@ -523,14 +523,14 @@
   buildCounterRollingUpdate--;
 }
 
-buildUnnamed4088() {
+buildUnnamed4009() {
   var o = new core.List<api.RollingUpdate>();
   o.add(buildRollingUpdate());
   o.add(buildRollingUpdate());
   return o;
 }
 
-checkUnnamed4088(core.List<api.RollingUpdate> o) {
+checkUnnamed4009(core.List<api.RollingUpdate> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRollingUpdate(o[0]);
   checkRollingUpdate(o[1]);
@@ -541,7 +541,7 @@
   var o = new api.RollingUpdateList();
   buildCounterRollingUpdateList++;
   if (buildCounterRollingUpdateList < 3) {
-    o.items = buildUnnamed4088();
+    o.items = buildUnnamed4009();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -553,7 +553,7 @@
 checkRollingUpdateList(api.RollingUpdateList o) {
   buildCounterRollingUpdateList++;
   if (buildCounterRollingUpdateList < 3) {
-    checkUnnamed4088(o.items);
+    checkUnnamed4009(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -729,7 +729,7 @@
       res
           .cancel(arg_project, arg_zone, arg_rollingUpdate,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -779,7 +779,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_rollingUpdate, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RollingUpdate response) {
+          .then(unittest.expectAsync1(((response) {
         checkRollingUpdate(response);
       })));
     });
@@ -832,7 +832,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, arg_zone, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -893,7 +893,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RollingUpdateList response) {
+          .then(unittest.expectAsync1(((response) {
         checkRollingUpdateList(response);
       })));
     });
@@ -955,7 +955,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceUpdateList response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceUpdateList(response);
       })));
     });
@@ -1005,7 +1005,7 @@
       }), true);
       res
           .pause(arg_project, arg_zone, arg_rollingUpdate, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1056,7 +1056,7 @@
       res
           .resume(arg_project, arg_zone, arg_rollingUpdate,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1107,7 +1107,7 @@
       res
           .rollback(arg_project, arg_zone, arg_rollingUpdate,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1159,7 +1159,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_operation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1220,7 +1220,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperationList response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperationList(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/resourceviews/v1beta1_test.dart b/generated/googleapis_beta/test/resourceviews/v1beta1_test.dart
index f684768..197ed5b 100644
--- a/generated/googleapis_beta/test/resourceviews/v1beta1_test.dart
+++ b/generated/googleapis_beta/test/resourceviews/v1beta1_test.dart
@@ -71,14 +71,14 @@
   buildCounterLabel--;
 }
 
-buildUnnamed3824() {
+buildUnnamed3812() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3824(core.List<core.String> o) {
+checkUnnamed3812(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -89,7 +89,7 @@
   var o = new api.RegionViewsAddResourcesRequest();
   buildCounterRegionViewsAddResourcesRequest++;
   if (buildCounterRegionViewsAddResourcesRequest < 3) {
-    o.resources = buildUnnamed3824();
+    o.resources = buildUnnamed3812();
   }
   buildCounterRegionViewsAddResourcesRequest--;
   return o;
@@ -98,7 +98,7 @@
 checkRegionViewsAddResourcesRequest(api.RegionViewsAddResourcesRequest o) {
   buildCounterRegionViewsAddResourcesRequest++;
   if (buildCounterRegionViewsAddResourcesRequest < 3) {
-    checkUnnamed3824(o.resources);
+    checkUnnamed3812(o.resources);
   }
   buildCounterRegionViewsAddResourcesRequest--;
 }
@@ -122,14 +122,14 @@
   buildCounterRegionViewsInsertResponse--;
 }
 
-buildUnnamed3825() {
+buildUnnamed3813() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3825(core.List<core.String> o) {
+checkUnnamed3813(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -140,7 +140,7 @@
   var o = new api.RegionViewsListResourcesResponse();
   buildCounterRegionViewsListResourcesResponse++;
   if (buildCounterRegionViewsListResourcesResponse < 3) {
-    o.members = buildUnnamed3825();
+    o.members = buildUnnamed3813();
     o.nextPageToken = "foo";
   }
   buildCounterRegionViewsListResourcesResponse--;
@@ -150,20 +150,20 @@
 checkRegionViewsListResourcesResponse(api.RegionViewsListResourcesResponse o) {
   buildCounterRegionViewsListResourcesResponse++;
   if (buildCounterRegionViewsListResourcesResponse < 3) {
-    checkUnnamed3825(o.members);
+    checkUnnamed3813(o.members);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterRegionViewsListResourcesResponse--;
 }
 
-buildUnnamed3826() {
+buildUnnamed3814() {
   var o = new core.List<api.ResourceView>();
   o.add(buildResourceView());
   o.add(buildResourceView());
   return o;
 }
 
-checkUnnamed3826(core.List<api.ResourceView> o) {
+checkUnnamed3814(core.List<api.ResourceView> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceView(o[0]);
   checkResourceView(o[1]);
@@ -175,7 +175,7 @@
   buildCounterRegionViewsListResponse++;
   if (buildCounterRegionViewsListResponse < 3) {
     o.nextPageToken = "foo";
-    o.resourceViews = buildUnnamed3826();
+    o.resourceViews = buildUnnamed3814();
   }
   buildCounterRegionViewsListResponse--;
   return o;
@@ -185,19 +185,19 @@
   buildCounterRegionViewsListResponse++;
   if (buildCounterRegionViewsListResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3826(o.resourceViews);
+    checkUnnamed3814(o.resourceViews);
   }
   buildCounterRegionViewsListResponse--;
 }
 
-buildUnnamed3827() {
+buildUnnamed3815() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3827(core.List<core.String> o) {
+checkUnnamed3815(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -208,7 +208,7 @@
   var o = new api.RegionViewsRemoveResourcesRequest();
   buildCounterRegionViewsRemoveResourcesRequest++;
   if (buildCounterRegionViewsRemoveResourcesRequest < 3) {
-    o.resources = buildUnnamed3827();
+    o.resources = buildUnnamed3815();
   }
   buildCounterRegionViewsRemoveResourcesRequest--;
   return o;
@@ -218,32 +218,32 @@
     api.RegionViewsRemoveResourcesRequest o) {
   buildCounterRegionViewsRemoveResourcesRequest++;
   if (buildCounterRegionViewsRemoveResourcesRequest < 3) {
-    checkUnnamed3827(o.resources);
+    checkUnnamed3815(o.resources);
   }
   buildCounterRegionViewsRemoveResourcesRequest--;
 }
 
-buildUnnamed3828() {
+buildUnnamed3816() {
   var o = new core.List<api.Label>();
   o.add(buildLabel());
   o.add(buildLabel());
   return o;
 }
 
-checkUnnamed3828(core.List<api.Label> o) {
+checkUnnamed3816(core.List<api.Label> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabel(o[0]);
   checkLabel(o[1]);
 }
 
-buildUnnamed3829() {
+buildUnnamed3817() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3829(core.List<core.String> o) {
+checkUnnamed3817(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -258,9 +258,9 @@
     o.description = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed3828();
+    o.labels = buildUnnamed3816();
     o.lastModified = "foo";
-    o.members = buildUnnamed3829();
+    o.members = buildUnnamed3817();
     o.name = "foo";
     o.numMembers = 42;
     o.selfLink = "foo";
@@ -276,9 +276,9 @@
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed3828(o.labels);
+    checkUnnamed3816(o.labels);
     unittest.expect(o.lastModified, unittest.equals('foo'));
-    checkUnnamed3829(o.members);
+    checkUnnamed3817(o.members);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.numMembers, unittest.equals(42));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -286,14 +286,14 @@
   buildCounterResourceView--;
 }
 
-buildUnnamed3830() {
+buildUnnamed3818() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3830(core.List<core.String> o) {
+checkUnnamed3818(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -304,7 +304,7 @@
   var o = new api.ZoneViewsAddResourcesRequest();
   buildCounterZoneViewsAddResourcesRequest++;
   if (buildCounterZoneViewsAddResourcesRequest < 3) {
-    o.resources = buildUnnamed3830();
+    o.resources = buildUnnamed3818();
   }
   buildCounterZoneViewsAddResourcesRequest--;
   return o;
@@ -313,7 +313,7 @@
 checkZoneViewsAddResourcesRequest(api.ZoneViewsAddResourcesRequest o) {
   buildCounterZoneViewsAddResourcesRequest++;
   if (buildCounterZoneViewsAddResourcesRequest < 3) {
-    checkUnnamed3830(o.resources);
+    checkUnnamed3818(o.resources);
   }
   buildCounterZoneViewsAddResourcesRequest--;
 }
@@ -337,14 +337,14 @@
   buildCounterZoneViewsInsertResponse--;
 }
 
-buildUnnamed3831() {
+buildUnnamed3819() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3831(core.List<core.String> o) {
+checkUnnamed3819(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -355,7 +355,7 @@
   var o = new api.ZoneViewsListResourcesResponse();
   buildCounterZoneViewsListResourcesResponse++;
   if (buildCounterZoneViewsListResourcesResponse < 3) {
-    o.members = buildUnnamed3831();
+    o.members = buildUnnamed3819();
     o.nextPageToken = "foo";
   }
   buildCounterZoneViewsListResourcesResponse--;
@@ -365,20 +365,20 @@
 checkZoneViewsListResourcesResponse(api.ZoneViewsListResourcesResponse o) {
   buildCounterZoneViewsListResourcesResponse++;
   if (buildCounterZoneViewsListResourcesResponse < 3) {
-    checkUnnamed3831(o.members);
+    checkUnnamed3819(o.members);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterZoneViewsListResourcesResponse--;
 }
 
-buildUnnamed3832() {
+buildUnnamed3820() {
   var o = new core.List<api.ResourceView>();
   o.add(buildResourceView());
   o.add(buildResourceView());
   return o;
 }
 
-checkUnnamed3832(core.List<api.ResourceView> o) {
+checkUnnamed3820(core.List<api.ResourceView> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceView(o[0]);
   checkResourceView(o[1]);
@@ -390,7 +390,7 @@
   buildCounterZoneViewsListResponse++;
   if (buildCounterZoneViewsListResponse < 3) {
     o.nextPageToken = "foo";
-    o.resourceViews = buildUnnamed3832();
+    o.resourceViews = buildUnnamed3820();
   }
   buildCounterZoneViewsListResponse--;
   return o;
@@ -400,19 +400,19 @@
   buildCounterZoneViewsListResponse++;
   if (buildCounterZoneViewsListResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3832(o.resourceViews);
+    checkUnnamed3820(o.resourceViews);
   }
   buildCounterZoneViewsListResponse--;
 }
 
-buildUnnamed3833() {
+buildUnnamed3821() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3833(core.List<core.String> o) {
+checkUnnamed3821(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -423,7 +423,7 @@
   var o = new api.ZoneViewsRemoveResourcesRequest();
   buildCounterZoneViewsRemoveResourcesRequest++;
   if (buildCounterZoneViewsRemoveResourcesRequest < 3) {
-    o.resources = buildUnnamed3833();
+    o.resources = buildUnnamed3821();
   }
   buildCounterZoneViewsRemoveResourcesRequest--;
   return o;
@@ -432,7 +432,7 @@
 checkZoneViewsRemoveResourcesRequest(api.ZoneViewsRemoveResourcesRequest o) {
   buildCounterZoneViewsRemoveResourcesRequest++;
   if (buildCounterZoneViewsRemoveResourcesRequest < 3) {
-    checkUnnamed3833(o.resources);
+    checkUnnamed3821(o.resources);
   }
   buildCounterZoneViewsRemoveResourcesRequest--;
 }
@@ -684,7 +684,7 @@
       res
           .get(arg_projectName, arg_region, arg_resourceViewName,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ResourceView response) {
+          .then(unittest.expectAsync1(((response) {
         checkResourceView(response);
       })));
     });
@@ -738,8 +738,7 @@
       res
           .insert(arg_request, arg_projectName, arg_region,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.RegionViewsInsertResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegionViewsInsertResponse(response);
       })));
     });
@@ -797,7 +796,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RegionViewsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegionViewsListResponse(response);
       })));
     });
@@ -856,8 +855,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.RegionViewsListResourcesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkRegionViewsListResourcesResponse(response);
       })));
     });
@@ -1064,7 +1062,7 @@
       res
           .get(arg_projectName, arg_zone, arg_resourceViewName,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ResourceView response) {
+          .then(unittest.expectAsync1(((response) {
         checkResourceView(response);
       })));
     });
@@ -1116,7 +1114,7 @@
       }), true);
       res
           .insert(arg_request, arg_projectName, arg_zone, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ZoneViewsInsertResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkZoneViewsInsertResponse(response);
       })));
     });
@@ -1173,7 +1171,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ZoneViewsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkZoneViewsListResponse(response);
       })));
     });
@@ -1231,8 +1229,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ZoneViewsListResourcesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkZoneViewsListResourcesResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/resourceviews/v1beta2_test.dart b/generated/googleapis_beta/test/resourceviews/v1beta2_test.dart
index beae1fb..665cf7e 100644
--- a/generated/googleapis_beta/test/resourceviews/v1beta2_test.dart
+++ b/generated/googleapis_beta/test/resourceviews/v1beta2_test.dart
@@ -71,30 +71,30 @@
   buildCounterLabel--;
 }
 
-buildUnnamed4428() {
+buildUnnamed4540() {
   var o = new core.List<core.int>();
   o.add(42);
   o.add(42);
   return o;
 }
 
-checkUnnamed4428(core.List<core.int> o) {
+checkUnnamed4540(core.List<core.int> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals(42));
   unittest.expect(o[1], unittest.equals(42));
 }
 
-buildUnnamed4429() {
+buildUnnamed4541() {
   var o = new core.Map<core.String, core.List<core.int>>();
-  o["x"] = buildUnnamed4428();
-  o["y"] = buildUnnamed4428();
+  o["x"] = buildUnnamed4540();
+  o["y"] = buildUnnamed4540();
   return o;
 }
 
-checkUnnamed4429(core.Map<core.String, core.List<core.int>> o) {
+checkUnnamed4541(core.Map<core.String, core.List<core.int>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4428(o["x"]);
-  checkUnnamed4428(o["y"]);
+  checkUnnamed4540(o["x"]);
+  checkUnnamed4540(o["y"]);
 }
 
 core.int buildCounterListResourceResponseItem = 0;
@@ -102,7 +102,7 @@
   var o = new api.ListResourceResponseItem();
   buildCounterListResourceResponseItem++;
   if (buildCounterListResourceResponseItem < 3) {
-    o.endpoints = buildUnnamed4429();
+    o.endpoints = buildUnnamed4541();
     o.resource = "foo";
   }
   buildCounterListResourceResponseItem--;
@@ -112,7 +112,7 @@
 checkListResourceResponseItem(api.ListResourceResponseItem o) {
   buildCounterListResourceResponseItem++;
   if (buildCounterListResourceResponseItem < 3) {
-    checkUnnamed4429(o.endpoints);
+    checkUnnamed4541(o.endpoints);
     unittest.expect(o.resource, unittest.equals('foo'));
   }
   buildCounterListResourceResponseItem--;
@@ -141,14 +141,14 @@
   buildCounterOperationErrorErrors--;
 }
 
-buildUnnamed4430() {
+buildUnnamed4542() {
   var o = new core.List<api.OperationErrorErrors>();
   o.add(buildOperationErrorErrors());
   o.add(buildOperationErrorErrors());
   return o;
 }
 
-checkUnnamed4430(core.List<api.OperationErrorErrors> o) {
+checkUnnamed4542(core.List<api.OperationErrorErrors> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationErrorErrors(o[0]);
   checkOperationErrorErrors(o[1]);
@@ -159,7 +159,7 @@
   var o = new api.OperationError();
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    o.errors = buildUnnamed4430();
+    o.errors = buildUnnamed4542();
   }
   buildCounterOperationError--;
   return o;
@@ -168,7 +168,7 @@
 checkOperationError(api.OperationError o) {
   buildCounterOperationError++;
   if (buildCounterOperationError < 3) {
-    checkUnnamed4430(o.errors);
+    checkUnnamed4542(o.errors);
   }
   buildCounterOperationError--;
 }
@@ -194,14 +194,14 @@
   buildCounterOperationWarningsData--;
 }
 
-buildUnnamed4431() {
+buildUnnamed4543() {
   var o = new core.List<api.OperationWarningsData>();
   o.add(buildOperationWarningsData());
   o.add(buildOperationWarningsData());
   return o;
 }
 
-checkUnnamed4431(core.List<api.OperationWarningsData> o) {
+checkUnnamed4543(core.List<api.OperationWarningsData> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarningsData(o[0]);
   checkOperationWarningsData(o[1]);
@@ -213,7 +213,7 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     o.code = "foo";
-    o.data = buildUnnamed4431();
+    o.data = buildUnnamed4543();
     o.message = "foo";
   }
   buildCounterOperationWarnings--;
@@ -224,20 +224,20 @@
   buildCounterOperationWarnings++;
   if (buildCounterOperationWarnings < 3) {
     unittest.expect(o.code, unittest.equals('foo'));
-    checkUnnamed4431(o.data);
+    checkUnnamed4543(o.data);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterOperationWarnings--;
 }
 
-buildUnnamed4432() {
+buildUnnamed4544() {
   var o = new core.List<api.OperationWarnings>();
   o.add(buildOperationWarnings());
   o.add(buildOperationWarnings());
   return o;
 }
 
-checkUnnamed4432(core.List<api.OperationWarnings> o) {
+checkUnnamed4544(core.List<api.OperationWarnings> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationWarnings(o[0]);
   checkOperationWarnings(o[1]);
@@ -268,7 +268,7 @@
     o.targetId = "foo";
     o.targetLink = "foo";
     o.user = "foo";
-    o.warnings = buildUnnamed4432();
+    o.warnings = buildUnnamed4544();
     o.zone = "foo";
   }
   buildCounterOperation--;
@@ -298,20 +298,20 @@
     unittest.expect(o.targetId, unittest.equals('foo'));
     unittest.expect(o.targetLink, unittest.equals('foo'));
     unittest.expect(o.user, unittest.equals('foo'));
-    checkUnnamed4432(o.warnings);
+    checkUnnamed4544(o.warnings);
     unittest.expect(o.zone, unittest.equals('foo'));
   }
   buildCounterOperation--;
 }
 
-buildUnnamed4433() {
+buildUnnamed4545() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed4433(core.List<api.Operation> o) {
+checkUnnamed4545(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -323,7 +323,7 @@
   buildCounterOperationList++;
   if (buildCounterOperationList < 3) {
     o.id = "foo";
-    o.items = buildUnnamed4433();
+    o.items = buildUnnamed4545();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -336,7 +336,7 @@
   buildCounterOperationList++;
   if (buildCounterOperationList < 3) {
     unittest.expect(o.id, unittest.equals('foo'));
-    checkUnnamed4433(o.items);
+    checkUnnamed4545(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -344,40 +344,40 @@
   buildCounterOperationList--;
 }
 
-buildUnnamed4434() {
+buildUnnamed4546() {
   var o = new core.List<api.ServiceEndpoint>();
   o.add(buildServiceEndpoint());
   o.add(buildServiceEndpoint());
   return o;
 }
 
-checkUnnamed4434(core.List<api.ServiceEndpoint> o) {
+checkUnnamed4546(core.List<api.ServiceEndpoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServiceEndpoint(o[0]);
   checkServiceEndpoint(o[1]);
 }
 
-buildUnnamed4435() {
+buildUnnamed4547() {
   var o = new core.List<api.Label>();
   o.add(buildLabel());
   o.add(buildLabel());
   return o;
 }
 
-checkUnnamed4435(core.List<api.Label> o) {
+checkUnnamed4547(core.List<api.Label> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLabel(o[0]);
   checkLabel(o[1]);
 }
 
-buildUnnamed4436() {
+buildUnnamed4548() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4436(core.List<core.String> o) {
+checkUnnamed4548(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -390,14 +390,14 @@
   if (buildCounterResourceView < 3) {
     o.creationTimestamp = "foo";
     o.description = "foo";
-    o.endpoints = buildUnnamed4434();
+    o.endpoints = buildUnnamed4546();
     o.fingerprint = "foo";
     o.id = "foo";
     o.kind = "foo";
-    o.labels = buildUnnamed4435();
+    o.labels = buildUnnamed4547();
     o.name = "foo";
     o.network = "foo";
-    o.resources = buildUnnamed4436();
+    o.resources = buildUnnamed4548();
     o.selfLink = "foo";
     o.size = 42;
   }
@@ -410,14 +410,14 @@
   if (buildCounterResourceView < 3) {
     unittest.expect(o.creationTimestamp, unittest.equals('foo'));
     unittest.expect(o.description, unittest.equals('foo'));
-    checkUnnamed4434(o.endpoints);
+    checkUnnamed4546(o.endpoints);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.id, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed4435(o.labels);
+    checkUnnamed4547(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.network, unittest.equals('foo'));
-    checkUnnamed4436(o.resources);
+    checkUnnamed4548(o.resources);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     unittest.expect(o.size, unittest.equals(42));
   }
@@ -445,14 +445,14 @@
   buildCounterServiceEndpoint--;
 }
 
-buildUnnamed4437() {
+buildUnnamed4549() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4437(core.List<core.String> o) {
+checkUnnamed4549(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -463,7 +463,7 @@
   var o = new api.ZoneViewsAddResourcesRequest();
   buildCounterZoneViewsAddResourcesRequest++;
   if (buildCounterZoneViewsAddResourcesRequest < 3) {
-    o.resources = buildUnnamed4437();
+    o.resources = buildUnnamed4549();
   }
   buildCounterZoneViewsAddResourcesRequest--;
   return o;
@@ -472,19 +472,19 @@
 checkZoneViewsAddResourcesRequest(api.ZoneViewsAddResourcesRequest o) {
   buildCounterZoneViewsAddResourcesRequest++;
   if (buildCounterZoneViewsAddResourcesRequest < 3) {
-    checkUnnamed4437(o.resources);
+    checkUnnamed4549(o.resources);
   }
   buildCounterZoneViewsAddResourcesRequest--;
 }
 
-buildUnnamed4438() {
+buildUnnamed4550() {
   var o = new core.List<api.ServiceEndpoint>();
   o.add(buildServiceEndpoint());
   o.add(buildServiceEndpoint());
   return o;
 }
 
-checkUnnamed4438(core.List<api.ServiceEndpoint> o) {
+checkUnnamed4550(core.List<api.ServiceEndpoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServiceEndpoint(o[0]);
   checkServiceEndpoint(o[1]);
@@ -495,7 +495,7 @@
   var o = new api.ZoneViewsGetServiceResponse();
   buildCounterZoneViewsGetServiceResponse++;
   if (buildCounterZoneViewsGetServiceResponse < 3) {
-    o.endpoints = buildUnnamed4438();
+    o.endpoints = buildUnnamed4550();
     o.fingerprint = "foo";
   }
   buildCounterZoneViewsGetServiceResponse--;
@@ -505,20 +505,20 @@
 checkZoneViewsGetServiceResponse(api.ZoneViewsGetServiceResponse o) {
   buildCounterZoneViewsGetServiceResponse++;
   if (buildCounterZoneViewsGetServiceResponse < 3) {
-    checkUnnamed4438(o.endpoints);
+    checkUnnamed4550(o.endpoints);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
   }
   buildCounterZoneViewsGetServiceResponse--;
 }
 
-buildUnnamed4439() {
+buildUnnamed4551() {
   var o = new core.List<api.ResourceView>();
   o.add(buildResourceView());
   o.add(buildResourceView());
   return o;
 }
 
-checkUnnamed4439(core.List<api.ResourceView> o) {
+checkUnnamed4551(core.List<api.ResourceView> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkResourceView(o[0]);
   checkResourceView(o[1]);
@@ -529,7 +529,7 @@
   var o = new api.ZoneViewsList();
   buildCounterZoneViewsList++;
   if (buildCounterZoneViewsList < 3) {
-    o.items = buildUnnamed4439();
+    o.items = buildUnnamed4551();
     o.kind = "foo";
     o.nextPageToken = "foo";
     o.selfLink = "foo";
@@ -541,7 +541,7 @@
 checkZoneViewsList(api.ZoneViewsList o) {
   buildCounterZoneViewsList++;
   if (buildCounterZoneViewsList < 3) {
-    checkUnnamed4439(o.items);
+    checkUnnamed4551(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
     unittest.expect(o.selfLink, unittest.equals('foo'));
@@ -549,14 +549,14 @@
   buildCounterZoneViewsList--;
 }
 
-buildUnnamed4440() {
+buildUnnamed4552() {
   var o = new core.List<api.ListResourceResponseItem>();
   o.add(buildListResourceResponseItem());
   o.add(buildListResourceResponseItem());
   return o;
 }
 
-checkUnnamed4440(core.List<api.ListResourceResponseItem> o) {
+checkUnnamed4552(core.List<api.ListResourceResponseItem> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkListResourceResponseItem(o[0]);
   checkListResourceResponseItem(o[1]);
@@ -567,7 +567,7 @@
   var o = new api.ZoneViewsListResourcesResponse();
   buildCounterZoneViewsListResourcesResponse++;
   if (buildCounterZoneViewsListResourcesResponse < 3) {
-    o.items = buildUnnamed4440();
+    o.items = buildUnnamed4552();
     o.network = "foo";
     o.nextPageToken = "foo";
   }
@@ -578,21 +578,21 @@
 checkZoneViewsListResourcesResponse(api.ZoneViewsListResourcesResponse o) {
   buildCounterZoneViewsListResourcesResponse++;
   if (buildCounterZoneViewsListResourcesResponse < 3) {
-    checkUnnamed4440(o.items);
+    checkUnnamed4552(o.items);
     unittest.expect(o.network, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterZoneViewsListResourcesResponse--;
 }
 
-buildUnnamed4441() {
+buildUnnamed4553() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4441(core.List<core.String> o) {
+checkUnnamed4553(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -603,7 +603,7 @@
   var o = new api.ZoneViewsRemoveResourcesRequest();
   buildCounterZoneViewsRemoveResourcesRequest++;
   if (buildCounterZoneViewsRemoveResourcesRequest < 3) {
-    o.resources = buildUnnamed4441();
+    o.resources = buildUnnamed4553();
   }
   buildCounterZoneViewsRemoveResourcesRequest--;
   return o;
@@ -612,19 +612,19 @@
 checkZoneViewsRemoveResourcesRequest(api.ZoneViewsRemoveResourcesRequest o) {
   buildCounterZoneViewsRemoveResourcesRequest++;
   if (buildCounterZoneViewsRemoveResourcesRequest < 3) {
-    checkUnnamed4441(o.resources);
+    checkUnnamed4553(o.resources);
   }
   buildCounterZoneViewsRemoveResourcesRequest--;
 }
 
-buildUnnamed4442() {
+buildUnnamed4554() {
   var o = new core.List<api.ServiceEndpoint>();
   o.add(buildServiceEndpoint());
   o.add(buildServiceEndpoint());
   return o;
 }
 
-checkUnnamed4442(core.List<api.ServiceEndpoint> o) {
+checkUnnamed4554(core.List<api.ServiceEndpoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkServiceEndpoint(o[0]);
   checkServiceEndpoint(o[1]);
@@ -635,7 +635,7 @@
   var o = new api.ZoneViewsSetServiceRequest();
   buildCounterZoneViewsSetServiceRequest++;
   if (buildCounterZoneViewsSetServiceRequest < 3) {
-    o.endpoints = buildUnnamed4442();
+    o.endpoints = buildUnnamed4554();
     o.fingerprint = "foo";
     o.resourceName = "foo";
   }
@@ -646,7 +646,7 @@
 checkZoneViewsSetServiceRequest(api.ZoneViewsSetServiceRequest o) {
   buildCounterZoneViewsSetServiceRequest++;
   if (buildCounterZoneViewsSetServiceRequest < 3) {
-    checkUnnamed4442(o.endpoints);
+    checkUnnamed4554(o.endpoints);
     unittest.expect(o.fingerprint, unittest.equals('foo'));
     unittest.expect(o.resourceName, unittest.equals('foo'));
   }
@@ -828,7 +828,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_operation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -889,7 +889,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperationList response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperationList(response);
       })));
     });
@@ -945,7 +945,7 @@
       res
           .addResources(arg_request, arg_project, arg_zone, arg_resourceView,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -994,7 +994,7 @@
       }), true);
       res
           .delete(arg_project, arg_zone, arg_resourceView, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1043,7 +1043,7 @@
       }), true);
       res
           .get(arg_project, arg_zone, arg_resourceView, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ResourceView response) {
+          .then(unittest.expectAsync1(((response) {
         checkResourceView(response);
       })));
     });
@@ -1096,8 +1096,7 @@
       res
           .getService(arg_project, arg_zone, arg_resourceView,
               resourceName: arg_resourceName, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ZoneViewsGetServiceResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkZoneViewsGetServiceResponse(response);
       })));
     });
@@ -1149,7 +1148,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, arg_zone, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1206,7 +1205,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ZoneViewsList response) {
+          .then(unittest.expectAsync1(((response) {
         checkZoneViewsList(response);
       })));
     });
@@ -1275,8 +1274,7 @@
               pageToken: arg_pageToken,
               serviceName: arg_serviceName,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ZoneViewsListResourcesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkZoneViewsListResourcesResponse(response);
       })));
     });
@@ -1330,7 +1328,7 @@
       res
           .removeResources(arg_request, arg_project, arg_zone, arg_resourceView,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1384,7 +1382,7 @@
       res
           .setService(arg_request, arg_project, arg_zone, arg_resourceView,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/runtimeconfig/v1beta1_test.dart b/generated/googleapis_beta/test/runtimeconfig/v1beta1_test.dart
index d7764d1..202ea20 100644
--- a/generated/googleapis_beta/test/runtimeconfig/v1beta1_test.dart
+++ b/generated/googleapis_beta/test/runtimeconfig/v1beta1_test.dart
@@ -50,14 +50,14 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3967() {
+buildUnnamed3920() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3967(core.List<core.String> o) {
+checkUnnamed3920(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -68,7 +68,7 @@
   var o = new api.Binding();
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    o.members = buildUnnamed3967();
+    o.members = buildUnnamed3920();
     o.role = "foo";
   }
   buildCounterBinding--;
@@ -78,7 +78,7 @@
 checkBinding(api.Binding o) {
   buildCounterBinding++;
   if (buildCounterBinding < 3) {
-    checkUnnamed3967(o.members);
+    checkUnnamed3920(o.members);
     unittest.expect(o.role, unittest.equals('foo'));
   }
   buildCounterBinding--;
@@ -139,14 +139,14 @@
   buildCounterEndCondition--;
 }
 
-buildUnnamed3968() {
+buildUnnamed3921() {
   var o = new core.List<api.RuntimeConfig>();
   o.add(buildRuntimeConfig());
   o.add(buildRuntimeConfig());
   return o;
 }
 
-checkUnnamed3968(core.List<api.RuntimeConfig> o) {
+checkUnnamed3921(core.List<api.RuntimeConfig> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkRuntimeConfig(o[0]);
   checkRuntimeConfig(o[1]);
@@ -157,7 +157,7 @@
   var o = new api.ListConfigsResponse();
   buildCounterListConfigsResponse++;
   if (buildCounterListConfigsResponse < 3) {
-    o.configs = buildUnnamed3968();
+    o.configs = buildUnnamed3921();
     o.nextPageToken = "foo";
   }
   buildCounterListConfigsResponse--;
@@ -167,20 +167,20 @@
 checkListConfigsResponse(api.ListConfigsResponse o) {
   buildCounterListConfigsResponse++;
   if (buildCounterListConfigsResponse < 3) {
-    checkUnnamed3968(o.configs);
+    checkUnnamed3921(o.configs);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListConfigsResponse--;
 }
 
-buildUnnamed3969() {
+buildUnnamed3922() {
   var o = new core.List<api.Variable>();
   o.add(buildVariable());
   o.add(buildVariable());
   return o;
 }
 
-checkUnnamed3969(core.List<api.Variable> o) {
+checkUnnamed3922(core.List<api.Variable> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkVariable(o[0]);
   checkVariable(o[1]);
@@ -192,7 +192,7 @@
   buildCounterListVariablesResponse++;
   if (buildCounterListVariablesResponse < 3) {
     o.nextPageToken = "foo";
-    o.variables = buildUnnamed3969();
+    o.variables = buildUnnamed3922();
   }
   buildCounterListVariablesResponse--;
   return o;
@@ -202,19 +202,19 @@
   buildCounterListVariablesResponse++;
   if (buildCounterListVariablesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3969(o.variables);
+    checkUnnamed3922(o.variables);
   }
   buildCounterListVariablesResponse--;
 }
 
-buildUnnamed3970() {
+buildUnnamed3923() {
   var o = new core.List<api.Waiter>();
   o.add(buildWaiter());
   o.add(buildWaiter());
   return o;
 }
 
-checkUnnamed3970(core.List<api.Waiter> o) {
+checkUnnamed3923(core.List<api.Waiter> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkWaiter(o[0]);
   checkWaiter(o[1]);
@@ -226,7 +226,7 @@
   buildCounterListWaitersResponse++;
   if (buildCounterListWaitersResponse < 3) {
     o.nextPageToken = "foo";
-    o.waiters = buildUnnamed3970();
+    o.waiters = buildUnnamed3923();
   }
   buildCounterListWaitersResponse--;
   return o;
@@ -236,12 +236,12 @@
   buildCounterListWaitersResponse++;
   if (buildCounterListWaitersResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3970(o.waiters);
+    checkUnnamed3923(o.waiters);
   }
   buildCounterListWaitersResponse--;
 }
 
-buildUnnamed3971() {
+buildUnnamed3924() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -256,7 +256,7 @@
   return o;
 }
 
-checkUnnamed3971(core.Map<core.String, core.Object> o) {
+checkUnnamed3924(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -270,7 +270,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3972() {
+buildUnnamed3925() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -285,7 +285,7 @@
   return o;
 }
 
-checkUnnamed3972(core.Map<core.String, core.Object> o) {
+checkUnnamed3925(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -306,9 +306,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed3971();
+    o.metadata = buildUnnamed3924();
     o.name = "foo";
-    o.response = buildUnnamed3972();
+    o.response = buildUnnamed3925();
   }
   buildCounterOperation--;
   return o;
@@ -319,21 +319,21 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed3971(o.metadata);
+    checkUnnamed3924(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3972(o.response);
+    checkUnnamed3925(o.response);
   }
   buildCounterOperation--;
 }
 
-buildUnnamed3973() {
+buildUnnamed3926() {
   var o = new core.List<api.Binding>();
   o.add(buildBinding());
   o.add(buildBinding());
   return o;
 }
 
-checkUnnamed3973(core.List<api.Binding> o) {
+checkUnnamed3926(core.List<api.Binding> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBinding(o[0]);
   checkBinding(o[1]);
@@ -344,7 +344,7 @@
   var o = new api.Policy();
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    o.bindings = buildUnnamed3973();
+    o.bindings = buildUnnamed3926();
     o.etag = "foo";
     o.version = 42;
   }
@@ -355,7 +355,7 @@
 checkPolicy(api.Policy o) {
   buildCounterPolicy++;
   if (buildCounterPolicy < 3) {
-    checkUnnamed3973(o.bindings);
+    checkUnnamed3926(o.bindings);
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.version, unittest.equals(42));
   }
@@ -402,7 +402,7 @@
   buildCounterSetIamPolicyRequest--;
 }
 
-buildUnnamed3974() {
+buildUnnamed3927() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -417,7 +417,7 @@
   return o;
 }
 
-checkUnnamed3974(core.Map<core.String, core.Object> o) {
+checkUnnamed3927(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -431,17 +431,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3975() {
+buildUnnamed3928() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3974());
-  o.add(buildUnnamed3974());
+  o.add(buildUnnamed3927());
+  o.add(buildUnnamed3927());
   return o;
 }
 
-checkUnnamed3975(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed3928(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3974(o[0]);
-  checkUnnamed3974(o[1]);
+  checkUnnamed3927(o[0]);
+  checkUnnamed3927(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -450,7 +450,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed3975();
+    o.details = buildUnnamed3928();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -461,20 +461,20 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed3975(o.details);
+    checkUnnamed3928(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed3976() {
+buildUnnamed3929() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3976(core.List<core.String> o) {
+checkUnnamed3929(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -485,7 +485,7 @@
   var o = new api.TestIamPermissionsRequest();
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    o.permissions = buildUnnamed3976();
+    o.permissions = buildUnnamed3929();
   }
   buildCounterTestIamPermissionsRequest--;
   return o;
@@ -494,19 +494,19 @@
 checkTestIamPermissionsRequest(api.TestIamPermissionsRequest o) {
   buildCounterTestIamPermissionsRequest++;
   if (buildCounterTestIamPermissionsRequest < 3) {
-    checkUnnamed3976(o.permissions);
+    checkUnnamed3929(o.permissions);
   }
   buildCounterTestIamPermissionsRequest--;
 }
 
-buildUnnamed3977() {
+buildUnnamed3930() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3977(core.List<core.String> o) {
+checkUnnamed3930(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -517,7 +517,7 @@
   var o = new api.TestIamPermissionsResponse();
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    o.permissions = buildUnnamed3977();
+    o.permissions = buildUnnamed3930();
   }
   buildCounterTestIamPermissionsResponse--;
   return o;
@@ -526,7 +526,7 @@
 checkTestIamPermissionsResponse(api.TestIamPermissionsResponse o) {
   buildCounterTestIamPermissionsResponse++;
   if (buildCounterTestIamPermissionsResponse < 3) {
-    checkUnnamed3977(o.permissions);
+    checkUnnamed3930(o.permissions);
   }
   buildCounterTestIamPermissionsResponse--;
 }
@@ -801,7 +801,7 @@
       res
           .create(arg_request, arg_parent,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RuntimeConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkRuntimeConfig(response);
       })));
     });
@@ -853,7 +853,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -905,7 +905,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RuntimeConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkRuntimeConfig(response);
       })));
     });
@@ -957,7 +957,7 @@
       }), true);
       res
           .getIamPolicy(arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1018,7 +1018,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListConfigsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListConfigsResponse(response);
       })));
     });
@@ -1074,7 +1074,7 @@
       }), true);
       res
           .setIamPolicy(arg_request, arg_resource, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Policy response) {
+          .then(unittest.expectAsync1(((response) {
         checkPolicy(response);
       })));
     });
@@ -1130,8 +1130,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -1187,7 +1186,7 @@
       }), true);
       res
           .update(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.RuntimeConfig response) {
+          .then(unittest.expectAsync1(((response) {
         checkRuntimeConfig(response);
       })));
     });
@@ -1241,7 +1240,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1297,8 +1296,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -1360,7 +1358,7 @@
       res
           .create(arg_request, arg_parent,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variable response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariable(response);
       })));
     });
@@ -1415,7 +1413,7 @@
       }), true);
       res
           .delete(arg_name, recursive: arg_recursive, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1467,7 +1465,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variable response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariable(response);
       })));
     });
@@ -1535,7 +1533,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListVariablesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListVariablesResponse(response);
       })));
     });
@@ -1591,8 +1589,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
@@ -1648,7 +1645,7 @@
       }), true);
       res
           .update(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variable response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariable(response);
       })));
     });
@@ -1704,7 +1701,7 @@
       }), true);
       res
           .watch(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Variable response) {
+          .then(unittest.expectAsync1(((response) {
         checkVariable(response);
       })));
     });
@@ -1766,7 +1763,7 @@
       res
           .create(arg_request, arg_parent,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1818,7 +1815,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1870,7 +1867,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Waiter response) {
+          .then(unittest.expectAsync1(((response) {
         checkWaiter(response);
       })));
     });
@@ -1931,7 +1928,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListWaitersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListWaitersResponse(response);
       })));
     });
@@ -1987,8 +1984,7 @@
       }), true);
       res
           .testIamPermissions(arg_request, arg_resource, $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.TestIamPermissionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTestIamPermissionsResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/speech/v1beta1_test.dart b/generated/googleapis_beta/test/speech/v1beta1_test.dart
index 056f111..3a8f5f3 100644
--- a/generated/googleapis_beta/test/speech/v1beta1_test.dart
+++ b/generated/googleapis_beta/test/speech/v1beta1_test.dart
@@ -71,7 +71,7 @@
   buildCounterAsyncRecognizeRequest--;
 }
 
-buildUnnamed4419() {
+buildUnnamed4034() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -86,7 +86,7 @@
   return o;
 }
 
-checkUnnamed4419(core.Map<core.String, core.Object> o) {
+checkUnnamed4034(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -100,7 +100,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4420() {
+buildUnnamed4035() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -115,7 +115,7 @@
   return o;
 }
 
-checkUnnamed4420(core.Map<core.String, core.Object> o) {
+checkUnnamed4035(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -136,9 +136,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed4419();
+    o.metadata = buildUnnamed4034();
     o.name = "foo";
-    o.response = buildUnnamed4420();
+    o.response = buildUnnamed4035();
   }
   buildCounterOperation--;
   return o;
@@ -149,9 +149,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed4419(o.metadata);
+    checkUnnamed4034(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4420(o.response);
+    checkUnnamed4035(o.response);
   }
   buildCounterOperation--;
 }
@@ -206,14 +206,14 @@
   buildCounterRecognitionConfig--;
 }
 
-buildUnnamed4421() {
+buildUnnamed4036() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4421(core.List<core.String> o) {
+checkUnnamed4036(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -224,7 +224,7 @@
   var o = new api.SpeechContext();
   buildCounterSpeechContext++;
   if (buildCounterSpeechContext < 3) {
-    o.phrases = buildUnnamed4421();
+    o.phrases = buildUnnamed4036();
   }
   buildCounterSpeechContext--;
   return o;
@@ -233,7 +233,7 @@
 checkSpeechContext(api.SpeechContext o) {
   buildCounterSpeechContext++;
   if (buildCounterSpeechContext < 3) {
-    checkUnnamed4421(o.phrases);
+    checkUnnamed4036(o.phrases);
   }
   buildCounterSpeechContext--;
 }
@@ -259,14 +259,14 @@
   buildCounterSpeechRecognitionAlternative--;
 }
 
-buildUnnamed4422() {
+buildUnnamed4037() {
   var o = new core.List<api.SpeechRecognitionAlternative>();
   o.add(buildSpeechRecognitionAlternative());
   o.add(buildSpeechRecognitionAlternative());
   return o;
 }
 
-checkUnnamed4422(core.List<api.SpeechRecognitionAlternative> o) {
+checkUnnamed4037(core.List<api.SpeechRecognitionAlternative> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSpeechRecognitionAlternative(o[0]);
   checkSpeechRecognitionAlternative(o[1]);
@@ -277,7 +277,7 @@
   var o = new api.SpeechRecognitionResult();
   buildCounterSpeechRecognitionResult++;
   if (buildCounterSpeechRecognitionResult < 3) {
-    o.alternatives = buildUnnamed4422();
+    o.alternatives = buildUnnamed4037();
   }
   buildCounterSpeechRecognitionResult--;
   return o;
@@ -286,12 +286,12 @@
 checkSpeechRecognitionResult(api.SpeechRecognitionResult o) {
   buildCounterSpeechRecognitionResult++;
   if (buildCounterSpeechRecognitionResult < 3) {
-    checkUnnamed4422(o.alternatives);
+    checkUnnamed4037(o.alternatives);
   }
   buildCounterSpeechRecognitionResult--;
 }
 
-buildUnnamed4423() {
+buildUnnamed4038() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -306,7 +306,7 @@
   return o;
 }
 
-checkUnnamed4423(core.Map<core.String, core.Object> o) {
+checkUnnamed4038(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -320,17 +320,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4424() {
+buildUnnamed4039() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4423());
-  o.add(buildUnnamed4423());
+  o.add(buildUnnamed4038());
+  o.add(buildUnnamed4038());
   return o;
 }
 
-checkUnnamed4424(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4039(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4423(o[0]);
-  checkUnnamed4423(o[1]);
+  checkUnnamed4038(o[0]);
+  checkUnnamed4038(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -339,7 +339,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed4424();
+    o.details = buildUnnamed4039();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -350,7 +350,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed4424(o.details);
+    checkUnnamed4039(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -377,14 +377,14 @@
   buildCounterSyncRecognizeRequest--;
 }
 
-buildUnnamed4425() {
+buildUnnamed4040() {
   var o = new core.List<api.SpeechRecognitionResult>();
   o.add(buildSpeechRecognitionResult());
   o.add(buildSpeechRecognitionResult());
   return o;
 }
 
-checkUnnamed4425(core.List<api.SpeechRecognitionResult> o) {
+checkUnnamed4040(core.List<api.SpeechRecognitionResult> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSpeechRecognitionResult(o[0]);
   checkSpeechRecognitionResult(o[1]);
@@ -395,7 +395,7 @@
   var o = new api.SyncRecognizeResponse();
   buildCounterSyncRecognizeResponse++;
   if (buildCounterSyncRecognizeResponse < 3) {
-    o.results = buildUnnamed4425();
+    o.results = buildUnnamed4040();
   }
   buildCounterSyncRecognizeResponse--;
   return o;
@@ -404,7 +404,7 @@
 checkSyncRecognizeResponse(api.SyncRecognizeResponse o) {
   buildCounterSyncRecognizeResponse++;
   if (buildCounterSyncRecognizeResponse < 3) {
-    checkUnnamed4425(o.results);
+    checkUnnamed4040(o.results);
   }
   buildCounterSyncRecognizeResponse--;
 }
@@ -537,7 +537,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -592,7 +592,7 @@
       }), true);
       res
           .asyncrecognize(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -645,7 +645,7 @@
       }), true);
       res
           .syncrecognize(arg_request, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SyncRecognizeResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSyncRecognizeResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/sqladmin/v1beta3_test.dart b/generated/googleapis_beta/test/sqladmin/v1beta3_test.dart
index 8ca0293..245606c 100644
--- a/generated/googleapis_beta/test/sqladmin/v1beta3_test.dart
+++ b/generated/googleapis_beta/test/sqladmin/v1beta3_test.dart
@@ -118,14 +118,14 @@
   buildCounterBackupRun--;
 }
 
-buildUnnamed4513() {
+buildUnnamed4392() {
   var o = new core.List<api.BackupRun>();
   o.add(buildBackupRun());
   o.add(buildBackupRun());
   return o;
 }
 
-checkUnnamed4513(core.List<api.BackupRun> o) {
+checkUnnamed4392(core.List<api.BackupRun> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackupRun(o[0]);
   checkBackupRun(o[1]);
@@ -136,7 +136,7 @@
   var o = new api.BackupRunsListResponse();
   buildCounterBackupRunsListResponse++;
   if (buildCounterBackupRunsListResponse < 3) {
-    o.items = buildUnnamed4513();
+    o.items = buildUnnamed4392();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -147,7 +147,7 @@
 checkBackupRunsListResponse(api.BackupRunsListResponse o) {
   buildCounterBackupRunsListResponse++;
   if (buildCounterBackupRunsListResponse < 3) {
-    checkUnnamed4513(o.items);
+    checkUnnamed4392(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -225,27 +225,27 @@
   buildCounterDatabaseFlags--;
 }
 
-buildUnnamed4514() {
+buildUnnamed4393() {
   var o = new core.List<api.IpMapping>();
   o.add(buildIpMapping());
   o.add(buildIpMapping());
   return o;
 }
 
-checkUnnamed4514(core.List<api.IpMapping> o) {
+checkUnnamed4393(core.List<api.IpMapping> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkIpMapping(o[0]);
   checkIpMapping(o[1]);
 }
 
-buildUnnamed4515() {
+buildUnnamed4394() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4515(core.List<core.String> o) {
+checkUnnamed4394(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -262,14 +262,14 @@
     o.etag = "foo";
     o.instance = "foo";
     o.instanceType = "foo";
-    o.ipAddresses = buildUnnamed4514();
+    o.ipAddresses = buildUnnamed4393();
     o.ipv6Address = "foo";
     o.kind = "foo";
     o.masterInstanceName = "foo";
     o.maxDiskSize = "foo";
     o.project = "foo";
     o.region = "foo";
-    o.replicaNames = buildUnnamed4515();
+    o.replicaNames = buildUnnamed4394();
     o.serverCaCert = buildSslCert();
     o.serviceAccountEmailAddress = "foo";
     o.settings = buildSettings();
@@ -288,14 +288,14 @@
     unittest.expect(o.etag, unittest.equals('foo'));
     unittest.expect(o.instance, unittest.equals('foo'));
     unittest.expect(o.instanceType, unittest.equals('foo'));
-    checkUnnamed4514(o.ipAddresses);
+    checkUnnamed4393(o.ipAddresses);
     unittest.expect(o.ipv6Address, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.masterInstanceName, unittest.equals('foo'));
     unittest.expect(o.maxDiskSize, unittest.equals('foo'));
     unittest.expect(o.project, unittest.equals('foo'));
     unittest.expect(o.region, unittest.equals('foo'));
-    checkUnnamed4515(o.replicaNames);
+    checkUnnamed4394(o.replicaNames);
     checkSslCert(o.serverCaCert);
     unittest.expect(o.serviceAccountEmailAddress, unittest.equals('foo'));
     checkSettings(o.settings);
@@ -304,27 +304,27 @@
   buildCounterDatabaseInstance--;
 }
 
-buildUnnamed4516() {
+buildUnnamed4395() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4516(core.List<core.String> o) {
+checkUnnamed4395(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4517() {
+buildUnnamed4396() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4517(core.List<core.String> o) {
+checkUnnamed4396(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -335,9 +335,9 @@
   var o = new api.ExportContext();
   buildCounterExportContext++;
   if (buildCounterExportContext < 3) {
-    o.database = buildUnnamed4516();
+    o.database = buildUnnamed4395();
     o.kind = "foo";
-    o.table = buildUnnamed4517();
+    o.table = buildUnnamed4396();
     o.uri = "foo";
   }
   buildCounterExportContext--;
@@ -347,35 +347,35 @@
 checkExportContext(api.ExportContext o) {
   buildCounterExportContext++;
   if (buildCounterExportContext < 3) {
-    checkUnnamed4516(o.database);
+    checkUnnamed4395(o.database);
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed4517(o.table);
+    checkUnnamed4396(o.table);
     unittest.expect(o.uri, unittest.equals('foo'));
   }
   buildCounterExportContext--;
 }
 
-buildUnnamed4518() {
+buildUnnamed4397() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4518(core.List<core.String> o) {
+checkUnnamed4397(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4519() {
+buildUnnamed4398() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4519(core.List<core.String> o) {
+checkUnnamed4398(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -386,8 +386,8 @@
   var o = new api.Flag();
   buildCounterFlag++;
   if (buildCounterFlag < 3) {
-    o.allowedStringValues = buildUnnamed4518();
-    o.appliesTo = buildUnnamed4519();
+    o.allowedStringValues = buildUnnamed4397();
+    o.appliesTo = buildUnnamed4398();
     o.kind = "foo";
     o.maxValue = "foo";
     o.minValue = "foo";
@@ -401,8 +401,8 @@
 checkFlag(api.Flag o) {
   buildCounterFlag++;
   if (buildCounterFlag < 3) {
-    checkUnnamed4518(o.allowedStringValues);
-    checkUnnamed4519(o.appliesTo);
+    checkUnnamed4397(o.allowedStringValues);
+    checkUnnamed4398(o.appliesTo);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.maxValue, unittest.equals('foo'));
     unittest.expect(o.minValue, unittest.equals('foo'));
@@ -412,14 +412,14 @@
   buildCounterFlag--;
 }
 
-buildUnnamed4520() {
+buildUnnamed4399() {
   var o = new core.List<api.Flag>();
   o.add(buildFlag());
   o.add(buildFlag());
   return o;
 }
 
-checkUnnamed4520(core.List<api.Flag> o) {
+checkUnnamed4399(core.List<api.Flag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFlag(o[0]);
   checkFlag(o[1]);
@@ -430,7 +430,7 @@
   var o = new api.FlagsListResponse();
   buildCounterFlagsListResponse++;
   if (buildCounterFlagsListResponse < 3) {
-    o.items = buildUnnamed4520();
+    o.items = buildUnnamed4399();
     o.kind = "foo";
   }
   buildCounterFlagsListResponse--;
@@ -440,20 +440,20 @@
 checkFlagsListResponse(api.FlagsListResponse o) {
   buildCounterFlagsListResponse++;
   if (buildCounterFlagsListResponse < 3) {
-    checkUnnamed4520(o.items);
+    checkUnnamed4399(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterFlagsListResponse--;
 }
 
-buildUnnamed4521() {
+buildUnnamed4400() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4521(core.List<core.String> o) {
+checkUnnamed4400(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -466,7 +466,7 @@
   if (buildCounterImportContext < 3) {
     o.database = "foo";
     o.kind = "foo";
-    o.uri = buildUnnamed4521();
+    o.uri = buildUnnamed4400();
   }
   buildCounterImportContext--;
   return o;
@@ -477,19 +477,19 @@
   if (buildCounterImportContext < 3) {
     unittest.expect(o.database, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed4521(o.uri);
+    checkUnnamed4400(o.uri);
   }
   buildCounterImportContext--;
 }
 
-buildUnnamed4522() {
+buildUnnamed4401() {
   var o = new core.List<api.OperationError>();
   o.add(buildOperationError());
   o.add(buildOperationError());
   return o;
 }
 
-checkUnnamed4522(core.List<api.OperationError> o) {
+checkUnnamed4401(core.List<api.OperationError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationError(o[0]);
   checkOperationError(o[1]);
@@ -502,7 +502,7 @@
   if (buildCounterInstanceOperation < 3) {
     o.endTime = core.DateTime.parse("2002-02-27T14:01:02");
     o.enqueuedTime = core.DateTime.parse("2002-02-27T14:01:02");
-    o.error = buildUnnamed4522();
+    o.error = buildUnnamed4401();
     o.exportContext = buildExportContext();
     o.importContext = buildImportContext();
     o.instance = "foo";
@@ -524,7 +524,7 @@
         o.endTime, unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
     unittest.expect(o.enqueuedTime,
         unittest.equals(core.DateTime.parse("2002-02-27T14:01:02")));
-    checkUnnamed4522(o.error);
+    checkUnnamed4401(o.error);
     checkExportContext(o.exportContext);
     checkImportContext(o.importContext);
     unittest.expect(o.instance, unittest.equals('foo'));
@@ -720,14 +720,14 @@
   buildCounterInstancesInsertResponse--;
 }
 
-buildUnnamed4523() {
+buildUnnamed4402() {
   var o = new core.List<api.DatabaseInstance>();
   o.add(buildDatabaseInstance());
   o.add(buildDatabaseInstance());
   return o;
 }
 
-checkUnnamed4523(core.List<api.DatabaseInstance> o) {
+checkUnnamed4402(core.List<api.DatabaseInstance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatabaseInstance(o[0]);
   checkDatabaseInstance(o[1]);
@@ -738,7 +738,7 @@
   var o = new api.InstancesListResponse();
   buildCounterInstancesListResponse++;
   if (buildCounterInstancesListResponse < 3) {
-    o.items = buildUnnamed4523();
+    o.items = buildUnnamed4402();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -749,7 +749,7 @@
 checkInstancesListResponse(api.InstancesListResponse o) {
   buildCounterInstancesListResponse++;
   if (buildCounterInstancesListResponse < 3) {
-    checkUnnamed4523(o.items);
+    checkUnnamed4402(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -882,14 +882,14 @@
   buildCounterInstancesUpdateResponse--;
 }
 
-buildUnnamed4524() {
+buildUnnamed4403() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4524(core.List<core.String> o) {
+checkUnnamed4403(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -900,7 +900,7 @@
   var o = new api.IpConfiguration();
   buildCounterIpConfiguration++;
   if (buildCounterIpConfiguration < 3) {
-    o.authorizedNetworks = buildUnnamed4524();
+    o.authorizedNetworks = buildUnnamed4403();
     o.enabled = true;
     o.kind = "foo";
     o.requireSsl = true;
@@ -912,7 +912,7 @@
 checkIpConfiguration(api.IpConfiguration o) {
   buildCounterIpConfiguration++;
   if (buildCounterIpConfiguration < 3) {
-    checkUnnamed4524(o.authorizedNetworks);
+    checkUnnamed4403(o.authorizedNetworks);
     unittest.expect(o.enabled, unittest.isTrue);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.requireSsl, unittest.isTrue);
@@ -986,14 +986,14 @@
   buildCounterOperationError--;
 }
 
-buildUnnamed4525() {
+buildUnnamed4404() {
   var o = new core.List<api.InstanceOperation>();
   o.add(buildInstanceOperation());
   o.add(buildInstanceOperation());
   return o;
 }
 
-checkUnnamed4525(core.List<api.InstanceOperation> o) {
+checkUnnamed4404(core.List<api.InstanceOperation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkInstanceOperation(o[0]);
   checkInstanceOperation(o[1]);
@@ -1004,7 +1004,7 @@
   var o = new api.OperationsListResponse();
   buildCounterOperationsListResponse++;
   if (buildCounterOperationsListResponse < 3) {
-    o.items = buildUnnamed4525();
+    o.items = buildUnnamed4404();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1015,7 +1015,7 @@
 checkOperationsListResponse(api.OperationsListResponse o) {
   buildCounterOperationsListResponse++;
   if (buildCounterOperationsListResponse < 3) {
-    checkUnnamed4525(o.items);
+    checkUnnamed4404(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1043,40 +1043,40 @@
   buildCounterSetRootPasswordContext--;
 }
 
-buildUnnamed4526() {
+buildUnnamed4405() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4526(core.List<core.String> o) {
+checkUnnamed4405(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4527() {
+buildUnnamed4406() {
   var o = new core.List<api.BackupConfiguration>();
   o.add(buildBackupConfiguration());
   o.add(buildBackupConfiguration());
   return o;
 }
 
-checkUnnamed4527(core.List<api.BackupConfiguration> o) {
+checkUnnamed4406(core.List<api.BackupConfiguration> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackupConfiguration(o[0]);
   checkBackupConfiguration(o[1]);
 }
 
-buildUnnamed4528() {
+buildUnnamed4407() {
   var o = new core.List<api.DatabaseFlags>();
   o.add(buildDatabaseFlags());
   o.add(buildDatabaseFlags());
   return o;
 }
 
-checkUnnamed4528(core.List<api.DatabaseFlags> o) {
+checkUnnamed4407(core.List<api.DatabaseFlags> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatabaseFlags(o[0]);
   checkDatabaseFlags(o[1]);
@@ -1088,9 +1088,9 @@
   buildCounterSettings++;
   if (buildCounterSettings < 3) {
     o.activationPolicy = "foo";
-    o.authorizedGaeApplications = buildUnnamed4526();
-    o.backupConfiguration = buildUnnamed4527();
-    o.databaseFlags = buildUnnamed4528();
+    o.authorizedGaeApplications = buildUnnamed4405();
+    o.backupConfiguration = buildUnnamed4406();
+    o.databaseFlags = buildUnnamed4407();
     o.databaseReplicationEnabled = true;
     o.ipConfiguration = buildIpConfiguration();
     o.kind = "foo";
@@ -1108,9 +1108,9 @@
   buildCounterSettings++;
   if (buildCounterSettings < 3) {
     unittest.expect(o.activationPolicy, unittest.equals('foo'));
-    checkUnnamed4526(o.authorizedGaeApplications);
-    checkUnnamed4527(o.backupConfiguration);
-    checkUnnamed4528(o.databaseFlags);
+    checkUnnamed4405(o.authorizedGaeApplications);
+    checkUnnamed4406(o.backupConfiguration);
+    checkUnnamed4407(o.databaseFlags);
     unittest.expect(o.databaseReplicationEnabled, unittest.isTrue);
     checkIpConfiguration(o.ipConfiguration);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -1242,14 +1242,14 @@
   buildCounterSslCertsInsertResponse--;
 }
 
-buildUnnamed4529() {
+buildUnnamed4408() {
   var o = new core.List<api.SslCert>();
   o.add(buildSslCert());
   o.add(buildSslCert());
   return o;
 }
 
-checkUnnamed4529(core.List<api.SslCert> o) {
+checkUnnamed4408(core.List<api.SslCert> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSslCert(o[0]);
   checkSslCert(o[1]);
@@ -1260,7 +1260,7 @@
   var o = new api.SslCertsListResponse();
   buildCounterSslCertsListResponse++;
   if (buildCounterSslCertsListResponse < 3) {
-    o.items = buildUnnamed4529();
+    o.items = buildUnnamed4408();
     o.kind = "foo";
   }
   buildCounterSslCertsListResponse--;
@@ -1270,20 +1270,20 @@
 checkSslCertsListResponse(api.SslCertsListResponse o) {
   buildCounterSslCertsListResponse++;
   if (buildCounterSslCertsListResponse < 3) {
-    checkUnnamed4529(o.items);
+    checkUnnamed4408(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterSslCertsListResponse--;
 }
 
-buildUnnamed4530() {
+buildUnnamed4409() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4530(core.List<core.String> o) {
+checkUnnamed4409(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1297,7 +1297,7 @@
     o.DiskQuota = "foo";
     o.RAM = "foo";
     o.kind = "foo";
-    o.region = buildUnnamed4530();
+    o.region = buildUnnamed4409();
     o.tier = "foo";
   }
   buildCounterTier--;
@@ -1310,20 +1310,20 @@
     unittest.expect(o.DiskQuota, unittest.equals('foo'));
     unittest.expect(o.RAM, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed4530(o.region);
+    checkUnnamed4409(o.region);
     unittest.expect(o.tier, unittest.equals('foo'));
   }
   buildCounterTier--;
 }
 
-buildUnnamed4531() {
+buildUnnamed4410() {
   var o = new core.List<api.Tier>();
   o.add(buildTier());
   o.add(buildTier());
   return o;
 }
 
-checkUnnamed4531(core.List<api.Tier> o) {
+checkUnnamed4410(core.List<api.Tier> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTier(o[0]);
   checkTier(o[1]);
@@ -1334,7 +1334,7 @@
   var o = new api.TiersListResponse();
   buildCounterTiersListResponse++;
   if (buildCounterTiersListResponse < 3) {
-    o.items = buildUnnamed4531();
+    o.items = buildUnnamed4410();
     o.kind = "foo";
   }
   buildCounterTiersListResponse--;
@@ -1344,7 +1344,7 @@
 checkTiersListResponse(api.TiersListResponse o) {
   buildCounterTiersListResponse++;
   if (buildCounterTiersListResponse < 3) {
-    checkUnnamed4531(o.items);
+    checkUnnamed4410(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTiersListResponse--;
@@ -1771,7 +1771,7 @@
       res
           .get(arg_project, arg_instance, arg_backupConfiguration, arg_dueTime,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BackupRun response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackupRun(response);
       })));
     });
@@ -1855,7 +1855,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BackupRunsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackupRunsListResponse(response);
       })));
     });
@@ -1907,9 +1907,7 @@
         var resp = convert.JSON.encode(buildFlagsListResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res
-          .list($fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FlagsListResponse response) {
+      res.list($fields: arg_$fields).then(unittest.expectAsync1(((response) {
         checkFlagsListResponse(response);
       })));
     });
@@ -1977,7 +1975,7 @@
       }), true);
       res
           .clone(arg_request, arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstancesCloneResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstancesCloneResponse(response);
       })));
     });
@@ -2043,7 +2041,7 @@
       }), true);
       res
           .delete(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstancesDeleteResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstancesDeleteResponse(response);
       })));
     });
@@ -2119,7 +2117,7 @@
       }), true);
       res
           .export(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstancesExportResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstancesExportResponse(response);
       })));
     });
@@ -2185,7 +2183,7 @@
       }), true);
       res
           .get(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DatabaseInstance response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatabaseInstance(response);
       })));
     });
@@ -2261,7 +2259,7 @@
       }), true);
       res
           .import(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstancesImportResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstancesImportResponse(response);
       })));
     });
@@ -2327,7 +2325,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstancesInsertResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstancesInsertResponse(response);
       })));
     });
@@ -2398,7 +2396,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstancesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstancesListResponse(response);
       })));
     });
@@ -2468,7 +2466,7 @@
       }), true);
       res
           .patch(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstancesUpdateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstancesUpdateResponse(response);
       })));
     });
@@ -2538,9 +2536,9 @@
         var resp = convert.JSON.encode(buildInstancesPromoteReplicaResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.promoteReplica(arg_project, arg_instance, $fields: arg_$fields).then(
-          unittest
-              .expectAsync1(((api.InstancesPromoteReplicaResponse response) {
+      res
+          .promoteReplica(arg_project, arg_instance, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkInstancesPromoteReplicaResponse(response);
       })));
     });
@@ -2610,9 +2608,9 @@
         var resp = convert.JSON.encode(buildInstancesResetSslConfigResponse());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.resetSslConfig(arg_project, arg_instance, $fields: arg_$fields).then(
-          unittest
-              .expectAsync1(((api.InstancesResetSslConfigResponse response) {
+      res
+          .resetSslConfig(arg_project, arg_instance, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkInstancesResetSslConfigResponse(response);
       })));
     });
@@ -2684,7 +2682,7 @@
       }), true);
       res
           .restart(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstancesRestartResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstancesRestartResponse(response);
       })));
     });
@@ -2764,8 +2762,7 @@
           .restoreBackup(
               arg_project, arg_instance, arg_backupConfiguration, arg_dueTime,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.InstancesRestoreBackupResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstancesRestoreBackupResponse(response);
       })));
     });
@@ -2842,8 +2839,7 @@
       res
           .setRootPassword(arg_request, arg_project, arg_instance,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.InstancesSetRootPasswordResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstancesSetRootPasswordResponse(response);
       })));
     });
@@ -2913,7 +2909,7 @@
       }), true);
       res
           .update(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstancesUpdateResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstancesUpdateResponse(response);
       })));
     });
@@ -2991,7 +2987,7 @@
       }), true);
       res
           .get(arg_project, arg_instance, arg_operation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstanceOperation response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstanceOperation(response);
       })));
     });
@@ -3072,7 +3068,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperationsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperationsListResponse(response);
       })));
     });
@@ -3151,7 +3147,7 @@
       res
           .delete(arg_project, arg_instance, arg_sha1Fingerprint,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SslCertsDeleteResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSslCertsDeleteResponse(response);
       })));
     });
@@ -3228,7 +3224,7 @@
       res
           .get(arg_project, arg_instance, arg_sha1Fingerprint,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SslCert response) {
+          .then(unittest.expectAsync1(((response) {
         checkSslCert(response);
       })));
     });
@@ -3304,7 +3300,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SslCertsInsertResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSslCertsInsertResponse(response);
       })));
     });
@@ -3376,7 +3372,7 @@
       }), true);
       res
           .list(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SslCertsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSslCertsListResponse(response);
       })));
     });
@@ -3440,7 +3436,7 @@
       }), true);
       res
           .list(arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TiersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTiersListResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/sqladmin/v1beta4_test.dart b/generated/googleapis_beta/test/sqladmin/v1beta4_test.dart
index a5f1a86..2b6d628 100644
--- a/generated/googleapis_beta/test/sqladmin/v1beta4_test.dart
+++ b/generated/googleapis_beta/test/sqladmin/v1beta4_test.dart
@@ -148,14 +148,14 @@
   buildCounterBackupRun--;
 }
 
-buildUnnamed4101() {
+buildUnnamed3931() {
   var o = new core.List<api.BackupRun>();
   o.add(buildBackupRun());
   o.add(buildBackupRun());
   return o;
 }
 
-checkUnnamed4101(core.List<api.BackupRun> o) {
+checkUnnamed3931(core.List<api.BackupRun> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkBackupRun(o[0]);
   checkBackupRun(o[1]);
@@ -166,7 +166,7 @@
   var o = new api.BackupRunsListResponse();
   buildCounterBackupRunsListResponse++;
   if (buildCounterBackupRunsListResponse < 3) {
-    o.items = buildUnnamed4101();
+    o.items = buildUnnamed3931();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -177,7 +177,7 @@
 checkBackupRunsListResponse(api.BackupRunsListResponse o) {
   buildCounterBackupRunsListResponse++;
   if (buildCounterBackupRunsListResponse < 3) {
-    checkUnnamed4101(o.items);
+    checkUnnamed3931(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -307,40 +307,40 @@
   buildCounterDatabaseInstanceFailoverReplica--;
 }
 
-buildUnnamed4102() {
+buildUnnamed3932() {
   var o = new core.List<api.IpMapping>();
   o.add(buildIpMapping());
   o.add(buildIpMapping());
   return o;
 }
 
-checkUnnamed4102(core.List<api.IpMapping> o) {
+checkUnnamed3932(core.List<api.IpMapping> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkIpMapping(o[0]);
   checkIpMapping(o[1]);
 }
 
-buildUnnamed4103() {
+buildUnnamed3933() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4103(core.List<core.String> o) {
+checkUnnamed3933(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4104() {
+buildUnnamed3934() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4104(core.List<core.String> o) {
+checkUnnamed3934(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -359,7 +359,7 @@
     o.failoverReplica = buildDatabaseInstanceFailoverReplica();
     o.gceZone = "foo";
     o.instanceType = "foo";
-    o.ipAddresses = buildUnnamed4102();
+    o.ipAddresses = buildUnnamed3932();
     o.ipv6Address = "foo";
     o.kind = "foo";
     o.masterInstanceName = "foo";
@@ -369,13 +369,13 @@
     o.project = "foo";
     o.region = "foo";
     o.replicaConfiguration = buildReplicaConfiguration();
-    o.replicaNames = buildUnnamed4103();
+    o.replicaNames = buildUnnamed3933();
     o.selfLink = "foo";
     o.serverCaCert = buildSslCert();
     o.serviceAccountEmailAddress = "foo";
     o.settings = buildSettings();
     o.state = "foo";
-    o.suspensionReason = buildUnnamed4104();
+    o.suspensionReason = buildUnnamed3934();
   }
   buildCounterDatabaseInstance--;
   return o;
@@ -392,7 +392,7 @@
     checkDatabaseInstanceFailoverReplica(o.failoverReplica);
     unittest.expect(o.gceZone, unittest.equals('foo'));
     unittest.expect(o.instanceType, unittest.equals('foo'));
-    checkUnnamed4102(o.ipAddresses);
+    checkUnnamed3932(o.ipAddresses);
     unittest.expect(o.ipv6Address, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.masterInstanceName, unittest.equals('foo'));
@@ -402,25 +402,25 @@
     unittest.expect(o.project, unittest.equals('foo'));
     unittest.expect(o.region, unittest.equals('foo'));
     checkReplicaConfiguration(o.replicaConfiguration);
-    checkUnnamed4103(o.replicaNames);
+    checkUnnamed3933(o.replicaNames);
     unittest.expect(o.selfLink, unittest.equals('foo'));
     checkSslCert(o.serverCaCert);
     unittest.expect(o.serviceAccountEmailAddress, unittest.equals('foo'));
     checkSettings(o.settings);
     unittest.expect(o.state, unittest.equals('foo'));
-    checkUnnamed4104(o.suspensionReason);
+    checkUnnamed3934(o.suspensionReason);
   }
   buildCounterDatabaseInstance--;
 }
 
-buildUnnamed4105() {
+buildUnnamed3935() {
   var o = new core.List<api.Database>();
   o.add(buildDatabase());
   o.add(buildDatabase());
   return o;
 }
 
-checkUnnamed4105(core.List<api.Database> o) {
+checkUnnamed3935(core.List<api.Database> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatabase(o[0]);
   checkDatabase(o[1]);
@@ -431,7 +431,7 @@
   var o = new api.DatabasesListResponse();
   buildCounterDatabasesListResponse++;
   if (buildCounterDatabasesListResponse < 3) {
-    o.items = buildUnnamed4105();
+    o.items = buildUnnamed3935();
     o.kind = "foo";
   }
   buildCounterDatabasesListResponse--;
@@ -441,7 +441,7 @@
 checkDatabasesListResponse(api.DatabasesListResponse o) {
   buildCounterDatabasesListResponse++;
   if (buildCounterDatabasesListResponse < 3) {
-    checkUnnamed4105(o.items);
+    checkUnnamed3935(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterDatabasesListResponse--;
@@ -540,27 +540,27 @@
   buildCounterExportContextCsvExportOptions--;
 }
 
-buildUnnamed4106() {
+buildUnnamed3936() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4106(core.List<core.String> o) {
+checkUnnamed3936(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4107() {
+buildUnnamed3937() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4107(core.List<core.String> o) {
+checkUnnamed3937(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -572,7 +572,7 @@
   buildCounterExportContextSqlExportOptions++;
   if (buildCounterExportContextSqlExportOptions < 3) {
     o.schemaOnly = true;
-    o.tables = buildUnnamed4107();
+    o.tables = buildUnnamed3937();
   }
   buildCounterExportContextSqlExportOptions--;
   return o;
@@ -582,7 +582,7 @@
   buildCounterExportContextSqlExportOptions++;
   if (buildCounterExportContextSqlExportOptions < 3) {
     unittest.expect(o.schemaOnly, unittest.isTrue);
-    checkUnnamed4107(o.tables);
+    checkUnnamed3937(o.tables);
   }
   buildCounterExportContextSqlExportOptions--;
 }
@@ -593,7 +593,7 @@
   buildCounterExportContext++;
   if (buildCounterExportContext < 3) {
     o.csvExportOptions = buildExportContextCsvExportOptions();
-    o.databases = buildUnnamed4106();
+    o.databases = buildUnnamed3936();
     o.fileType = "foo";
     o.kind = "foo";
     o.sqlExportOptions = buildExportContextSqlExportOptions();
@@ -607,7 +607,7 @@
   buildCounterExportContext++;
   if (buildCounterExportContext < 3) {
     checkExportContextCsvExportOptions(o.csvExportOptions);
-    checkUnnamed4106(o.databases);
+    checkUnnamed3936(o.databases);
     unittest.expect(o.fileType, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
     checkExportContextSqlExportOptions(o.sqlExportOptions);
@@ -637,27 +637,27 @@
   buildCounterFailoverContext--;
 }
 
-buildUnnamed4108() {
+buildUnnamed3938() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4108(core.List<core.String> o) {
+checkUnnamed3938(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4109() {
+buildUnnamed3939() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4109(core.List<core.String> o) {
+checkUnnamed3939(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -668,8 +668,8 @@
   var o = new api.Flag();
   buildCounterFlag++;
   if (buildCounterFlag < 3) {
-    o.allowedStringValues = buildUnnamed4108();
-    o.appliesTo = buildUnnamed4109();
+    o.allowedStringValues = buildUnnamed3938();
+    o.appliesTo = buildUnnamed3939();
     o.kind = "foo";
     o.maxValue = "foo";
     o.minValue = "foo";
@@ -684,8 +684,8 @@
 checkFlag(api.Flag o) {
   buildCounterFlag++;
   if (buildCounterFlag < 3) {
-    checkUnnamed4108(o.allowedStringValues);
-    checkUnnamed4109(o.appliesTo);
+    checkUnnamed3938(o.allowedStringValues);
+    checkUnnamed3939(o.appliesTo);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.maxValue, unittest.equals('foo'));
     unittest.expect(o.minValue, unittest.equals('foo'));
@@ -696,14 +696,14 @@
   buildCounterFlag--;
 }
 
-buildUnnamed4110() {
+buildUnnamed3940() {
   var o = new core.List<api.Flag>();
   o.add(buildFlag());
   o.add(buildFlag());
   return o;
 }
 
-checkUnnamed4110(core.List<api.Flag> o) {
+checkUnnamed3940(core.List<api.Flag> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFlag(o[0]);
   checkFlag(o[1]);
@@ -714,7 +714,7 @@
   var o = new api.FlagsListResponse();
   buildCounterFlagsListResponse++;
   if (buildCounterFlagsListResponse < 3) {
-    o.items = buildUnnamed4110();
+    o.items = buildUnnamed3940();
     o.kind = "foo";
   }
   buildCounterFlagsListResponse--;
@@ -724,20 +724,20 @@
 checkFlagsListResponse(api.FlagsListResponse o) {
   buildCounterFlagsListResponse++;
   if (buildCounterFlagsListResponse < 3) {
-    checkUnnamed4110(o.items);
+    checkUnnamed3940(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterFlagsListResponse--;
 }
 
-buildUnnamed4111() {
+buildUnnamed3941() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4111(core.List<core.String> o) {
+checkUnnamed3941(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -748,7 +748,7 @@
   var o = new api.ImportContextCsvImportOptions();
   buildCounterImportContextCsvImportOptions++;
   if (buildCounterImportContextCsvImportOptions < 3) {
-    o.columns = buildUnnamed4111();
+    o.columns = buildUnnamed3941();
     o.table = "foo";
   }
   buildCounterImportContextCsvImportOptions--;
@@ -758,7 +758,7 @@
 checkImportContextCsvImportOptions(api.ImportContextCsvImportOptions o) {
   buildCounterImportContextCsvImportOptions++;
   if (buildCounterImportContextCsvImportOptions < 3) {
-    checkUnnamed4111(o.columns);
+    checkUnnamed3941(o.columns);
     unittest.expect(o.table, unittest.equals('foo'));
   }
   buildCounterImportContextCsvImportOptions--;
@@ -888,14 +888,14 @@
   buildCounterInstancesImportRequest--;
 }
 
-buildUnnamed4112() {
+buildUnnamed3942() {
   var o = new core.List<api.DatabaseInstance>();
   o.add(buildDatabaseInstance());
   o.add(buildDatabaseInstance());
   return o;
 }
 
-checkUnnamed4112(core.List<api.DatabaseInstance> o) {
+checkUnnamed3942(core.List<api.DatabaseInstance> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatabaseInstance(o[0]);
   checkDatabaseInstance(o[1]);
@@ -906,7 +906,7 @@
   var o = new api.InstancesListResponse();
   buildCounterInstancesListResponse++;
   if (buildCounterInstancesListResponse < 3) {
-    o.items = buildUnnamed4112();
+    o.items = buildUnnamed3942();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -917,7 +917,7 @@
 checkInstancesListResponse(api.InstancesListResponse o) {
   buildCounterInstancesListResponse++;
   if (buildCounterInstancesListResponse < 3) {
-    checkUnnamed4112(o.items);
+    checkUnnamed3942(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -962,14 +962,14 @@
   buildCounterInstancesTruncateLogRequest--;
 }
 
-buildUnnamed4113() {
+buildUnnamed3943() {
   var o = new core.List<api.AclEntry>();
   o.add(buildAclEntry());
   o.add(buildAclEntry());
   return o;
 }
 
-checkUnnamed4113(core.List<api.AclEntry> o) {
+checkUnnamed3943(core.List<api.AclEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAclEntry(o[0]);
   checkAclEntry(o[1]);
@@ -980,7 +980,7 @@
   var o = new api.IpConfiguration();
   buildCounterIpConfiguration++;
   if (buildCounterIpConfiguration < 3) {
-    o.authorizedNetworks = buildUnnamed4113();
+    o.authorizedNetworks = buildUnnamed3943();
     o.ipv4Enabled = true;
     o.requireSsl = true;
   }
@@ -991,7 +991,7 @@
 checkIpConfiguration(api.IpConfiguration o) {
   buildCounterIpConfiguration++;
   if (buildCounterIpConfiguration < 3) {
-    checkUnnamed4113(o.authorizedNetworks);
+    checkUnnamed3943(o.authorizedNetworks);
     unittest.expect(o.ipv4Enabled, unittest.isTrue);
     unittest.expect(o.requireSsl, unittest.isTrue);
   }
@@ -1203,14 +1203,14 @@
   buildCounterOperationError--;
 }
 
-buildUnnamed4114() {
+buildUnnamed3944() {
   var o = new core.List<api.OperationError>();
   o.add(buildOperationError());
   o.add(buildOperationError());
   return o;
 }
 
-checkUnnamed4114(core.List<api.OperationError> o) {
+checkUnnamed3944(core.List<api.OperationError> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperationError(o[0]);
   checkOperationError(o[1]);
@@ -1221,7 +1221,7 @@
   var o = new api.OperationErrors();
   buildCounterOperationErrors++;
   if (buildCounterOperationErrors < 3) {
-    o.errors = buildUnnamed4114();
+    o.errors = buildUnnamed3944();
     o.kind = "foo";
   }
   buildCounterOperationErrors--;
@@ -1231,20 +1231,20 @@
 checkOperationErrors(api.OperationErrors o) {
   buildCounterOperationErrors++;
   if (buildCounterOperationErrors < 3) {
-    checkUnnamed4114(o.errors);
+    checkUnnamed3944(o.errors);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterOperationErrors--;
 }
 
-buildUnnamed4115() {
+buildUnnamed3945() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed4115(core.List<api.Operation> o) {
+checkUnnamed3945(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -1255,7 +1255,7 @@
   var o = new api.OperationsListResponse();
   buildCounterOperationsListResponse++;
   if (buildCounterOperationsListResponse < 3) {
-    o.items = buildUnnamed4115();
+    o.items = buildUnnamed3945();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1266,7 +1266,7 @@
 checkOperationsListResponse(api.OperationsListResponse o) {
   buildCounterOperationsListResponse++;
   if (buildCounterOperationsListResponse < 3) {
-    checkUnnamed4115(o.items);
+    checkUnnamed3945(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -1319,40 +1319,40 @@
   buildCounterRestoreBackupContext--;
 }
 
-buildUnnamed4116() {
+buildUnnamed3946() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4116(core.List<core.String> o) {
+checkUnnamed3946(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4117() {
+buildUnnamed3947() {
   var o = new core.List<api.DatabaseFlags>();
   o.add(buildDatabaseFlags());
   o.add(buildDatabaseFlags());
   return o;
 }
 
-checkUnnamed4117(core.List<api.DatabaseFlags> o) {
+checkUnnamed3947(core.List<api.DatabaseFlags> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkDatabaseFlags(o[0]);
   checkDatabaseFlags(o[1]);
 }
 
-buildUnnamed4118() {
+buildUnnamed3948() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4118(core.Map<core.String, core.String> o) {
+checkUnnamed3948(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
@@ -1364,13 +1364,13 @@
   buildCounterSettings++;
   if (buildCounterSettings < 3) {
     o.activationPolicy = "foo";
-    o.authorizedGaeApplications = buildUnnamed4116();
+    o.authorizedGaeApplications = buildUnnamed3946();
     o.availabilityType = "foo";
     o.backupConfiguration = buildBackupConfiguration();
     o.crashSafeReplicationEnabled = true;
     o.dataDiskSizeGb = "foo";
     o.dataDiskType = "foo";
-    o.databaseFlags = buildUnnamed4117();
+    o.databaseFlags = buildUnnamed3947();
     o.databaseReplicationEnabled = true;
     o.ipConfiguration = buildIpConfiguration();
     o.kind = "foo";
@@ -1382,7 +1382,7 @@
     o.storageAutoResize = true;
     o.storageAutoResizeLimit = "foo";
     o.tier = "foo";
-    o.userLabels = buildUnnamed4118();
+    o.userLabels = buildUnnamed3948();
   }
   buildCounterSettings--;
   return o;
@@ -1392,13 +1392,13 @@
   buildCounterSettings++;
   if (buildCounterSettings < 3) {
     unittest.expect(o.activationPolicy, unittest.equals('foo'));
-    checkUnnamed4116(o.authorizedGaeApplications);
+    checkUnnamed3946(o.authorizedGaeApplications);
     unittest.expect(o.availabilityType, unittest.equals('foo'));
     checkBackupConfiguration(o.backupConfiguration);
     unittest.expect(o.crashSafeReplicationEnabled, unittest.isTrue);
     unittest.expect(o.dataDiskSizeGb, unittest.equals('foo'));
     unittest.expect(o.dataDiskType, unittest.equals('foo'));
-    checkUnnamed4117(o.databaseFlags);
+    checkUnnamed3947(o.databaseFlags);
     unittest.expect(o.databaseReplicationEnabled, unittest.isTrue);
     checkIpConfiguration(o.ipConfiguration);
     unittest.expect(o.kind, unittest.equals('foo'));
@@ -1410,7 +1410,7 @@
     unittest.expect(o.storageAutoResize, unittest.isTrue);
     unittest.expect(o.storageAutoResizeLimit, unittest.equals('foo'));
     unittest.expect(o.tier, unittest.equals('foo'));
-    checkUnnamed4118(o.userLabels);
+    checkUnnamed3948(o.userLabels);
   }
   buildCounterSettings--;
 }
@@ -1536,14 +1536,14 @@
   buildCounterSslCertsInsertResponse--;
 }
 
-buildUnnamed4119() {
+buildUnnamed3949() {
   var o = new core.List<api.SslCert>();
   o.add(buildSslCert());
   o.add(buildSslCert());
   return o;
 }
 
-checkUnnamed4119(core.List<api.SslCert> o) {
+checkUnnamed3949(core.List<api.SslCert> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkSslCert(o[0]);
   checkSslCert(o[1]);
@@ -1554,7 +1554,7 @@
   var o = new api.SslCertsListResponse();
   buildCounterSslCertsListResponse++;
   if (buildCounterSslCertsListResponse < 3) {
-    o.items = buildUnnamed4119();
+    o.items = buildUnnamed3949();
     o.kind = "foo";
   }
   buildCounterSslCertsListResponse--;
@@ -1564,20 +1564,20 @@
 checkSslCertsListResponse(api.SslCertsListResponse o) {
   buildCounterSslCertsListResponse++;
   if (buildCounterSslCertsListResponse < 3) {
-    checkUnnamed4119(o.items);
+    checkUnnamed3949(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterSslCertsListResponse--;
 }
 
-buildUnnamed4120() {
+buildUnnamed3950() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4120(core.List<core.String> o) {
+checkUnnamed3950(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -1591,7 +1591,7 @@
     o.DiskQuota = "foo";
     o.RAM = "foo";
     o.kind = "foo";
-    o.region = buildUnnamed4120();
+    o.region = buildUnnamed3950();
     o.tier = "foo";
   }
   buildCounterTier--;
@@ -1604,20 +1604,20 @@
     unittest.expect(o.DiskQuota, unittest.equals('foo'));
     unittest.expect(o.RAM, unittest.equals('foo'));
     unittest.expect(o.kind, unittest.equals('foo'));
-    checkUnnamed4120(o.region);
+    checkUnnamed3950(o.region);
     unittest.expect(o.tier, unittest.equals('foo'));
   }
   buildCounterTier--;
 }
 
-buildUnnamed4121() {
+buildUnnamed3951() {
   var o = new core.List<api.Tier>();
   o.add(buildTier());
   o.add(buildTier());
   return o;
 }
 
-checkUnnamed4121(core.List<api.Tier> o) {
+checkUnnamed3951(core.List<api.Tier> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTier(o[0]);
   checkTier(o[1]);
@@ -1628,7 +1628,7 @@
   var o = new api.TiersListResponse();
   buildCounterTiersListResponse++;
   if (buildCounterTiersListResponse < 3) {
-    o.items = buildUnnamed4121();
+    o.items = buildUnnamed3951();
     o.kind = "foo";
   }
   buildCounterTiersListResponse--;
@@ -1638,7 +1638,7 @@
 checkTiersListResponse(api.TiersListResponse o) {
   buildCounterTiersListResponse++;
   if (buildCounterTiersListResponse < 3) {
-    checkUnnamed4121(o.items);
+    checkUnnamed3951(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTiersListResponse--;
@@ -1696,14 +1696,14 @@
   buildCounterUser--;
 }
 
-buildUnnamed4122() {
+buildUnnamed3952() {
   var o = new core.List<api.User>();
   o.add(buildUser());
   o.add(buildUser());
   return o;
 }
 
-checkUnnamed4122(core.List<api.User> o) {
+checkUnnamed3952(core.List<api.User> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkUser(o[0]);
   checkUser(o[1]);
@@ -1714,7 +1714,7 @@
   var o = new api.UsersListResponse();
   buildCounterUsersListResponse++;
   if (buildCounterUsersListResponse < 3) {
-    o.items = buildUnnamed4122();
+    o.items = buildUnnamed3952();
     o.kind = "foo";
     o.nextPageToken = "foo";
   }
@@ -1725,7 +1725,7 @@
 checkUsersListResponse(api.UsersListResponse o) {
   buildCounterUsersListResponse++;
   if (buildCounterUsersListResponse < 3) {
-    checkUnnamed4122(o.items);
+    checkUnnamed3952(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
@@ -2238,7 +2238,7 @@
       }), true);
       res
           .delete(arg_project, arg_instance, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2314,7 +2314,7 @@
       }), true);
       res
           .get(arg_project, arg_instance, arg_id, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BackupRun response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackupRun(response);
       })));
     });
@@ -2390,7 +2390,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2471,7 +2471,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.BackupRunsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBackupRunsListResponse(response);
       })));
     });
@@ -2549,7 +2549,7 @@
       }), true);
       res
           .delete(arg_project, arg_instance, arg_database, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2625,7 +2625,7 @@
       }), true);
       res
           .get(arg_project, arg_instance, arg_database, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Database response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatabase(response);
       })));
     });
@@ -2701,7 +2701,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2773,7 +2773,7 @@
       }), true);
       res
           .list(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DatabasesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatabasesListResponse(response);
       })));
     });
@@ -2854,7 +2854,7 @@
       res
           .patch(arg_request, arg_project, arg_instance, arg_database,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2935,7 +2935,7 @@
       res
           .update(arg_request, arg_project, arg_instance, arg_database,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -2992,7 +2992,7 @@
       }), true);
       res
           .list(databaseVersion: arg_databaseVersion, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.FlagsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkFlagsListResponse(response);
       })));
     });
@@ -3070,7 +3070,7 @@
       }), true);
       res
           .clone(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3136,7 +3136,7 @@
       }), true);
       res
           .delete(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3213,7 +3213,7 @@
       res
           .demoteMaster(arg_request, arg_project, arg_instance,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3289,7 +3289,7 @@
       }), true);
       res
           .export(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3366,7 +3366,7 @@
       res
           .failover(arg_request, arg_project, arg_instance,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3432,7 +3432,7 @@
       }), true);
       res
           .get(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.DatabaseInstance response) {
+          .then(unittest.expectAsync1(((response) {
         checkDatabaseInstance(response);
       })));
     });
@@ -3508,7 +3508,7 @@
       }), true);
       res
           .import(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3574,7 +3574,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3648,7 +3648,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.InstancesListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkInstancesListResponse(response);
       })));
     });
@@ -3718,7 +3718,7 @@
       }), true);
       res
           .patch(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3790,7 +3790,7 @@
       }), true);
       res
           .promoteReplica(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3862,7 +3862,7 @@
       }), true);
       res
           .resetSslConfig(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -3934,7 +3934,7 @@
       }), true);
       res
           .restart(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4011,7 +4011,7 @@
       res
           .restoreBackup(arg_request, arg_project, arg_instance,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4083,7 +4083,7 @@
       }), true);
       res
           .startReplica(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4155,7 +4155,7 @@
       }), true);
       res
           .stopReplica(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4232,7 +4232,7 @@
       res
           .truncateLog(arg_request, arg_project, arg_instance,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4302,7 +4302,7 @@
       }), true);
       res
           .update(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4370,7 +4370,7 @@
       }), true);
       res
           .get(arg_project, arg_operation, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4444,7 +4444,7 @@
               maxResults: arg_maxResults,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.OperationsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperationsListResponse(response);
       })));
     });
@@ -4523,7 +4523,7 @@
       res
           .createEphemeral(arg_request, arg_project, arg_instance,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SslCert response) {
+          .then(unittest.expectAsync1(((response) {
         checkSslCert(response);
       })));
     });
@@ -4600,7 +4600,7 @@
       res
           .delete(arg_project, arg_instance, arg_sha1Fingerprint,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -4677,7 +4677,7 @@
       res
           .get(arg_project, arg_instance, arg_sha1Fingerprint,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SslCert response) {
+          .then(unittest.expectAsync1(((response) {
         checkSslCert(response);
       })));
     });
@@ -4753,7 +4753,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SslCertsInsertResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSslCertsInsertResponse(response);
       })));
     });
@@ -4825,7 +4825,7 @@
       }), true);
       res
           .list(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.SslCertsListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkSslCertsListResponse(response);
       })));
     });
@@ -4889,7 +4889,7 @@
       }), true);
       res
           .list(arg_project, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TiersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkTiersListResponse(response);
       })));
     });
@@ -4968,7 +4968,7 @@
       res
           .delete(arg_project, arg_instance, arg_host, arg_name,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5044,7 +5044,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -5116,7 +5116,7 @@
       }), true);
       res
           .list(arg_project, arg_instance, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.UsersListResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkUsersListResponse(response);
       })));
     });
@@ -5197,7 +5197,7 @@
       res
           .update(arg_request, arg_project, arg_instance, arg_host, arg_name,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/taskqueue/v1beta2_test.dart b/generated/googleapis_beta/test/taskqueue/v1beta2_test.dart
index a9d5c5d..f1cb5ad 100644
--- a/generated/googleapis_beta/test/taskqueue/v1beta2_test.dart
+++ b/generated/googleapis_beta/test/taskqueue/v1beta2_test.dart
@@ -83,40 +83,40 @@
   buildCounterTask--;
 }
 
-buildUnnamed4269() {
+buildUnnamed4492() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4269(core.List<core.String> o) {
+checkUnnamed4492(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4270() {
+buildUnnamed4493() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4270(core.List<core.String> o) {
+checkUnnamed4493(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed4271() {
+buildUnnamed4494() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed4271(core.List<core.String> o) {
+checkUnnamed4494(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -127,9 +127,9 @@
   var o = new api.TaskQueueAcl();
   buildCounterTaskQueueAcl++;
   if (buildCounterTaskQueueAcl < 3) {
-    o.adminEmails = buildUnnamed4269();
-    o.consumerEmails = buildUnnamed4270();
-    o.producerEmails = buildUnnamed4271();
+    o.adminEmails = buildUnnamed4492();
+    o.consumerEmails = buildUnnamed4493();
+    o.producerEmails = buildUnnamed4494();
   }
   buildCounterTaskQueueAcl--;
   return o;
@@ -138,9 +138,9 @@
 checkTaskQueueAcl(api.TaskQueueAcl o) {
   buildCounterTaskQueueAcl++;
   if (buildCounterTaskQueueAcl < 3) {
-    checkUnnamed4269(o.adminEmails);
-    checkUnnamed4270(o.consumerEmails);
-    checkUnnamed4271(o.producerEmails);
+    checkUnnamed4492(o.adminEmails);
+    checkUnnamed4493(o.consumerEmails);
+    checkUnnamed4494(o.producerEmails);
   }
   buildCounterTaskQueueAcl--;
 }
@@ -197,14 +197,14 @@
   buildCounterTaskQueue--;
 }
 
-buildUnnamed4272() {
+buildUnnamed4495() {
   var o = new core.List<api.Task>();
   o.add(buildTask());
   o.add(buildTask());
   return o;
 }
 
-checkUnnamed4272(core.List<api.Task> o) {
+checkUnnamed4495(core.List<api.Task> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTask(o[0]);
   checkTask(o[1]);
@@ -215,7 +215,7 @@
   var o = new api.Tasks();
   buildCounterTasks++;
   if (buildCounterTasks < 3) {
-    o.items = buildUnnamed4272();
+    o.items = buildUnnamed4495();
     o.kind = "foo";
   }
   buildCounterTasks--;
@@ -225,20 +225,20 @@
 checkTasks(api.Tasks o) {
   buildCounterTasks++;
   if (buildCounterTasks < 3) {
-    checkUnnamed4272(o.items);
+    checkUnnamed4495(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTasks--;
 }
 
-buildUnnamed4273() {
+buildUnnamed4496() {
   var o = new core.List<api.Task>();
   o.add(buildTask());
   o.add(buildTask());
   return o;
 }
 
-checkUnnamed4273(core.List<api.Task> o) {
+checkUnnamed4496(core.List<api.Task> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTask(o[0]);
   checkTask(o[1]);
@@ -249,7 +249,7 @@
   var o = new api.Tasks2();
   buildCounterTasks2++;
   if (buildCounterTasks2 < 3) {
-    o.items = buildUnnamed4273();
+    o.items = buildUnnamed4496();
     o.kind = "foo";
   }
   buildCounterTasks2--;
@@ -259,7 +259,7 @@
 checkTasks2(api.Tasks2 o) {
   buildCounterTasks2++;
   if (buildCounterTasks2 < 3) {
-    checkUnnamed4273(o.items);
+    checkUnnamed4496(o.items);
     unittest.expect(o.kind, unittest.equals('foo'));
   }
   buildCounterTasks2--;
@@ -362,7 +362,7 @@
       res
           .get(arg_project, arg_taskqueue,
               getStats: arg_getStats, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TaskQueue response) {
+          .then(unittest.expectAsync1(((response) {
         checkTaskQueue(response);
       })));
     });
@@ -460,7 +460,7 @@
       }), true);
       res
           .get(arg_project, arg_taskqueue, arg_task, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -512,7 +512,7 @@
       }), true);
       res
           .insert(arg_request, arg_project, arg_taskqueue, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -572,7 +572,7 @@
       res
           .lease(arg_project, arg_taskqueue, arg_numTasks, arg_leaseSecs,
               groupByTag: arg_groupByTag, tag: arg_tag, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Tasks response) {
+          .then(unittest.expectAsync1(((response) {
         checkTasks(response);
       })));
     });
@@ -620,7 +620,7 @@
       }), true);
       res
           .list(arg_project, arg_taskqueue, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Tasks2 response) {
+          .then(unittest.expectAsync1(((response) {
         checkTasks2(response);
       })));
     });
@@ -678,7 +678,7 @@
           .patch(arg_request, arg_project, arg_taskqueue, arg_task,
               arg_newLeaseSeconds,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
@@ -736,7 +736,7 @@
           .update(arg_request, arg_project, arg_taskqueue, arg_task,
               arg_newLeaseSeconds,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Task response) {
+          .then(unittest.expectAsync1(((response) {
         checkTask(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/toolresults/v1beta3_test.dart b/generated/googleapis_beta/test/toolresults/v1beta3_test.dart
index 1f58505..1a41459 100644
--- a/generated/googleapis_beta/test/toolresults/v1beta3_test.dart
+++ b/generated/googleapis_beta/test/toolresults/v1beta3_test.dart
@@ -75,14 +75,14 @@
   buildCounterAndroidAppInfo--;
 }
 
-buildUnnamed3878() {
+buildUnnamed4329() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3878(core.List<core.String> o) {
+checkUnnamed4329(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -95,7 +95,7 @@
   if (buildCounterAndroidInstrumentationTest < 3) {
     o.testPackageId = "foo";
     o.testRunnerClass = "foo";
-    o.testTargets = buildUnnamed3878();
+    o.testTargets = buildUnnamed4329();
     o.useOrchestrator = true;
   }
   buildCounterAndroidInstrumentationTest--;
@@ -107,7 +107,7 @@
   if (buildCounterAndroidInstrumentationTest < 3) {
     unittest.expect(o.testPackageId, unittest.equals('foo'));
     unittest.expect(o.testRunnerClass, unittest.equals('foo'));
-    checkUnnamed3878(o.testTargets);
+    checkUnnamed4329(o.testTargets);
     unittest.expect(o.useOrchestrator, unittest.isTrue);
   }
   buildCounterAndroidInstrumentationTest--;
@@ -230,14 +230,14 @@
   buildCounterBasicPerfSampleSeries--;
 }
 
-buildUnnamed3879() {
+buildUnnamed4330() {
   var o = new core.List<api.PerfSample>();
   o.add(buildPerfSample());
   o.add(buildPerfSample());
   return o;
 }
 
-checkUnnamed3879(core.List<api.PerfSample> o) {
+checkUnnamed4330(core.List<api.PerfSample> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerfSample(o[0]);
   checkPerfSample(o[1]);
@@ -248,7 +248,7 @@
   var o = new api.BatchCreatePerfSamplesRequest();
   buildCounterBatchCreatePerfSamplesRequest++;
   if (buildCounterBatchCreatePerfSamplesRequest < 3) {
-    o.perfSamples = buildUnnamed3879();
+    o.perfSamples = buildUnnamed4330();
   }
   buildCounterBatchCreatePerfSamplesRequest--;
   return o;
@@ -257,19 +257,19 @@
 checkBatchCreatePerfSamplesRequest(api.BatchCreatePerfSamplesRequest o) {
   buildCounterBatchCreatePerfSamplesRequest++;
   if (buildCounterBatchCreatePerfSamplesRequest < 3) {
-    checkUnnamed3879(o.perfSamples);
+    checkUnnamed4330(o.perfSamples);
   }
   buildCounterBatchCreatePerfSamplesRequest--;
 }
 
-buildUnnamed3880() {
+buildUnnamed4331() {
   var o = new core.List<api.PerfSample>();
   o.add(buildPerfSample());
   o.add(buildPerfSample());
   return o;
 }
 
-checkUnnamed3880(core.List<api.PerfSample> o) {
+checkUnnamed4331(core.List<api.PerfSample> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerfSample(o[0]);
   checkPerfSample(o[1]);
@@ -280,7 +280,7 @@
   var o = new api.BatchCreatePerfSamplesResponse();
   buildCounterBatchCreatePerfSamplesResponse++;
   if (buildCounterBatchCreatePerfSamplesResponse < 3) {
-    o.perfSamples = buildUnnamed3880();
+    o.perfSamples = buildUnnamed4331();
   }
   buildCounterBatchCreatePerfSamplesResponse--;
   return o;
@@ -289,7 +289,7 @@
 checkBatchCreatePerfSamplesResponse(api.BatchCreatePerfSamplesResponse o) {
   buildCounterBatchCreatePerfSamplesResponse++;
   if (buildCounterBatchCreatePerfSamplesResponse < 3) {
-    checkUnnamed3880(o.perfSamples);
+    checkUnnamed4331(o.perfSamples);
   }
   buildCounterBatchCreatePerfSamplesResponse--;
 }
@@ -415,14 +415,14 @@
   buildCounterFileReference--;
 }
 
-buildUnnamed3881() {
+buildUnnamed4332() {
   var o = new core.List<api.GraphicsStatsBucket>();
   o.add(buildGraphicsStatsBucket());
   o.add(buildGraphicsStatsBucket());
   return o;
 }
 
-checkUnnamed3881(core.List<api.GraphicsStatsBucket> o) {
+checkUnnamed4332(core.List<api.GraphicsStatsBucket> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGraphicsStatsBucket(o[0]);
   checkGraphicsStatsBucket(o[1]);
@@ -433,7 +433,7 @@
   var o = new api.GraphicsStats();
   buildCounterGraphicsStats++;
   if (buildCounterGraphicsStats < 3) {
-    o.buckets = buildUnnamed3881();
+    o.buckets = buildUnnamed4332();
     o.highInputLatencyCount = "foo";
     o.jankyFrames = "foo";
     o.missedVsyncCount = "foo";
@@ -453,7 +453,7 @@
 checkGraphicsStats(api.GraphicsStats o) {
   buildCounterGraphicsStats++;
   if (buildCounterGraphicsStats < 3) {
-    checkUnnamed3881(o.buckets);
+    checkUnnamed4332(o.buckets);
     unittest.expect(o.highInputLatencyCount, unittest.equals('foo'));
     unittest.expect(o.jankyFrames, unittest.equals('foo'));
     unittest.expect(o.missedVsyncCount, unittest.equals('foo'));
@@ -559,14 +559,14 @@
   buildCounterInconclusiveDetail--;
 }
 
-buildUnnamed3882() {
+buildUnnamed4333() {
   var o = new core.List<api.Execution>();
   o.add(buildExecution());
   o.add(buildExecution());
   return o;
 }
 
-checkUnnamed3882(core.List<api.Execution> o) {
+checkUnnamed4333(core.List<api.Execution> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkExecution(o[0]);
   checkExecution(o[1]);
@@ -577,7 +577,7 @@
   var o = new api.ListExecutionsResponse();
   buildCounterListExecutionsResponse++;
   if (buildCounterListExecutionsResponse < 3) {
-    o.executions = buildUnnamed3882();
+    o.executions = buildUnnamed4333();
     o.nextPageToken = "foo";
   }
   buildCounterListExecutionsResponse--;
@@ -587,20 +587,20 @@
 checkListExecutionsResponse(api.ListExecutionsResponse o) {
   buildCounterListExecutionsResponse++;
   if (buildCounterListExecutionsResponse < 3) {
-    checkUnnamed3882(o.executions);
+    checkUnnamed4333(o.executions);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListExecutionsResponse--;
 }
 
-buildUnnamed3883() {
+buildUnnamed4334() {
   var o = new core.List<api.History>();
   o.add(buildHistory());
   o.add(buildHistory());
   return o;
 }
 
-checkUnnamed3883(core.List<api.History> o) {
+checkUnnamed4334(core.List<api.History> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkHistory(o[0]);
   checkHistory(o[1]);
@@ -611,7 +611,7 @@
   var o = new api.ListHistoriesResponse();
   buildCounterListHistoriesResponse++;
   if (buildCounterListHistoriesResponse < 3) {
-    o.histories = buildUnnamed3883();
+    o.histories = buildUnnamed4334();
     o.nextPageToken = "foo";
   }
   buildCounterListHistoriesResponse--;
@@ -621,20 +621,20 @@
 checkListHistoriesResponse(api.ListHistoriesResponse o) {
   buildCounterListHistoriesResponse++;
   if (buildCounterListHistoriesResponse < 3) {
-    checkUnnamed3883(o.histories);
+    checkUnnamed4334(o.histories);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListHistoriesResponse--;
 }
 
-buildUnnamed3884() {
+buildUnnamed4335() {
   var o = new core.List<api.PerfSampleSeries>();
   o.add(buildPerfSampleSeries());
   o.add(buildPerfSampleSeries());
   return o;
 }
 
-checkUnnamed3884(core.List<api.PerfSampleSeries> o) {
+checkUnnamed4335(core.List<api.PerfSampleSeries> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerfSampleSeries(o[0]);
   checkPerfSampleSeries(o[1]);
@@ -645,7 +645,7 @@
   var o = new api.ListPerfSampleSeriesResponse();
   buildCounterListPerfSampleSeriesResponse++;
   if (buildCounterListPerfSampleSeriesResponse < 3) {
-    o.perfSampleSeries = buildUnnamed3884();
+    o.perfSampleSeries = buildUnnamed4335();
   }
   buildCounterListPerfSampleSeriesResponse--;
   return o;
@@ -654,19 +654,19 @@
 checkListPerfSampleSeriesResponse(api.ListPerfSampleSeriesResponse o) {
   buildCounterListPerfSampleSeriesResponse++;
   if (buildCounterListPerfSampleSeriesResponse < 3) {
-    checkUnnamed3884(o.perfSampleSeries);
+    checkUnnamed4335(o.perfSampleSeries);
   }
   buildCounterListPerfSampleSeriesResponse--;
 }
 
-buildUnnamed3885() {
+buildUnnamed4336() {
   var o = new core.List<api.PerfSample>();
   o.add(buildPerfSample());
   o.add(buildPerfSample());
   return o;
 }
 
-checkUnnamed3885(core.List<api.PerfSample> o) {
+checkUnnamed4336(core.List<api.PerfSample> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkPerfSample(o[0]);
   checkPerfSample(o[1]);
@@ -678,7 +678,7 @@
   buildCounterListPerfSamplesResponse++;
   if (buildCounterListPerfSamplesResponse < 3) {
     o.nextPageToken = "foo";
-    o.perfSamples = buildUnnamed3885();
+    o.perfSamples = buildUnnamed4336();
   }
   buildCounterListPerfSamplesResponse--;
   return o;
@@ -688,19 +688,19 @@
   buildCounterListPerfSamplesResponse++;
   if (buildCounterListPerfSamplesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3885(o.perfSamples);
+    checkUnnamed4336(o.perfSamples);
   }
   buildCounterListPerfSamplesResponse--;
 }
 
-buildUnnamed3886() {
+buildUnnamed4337() {
   var o = new core.List<api.ScreenshotCluster>();
   o.add(buildScreenshotCluster());
   o.add(buildScreenshotCluster());
   return o;
 }
 
-checkUnnamed3886(core.List<api.ScreenshotCluster> o) {
+checkUnnamed4337(core.List<api.ScreenshotCluster> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkScreenshotCluster(o[0]);
   checkScreenshotCluster(o[1]);
@@ -711,7 +711,7 @@
   var o = new api.ListScreenshotClustersResponse();
   buildCounterListScreenshotClustersResponse++;
   if (buildCounterListScreenshotClustersResponse < 3) {
-    o.clusters = buildUnnamed3886();
+    o.clusters = buildUnnamed4337();
   }
   buildCounterListScreenshotClustersResponse--;
   return o;
@@ -720,19 +720,19 @@
 checkListScreenshotClustersResponse(api.ListScreenshotClustersResponse o) {
   buildCounterListScreenshotClustersResponse++;
   if (buildCounterListScreenshotClustersResponse < 3) {
-    checkUnnamed3886(o.clusters);
+    checkUnnamed4337(o.clusters);
   }
   buildCounterListScreenshotClustersResponse--;
 }
 
-buildUnnamed3887() {
+buildUnnamed4338() {
   var o = new core.List<api.Image>();
   o.add(buildImage());
   o.add(buildImage());
   return o;
 }
 
-checkUnnamed3887(core.List<api.Image> o) {
+checkUnnamed4338(core.List<api.Image> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkImage(o[0]);
   checkImage(o[1]);
@@ -744,7 +744,7 @@
   buildCounterListStepThumbnailsResponse++;
   if (buildCounterListStepThumbnailsResponse < 3) {
     o.nextPageToken = "foo";
-    o.thumbnails = buildUnnamed3887();
+    o.thumbnails = buildUnnamed4338();
   }
   buildCounterListStepThumbnailsResponse--;
   return o;
@@ -754,19 +754,19 @@
   buildCounterListStepThumbnailsResponse++;
   if (buildCounterListStepThumbnailsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3887(o.thumbnails);
+    checkUnnamed4338(o.thumbnails);
   }
   buildCounterListStepThumbnailsResponse--;
 }
 
-buildUnnamed3888() {
+buildUnnamed4339() {
   var o = new core.List<api.Step>();
   o.add(buildStep());
   o.add(buildStep());
   return o;
 }
 
-checkUnnamed3888(core.List<api.Step> o) {
+checkUnnamed4339(core.List<api.Step> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStep(o[0]);
   checkStep(o[1]);
@@ -778,7 +778,7 @@
   buildCounterListStepsResponse++;
   if (buildCounterListStepsResponse < 3) {
     o.nextPageToken = "foo";
-    o.steps = buildUnnamed3888();
+    o.steps = buildUnnamed4339();
   }
   buildCounterListStepsResponse--;
   return o;
@@ -788,7 +788,7 @@
   buildCounterListStepsResponse++;
   if (buildCounterListStepsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed3888(o.steps);
+    checkUnnamed4339(o.steps);
   }
   buildCounterListStepsResponse--;
 }
@@ -862,14 +862,14 @@
   buildCounterPerfEnvironment--;
 }
 
-buildUnnamed3889() {
+buildUnnamed4340() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3889(core.List<core.String> o) {
+checkUnnamed4340(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -885,7 +885,7 @@
     o.graphicsStats = buildGraphicsStats();
     o.historyId = "foo";
     o.perfEnvironment = buildPerfEnvironment();
-    o.perfMetrics = buildUnnamed3889();
+    o.perfMetrics = buildUnnamed4340();
     o.projectId = "foo";
     o.stepId = "foo";
   }
@@ -901,7 +901,7 @@
     checkGraphicsStats(o.graphicsStats);
     unittest.expect(o.historyId, unittest.equals('foo'));
     checkPerfEnvironment(o.perfEnvironment);
-    checkUnnamed3889(o.perfMetrics);
+    checkUnnamed4340(o.perfMetrics);
     unittest.expect(o.projectId, unittest.equals('foo'));
     unittest.expect(o.stepId, unittest.equals('foo'));
   }
@@ -979,14 +979,14 @@
   buildCounterProjectSettings--;
 }
 
-buildUnnamed3890() {
+buildUnnamed4341() {
   var o = new core.List<api.FileReference>();
   o.add(buildFileReference());
   o.add(buildFileReference());
   return o;
 }
 
-checkUnnamed3890(core.List<api.FileReference> o) {
+checkUnnamed4341(core.List<api.FileReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFileReference(o[0]);
   checkFileReference(o[1]);
@@ -997,7 +997,7 @@
   var o = new api.PublishXunitXmlFilesRequest();
   buildCounterPublishXunitXmlFilesRequest++;
   if (buildCounterPublishXunitXmlFilesRequest < 3) {
-    o.xunitXmlFiles = buildUnnamed3890();
+    o.xunitXmlFiles = buildUnnamed4341();
   }
   buildCounterPublishXunitXmlFilesRequest--;
   return o;
@@ -1006,7 +1006,7 @@
 checkPublishXunitXmlFilesRequest(api.PublishXunitXmlFilesRequest o) {
   buildCounterPublishXunitXmlFilesRequest++;
   if (buildCounterPublishXunitXmlFilesRequest < 3) {
-    checkUnnamed3890(o.xunitXmlFiles);
+    checkUnnamed4341(o.xunitXmlFiles);
   }
   buildCounterPublishXunitXmlFilesRequest--;
 }
@@ -1036,14 +1036,14 @@
   buildCounterScreen--;
 }
 
-buildUnnamed3891() {
+buildUnnamed4342() {
   var o = new core.List<api.Screen>();
   o.add(buildScreen());
   o.add(buildScreen());
   return o;
 }
 
-checkUnnamed3891(core.List<api.Screen> o) {
+checkUnnamed4342(core.List<api.Screen> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkScreen(o[0]);
   checkScreen(o[1]);
@@ -1057,7 +1057,7 @@
     o.activity = "foo";
     o.clusterId = "foo";
     o.keyScreen = buildScreen();
-    o.screens = buildUnnamed3891();
+    o.screens = buildUnnamed4342();
   }
   buildCounterScreenshotCluster--;
   return o;
@@ -1069,7 +1069,7 @@
     unittest.expect(o.activity, unittest.equals('foo'));
     unittest.expect(o.clusterId, unittest.equals('foo'));
     checkScreen(o.keyScreen);
-    checkUnnamed3891(o.screens);
+    checkUnnamed4342(o.screens);
   }
   buildCounterScreenshotCluster--;
 }
@@ -1139,14 +1139,14 @@
   buildCounterStackTrace--;
 }
 
-buildUnnamed3892() {
+buildUnnamed4343() {
   var o = new core.List<api.Any>();
   o.add(buildAny());
   o.add(buildAny());
   return o;
 }
 
-checkUnnamed3892(core.List<api.Any> o) {
+checkUnnamed4343(core.List<api.Any> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkAny(o[0]);
   checkAny(o[1]);
@@ -1158,7 +1158,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed3892();
+    o.details = buildUnnamed4343();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -1169,33 +1169,33 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed3892(o.details);
+    checkUnnamed4343(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
 }
 
-buildUnnamed3893() {
+buildUnnamed4344() {
   var o = new core.List<api.StepDimensionValueEntry>();
   o.add(buildStepDimensionValueEntry());
   o.add(buildStepDimensionValueEntry());
   return o;
 }
 
-checkUnnamed3893(core.List<api.StepDimensionValueEntry> o) {
+checkUnnamed4344(core.List<api.StepDimensionValueEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStepDimensionValueEntry(o[0]);
   checkStepDimensionValueEntry(o[1]);
 }
 
-buildUnnamed3894() {
+buildUnnamed4345() {
   var o = new core.List<api.StepLabelsEntry>();
   o.add(buildStepLabelsEntry());
   o.add(buildStepLabelsEntry());
   return o;
 }
 
-checkUnnamed3894(core.List<api.StepLabelsEntry> o) {
+checkUnnamed4345(core.List<api.StepLabelsEntry> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkStepLabelsEntry(o[0]);
   checkStepLabelsEntry(o[1]);
@@ -1210,9 +1210,9 @@
     o.creationTime = buildTimestamp();
     o.description = "foo";
     o.deviceUsageDuration = buildDuration();
-    o.dimensionValue = buildUnnamed3893();
+    o.dimensionValue = buildUnnamed4344();
     o.hasImages = true;
-    o.labels = buildUnnamed3894();
+    o.labels = buildUnnamed4345();
     o.name = "foo";
     o.outcome = buildOutcome();
     o.runDuration = buildDuration();
@@ -1232,9 +1232,9 @@
     checkTimestamp(o.creationTime);
     unittest.expect(o.description, unittest.equals('foo'));
     checkDuration(o.deviceUsageDuration);
-    checkUnnamed3893(o.dimensionValue);
+    checkUnnamed4344(o.dimensionValue);
     unittest.expect(o.hasImages, unittest.isTrue);
-    checkUnnamed3894(o.labels);
+    checkUnnamed4345(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     checkOutcome(o.outcome);
     checkDuration(o.runDuration);
@@ -1330,27 +1330,27 @@
   buildCounterTestCaseReference--;
 }
 
-buildUnnamed3895() {
+buildUnnamed4346() {
   var o = new core.List<api.TestIssue>();
   o.add(buildTestIssue());
   o.add(buildTestIssue());
   return o;
 }
 
-checkUnnamed3895(core.List<api.TestIssue> o) {
+checkUnnamed4346(core.List<api.TestIssue> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTestIssue(o[0]);
   checkTestIssue(o[1]);
 }
 
-buildUnnamed3896() {
+buildUnnamed4347() {
   var o = new core.List<api.TestSuiteOverview>();
   o.add(buildTestSuiteOverview());
   o.add(buildTestSuiteOverview());
   return o;
 }
 
-checkUnnamed3896(core.List<api.TestSuiteOverview> o) {
+checkUnnamed4347(core.List<api.TestSuiteOverview> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTestSuiteOverview(o[0]);
   checkTestSuiteOverview(o[1]);
@@ -1361,8 +1361,8 @@
   var o = new api.TestExecutionStep();
   buildCounterTestExecutionStep++;
   if (buildCounterTestExecutionStep < 3) {
-    o.testIssues = buildUnnamed3895();
-    o.testSuiteOverviews = buildUnnamed3896();
+    o.testIssues = buildUnnamed4346();
+    o.testSuiteOverviews = buildUnnamed4347();
     o.testTiming = buildTestTiming();
     o.toolExecution = buildToolExecution();
   }
@@ -1373,8 +1373,8 @@
 checkTestExecutionStep(api.TestExecutionStep o) {
   buildCounterTestExecutionStep++;
   if (buildCounterTestExecutionStep < 3) {
-    checkUnnamed3895(o.testIssues);
-    checkUnnamed3896(o.testSuiteOverviews);
+    checkUnnamed4346(o.testIssues);
+    checkUnnamed4347(o.testSuiteOverviews);
     checkTestTiming(o.testTiming);
     checkToolExecution(o.toolExecution);
   }
@@ -1502,40 +1502,40 @@
   buildCounterTimestamp--;
 }
 
-buildUnnamed3897() {
+buildUnnamed4348() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3897(core.List<core.String> o) {
+checkUnnamed4348(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
 }
 
-buildUnnamed3898() {
+buildUnnamed4349() {
   var o = new core.List<api.FileReference>();
   o.add(buildFileReference());
   o.add(buildFileReference());
   return o;
 }
 
-checkUnnamed3898(core.List<api.FileReference> o) {
+checkUnnamed4349(core.List<api.FileReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkFileReference(o[0]);
   checkFileReference(o[1]);
 }
 
-buildUnnamed3899() {
+buildUnnamed4350() {
   var o = new core.List<api.ToolOutputReference>();
   o.add(buildToolOutputReference());
   o.add(buildToolOutputReference());
   return o;
 }
 
-checkUnnamed3899(core.List<api.ToolOutputReference> o) {
+checkUnnamed4350(core.List<api.ToolOutputReference> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkToolOutputReference(o[0]);
   checkToolOutputReference(o[1]);
@@ -1546,10 +1546,10 @@
   var o = new api.ToolExecution();
   buildCounterToolExecution++;
   if (buildCounterToolExecution < 3) {
-    o.commandLineArguments = buildUnnamed3897();
+    o.commandLineArguments = buildUnnamed4348();
     o.exitCode = buildToolExitCode();
-    o.toolLogs = buildUnnamed3898();
-    o.toolOutputs = buildUnnamed3899();
+    o.toolLogs = buildUnnamed4349();
+    o.toolOutputs = buildUnnamed4350();
   }
   buildCounterToolExecution--;
   return o;
@@ -1558,10 +1558,10 @@
 checkToolExecution(api.ToolExecution o) {
   buildCounterToolExecution++;
   if (buildCounterToolExecution < 3) {
-    checkUnnamed3897(o.commandLineArguments);
+    checkUnnamed4348(o.commandLineArguments);
     checkToolExitCode(o.exitCode);
-    checkUnnamed3898(o.toolLogs);
-    checkUnnamed3899(o.toolOutputs);
+    checkUnnamed4349(o.toolLogs);
+    checkUnnamed4350(o.toolOutputs);
   }
   buildCounterToolExecution--;
 }
@@ -1627,14 +1627,14 @@
   buildCounterToolOutputReference--;
 }
 
-buildUnnamed3900() {
+buildUnnamed4351() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3900(core.List<core.String> o) {
+checkUnnamed4351(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -2124,7 +2124,7 @@
       }), true);
       res
           .getSettings(arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProjectSettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkProjectSettings(response);
       })));
     });
@@ -2171,7 +2171,7 @@
       }), true);
       res
           .initializeSettings(arg_projectId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ProjectSettings response) {
+          .then(unittest.expectAsync1(((response) {
         checkProjectSettings(response);
       })));
     });
@@ -2229,7 +2229,7 @@
       res
           .create(arg_request, arg_projectId,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.History response) {
+          .then(unittest.expectAsync1(((response) {
         checkHistory(response);
       })));
     });
@@ -2278,7 +2278,7 @@
       }), true);
       res
           .get(arg_projectId, arg_historyId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.History response) {
+          .then(unittest.expectAsync1(((response) {
         checkHistory(response);
       })));
     });
@@ -2339,7 +2339,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListHistoriesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListHistoriesResponse(response);
       })));
     });
@@ -2398,7 +2398,7 @@
       res
           .create(arg_request, arg_projectId, arg_historyId,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Execution response) {
+          .then(unittest.expectAsync1(((response) {
         checkExecution(response);
       })));
     });
@@ -2449,7 +2449,7 @@
       res
           .get(arg_projectId, arg_historyId, arg_executionId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Execution response) {
+          .then(unittest.expectAsync1(((response) {
         checkExecution(response);
       })));
     });
@@ -2507,7 +2507,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListExecutionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListExecutionsResponse(response);
       })));
     });
@@ -2565,7 +2565,7 @@
       res
           .patch(arg_request, arg_projectId, arg_historyId, arg_executionId,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Execution response) {
+          .then(unittest.expectAsync1(((response) {
         checkExecution(response);
       })));
     });
@@ -2619,7 +2619,7 @@
       res
           .get(arg_projectId, arg_historyId, arg_executionId, arg_clusterId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ScreenshotCluster response) {
+          .then(unittest.expectAsync1(((response) {
         checkScreenshotCluster(response);
       })));
     });
@@ -2670,8 +2670,7 @@
       res
           .list(arg_projectId, arg_historyId, arg_executionId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListScreenshotClustersResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListScreenshotClustersResponse(response);
       })));
     });
@@ -2731,7 +2730,7 @@
       res
           .create(arg_request, arg_projectId, arg_historyId, arg_executionId,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Step response) {
+          .then(unittest.expectAsync1(((response) {
         checkStep(response);
       })));
     });
@@ -2783,7 +2782,7 @@
       res
           .get(arg_projectId, arg_historyId, arg_executionId, arg_stepId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Step response) {
+          .then(unittest.expectAsync1(((response) {
         checkStep(response);
       })));
     });
@@ -2836,7 +2835,7 @@
           .getPerfMetricsSummary(
               arg_projectId, arg_historyId, arg_executionId, arg_stepId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PerfMetricsSummary response) {
+          .then(unittest.expectAsync1(((response) {
         checkPerfMetricsSummary(response);
       })));
     });
@@ -2895,7 +2894,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListStepsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListStepsResponse(response);
       })));
     });
@@ -2955,7 +2954,7 @@
           .patch(arg_request, arg_projectId, arg_historyId, arg_executionId,
               arg_stepId,
               requestId: arg_requestId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Step response) {
+          .then(unittest.expectAsync1(((response) {
         checkStep(response);
       })));
     });
@@ -3012,7 +3011,7 @@
           .publishXunitXmlFiles(arg_request, arg_projectId, arg_historyId,
               arg_executionId, arg_stepId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Step response) {
+          .then(unittest.expectAsync1(((response) {
         checkStep(response);
       })));
     });
@@ -3078,7 +3077,7 @@
           .create(arg_request, arg_projectId, arg_historyId, arg_executionId,
               arg_stepId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PerfMetricsSummary response) {
+          .then(unittest.expectAsync1(((response) {
         checkPerfMetricsSummary(response);
       })));
     });
@@ -3144,7 +3143,7 @@
           .create(arg_request, arg_projectId, arg_historyId, arg_executionId,
               arg_stepId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PerfSampleSeries response) {
+          .then(unittest.expectAsync1(((response) {
         checkPerfSampleSeries(response);
       })));
     });
@@ -3203,7 +3202,7 @@
           .get(arg_projectId, arg_historyId, arg_executionId, arg_stepId,
               arg_sampleSeriesId,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.PerfSampleSeries response) {
+          .then(unittest.expectAsync1(((response) {
         checkPerfSampleSeries(response);
       })));
     });
@@ -3221,7 +3220,7 @@
       var arg_historyId = "foo";
       var arg_executionId = "foo";
       var arg_stepId = "foo";
-      var arg_filter = buildUnnamed3900();
+      var arg_filter = buildUnnamed4351();
       var arg_$fields = "foo";
       mock.register(unittest.expectAsync2((http.BaseRequest req, json) {
         var path = (req.url).path;
@@ -3262,8 +3261,7 @@
       res
           .list(arg_projectId, arg_historyId, arg_executionId, arg_stepId,
               filter: arg_filter, $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListPerfSampleSeriesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListPerfSampleSeriesResponse(response);
       })));
     });
@@ -3331,8 +3329,7 @@
           .batchCreate(arg_request, arg_projectId, arg_historyId,
               arg_executionId, arg_stepId, arg_sampleSeriesId,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.BatchCreatePerfSamplesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkBatchCreatePerfSamplesResponse(response);
       })));
     });
@@ -3400,7 +3397,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListPerfSamplesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListPerfSamplesResponse(response);
       })));
     });
@@ -3468,8 +3465,7 @@
               pageSize: arg_pageSize,
               pageToken: arg_pageToken,
               $fields: arg_$fields)
-          .then(
-              unittest.expectAsync1(((api.ListStepThumbnailsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListStepThumbnailsResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/tpu/v1alpha1_test.dart b/generated/googleapis_beta/test/tpu/v1alpha1_test.dart
index 0f8770c..9778d8d 100644
--- a/generated/googleapis_beta/test/tpu/v1alpha1_test.dart
+++ b/generated/googleapis_beta/test/tpu/v1alpha1_test.dart
@@ -65,14 +65,14 @@
   buildCounterEmpty--;
 }
 
-buildUnnamed4089() {
+buildUnnamed3990() {
   var o = new core.List<api.Location>();
   o.add(buildLocation());
   o.add(buildLocation());
   return o;
 }
 
-checkUnnamed4089(core.List<api.Location> o) {
+checkUnnamed3990(core.List<api.Location> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkLocation(o[0]);
   checkLocation(o[1]);
@@ -83,7 +83,7 @@
   var o = new api.ListLocationsResponse();
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    o.locations = buildUnnamed4089();
+    o.locations = buildUnnamed3990();
     o.nextPageToken = "foo";
   }
   buildCounterListLocationsResponse--;
@@ -93,20 +93,20 @@
 checkListLocationsResponse(api.ListLocationsResponse o) {
   buildCounterListLocationsResponse++;
   if (buildCounterListLocationsResponse < 3) {
-    checkUnnamed4089(o.locations);
+    checkUnnamed3990(o.locations);
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
   }
   buildCounterListLocationsResponse--;
 }
 
-buildUnnamed4090() {
+buildUnnamed3991() {
   var o = new core.List<api.Node>();
   o.add(buildNode());
   o.add(buildNode());
   return o;
 }
 
-checkUnnamed4090(core.List<api.Node> o) {
+checkUnnamed3991(core.List<api.Node> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNode(o[0]);
   checkNode(o[1]);
@@ -118,7 +118,7 @@
   buildCounterListNodesResponse++;
   if (buildCounterListNodesResponse < 3) {
     o.nextPageToken = "foo";
-    o.nodes = buildUnnamed4090();
+    o.nodes = buildUnnamed3991();
   }
   buildCounterListNodesResponse--;
   return o;
@@ -128,19 +128,19 @@
   buildCounterListNodesResponse++;
   if (buildCounterListNodesResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4090(o.nodes);
+    checkUnnamed3991(o.nodes);
   }
   buildCounterListNodesResponse--;
 }
 
-buildUnnamed4091() {
+buildUnnamed3992() {
   var o = new core.List<api.Operation>();
   o.add(buildOperation());
   o.add(buildOperation());
   return o;
 }
 
-checkUnnamed4091(core.List<api.Operation> o) {
+checkUnnamed3992(core.List<api.Operation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkOperation(o[0]);
   checkOperation(o[1]);
@@ -152,7 +152,7 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     o.nextPageToken = "foo";
-    o.operations = buildUnnamed4091();
+    o.operations = buildUnnamed3992();
   }
   buildCounterListOperationsResponse--;
   return o;
@@ -162,19 +162,19 @@
   buildCounterListOperationsResponse++;
   if (buildCounterListOperationsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4091(o.operations);
+    checkUnnamed3992(o.operations);
   }
   buildCounterListOperationsResponse--;
 }
 
-buildUnnamed4092() {
+buildUnnamed3993() {
   var o = new core.List<api.TensorFlowVersion>();
   o.add(buildTensorFlowVersion());
   o.add(buildTensorFlowVersion());
   return o;
 }
 
-checkUnnamed4092(core.List<api.TensorFlowVersion> o) {
+checkUnnamed3993(core.List<api.TensorFlowVersion> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkTensorFlowVersion(o[0]);
   checkTensorFlowVersion(o[1]);
@@ -186,7 +186,7 @@
   buildCounterListTensorFlowVersionsResponse++;
   if (buildCounterListTensorFlowVersionsResponse < 3) {
     o.nextPageToken = "foo";
-    o.tensorflowVersions = buildUnnamed4092();
+    o.tensorflowVersions = buildUnnamed3993();
   }
   buildCounterListTensorFlowVersionsResponse--;
   return o;
@@ -196,25 +196,25 @@
   buildCounterListTensorFlowVersionsResponse++;
   if (buildCounterListTensorFlowVersionsResponse < 3) {
     unittest.expect(o.nextPageToken, unittest.equals('foo'));
-    checkUnnamed4092(o.tensorflowVersions);
+    checkUnnamed3993(o.tensorflowVersions);
   }
   buildCounterListTensorFlowVersionsResponse--;
 }
 
-buildUnnamed4093() {
+buildUnnamed3994() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4093(core.Map<core.String, core.String> o) {
+checkUnnamed3994(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed4094() {
+buildUnnamed3995() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -229,7 +229,7 @@
   return o;
 }
 
-checkUnnamed4094(core.Map<core.String, core.Object> o) {
+checkUnnamed3995(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -248,9 +248,9 @@
   var o = new api.Location();
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    o.labels = buildUnnamed4093();
+    o.labels = buildUnnamed3994();
     o.locationId = "foo";
-    o.metadata = buildUnnamed4094();
+    o.metadata = buildUnnamed3995();
     o.name = "foo";
   }
   buildCounterLocation--;
@@ -260,9 +260,9 @@
 checkLocation(api.Location o) {
   buildCounterLocation++;
   if (buildCounterLocation < 3) {
-    checkUnnamed4093(o.labels);
+    checkUnnamed3994(o.labels);
     unittest.expect(o.locationId, unittest.equals('foo'));
-    checkUnnamed4094(o.metadata);
+    checkUnnamed3995(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
   }
   buildCounterLocation--;
@@ -289,27 +289,27 @@
   buildCounterNetworkEndpoint--;
 }
 
-buildUnnamed4095() {
+buildUnnamed3996() {
   var o = new core.Map<core.String, core.String>();
   o["x"] = "foo";
   o["y"] = "foo";
   return o;
 }
 
-checkUnnamed4095(core.Map<core.String, core.String> o) {
+checkUnnamed3996(core.Map<core.String, core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o["x"], unittest.equals('foo'));
   unittest.expect(o["y"], unittest.equals('foo'));
 }
 
-buildUnnamed4096() {
+buildUnnamed3997() {
   var o = new core.List<api.NetworkEndpoint>();
   o.add(buildNetworkEndpoint());
   o.add(buildNetworkEndpoint());
   return o;
 }
 
-checkUnnamed4096(core.List<api.NetworkEndpoint> o) {
+checkUnnamed3997(core.List<api.NetworkEndpoint> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkNetworkEndpoint(o[0]);
   checkNetworkEndpoint(o[1]);
@@ -327,10 +327,10 @@
     o.health = "foo";
     o.healthDescription = "foo";
     o.ipAddress = "foo";
-    o.labels = buildUnnamed4095();
+    o.labels = buildUnnamed3996();
     o.name = "foo";
     o.network = "foo";
-    o.networkEndpoints = buildUnnamed4096();
+    o.networkEndpoints = buildUnnamed3997();
     o.port = "foo";
     o.serviceAccount = "foo";
     o.state = "foo";
@@ -350,10 +350,10 @@
     unittest.expect(o.health, unittest.equals('foo'));
     unittest.expect(o.healthDescription, unittest.equals('foo'));
     unittest.expect(o.ipAddress, unittest.equals('foo'));
-    checkUnnamed4095(o.labels);
+    checkUnnamed3996(o.labels);
     unittest.expect(o.name, unittest.equals('foo'));
     unittest.expect(o.network, unittest.equals('foo'));
-    checkUnnamed4096(o.networkEndpoints);
+    checkUnnamed3997(o.networkEndpoints);
     unittest.expect(o.port, unittest.equals('foo'));
     unittest.expect(o.serviceAccount, unittest.equals('foo'));
     unittest.expect(o.state, unittest.equals('foo'));
@@ -362,7 +362,7 @@
   buildCounterNode--;
 }
 
-buildUnnamed4097() {
+buildUnnamed3998() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -377,7 +377,7 @@
   return o;
 }
 
-checkUnnamed4097(core.Map<core.String, core.Object> o) {
+checkUnnamed3998(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -391,7 +391,7 @@
   unittest.expect(casted4["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4098() {
+buildUnnamed3999() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -406,7 +406,7 @@
   return o;
 }
 
-checkUnnamed4098(core.Map<core.String, core.Object> o) {
+checkUnnamed3999(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -427,9 +427,9 @@
   if (buildCounterOperation < 3) {
     o.done = true;
     o.error = buildStatus();
-    o.metadata = buildUnnamed4097();
+    o.metadata = buildUnnamed3998();
     o.name = "foo";
-    o.response = buildUnnamed4098();
+    o.response = buildUnnamed3999();
   }
   buildCounterOperation--;
   return o;
@@ -440,9 +440,9 @@
   if (buildCounterOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkStatus(o.error);
-    checkUnnamed4097(o.metadata);
+    checkUnnamed3998(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed4098(o.response);
+    checkUnnamed3999(o.response);
   }
   buildCounterOperation--;
 }
@@ -527,7 +527,7 @@
   buildCounterStartNodeRequest--;
 }
 
-buildUnnamed4099() {
+buildUnnamed4000() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -542,7 +542,7 @@
   return o;
 }
 
-checkUnnamed4099(core.Map<core.String, core.Object> o) {
+checkUnnamed4000(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted7 = (o["x"]) as core.Map;
   unittest.expect(casted7, unittest.hasLength(3));
@@ -556,17 +556,17 @@
   unittest.expect(casted8["string"], unittest.equals('foo'));
 }
 
-buildUnnamed4100() {
+buildUnnamed4001() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed4099());
-  o.add(buildUnnamed4099());
+  o.add(buildUnnamed4000());
+  o.add(buildUnnamed4000());
   return o;
 }
 
-checkUnnamed4100(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4001(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed4099(o[0]);
-  checkUnnamed4099(o[1]);
+  checkUnnamed4000(o[0]);
+  checkUnnamed4000(o[1]);
 }
 
 core.int buildCounterStatus = 0;
@@ -575,7 +575,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed4100();
+    o.details = buildUnnamed4001();
     o.message = "foo";
   }
   buildCounterStatus--;
@@ -586,7 +586,7 @@
   buildCounterStatus++;
   if (buildCounterStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed4100(o.details);
+    checkUnnamed4001(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterStatus--;
@@ -805,7 +805,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Location response) {
+          .then(unittest.expectAsync1(((response) {
         checkLocation(response);
       })));
     });
@@ -869,7 +869,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListLocationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListLocationsResponse(response);
       })));
     });
@@ -930,7 +930,7 @@
       res
           .create(arg_request, arg_parent,
               nodeId: arg_nodeId, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -982,7 +982,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1034,7 +1034,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Node response) {
+          .then(unittest.expectAsync1(((response) {
         checkNode(response);
       })));
     });
@@ -1095,7 +1095,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListNodesResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListNodesResponse(response);
       })));
     });
@@ -1151,7 +1151,7 @@
       }), true);
       res
           .reimage(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1207,7 +1207,7 @@
       }), true);
       res
           .reset(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1263,7 +1263,7 @@
       }), true);
       res
           .start(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1319,7 +1319,7 @@
       }), true);
       res
           .stop(arg_request, arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1373,7 +1373,7 @@
       }), true);
       res
           .cancel(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1425,7 +1425,7 @@
       }), true);
       res
           .delete(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Empty response) {
+          .then(unittest.expectAsync1(((response) {
         checkEmpty(response);
       })));
     });
@@ -1477,7 +1477,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.Operation response) {
+          .then(unittest.expectAsync1(((response) {
         checkOperation(response);
       })));
     });
@@ -1541,7 +1541,7 @@
               pageToken: arg_pageToken,
               pageSize: arg_pageSize,
               $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.ListOperationsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListOperationsResponse(response);
       })));
     });
@@ -1595,7 +1595,7 @@
       }), true);
       res
           .get(arg_name, $fields: arg_$fields)
-          .then(unittest.expectAsync1(((api.TensorFlowVersion response) {
+          .then(unittest.expectAsync1(((response) {
         checkTensorFlowVersion(response);
       })));
     });
@@ -1663,8 +1663,7 @@
               pageSize: arg_pageSize,
               filter: arg_filter,
               $fields: arg_$fields)
-          .then(unittest
-              .expectAsync1(((api.ListTensorFlowVersionsResponse response) {
+          .then(unittest.expectAsync1(((response) {
         checkListTensorFlowVersionsResponse(response);
       })));
     });
diff --git a/generated/googleapis_beta/test/videointelligence/v1beta1_test.dart b/generated/googleapis_beta/test/videointelligence/v1beta1_test.dart
index 772c60f..b993bd0 100644
--- a/generated/googleapis_beta/test/videointelligence/v1beta1_test.dart
+++ b/generated/googleapis_beta/test/videointelligence/v1beta1_test.dart
@@ -50,7 +50,7 @@
   return new http.StreamedResponse(stream, status, headers: headers);
 }
 
-buildUnnamed3935() {
+buildUnnamed4439() {
   var o = new core
       .List<api.GoogleCloudVideointelligenceV1VideoAnnotationProgress>();
   o.add(buildGoogleCloudVideointelligenceV1VideoAnnotationProgress());
@@ -58,7 +58,7 @@
   return o;
 }
 
-checkUnnamed3935(
+checkUnnamed4439(
     core.List<api.GoogleCloudVideointelligenceV1VideoAnnotationProgress> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1VideoAnnotationProgress(o[0]);
@@ -70,7 +70,7 @@
   var o = new api.GoogleCloudVideointelligenceV1AnnotateVideoProgress();
   buildCounterGoogleCloudVideointelligenceV1AnnotateVideoProgress++;
   if (buildCounterGoogleCloudVideointelligenceV1AnnotateVideoProgress < 3) {
-    o.annotationProgress = buildUnnamed3935();
+    o.annotationProgress = buildUnnamed4439();
   }
   buildCounterGoogleCloudVideointelligenceV1AnnotateVideoProgress--;
   return o;
@@ -80,12 +80,12 @@
     api.GoogleCloudVideointelligenceV1AnnotateVideoProgress o) {
   buildCounterGoogleCloudVideointelligenceV1AnnotateVideoProgress++;
   if (buildCounterGoogleCloudVideointelligenceV1AnnotateVideoProgress < 3) {
-    checkUnnamed3935(o.annotationProgress);
+    checkUnnamed4439(o.annotationProgress);
   }
   buildCounterGoogleCloudVideointelligenceV1AnnotateVideoProgress--;
 }
 
-buildUnnamed3936() {
+buildUnnamed4440() {
   var o =
       new core.List<api.GoogleCloudVideointelligenceV1VideoAnnotationResults>();
   o.add(buildGoogleCloudVideointelligenceV1VideoAnnotationResults());
@@ -93,7 +93,7 @@
   return o;
 }
 
-checkUnnamed3936(
+checkUnnamed4440(
     core.List<api.GoogleCloudVideointelligenceV1VideoAnnotationResults> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1VideoAnnotationResults(o[0]);
@@ -105,7 +105,7 @@
   var o = new api.GoogleCloudVideointelligenceV1AnnotateVideoResponse();
   buildCounterGoogleCloudVideointelligenceV1AnnotateVideoResponse++;
   if (buildCounterGoogleCloudVideointelligenceV1AnnotateVideoResponse < 3) {
-    o.annotationResults = buildUnnamed3936();
+    o.annotationResults = buildUnnamed4440();
   }
   buildCounterGoogleCloudVideointelligenceV1AnnotateVideoResponse--;
   return o;
@@ -115,7 +115,7 @@
     api.GoogleCloudVideointelligenceV1AnnotateVideoResponse o) {
   buildCounterGoogleCloudVideointelligenceV1AnnotateVideoResponse++;
   if (buildCounterGoogleCloudVideointelligenceV1AnnotateVideoResponse < 3) {
-    checkUnnamed3936(o.annotationResults);
+    checkUnnamed4440(o.annotationResults);
   }
   buildCounterGoogleCloudVideointelligenceV1AnnotateVideoResponse--;
 }
@@ -144,7 +144,7 @@
   buildCounterGoogleCloudVideointelligenceV1Entity--;
 }
 
-buildUnnamed3937() {
+buildUnnamed4441() {
   var o =
       new core.List<api.GoogleCloudVideointelligenceV1ExplicitContentFrame>();
   o.add(buildGoogleCloudVideointelligenceV1ExplicitContentFrame());
@@ -152,7 +152,7 @@
   return o;
 }
 
-checkUnnamed3937(
+checkUnnamed4441(
     core.List<api.GoogleCloudVideointelligenceV1ExplicitContentFrame> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1ExplicitContentFrame(o[0]);
@@ -165,7 +165,7 @@
   var o = new api.GoogleCloudVideointelligenceV1ExplicitContentAnnotation();
   buildCounterGoogleCloudVideointelligenceV1ExplicitContentAnnotation++;
   if (buildCounterGoogleCloudVideointelligenceV1ExplicitContentAnnotation < 3) {
-    o.frames = buildUnnamed3937();
+    o.frames = buildUnnamed4441();
   }
   buildCounterGoogleCloudVideointelligenceV1ExplicitContentAnnotation--;
   return o;
@@ -175,7 +175,7 @@
     api.GoogleCloudVideointelligenceV1ExplicitContentAnnotation o) {
   buildCounterGoogleCloudVideointelligenceV1ExplicitContentAnnotation++;
   if (buildCounterGoogleCloudVideointelligenceV1ExplicitContentAnnotation < 3) {
-    checkUnnamed3937(o.frames);
+    checkUnnamed4441(o.frames);
   }
   buildCounterGoogleCloudVideointelligenceV1ExplicitContentAnnotation--;
 }
@@ -202,40 +202,40 @@
   buildCounterGoogleCloudVideointelligenceV1ExplicitContentFrame--;
 }
 
-buildUnnamed3938() {
+buildUnnamed4442() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1Entity>();
   o.add(buildGoogleCloudVideointelligenceV1Entity());
   o.add(buildGoogleCloudVideointelligenceV1Entity());
   return o;
 }
 
-checkUnnamed3938(core.List<api.GoogleCloudVideointelligenceV1Entity> o) {
+checkUnnamed4442(core.List<api.GoogleCloudVideointelligenceV1Entity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1Entity(o[0]);
   checkGoogleCloudVideointelligenceV1Entity(o[1]);
 }
 
-buildUnnamed3939() {
+buildUnnamed4443() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1LabelFrame>();
   o.add(buildGoogleCloudVideointelligenceV1LabelFrame());
   o.add(buildGoogleCloudVideointelligenceV1LabelFrame());
   return o;
 }
 
-checkUnnamed3939(core.List<api.GoogleCloudVideointelligenceV1LabelFrame> o) {
+checkUnnamed4443(core.List<api.GoogleCloudVideointelligenceV1LabelFrame> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1LabelFrame(o[0]);
   checkGoogleCloudVideointelligenceV1LabelFrame(o[1]);
 }
 
-buildUnnamed3940() {
+buildUnnamed4444() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1LabelSegment>();
   o.add(buildGoogleCloudVideointelligenceV1LabelSegment());
   o.add(buildGoogleCloudVideointelligenceV1LabelSegment());
   return o;
 }
 
-checkUnnamed3940(core.List<api.GoogleCloudVideointelligenceV1LabelSegment> o) {
+checkUnnamed4444(core.List<api.GoogleCloudVideointelligenceV1LabelSegment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1LabelSegment(o[0]);
   checkGoogleCloudVideointelligenceV1LabelSegment(o[1]);
@@ -246,10 +246,10 @@
   var o = new api.GoogleCloudVideointelligenceV1LabelAnnotation();
   buildCounterGoogleCloudVideointelligenceV1LabelAnnotation++;
   if (buildCounterGoogleCloudVideointelligenceV1LabelAnnotation < 3) {
-    o.categoryEntities = buildUnnamed3938();
+    o.categoryEntities = buildUnnamed4442();
     o.entity = buildGoogleCloudVideointelligenceV1Entity();
-    o.frames = buildUnnamed3939();
-    o.segments = buildUnnamed3940();
+    o.frames = buildUnnamed4443();
+    o.segments = buildUnnamed4444();
   }
   buildCounterGoogleCloudVideointelligenceV1LabelAnnotation--;
   return o;
@@ -259,10 +259,10 @@
     api.GoogleCloudVideointelligenceV1LabelAnnotation o) {
   buildCounterGoogleCloudVideointelligenceV1LabelAnnotation++;
   if (buildCounterGoogleCloudVideointelligenceV1LabelAnnotation < 3) {
-    checkUnnamed3938(o.categoryEntities);
+    checkUnnamed4442(o.categoryEntities);
     checkGoogleCloudVideointelligenceV1Entity(o.entity);
-    checkUnnamed3939(o.frames);
-    checkUnnamed3940(o.segments);
+    checkUnnamed4443(o.frames);
+    checkUnnamed4444(o.segments);
   }
   buildCounterGoogleCloudVideointelligenceV1LabelAnnotation--;
 }
@@ -337,55 +337,55 @@
   buildCounterGoogleCloudVideointelligenceV1VideoAnnotationProgress--;
 }
 
-buildUnnamed3941() {
+buildUnnamed4445() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1LabelAnnotation>();
   o.add(buildGoogleCloudVideointelligenceV1LabelAnnotation());
   o.add(buildGoogleCloudVideointelligenceV1LabelAnnotation());
   return o;
 }
 
-checkUnnamed3941(
+checkUnnamed4445(
     core.List<api.GoogleCloudVideointelligenceV1LabelAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1LabelAnnotation(o[0]);
   checkGoogleCloudVideointelligenceV1LabelAnnotation(o[1]);
 }
 
-buildUnnamed3942() {
+buildUnnamed4446() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1LabelAnnotation>();
   o.add(buildGoogleCloudVideointelligenceV1LabelAnnotation());
   o.add(buildGoogleCloudVideointelligenceV1LabelAnnotation());
   return o;
 }
 
-checkUnnamed3942(
+checkUnnamed4446(
     core.List<api.GoogleCloudVideointelligenceV1LabelAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1LabelAnnotation(o[0]);
   checkGoogleCloudVideointelligenceV1LabelAnnotation(o[1]);
 }
 
-buildUnnamed3943() {
+buildUnnamed4447() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1VideoSegment>();
   o.add(buildGoogleCloudVideointelligenceV1VideoSegment());
   o.add(buildGoogleCloudVideointelligenceV1VideoSegment());
   return o;
 }
 
-checkUnnamed3943(core.List<api.GoogleCloudVideointelligenceV1VideoSegment> o) {
+checkUnnamed4447(core.List<api.GoogleCloudVideointelligenceV1VideoSegment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1VideoSegment(o[0]);
   checkGoogleCloudVideointelligenceV1VideoSegment(o[1]);
 }
 
-buildUnnamed3944() {
+buildUnnamed4448() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1LabelAnnotation>();
   o.add(buildGoogleCloudVideointelligenceV1LabelAnnotation());
   o.add(buildGoogleCloudVideointelligenceV1LabelAnnotation());
   return o;
 }
 
-checkUnnamed3944(
+checkUnnamed4448(
     core.List<api.GoogleCloudVideointelligenceV1LabelAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1LabelAnnotation(o[0]);
@@ -400,11 +400,11 @@
     o.error = buildGoogleRpcStatus();
     o.explicitAnnotation =
         buildGoogleCloudVideointelligenceV1ExplicitContentAnnotation();
-    o.frameLabelAnnotations = buildUnnamed3941();
+    o.frameLabelAnnotations = buildUnnamed4445();
     o.inputUri = "foo";
-    o.segmentLabelAnnotations = buildUnnamed3942();
-    o.shotAnnotations = buildUnnamed3943();
-    o.shotLabelAnnotations = buildUnnamed3944();
+    o.segmentLabelAnnotations = buildUnnamed4446();
+    o.shotAnnotations = buildUnnamed4447();
+    o.shotLabelAnnotations = buildUnnamed4448();
   }
   buildCounterGoogleCloudVideointelligenceV1VideoAnnotationResults--;
   return o;
@@ -417,11 +417,11 @@
     checkGoogleRpcStatus(o.error);
     checkGoogleCloudVideointelligenceV1ExplicitContentAnnotation(
         o.explicitAnnotation);
-    checkUnnamed3941(o.frameLabelAnnotations);
+    checkUnnamed4445(o.frameLabelAnnotations);
     unittest.expect(o.inputUri, unittest.equals('foo'));
-    checkUnnamed3942(o.segmentLabelAnnotations);
-    checkUnnamed3943(o.shotAnnotations);
-    checkUnnamed3944(o.shotLabelAnnotations);
+    checkUnnamed4446(o.segmentLabelAnnotations);
+    checkUnnamed4447(o.shotAnnotations);
+    checkUnnamed4448(o.shotLabelAnnotations);
   }
   buildCounterGoogleCloudVideointelligenceV1VideoAnnotationResults--;
 }
@@ -448,7 +448,7 @@
   buildCounterGoogleCloudVideointelligenceV1VideoSegment--;
 }
 
-buildUnnamed3945() {
+buildUnnamed4449() {
   var o = new core
       .List<api.GoogleCloudVideointelligenceV1beta1VideoAnnotationProgress>();
   o.add(buildGoogleCloudVideointelligenceV1beta1VideoAnnotationProgress());
@@ -456,7 +456,7 @@
   return o;
 }
 
-checkUnnamed3945(
+checkUnnamed4449(
     core.List<api.GoogleCloudVideointelligenceV1beta1VideoAnnotationProgress>
         o) {
   unittest.expect(o, unittest.hasLength(2));
@@ -471,7 +471,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoProgress++;
   if (buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoProgress <
       3) {
-    o.annotationProgress = buildUnnamed3945();
+    o.annotationProgress = buildUnnamed4449();
   }
   buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoProgress--;
   return o;
@@ -482,19 +482,19 @@
   buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoProgress++;
   if (buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoProgress <
       3) {
-    checkUnnamed3945(o.annotationProgress);
+    checkUnnamed4449(o.annotationProgress);
   }
   buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoProgress--;
 }
 
-buildUnnamed3946() {
+buildUnnamed4450() {
   var o = new core.List<core.String>();
   o.add("foo");
   o.add("foo");
   return o;
 }
 
-checkUnnamed3946(core.List<core.String> o) {
+checkUnnamed4450(core.List<core.String> o) {
   unittest.expect(o, unittest.hasLength(2));
   unittest.expect(o[0], unittest.equals('foo'));
   unittest.expect(o[1], unittest.equals('foo'));
@@ -506,7 +506,7 @@
   var o = new api.GoogleCloudVideointelligenceV1beta1AnnotateVideoRequest();
   buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoRequest++;
   if (buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoRequest < 3) {
-    o.features = buildUnnamed3946();
+    o.features = buildUnnamed4450();
     o.inputContent = "foo";
     o.inputUri = "foo";
     o.locationId = "foo";
@@ -521,7 +521,7 @@
     api.GoogleCloudVideointelligenceV1beta1AnnotateVideoRequest o) {
   buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoRequest++;
   if (buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoRequest < 3) {
-    checkUnnamed3946(o.features);
+    checkUnnamed4450(o.features);
     unittest.expect(o.inputContent, unittest.equals('foo'));
     unittest.expect(o.inputUri, unittest.equals('foo'));
     unittest.expect(o.locationId, unittest.equals('foo'));
@@ -531,7 +531,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoRequest--;
 }
 
-buildUnnamed3947() {
+buildUnnamed4451() {
   var o = new core
       .List<api.GoogleCloudVideointelligenceV1beta1VideoAnnotationResults>();
   o.add(buildGoogleCloudVideointelligenceV1beta1VideoAnnotationResults());
@@ -539,7 +539,7 @@
   return o;
 }
 
-checkUnnamed3947(
+checkUnnamed4451(
     core.List<api.GoogleCloudVideointelligenceV1beta1VideoAnnotationResults>
         o) {
   unittest.expect(o, unittest.hasLength(2));
@@ -554,7 +554,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoResponse++;
   if (buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoResponse <
       3) {
-    o.annotationResults = buildUnnamed3947();
+    o.annotationResults = buildUnnamed4451();
   }
   buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoResponse--;
   return o;
@@ -565,19 +565,19 @@
   buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoResponse++;
   if (buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoResponse <
       3) {
-    checkUnnamed3947(o.annotationResults);
+    checkUnnamed4451(o.annotationResults);
   }
   buildCounterGoogleCloudVideointelligenceV1beta1AnnotateVideoResponse--;
 }
 
-buildUnnamed3948() {
+buildUnnamed4452() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1beta1LabelLocation>();
   o.add(buildGoogleCloudVideointelligenceV1beta1LabelLocation());
   o.add(buildGoogleCloudVideointelligenceV1beta1LabelLocation());
   return o;
 }
 
-checkUnnamed3948(
+checkUnnamed4452(
     core.List<api.GoogleCloudVideointelligenceV1beta1LabelLocation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta1LabelLocation(o[0]);
@@ -591,7 +591,7 @@
   if (buildCounterGoogleCloudVideointelligenceV1beta1LabelAnnotation < 3) {
     o.description = "foo";
     o.languageCode = "foo";
-    o.locations = buildUnnamed3948();
+    o.locations = buildUnnamed4452();
   }
   buildCounterGoogleCloudVideointelligenceV1beta1LabelAnnotation--;
   return o;
@@ -603,7 +603,7 @@
   if (buildCounterGoogleCloudVideointelligenceV1beta1LabelAnnotation < 3) {
     unittest.expect(o.description, unittest.equals('foo'));
     unittest.expect(o.languageCode, unittest.equals('foo'));
-    checkUnnamed3948(o.locations);
+    checkUnnamed4452(o.locations);
   }
   buildCounterGoogleCloudVideointelligenceV1beta1LabelAnnotation--;
 }
@@ -692,7 +692,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta1VideoAnnotationProgress--;
 }
 
-buildUnnamed3949() {
+buildUnnamed4453() {
   var o =
       new core.List<api.GoogleCloudVideointelligenceV1beta1LabelAnnotation>();
   o.add(buildGoogleCloudVideointelligenceV1beta1LabelAnnotation());
@@ -700,14 +700,14 @@
   return o;
 }
 
-checkUnnamed3949(
+checkUnnamed4453(
     core.List<api.GoogleCloudVideointelligenceV1beta1LabelAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta1LabelAnnotation(o[0]);
   checkGoogleCloudVideointelligenceV1beta1LabelAnnotation(o[1]);
 }
 
-buildUnnamed3950() {
+buildUnnamed4454() {
   var o = new core
       .List<api.GoogleCloudVideointelligenceV1beta1SafeSearchAnnotation>();
   o.add(buildGoogleCloudVideointelligenceV1beta1SafeSearchAnnotation());
@@ -715,21 +715,21 @@
   return o;
 }
 
-checkUnnamed3950(
+checkUnnamed4454(
     core.List<api.GoogleCloudVideointelligenceV1beta1SafeSearchAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta1SafeSearchAnnotation(o[0]);
   checkGoogleCloudVideointelligenceV1beta1SafeSearchAnnotation(o[1]);
 }
 
-buildUnnamed3951() {
+buildUnnamed4455() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1beta1VideoSegment>();
   o.add(buildGoogleCloudVideointelligenceV1beta1VideoSegment());
   o.add(buildGoogleCloudVideointelligenceV1beta1VideoSegment());
   return o;
 }
 
-checkUnnamed3951(
+checkUnnamed4455(
     core.List<api.GoogleCloudVideointelligenceV1beta1VideoSegment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta1VideoSegment(o[0]);
@@ -745,9 +745,9 @@
       3) {
     o.error = buildGoogleRpcStatus();
     o.inputUri = "foo";
-    o.labelAnnotations = buildUnnamed3949();
-    o.safeSearchAnnotations = buildUnnamed3950();
-    o.shotAnnotations = buildUnnamed3951();
+    o.labelAnnotations = buildUnnamed4453();
+    o.safeSearchAnnotations = buildUnnamed4454();
+    o.shotAnnotations = buildUnnamed4455();
   }
   buildCounterGoogleCloudVideointelligenceV1beta1VideoAnnotationResults--;
   return o;
@@ -760,21 +760,21 @@
       3) {
     checkGoogleRpcStatus(o.error);
     unittest.expect(o.inputUri, unittest.equals('foo'));
-    checkUnnamed3949(o.labelAnnotations);
-    checkUnnamed3950(o.safeSearchAnnotations);
-    checkUnnamed3951(o.shotAnnotations);
+    checkUnnamed4453(o.labelAnnotations);
+    checkUnnamed4454(o.safeSearchAnnotations);
+    checkUnnamed4455(o.shotAnnotations);
   }
   buildCounterGoogleCloudVideointelligenceV1beta1VideoAnnotationResults--;
 }
 
-buildUnnamed3952() {
+buildUnnamed4456() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1beta1VideoSegment>();
   o.add(buildGoogleCloudVideointelligenceV1beta1VideoSegment());
   o.add(buildGoogleCloudVideointelligenceV1beta1VideoSegment());
   return o;
 }
 
-checkUnnamed3952(
+checkUnnamed4456(
     core.List<api.GoogleCloudVideointelligenceV1beta1VideoSegment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta1VideoSegment(o[0]);
@@ -789,7 +789,7 @@
     o.labelDetectionMode = "foo";
     o.labelDetectionModel = "foo";
     o.safeSearchDetectionModel = "foo";
-    o.segments = buildUnnamed3952();
+    o.segments = buildUnnamed4456();
     o.shotChangeDetectionModel = "foo";
     o.stationaryCamera = true;
   }
@@ -804,7 +804,7 @@
     unittest.expect(o.labelDetectionMode, unittest.equals('foo'));
     unittest.expect(o.labelDetectionModel, unittest.equals('foo'));
     unittest.expect(o.safeSearchDetectionModel, unittest.equals('foo'));
-    checkUnnamed3952(o.segments);
+    checkUnnamed4456(o.segments);
     unittest.expect(o.shotChangeDetectionModel, unittest.equals('foo'));
     unittest.expect(o.stationaryCamera, unittest.isTrue);
   }
@@ -833,7 +833,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta1VideoSegment--;
 }
 
-buildUnnamed3953() {
+buildUnnamed4457() {
   var o = new core
       .List<api.GoogleCloudVideointelligenceV1beta2VideoAnnotationProgress>();
   o.add(buildGoogleCloudVideointelligenceV1beta2VideoAnnotationProgress());
@@ -841,7 +841,7 @@
   return o;
 }
 
-checkUnnamed3953(
+checkUnnamed4457(
     core.List<api.GoogleCloudVideointelligenceV1beta2VideoAnnotationProgress>
         o) {
   unittest.expect(o, unittest.hasLength(2));
@@ -856,7 +856,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta2AnnotateVideoProgress++;
   if (buildCounterGoogleCloudVideointelligenceV1beta2AnnotateVideoProgress <
       3) {
-    o.annotationProgress = buildUnnamed3953();
+    o.annotationProgress = buildUnnamed4457();
   }
   buildCounterGoogleCloudVideointelligenceV1beta2AnnotateVideoProgress--;
   return o;
@@ -867,12 +867,12 @@
   buildCounterGoogleCloudVideointelligenceV1beta2AnnotateVideoProgress++;
   if (buildCounterGoogleCloudVideointelligenceV1beta2AnnotateVideoProgress <
       3) {
-    checkUnnamed3953(o.annotationProgress);
+    checkUnnamed4457(o.annotationProgress);
   }
   buildCounterGoogleCloudVideointelligenceV1beta2AnnotateVideoProgress--;
 }
 
-buildUnnamed3954() {
+buildUnnamed4458() {
   var o = new core
       .List<api.GoogleCloudVideointelligenceV1beta2VideoAnnotationResults>();
   o.add(buildGoogleCloudVideointelligenceV1beta2VideoAnnotationResults());
@@ -880,7 +880,7 @@
   return o;
 }
 
-checkUnnamed3954(
+checkUnnamed4458(
     core.List<api.GoogleCloudVideointelligenceV1beta2VideoAnnotationResults>
         o) {
   unittest.expect(o, unittest.hasLength(2));
@@ -895,7 +895,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta2AnnotateVideoResponse++;
   if (buildCounterGoogleCloudVideointelligenceV1beta2AnnotateVideoResponse <
       3) {
-    o.annotationResults = buildUnnamed3954();
+    o.annotationResults = buildUnnamed4458();
   }
   buildCounterGoogleCloudVideointelligenceV1beta2AnnotateVideoResponse--;
   return o;
@@ -906,7 +906,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta2AnnotateVideoResponse++;
   if (buildCounterGoogleCloudVideointelligenceV1beta2AnnotateVideoResponse <
       3) {
-    checkUnnamed3954(o.annotationResults);
+    checkUnnamed4458(o.annotationResults);
   }
   buildCounterGoogleCloudVideointelligenceV1beta2AnnotateVideoResponse--;
 }
@@ -935,7 +935,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta2Entity--;
 }
 
-buildUnnamed3955() {
+buildUnnamed4459() {
   var o = new core
       .List<api.GoogleCloudVideointelligenceV1beta2ExplicitContentFrame>();
   o.add(buildGoogleCloudVideointelligenceV1beta2ExplicitContentFrame());
@@ -943,7 +943,7 @@
   return o;
 }
 
-checkUnnamed3955(
+checkUnnamed4459(
     core.List<api.GoogleCloudVideointelligenceV1beta2ExplicitContentFrame> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta2ExplicitContentFrame(o[0]);
@@ -959,7 +959,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta2ExplicitContentAnnotation++;
   if (buildCounterGoogleCloudVideointelligenceV1beta2ExplicitContentAnnotation <
       3) {
-    o.frames = buildUnnamed3955();
+    o.frames = buildUnnamed4459();
   }
   buildCounterGoogleCloudVideointelligenceV1beta2ExplicitContentAnnotation--;
   return o;
@@ -970,7 +970,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta2ExplicitContentAnnotation++;
   if (buildCounterGoogleCloudVideointelligenceV1beta2ExplicitContentAnnotation <
       3) {
-    checkUnnamed3955(o.frames);
+    checkUnnamed4459(o.frames);
   }
   buildCounterGoogleCloudVideointelligenceV1beta2ExplicitContentAnnotation--;
 }
@@ -998,41 +998,41 @@
   buildCounterGoogleCloudVideointelligenceV1beta2ExplicitContentFrame--;
 }
 
-buildUnnamed3956() {
+buildUnnamed4460() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1beta2Entity>();
   o.add(buildGoogleCloudVideointelligenceV1beta2Entity());
   o.add(buildGoogleCloudVideointelligenceV1beta2Entity());
   return o;
 }
 
-checkUnnamed3956(core.List<api.GoogleCloudVideointelligenceV1beta2Entity> o) {
+checkUnnamed4460(core.List<api.GoogleCloudVideointelligenceV1beta2Entity> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta2Entity(o[0]);
   checkGoogleCloudVideointelligenceV1beta2Entity(o[1]);
 }
 
-buildUnnamed3957() {
+buildUnnamed4461() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1beta2LabelFrame>();
   o.add(buildGoogleCloudVideointelligenceV1beta2LabelFrame());
   o.add(buildGoogleCloudVideointelligenceV1beta2LabelFrame());
   return o;
 }
 
-checkUnnamed3957(
+checkUnnamed4461(
     core.List<api.GoogleCloudVideointelligenceV1beta2LabelFrame> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta2LabelFrame(o[0]);
   checkGoogleCloudVideointelligenceV1beta2LabelFrame(o[1]);
 }
 
-buildUnnamed3958() {
+buildUnnamed4462() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1beta2LabelSegment>();
   o.add(buildGoogleCloudVideointelligenceV1beta2LabelSegment());
   o.add(buildGoogleCloudVideointelligenceV1beta2LabelSegment());
   return o;
 }
 
-checkUnnamed3958(
+checkUnnamed4462(
     core.List<api.GoogleCloudVideointelligenceV1beta2LabelSegment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta2LabelSegment(o[0]);
@@ -1044,10 +1044,10 @@
   var o = new api.GoogleCloudVideointelligenceV1beta2LabelAnnotation();
   buildCounterGoogleCloudVideointelligenceV1beta2LabelAnnotation++;
   if (buildCounterGoogleCloudVideointelligenceV1beta2LabelAnnotation < 3) {
-    o.categoryEntities = buildUnnamed3956();
+    o.categoryEntities = buildUnnamed4460();
     o.entity = buildGoogleCloudVideointelligenceV1beta2Entity();
-    o.frames = buildUnnamed3957();
-    o.segments = buildUnnamed3958();
+    o.frames = buildUnnamed4461();
+    o.segments = buildUnnamed4462();
   }
   buildCounterGoogleCloudVideointelligenceV1beta2LabelAnnotation--;
   return o;
@@ -1057,10 +1057,10 @@
     api.GoogleCloudVideointelligenceV1beta2LabelAnnotation o) {
   buildCounterGoogleCloudVideointelligenceV1beta2LabelAnnotation++;
   if (buildCounterGoogleCloudVideointelligenceV1beta2LabelAnnotation < 3) {
-    checkUnnamed3956(o.categoryEntities);
+    checkUnnamed4460(o.categoryEntities);
     checkGoogleCloudVideointelligenceV1beta2Entity(o.entity);
-    checkUnnamed3957(o.frames);
-    checkUnnamed3958(o.segments);
+    checkUnnamed4461(o.frames);
+    checkUnnamed4462(o.segments);
   }
   buildCounterGoogleCloudVideointelligenceV1beta2LabelAnnotation--;
 }
@@ -1138,7 +1138,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta2VideoAnnotationProgress--;
 }
 
-buildUnnamed3959() {
+buildUnnamed4463() {
   var o =
       new core.List<api.GoogleCloudVideointelligenceV1beta2LabelAnnotation>();
   o.add(buildGoogleCloudVideointelligenceV1beta2LabelAnnotation());
@@ -1146,14 +1146,14 @@
   return o;
 }
 
-checkUnnamed3959(
+checkUnnamed4463(
     core.List<api.GoogleCloudVideointelligenceV1beta2LabelAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta2LabelAnnotation(o[0]);
   checkGoogleCloudVideointelligenceV1beta2LabelAnnotation(o[1]);
 }
 
-buildUnnamed3960() {
+buildUnnamed4464() {
   var o =
       new core.List<api.GoogleCloudVideointelligenceV1beta2LabelAnnotation>();
   o.add(buildGoogleCloudVideointelligenceV1beta2LabelAnnotation());
@@ -1161,28 +1161,28 @@
   return o;
 }
 
-checkUnnamed3960(
+checkUnnamed4464(
     core.List<api.GoogleCloudVideointelligenceV1beta2LabelAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta2LabelAnnotation(o[0]);
   checkGoogleCloudVideointelligenceV1beta2LabelAnnotation(o[1]);
 }
 
-buildUnnamed3961() {
+buildUnnamed4465() {
   var o = new core.List<api.GoogleCloudVideointelligenceV1beta2VideoSegment>();
   o.add(buildGoogleCloudVideointelligenceV1beta2VideoSegment());
   o.add(buildGoogleCloudVideointelligenceV1beta2VideoSegment());
   return o;
 }
 
-checkUnnamed3961(
+checkUnnamed4465(
     core.List<api.GoogleCloudVideointelligenceV1beta2VideoSegment> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta2VideoSegment(o[0]);
   checkGoogleCloudVideointelligenceV1beta2VideoSegment(o[1]);
 }
 
-buildUnnamed3962() {
+buildUnnamed4466() {
   var o =
       new core.List<api.GoogleCloudVideointelligenceV1beta2LabelAnnotation>();
   o.add(buildGoogleCloudVideointelligenceV1beta2LabelAnnotation());
@@ -1190,7 +1190,7 @@
   return o;
 }
 
-checkUnnamed3962(
+checkUnnamed4466(
     core.List<api.GoogleCloudVideointelligenceV1beta2LabelAnnotation> o) {
   unittest.expect(o, unittest.hasLength(2));
   checkGoogleCloudVideointelligenceV1beta2LabelAnnotation(o[0]);
@@ -1207,11 +1207,11 @@
     o.error = buildGoogleRpcStatus();
     o.explicitAnnotation =
         buildGoogleCloudVideointelligenceV1beta2ExplicitContentAnnotation();
-    o.frameLabelAnnotations = buildUnnamed3959();
+    o.frameLabelAnnotations = buildUnnamed4463();
     o.inputUri = "foo";
-    o.segmentLabelAnnotations = buildUnnamed3960();
-    o.shotAnnotations = buildUnnamed3961();
-    o.shotLabelAnnotations = buildUnnamed3962();
+    o.segmentLabelAnnotations = buildUnnamed4464();
+    o.shotAnnotations = buildUnnamed4465();
+    o.shotLabelAnnotations = buildUnnamed4466();
   }
   buildCounterGoogleCloudVideointelligenceV1beta2VideoAnnotationResults--;
   return o;
@@ -1225,11 +1225,11 @@
     checkGoogleRpcStatus(o.error);
     checkGoogleCloudVideointelligenceV1beta2ExplicitContentAnnotation(
         o.explicitAnnotation);
-    checkUnnamed3959(o.frameLabelAnnotations);
+    checkUnnamed4463(o.frameLabelAnnotations);
     unittest.expect(o.inputUri, unittest.equals('foo'));
-    checkUnnamed3960(o.segmentLabelAnnotations);
-    checkUnnamed3961(o.shotAnnotations);
-    checkUnnamed3962(o.shotLabelAnnotations);
+    checkUnnamed4464(o.segmentLabelAnnotations);
+    checkUnnamed4465(o.shotAnnotations);
+    checkUnnamed4466(o.shotLabelAnnotations);
   }
   buildCounterGoogleCloudVideointelligenceV1beta2VideoAnnotationResults--;
 }
@@ -1256,7 +1256,7 @@
   buildCounterGoogleCloudVideointelligenceV1beta2VideoSegment--;
 }
 
-buildUnnamed3963() {
+buildUnnamed4467() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1271,7 +1271,7 @@
   return o;
 }
 
-checkUnnamed3963(core.Map<core.String, core.Object> o) {
+checkUnnamed4467(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted1 = (o["x"]) as core.Map;
   unittest.expect(casted1, unittest.hasLength(3));
@@ -1285,7 +1285,7 @@
   unittest.expect(casted2["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3964() {
+buildUnnamed4468() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1300,7 +1300,7 @@
   return o;
 }
 
-checkUnnamed3964(core.Map<core.String, core.Object> o) {
+checkUnnamed4468(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted3 = (o["x"]) as core.Map;
   unittest.expect(casted3, unittest.hasLength(3));
@@ -1321,9 +1321,9 @@
   if (buildCounterGoogleLongrunningOperation < 3) {
     o.done = true;
     o.error = buildGoogleRpcStatus();
-    o.metadata = buildUnnamed3963();
+    o.metadata = buildUnnamed4467();
     o.name = "foo";
-    o.response = buildUnnamed3964();
+    o.response = buildUnnamed4468();
   }
   buildCounterGoogleLongrunningOperation--;
   return o;
@@ -1334,14 +1334,14 @@
   if (buildCounterGoogleLongrunningOperation < 3) {
     unittest.expect(o.done, unittest.isTrue);
     checkGoogleRpcStatus(o.error);
-    checkUnnamed3963(o.metadata);
+    checkUnnamed4467(o.metadata);
     unittest.expect(o.name, unittest.equals('foo'));
-    checkUnnamed3964(o.response);
+    checkUnnamed4468(o.response);
   }
   buildCounterGoogleLongrunningOperation--;
 }
 
-buildUnnamed3965() {
+buildUnnamed4469() {
   var o = new core.Map<core.String, core.Object>();
   o["x"] = {
     'list': [1, 2, 3],
@@ -1356,7 +1356,7 @@
   return o;
 }
 
-checkUnnamed3965(core.Map<core.String, core.Object> o) {
+checkUnnamed4469(core.Map<core.String, core.Object> o) {
   unittest.expect(o, unittest.hasLength(2));
   var casted5 = (o["x"]) as core.Map;
   unittest.expect(casted5, unittest.hasLength(3));
@@ -1370,17 +1370,17 @@
   unittest.expect(casted6["string"], unittest.equals('foo'));
 }
 
-buildUnnamed3966() {
+buildUnnamed4470() {
   var o = new core.List<core.Map<core.String, core.Object>>();
-  o.add(buildUnnamed3965());
-  o.add(buildUnnamed3965());
+  o.add(buildUnnamed4469());
+  o.add(buildUnnamed4469());
   return o;
 }
 
-checkUnnamed3966(core.List<core.Map<core.String, core.Object>> o) {
+checkUnnamed4470(core.List<core.Map<core.String, core.Object>> o) {
   unittest.expect(o, unittest.hasLength(2));
-  checkUnnamed3965(o[0]);
-  checkUnnamed3965(o[1]);
+  checkUnnamed4469(o[0]);
+  checkUnnamed4469(o[1]);
 }
 
 core.int buildCounterGoogleRpcStatus = 0;
@@ -1389,7 +1389,7 @@
   buildCounterGoogleRpcStatus++;
   if (buildCounterGoogleRpcStatus < 3) {
     o.code = 42;
-    o.details = buildUnnamed3966();
+    o.details = buildUnnamed4470();
     o.message = "foo";
   }
   buildCounterGoogleRpcStatus--;
@@ -1400,7 +1400,7 @@
   buildCounterGoogleRpcStatus++;
   if (buildCounterGoogleRpcStatus < 3) {
     unittest.expect(o.code, unittest.equals(42));
-    checkUnnamed3966(o.details);
+    checkUnnamed4470(o.details);
     unittest.expect(o.message, unittest.equals('foo'));
   }
   buildCounterGoogleRpcStatus--;
@@ -1819,8 +1819,9 @@
         var resp = convert.JSON.encode(buildGoogleLongrunningOperation());
         return new async.Future.value(stringResponse(200, h, resp));
       }), true);
-      res.annotate(arg_request, $fields: arg_$fields).then(
-          unittest.expectAsync1(((api.GoogleLongrunningOperation response) {
+      res
+          .annotate(arg_request, $fields: arg_$fields)
+          .then(unittest.expectAsync1(((response) {
         checkGoogleLongrunningOperation(response);
       })));
     });