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

Regenerated using updated generator, and existing discovery documents.
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);
       })));
     });