diff --git a/packages/container/angel_container/README.md b/packages/container/angel_container/README.md
index a83eaf12..2efb49ed 100644
--- a/packages/container/angel_container/README.md
+++ b/packages/container/angel_container/README.md
@@ -40,6 +40,6 @@ A better IoC container for Angel3, ultimately allowing Angel3 to be used with or
 
         var http = AngelHttp(app);
         var server = await http.startServer('localhost', 3000);
-        print("Angel server listening at ${http.uri}");
+        print("Angel3 server listening at ${http.uri}");
     }
 ```
diff --git a/packages/container/angel_container_generator/CHANGELOG.md b/packages/container/angel_container_generator/CHANGELOG.md
index 2bbcc7e5..d832dc97 100644
--- a/packages/container/angel_container_generator/CHANGELOG.md
+++ b/packages/container/angel_container_generator/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## 8.0.0
+
+* Require Dart >= 3.0
+
 ## 7.1.0-beta.1
 
 * Require Dart >= 2.19
diff --git a/packages/container/angel_container_generator/example/main.reflectable.dart b/packages/container/angel_container_generator/example/main.reflectable.dart
index b7db7ad1..78da37c2 100644
--- a/packages/container/angel_container_generator/example/main.reflectable.dart
+++ b/packages/container/angel_container_generator/example/main.reflectable.dart
@@ -33,8 +33,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             0,
             const prefix0.ContainedReflectable(),
-            const <int>[71],
-            const <int>[72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84],
+            const <int>[67],
+            const <int>[68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80],
             const <int>[],
             1,
             {},
@@ -51,9 +51,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             1,
             const prefix0.ContainedReflectable(),
-            const <int>[29, 30, 85, 88, 89],
-            const <int>[72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84],
-            const <int>[85, 86, 87],
+            const <int>[27, 28, 81, 84, 85],
+            const <int>[68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80],
+            const <int>[81, 82, 83],
             2,
             {
               r'getInstance': () => prefix1.Reflectable.getInstance,
@@ -73,8 +73,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             2,
             const prefix0.ContainedReflectable(),
-            const <int>[78, 79, 80, 81, 82, 83, 84, 90, 91],
-            const <int>[72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84],
+            const <int>[74, 75, 76, 77, 78, 79, 80, 86, 87],
+            const <int>[68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80],
             const <int>[],
             3,
             {},
@@ -91,8 +91,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             3,
             const prefix0.ContainedReflectable(),
-            const <int>[77, 92, 93],
-            const <int>[72, 73, 74, 75, 76, 77],
+            const <int>[73, 88, 89],
+            const <int>[68, 69, 70, 71, 72, 73],
             const <int>[],
             4,
             {},
@@ -127,9 +127,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             4,
             const prefix0.ContainedReflectable(),
-            const <int>[72, 73, 74, 94, 95, 96, 75, 76, 97],
-            const <int>[72, 73, 74, 75, 76],
-            const <int>[94, 95, 96],
+            const <int>[68, 69, 70, 90, 91, 92, 71, 72, 93],
+            const <int>[68, 69, 70, 71, 72],
+            const <int>[90, 91, 92],
             null,
             {
               r'hash': () => Object.hash,
@@ -150,6 +150,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             5,
             const prefix0.ContainedReflectable(),
             const <int>[
+              94,
+              95,
+              96,
+              97,
               98,
               99,
               100,
@@ -158,13 +162,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
               103,
               104,
               105,
-              106,
-              107,
-              108,
-              109,
-              110
+              106
             ],
-            const <int>[72, 73, 74, 75, 76, 99, 105],
+            const <int>[68, 69, 70, 71, 72, 95, 101],
             const <int>[],
             4,
             {},
@@ -197,8 +197,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             6,
             const prefix0.ContainedReflectable(),
-            const <int>[111, 112, 113, 114],
-            const <int>[72, 73, 74, 75, 76],
+            const <int>[107, 108, 109, 110],
+            const <int>[68, 69, 70, 71, 72],
             const <int>[],
             4,
             {},
@@ -216,6 +216,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             7,
             const prefix0.ContainedReflectable(),
             const <int>[
+              111,
+              112,
+              113,
+              114,
               115,
               116,
               117,
@@ -246,13 +250,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
               142,
               143,
               144,
-              145,
-              146,
-              147,
-              148,
-              149
+              145
             ],
-            const <int>[72, 73, 74, 75, 76],
+            const <int>[68, 69, 70, 71, 72],
             const <int>[],
             4,
             {},
@@ -277,11 +277,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             8,
             const prefix0.ContainedReflectable(),
-            const <int>[150, 151, 152, 153, 154, 155, 156],
-            const <int>[72, 153, 74, 154, 76, 150, 151, 152],
-            const <int>[],
+            const <int>[146, 147, 148, 149, 150, 151, 152, 153, 154],
+            const <int>[68, 151, 70, 152, 72, 148, 149, 150],
+            const <int>[146, 147],
             4,
-            {},
+            {r'parse': () => bool.parse, r'tryParse': () => bool.tryParse},
             {},
             {
               r'fromEnvironment': (bool b) => (name, {defaultValue}) => b
@@ -302,6 +302,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             9,
             const prefix0.ContainedReflectable(),
             const <int>[
+              155,
+              156,
               157,
               158,
               159,
@@ -330,12 +332,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
               182,
               183,
               184,
-              185,
-              186,
-              187
+              185
             ],
-            const <int>[72, 73, 74, 75, 76],
-            const <int>[181, 182],
+            const <int>[68, 69, 70, 71, 72],
+            const <int>[179, 180],
             -1,
             {r'parse': () => int.parse, r'tryParse': () => int.tryParse},
             {},
@@ -356,6 +356,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             10,
             const prefix0.ContainedReflectable(),
             const <int>[
+              186,
+              187,
               188,
               189,
               190,
@@ -396,13 +398,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
               225,
               226,
               227,
-              228,
-              229,
-              230,
-              231
+              228
             ],
-            const <int>[72, 73, 74, 75, 76],
-            const <int>[188, 189, 190],
+            const <int>[68, 69, 70, 71, 72],
+            const <int>[186, 187, 188],
             4,
             {
               r'castFrom': () => List.castFrom,
@@ -411,8 +410,6 @@ final _data = <r.Reflectable, r.ReflectorData>{
             },
             {},
             {
-              r'': (bool b) => ([length]) =>
-                  b ? (length == null ? [] : List.filled(length, null)) : null,
               r'filled': (bool b) => (length, fill, {growable}) =>
                   b ? List.filled(length, fill, growable: growable) : null,
               r'empty': (bool b) =>
@@ -441,8 +438,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             11,
             const prefix0.ContainedReflectable(),
-            const <int>[232, 233, 234, 235, 236, 237, 238],
-            const <int>[72, 73, 74, 75, 76],
+            const <int>[229, 230, 231, 232, 233, 234, 235],
+            const <int>[68, 69, 70, 71, 72],
             const <int>[],
             4,
             {},
@@ -460,6 +457,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             12,
             const prefix0.ContainedReflectable(),
             const <int>[
+              236,
+              237,
+              238,
               239,
               240,
               241,
@@ -470,12 +470,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
               246,
               247,
               248,
-              249,
-              250,
-              251,
-              252
+              249
             ],
-            const <int>[72, 73, 74, 75, 76],
+            const <int>[68, 69, 70, 71, 72],
             const <int>[],
             4,
             {},
@@ -492,8 +489,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             13,
             const prefix0.ContainedReflectable(),
-            const <int>[253, 254, 255, 256, 257, 258, 259],
-            const <int>[72, 73, 74, 75, 76],
+            const <int>[250, 251, 252, 253, 254, 255, 256],
+            const <int>[68, 69, 70, 71, 72],
             const <int>[],
             4,
             {},
@@ -511,6 +508,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             14,
             const prefix0.ContainedReflectable(),
             const <int>[
+              257,
+              258,
+              259,
               260,
               261,
               262,
@@ -537,13 +537,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
               283,
               284,
               285,
-              286,
-              287,
-              288,
-              289
+              286
             ],
-            const <int>[72, 73, 74, 75, 76],
-            const <int>[260],
+            const <int>[68, 69, 70, 71, 72],
+            const <int>[257],
             4,
             {r'castFrom': () => Map.castFrom},
             {},
@@ -576,6 +573,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             const prefix0.ContainedReflectable(),
             const <int>[
+              287,
+              288,
+              289,
               290,
               291,
               292,
@@ -609,15 +609,17 @@ final _data = <r.Reflectable, r.ReflectorData>{
               320,
               321,
               322,
-              323,
-              324
+              323
             ],
             const <int>[
+              68,
+              311,
+              70,
+              71,
               72,
-              314,
-              74,
-              75,
-              76,
+              288,
+              289,
+              290,
               291,
               292,
               293,
@@ -638,19 +640,20 @@ final _data = <r.Reflectable, r.ReflectorData>{
               308,
               309,
               310,
-              311,
-              312,
-              313,
+              315,
               316,
               317,
               318,
               319,
-              320,
-              321
+              320
             ],
-            const <int>[290],
+            const <int>[287, 312, 313],
             4,
-            {r'castFrom': () => Iterable.castFrom},
+            {
+              r'castFrom': () => Iterable.castFrom,
+              r'iterableToShortString': () => Iterable.iterableToShortString,
+              r'iterableToFullString': () => Iterable.iterableToFullString
+            },
             {},
             {
               r'generate': (bool b) => (count, [generator]) =>
@@ -671,8 +674,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             16,
             const prefix0.ContainedReflectable(),
-            const <int>[325],
-            const <int>[72, 73, 74, 75, 76],
+            const <int>[324],
+            const <int>[68, 69, 70, 71, 72],
             const <int>[],
             4,
             {},
@@ -745,32 +748,24 @@ final _data = <r.Reflectable, r.ReflectorData>{
             4,
             4,
             4, const <int>[], const []),
-        r.VariableMirrorImpl(
-            r'provisional',
-            75629717,
-            -1,
-            const prefix0.ContainedReflectable(),
-            -1,
-            22,
-            22, const <int>[], const []),
-        r.VariableMirrorImpl(
-            r'proxy',
-            75629717,
-            -1,
-            const prefix0.ContainedReflectable(),
-            -1,
-            22,
-            22, const <int>[], const []),
         r.VariableMirrorImpl(
             r'instanceInvokeCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
             -1,
+            22,
+            22, const <int>[], const []),
+        r.VariableMirrorImpl(
+            r'staticInvokeCapability',
+            142738581,
+            -1,
+            const prefix0.ContainedReflectable(),
+            -1,
             23,
             23, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'staticInvokeCapability',
+            r'topLevelInvokeCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -778,7 +773,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             24,
             24, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'topLevelInvokeCapability',
+            r'newInstanceCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -786,7 +781,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             25,
             25, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'newInstanceCapability',
+            r'metadataCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -794,7 +789,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             26,
             26, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'metadataCapability',
+            r'typeCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -802,7 +797,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             27,
             27, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'typeCapability',
+            r'typeRelationsCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -810,7 +805,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             28,
             28, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'typeRelationsCapability',
+            r'reflectedTypeCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -818,7 +813,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             29,
             29, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'reflectedTypeCapability',
+            r'libraryCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -826,7 +821,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             30,
             30, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'libraryCapability',
+            r'declarationsCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -834,7 +829,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             31,
             31, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'declarationsCapability',
+            r'uriCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -842,7 +837,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             32,
             32, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'uriCapability',
+            r'libraryDependenciesCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -850,7 +845,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             33,
             33, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'libraryDependenciesCapability',
+            r'invokingCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -858,7 +853,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             34,
             34, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'invokingCapability',
+            r'typingCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -866,7 +861,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35,
             35, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'typingCapability',
+            r'delegateCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -874,7 +869,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             36,
             36, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'delegateCapability',
+            r'subtypeQuantifyCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -882,7 +877,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             37,
             37, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'subtypeQuantifyCapability',
+            r'superclassQuantifyCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -890,45 +885,37 @@ final _data = <r.Reflectable, r.ReflectorData>{
             38,
             38, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'superclassQuantifyCapability',
+            r'typeAnnotationQuantifyCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
             -1,
             39,
             39, const <int>[], const []),
-        r.VariableMirrorImpl(
-            r'typeAnnotationQuantifyCapability',
-            142738581,
-            -1,
-            const prefix0.ContainedReflectable(),
-            -1,
-            40,
-            40, const <int>[], const []),
         r.VariableMirrorImpl(
             r'typeAnnotationDeepQuantifyCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
             -1,
-            40,
-            40, const <int>[], const []),
+            39,
+            39, const <int>[], const []),
         r.VariableMirrorImpl(
             r'correspondingSetterQuantifyCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
             -1,
-            41,
-            41, const <int>[], const []),
+            40,
+            40, const <int>[], const []),
         r.VariableMirrorImpl(
             r'admitSubtypeCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
             -1,
-            42,
-            42, const <int>[], const []),
+            41,
+            41, const <int>[], const []),
         r.VariableMirrorImpl(
             r'thisClassName',
             134349973,
@@ -956,8 +943,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             44040211,
             -1,
             -1,
+            42,
             43,
-            44,
             const <int>[1],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -979,8 +966,6 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[5], const prefix0.ContainedReflectable(), const []),
         r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 4, 12),
         r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 5, 13),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 6, 14),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 7, 15),
         r.MethodMirrorImpl(
             r'reflectableNoSuchInvokableError',
             8912920,
@@ -1036,6 +1021,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[23, 24, 25, 26],
             const prefix0.ContainedReflectable(),
             const []),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 6, 19),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 7, 20),
         r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 8, 21),
         r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 9, 22),
         r.ImplicitGetterMirrorImpl(
@@ -1072,10 +1059,6 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const prefix0.ContainedReflectable(), 25, 38),
         r.ImplicitGetterMirrorImpl(
             const prefix0.ContainedReflectable(), 26, 39),
-        r.ImplicitGetterMirrorImpl(
-            const prefix0.ContainedReflectable(), 27, 40),
-        r.ImplicitGetterMirrorImpl(
-            const prefix0.ContainedReflectable(), 28, 41),
         r.MethodMirrorImpl(r'', 128, 0, -1, 0, 0, const <int>[], const <int>[],
             const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'==', 2097154, 4, 8, 8, 8, const <int>[],
@@ -1102,7 +1085,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35651587,
             3,
             10,
-            45,
+            44,
             10,
             const <int>[16],
             const <int>[],
@@ -1168,9 +1151,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35651587,
             2,
             14,
-            47,
+            46,
             14,
-            const <int>[46, 13],
+            const <int>[45, 13],
             const <int>[],
             const prefix0.ContainedReflectable(),
             const <Object>[override]),
@@ -1179,16 +1162,16 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35651587,
             2,
             15,
-            49,
+            48,
             15,
-            const <int>[48],
+            const <int>[47],
             const <int>[],
             const prefix0.ContainedReflectable(),
             const <Object>[override]),
         r.MethodMirrorImpl(r'getInstance', 2097170, 1, 1, 1, 1, const <int>[],
             const <int>[34], const prefix0.ContainedReflectable(), const []),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 0, 57),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 1, 58),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 0, 55),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 1, 56),
         r.MethodMirrorImpl(
             r'',
             128,
@@ -1282,7 +1265,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35651587,
             5,
             10,
-            50,
+            49,
             10,
             const <int>[6],
             const <int>[],
@@ -1293,13 +1276,13 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652099,
             5,
             10,
-            51,
+            50,
             10,
             null,
             const <int>[],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'namedArguments', 35652099, 5, 14, 52, 14, null,
+        r.MethodMirrorImpl(r'namedArguments', 35652099, 5, 14, 51, 14, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'isMethod', 2097667, 5, 8, 8, 8, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
@@ -1506,7 +1489,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[132, 133, 134],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'split', 35652098, 7, 10, 53, 10, const <int>[7],
+        r.MethodMirrorImpl(r'split', 35652098, 7, 10, 52, 10, const <int>[7],
             const <int>[135], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'splitMapJoin',
@@ -1536,13 +1519,13 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652099,
             7,
             10,
-            54,
+            53,
             10,
             const <int>[9],
             const <int>[],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'runes', 2097667, 7, -1, 55, 55, const <int>[],
+        r.MethodMirrorImpl(r'runes', 2097667, 7, -1, 54, 54, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'fromCharCodes',
@@ -1568,12 +1551,34 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[143, 144],
             const prefix0.ContainedReflectable(),
             const []),
+        r.MethodMirrorImpl(
+            r'parse',
+            2097170,
+            8,
+            8,
+            8,
+            8,
+            const <int>[],
+            const <int>[145, 146],
+            const prefix0.ContainedReflectable(),
+            const []),
+        r.MethodMirrorImpl(
+            r'tryParse',
+            2097170,
+            8,
+            8,
+            8,
+            8,
+            const <int>[],
+            const <int>[147, 148],
+            const prefix0.ContainedReflectable(),
+            const []),
         r.MethodMirrorImpl(r'&', 2097154, 8, 8, 8, 8, const <int>[],
-            const <int>[145], const prefix0.ContainedReflectable(), const []),
+            const <int>[149], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'|', 2097154, 8, 8, 8, 8, const <int>[],
-            const <int>[146], const prefix0.ContainedReflectable(), const []),
+            const <int>[150], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'^', 2097154, 8, 8, 8, 8, const <int>[],
-            const <int>[147], const prefix0.ContainedReflectable(), const []),
+            const <int>[151], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'toString', 2097154, 8, 7, 7, 7, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'hashCode', 2097155, 8, 9, 9, 9, const <int>[],
@@ -1586,25 +1591,25 @@ final _data = <r.Reflectable, r.ReflectorData>{
             8,
             8,
             const <int>[],
-            const <int>[148, 149],
+            const <int>[152, 153],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'hasEnvironment', 129, 8, -1, 8, 8, const <int>[],
-            const <int>[150], const prefix0.ContainedReflectable(), const []),
+            const <int>[154], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'&', 2097666, 9, 9, 9, 9, const <int>[],
-            const <int>[151], const prefix0.ContainedReflectable(), const []),
+            const <int>[155], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'|', 2097666, 9, 9, 9, 9, const <int>[],
-            const <int>[152], const prefix0.ContainedReflectable(), const []),
+            const <int>[156], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'^', 2097666, 9, 9, 9, 9, const <int>[],
-            const <int>[153], const prefix0.ContainedReflectable(), const []),
+            const <int>[157], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'~', 2097666, 9, 9, 9, 9, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'<<', 2097666, 9, 9, 9, 9, const <int>[],
-            const <int>[154], const prefix0.ContainedReflectable(), const []),
+            const <int>[158], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'>>', 2097666, 9, 9, 9, 9, const <int>[],
-            const <int>[155], const prefix0.ContainedReflectable(), const []),
+            const <int>[159], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'>>>', 2097666, 9, 9, 9, 9, const <int>[],
-            const <int>[156], const prefix0.ContainedReflectable(), const []),
+            const <int>[160], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'modPow',
             2097666,
@@ -1613,17 +1618,17 @@ final _data = <r.Reflectable, r.ReflectorData>{
             9,
             9,
             const <int>[],
-            const <int>[157, 158],
+            const <int>[161, 162],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'modInverse', 2097666, 9, 9, 9, 9, const <int>[],
-            const <int>[159], const prefix0.ContainedReflectable(), const []),
+            const <int>[163], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'gcd', 2097666, 9, 9, 9, 9, const <int>[],
-            const <int>[160], const prefix0.ContainedReflectable(), const []),
+            const <int>[164], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'toUnsigned', 2097666, 9, 9, 9, 9, const <int>[],
-            const <int>[161], const prefix0.ContainedReflectable(), const []),
+            const <int>[165], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'toSigned', 2097666, 9, 9, 9, 9, const <int>[],
-            const <int>[162], const prefix0.ContainedReflectable(), const []),
+            const <int>[166], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'unary-', 2097666, 9, 9, 9, 9, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'abs', 2097666, 9, 9, 9, 9, const <int>[],
@@ -1641,8 +1646,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             2097666,
             9,
             -1,
-            56,
-            56,
+            55,
+            55,
             const <int>[],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -1652,8 +1657,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             2097666,
             9,
             -1,
-            56,
-            56,
+            55,
+            55,
             const <int>[],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -1663,8 +1668,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             2097666,
             9,
             -1,
-            56,
-            56,
+            55,
+            55,
             const <int>[],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -1674,8 +1679,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             2097666,
             9,
             -1,
-            56,
-            56,
+            55,
+            55,
             const <int>[],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -1683,7 +1688,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.MethodMirrorImpl(r'toString', 2097666, 9, 7, 7, 7, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'toRadixString', 2097666, 9, 7, 7, 7, const <int>[],
-            const <int>[163], const prefix0.ContainedReflectable(), const []),
+            const <int>[167], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'parse',
             2097170,
@@ -1692,7 +1697,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             9,
             9,
             const <int>[],
-            const <int>[164, 165, 166],
+            const <int>[168, 169],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1703,7 +1708,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             9,
             9,
             const <int>[],
-            const <int>[167, 168],
+            const <int>[170, 171],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'isEven', 2097667, 9, 8, 8, 8, const <int>[],
@@ -1722,11 +1727,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             9,
             9,
             const <int>[],
-            const <int>[169, 170],
+            const <int>[172, 173],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'castFrom', 35651602, 10, 10, 57, 10, null,
-            const <int>[171], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'castFrom', 35651602, 10, 10, 56, 10, null,
+            const <int>[174], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'copyRange',
             1310738,
@@ -1735,7 +1740,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[172, 173, 174, 175, 176],
+            const <int>[175, 176, 177, 178, 179],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1746,13 +1751,13 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[177, 178, 179],
+            const <int>[180, 181, 182],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'cast', 35652098, 10, 10, 58, 10, null,
+        r.MethodMirrorImpl(r'cast', 35652098, 10, 10, 57, 10, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'[]', 514, 10, -1, -1, -1, const <int>[],
-            const <int>[180], const prefix0.ContainedReflectable(), const []),
+            const <int>[183], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'[]=',
             1311234,
@@ -1761,17 +1766,17 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[181, 182],
+            const <int>[184, 185],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'add', 1311234, 10, -1, -1, -1, const <int>[],
-            const <int>[183], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'addAll', 1311234, 10, -1, -1, -1, const <int>[],
-            const <int>[184], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'sort', 1311234, 10, -1, -1, -1, const <int>[],
-            const <int>[185], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'shuffle', 1311234, 10, -1, -1, -1, const <int>[],
             const <int>[186], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'addAll', 1311234, 10, -1, -1, -1, const <int>[],
+            const <int>[187], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'sort', 1311234, 10, -1, -1, -1, const <int>[],
+            const <int>[188], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'shuffle', 1311234, 10, -1, -1, -1, const <int>[],
+            const <int>[189], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'indexOf',
             2097666,
@@ -1780,7 +1785,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             9,
             9,
             const <int>[],
-            const <int>[187, 188],
+            const <int>[190, 191],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1791,7 +1796,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             9,
             9,
             const <int>[],
-            const <int>[189, 190],
+            const <int>[192, 193],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1802,7 +1807,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             9,
             9,
             const <int>[],
-            const <int>[191, 192],
+            const <int>[194, 195],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1813,7 +1818,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             9,
             9,
             const <int>[],
-            const <int>[193, 194],
+            const <int>[196, 197],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'clear', 1311234, 10, -1, -1, -1, const <int>[],
@@ -1826,7 +1831,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[195, 196],
+            const <int>[198, 199],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1837,7 +1842,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[197, 198],
+            const <int>[200, 201],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1848,13 +1853,13 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[199, 200],
+            const <int>[202, 203],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'remove', 2097666, 10, 8, 8, 8, const <int>[],
-            const <int>[201], const prefix0.ContainedReflectable(), const []),
+            const <int>[204], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'removeAt', 514, 10, -1, -1, -1, const <int>[],
-            const <int>[202], const prefix0.ContainedReflectable(), const []),
+            const <int>[205], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'removeLast', 514, 10, -1, -1, -1, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
@@ -1865,7 +1870,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[203],
+            const <int>[206],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1876,20 +1881,20 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[204],
+            const <int>[207],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'+', 35652098, 10, 10, 59, 10, null,
-            const <int>[205], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'+', 35652098, 10, 10, 58, 10, null,
+            const <int>[208], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'sublist',
             35652098,
             10,
             10,
-            59,
+            58,
             10,
             null,
-            const <int>[206, 207],
+            const <int>[209, 210],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1897,10 +1902,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652098,
             10,
             15,
-            60,
+            59,
             15,
             null,
-            const <int>[208, 209],
+            const <int>[211, 212],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1911,7 +1916,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[210, 211, 212, 213],
+            const <int>[213, 214, 215, 216],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1922,7 +1927,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[214, 215],
+            const <int>[217, 218],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1933,7 +1938,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[216, 217, 218],
+            const <int>[219, 220, 221],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1944,47 +1949,45 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[219, 220, 221],
+            const <int>[222, 223, 224],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'asMap', 35652098, 10, 14, 61, 14, null,
+        r.MethodMirrorImpl(r'asMap', 35652098, 10, 14, 60, 14, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'==', 2097666, 10, 8, 8, 8, const <int>[],
-            const <int>[222], const prefix0.ContainedReflectable(), const []),
+            const <int>[225], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'first=', 1311236, 10, -1, -1, -1, const <int>[],
-            const <int>[236], const prefix0.ContainedReflectable(), const []),
+            const <int>[238], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'last=', 1311236, 10, -1, -1, -1, const <int>[],
-            const <int>[237], const prefix0.ContainedReflectable(), const []),
+            const <int>[239], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'length', 2097667, 10, 9, 9, 9, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'length=', 1311236, 10, -1, -1, -1, const <int>[],
-            const <int>[238], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'reversed', 35652099, 10, 15, 60, 15, null,
+            const <int>[240], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'reversed', 35652099, 10, 15, 59, 15, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'', 1, 10, -1, 59, 10, null, const <int>[223],
-            const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'filled',
             1,
             10,
             -1,
-            59,
+            58,
             10,
             null,
-            const <int>[224, 225, 226],
+            const <int>[226, 227, 228],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'empty', 1, 10, -1, 59, 10, null, const <int>[227],
+        r.MethodMirrorImpl(r'empty', 1, 10, -1, 58, 10, null, const <int>[229],
             const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'from',
             1,
             10,
             -1,
-            59,
+            58,
             10,
             null,
-            const <int>[228, 229],
+            const <int>[230, 231],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1992,10 +1995,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             1,
             10,
             -1,
-            59,
+            58,
             10,
             null,
-            const <int>[230, 231],
+            const <int>[232, 233],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2003,14 +2006,14 @@ final _data = <r.Reflectable, r.ReflectorData>{
             1,
             10,
             -1,
-            59,
+            58,
             10,
             null,
-            const <int>[232, 233, 234],
+            const <int>[234, 235, 236],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'unmodifiable', 1, 10, -1, 59, 10, null,
-            const <int>[235], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'unmodifiable', 1, 10, -1, 58, 10, null,
+            const <int>[237], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'==',
             2097666,
@@ -2019,12 +2022,12 @@ final _data = <r.Reflectable, r.ReflectorData>{
             8,
             8,
             const <int>[],
-            const <int>[239],
+            const <int>[241],
             const prefix0.ContainedReflectable(),
             const <Object>[override]),
         r.MethodMirrorImpl(r'delegate', 2097666, 11, 4, 4, 4, const <int>[],
-            const <int>[240], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'type', 2097667, 11, -1, 48, 48, const <int>[],
+            const <int>[242], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'type', 2097667, 11, -1, 47, 47, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'hasReflectee', 2097667, 11, 8, 8, 8, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
@@ -2044,7 +2047,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.MethodMirrorImpl(r'', 64, 11, -1, 11, 11, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'isSubtypeOf', 2097666, 12, 8, 8, 8, const <int>[],
-            const <int>[241], const prefix0.ContainedReflectable(), const []),
+            const <int>[243], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'isAssignableTo',
             2097666,
@@ -2053,7 +2056,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             8,
             8,
             const <int>[],
-            const <int>[242],
+            const <int>[244],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2083,9 +2086,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652099,
             12,
             10,
-            63,
+            62,
             10,
-            const <int>[62],
+            const <int>[61],
             const <int>[],
             const prefix0.ContainedReflectable(),
             const []),
@@ -2094,7 +2097,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652099,
             12,
             10,
-            64,
+            63,
             10,
             const <int>[12],
             const <int>[],
@@ -2105,7 +2108,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652099,
             12,
             10,
-            50,
+            49,
             10,
             const <int>[6],
             const <int>[],
@@ -2178,19 +2181,19 @@ final _data = <r.Reflectable, r.ReflectorData>{
             8,
             8,
             const <int>[],
-            const <int>[243],
+            const <int>[245],
             const prefix0.ContainedReflectable(),
             const <Object>[override]),
-        r.MethodMirrorImpl(r'uri', 2097667, 13, -1, 46, 46, const <int>[],
+        r.MethodMirrorImpl(r'uri', 2097667, 13, -1, 45, 45, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'declarations',
             35652099,
             13,
             14,
-            66,
+            65,
             14,
-            const <int>[7, 65],
+            const <int>[7, 64],
             const <int>[],
             const prefix0.ContainedReflectable(),
             const []),
@@ -2210,9 +2213,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652099,
             13,
             10,
-            68,
+            67,
             10,
-            const <int>[67],
+            const <int>[66],
             const <int>[],
             const prefix0.ContainedReflectable(),
             const []),
@@ -2221,8 +2224,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             2097667,
             13,
             -1,
-            22,
-            22,
+            68,
+            68,
             const <int>[],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -2230,7 +2233,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.MethodMirrorImpl(r'', 64, 13, -1, 13, 13, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'castFrom', 35651602, 14, 14, 69, 14, null,
-            const <int>[244], const prefix0.ContainedReflectable(), const []),
+            const <int>[246], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'cast', 35652098, 14, 14, 70, 14, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
@@ -2241,13 +2244,13 @@ final _data = <r.Reflectable, r.ReflectorData>{
             8,
             8,
             const <int>[],
-            const <int>[245],
+            const <int>[247],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'containsKey', 2097666, 14, 8, 8, 8, const <int>[],
-            const <int>[246], const prefix0.ContainedReflectable(), const []),
+            const <int>[248], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'[]', 514, 14, -1, -1, -1, const <int>[],
-            const <int>[247], const prefix0.ContainedReflectable(), const []),
+            const <int>[249], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'[]=',
             1311234,
@@ -2256,11 +2259,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[248, 249],
+            const <int>[250, 251],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'map', 35652098, 14, 14, 71, 14, null,
-            const <int>[250], const prefix0.ContainedReflectable(), const []),
+            const <int>[252], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'addEntries',
             1311234,
@@ -2269,7 +2272,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[251],
+            const <int>[253],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2280,11 +2283,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[252, 253, 254],
+            const <int>[254, 255, 256],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'updateAll', 1311234, 14, -1, -1, -1, const <int>[],
-            const <int>[255], const prefix0.ContainedReflectable(), const []),
+            const <int>[257], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'removeWhere',
             1311234,
@@ -2293,7 +2296,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[256],
+            const <int>[258],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2304,17 +2307,17 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[257, 258],
+            const <int>[259, 260],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'addAll', 1311234, 14, -1, -1, -1, const <int>[],
-            const <int>[259], const prefix0.ContainedReflectable(), const []),
+            const <int>[261], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'remove', 514, 14, -1, -1, -1, const <int>[],
-            const <int>[260], const prefix0.ContainedReflectable(), const []),
+            const <int>[262], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'clear', 1311234, 14, -1, -1, -1, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'forEach', 1311234, 14, -1, -1, -1, const <int>[],
-            const <int>[261], const prefix0.ContainedReflectable(), const []),
+            const <int>[263], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'entries', 35652099, 14, 15, 72, 15, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'keys', 35652099, 14, 15, 73, 15, null,
@@ -2329,12 +2332,12 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'', 1, 14, -1, 75, 14, null, const <int>[],
             const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'from', 257, 14, -1, 75, 14, null, const <int>[262],
+        r.MethodMirrorImpl(r'from', 257, 14, -1, 75, 14, null, const <int>[264],
             const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'of', 257, 14, -1, 75, 14, null, const <int>[263],
+        r.MethodMirrorImpl(r'of', 257, 14, -1, 75, 14, null, const <int>[265],
             const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'unmodifiable', 1, 14, -1, 75, 14, null,
-            const <int>[264], const prefix0.ContainedReflectable(), const []),
+            const <int>[266], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'identity', 257, 14, -1, 75, 14, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
@@ -2345,7 +2348,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             75,
             14,
             null,
-            const <int>[265, 266, 267],
+            const <int>[267, 268, 269],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2356,31 +2359,31 @@ final _data = <r.Reflectable, r.ReflectorData>{
             75,
             14,
             null,
-            const <int>[268, 269],
+            const <int>[270, 271],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'fromEntries', 1, 14, -1, 75, 14, null,
-            const <int>[270], const prefix0.ContainedReflectable(), const []),
+            const <int>[272], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'castFrom', 35651602, 15, 15, 76, 15, null,
-            const <int>[271], const prefix0.ContainedReflectable(), const []),
+            const <int>[273], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'cast', 35651586, 15, 15, 77, 15, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'followedBy', 35651586, 15, 15, 78, 15, null,
-            const <int>[272], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'map', 35651586, 15, 15, 79, 15, null,
-            const <int>[273], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'where', 35651586, 15, 15, 78, 15, null,
             const <int>[274], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'map', 35651586, 15, 15, 79, 15, null,
+            const <int>[275], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'where', 35651586, 15, 15, 78, 15, null,
+            const <int>[276], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'whereType', 35651586, 15, 15, 80, 15, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'expand', 35651586, 15, 15, 81, 15, null,
-            const <int>[275], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'contains', 2097154, 15, 8, 8, 8, const <int>[],
-            const <int>[276], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'forEach', 1310722, 15, -1, -1, -1, const <int>[],
             const <int>[277], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'reduce', 2, 15, -1, -1, -1, const <int>[],
+        r.MethodMirrorImpl(r'contains', 2097154, 15, 8, 8, 8, const <int>[],
             const <int>[278], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'forEach', 1310722, 15, -1, -1, -1, const <int>[],
+            const <int>[279], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'reduce', 2, 15, -1, -1, -1, const <int>[],
+            const <int>[280], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'fold',
             2,
@@ -2389,27 +2392,27 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[279, 280],
+            const <int>[281, 282],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'every', 2097154, 15, 8, 8, 8, const <int>[],
-            const <int>[281], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'join', 2097154, 15, 7, 7, 7, const <int>[],
-            const <int>[282], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'any', 2097154, 15, 8, 8, 8, const <int>[],
             const <int>[283], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'toList', 35651586, 15, 10, 82, 10, null,
+        r.MethodMirrorImpl(r'join', 2097154, 15, 7, 7, 7, const <int>[],
             const <int>[284], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'any', 2097154, 15, 8, 8, 8, const <int>[],
+            const <int>[285], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'toList', 35651586, 15, 10, 82, 10, null,
+            const <int>[286], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'toSet', 35651586, 15, -1, 83, 84, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'take', 35651586, 15, 15, 78, 15, null,
-            const <int>[285], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'takeWhile', 35651586, 15, 15, 78, 15, null,
-            const <int>[286], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'skip', 35651586, 15, 15, 78, 15, null,
             const <int>[287], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'skipWhile', 35651586, 15, 15, 78, 15, null,
+        r.MethodMirrorImpl(r'takeWhile', 35651586, 15, 15, 78, 15, null,
             const <int>[288], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'skip', 35651586, 15, 15, 78, 15, null,
+            const <int>[289], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'skipWhile', 35651586, 15, 15, 78, 15, null,
+            const <int>[290], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'firstWhere',
             2,
@@ -2418,22 +2421,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[289, 290],
-            const prefix0.ContainedReflectable(),
-            const []),
-        r.MethodMirrorImpl(
-            r'lastWhere',
-            2,
-            15,
-            -1,
-            -1,
-            -1,
-            const <int>[],
             const <int>[291, 292],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
-            r'singleWhere',
+            r'lastWhere',
             2,
             15,
             -1,
@@ -2443,10 +2435,43 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[293, 294],
             const prefix0.ContainedReflectable(),
             const []),
+        r.MethodMirrorImpl(
+            r'singleWhere',
+            2,
+            15,
+            -1,
+            -1,
+            -1,
+            const <int>[],
+            const <int>[295, 296],
+            const prefix0.ContainedReflectable(),
+            const []),
         r.MethodMirrorImpl(r'elementAt', 2, 15, -1, -1, -1, const <int>[],
-            const <int>[295], const prefix0.ContainedReflectable(), const []),
+            const <int>[297], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'toString', 2097154, 15, 7, 7, 7, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(
+            r'iterableToShortString',
+            2097170,
+            15,
+            7,
+            7,
+            7,
+            const <int>[],
+            const <int>[298, 299, 300],
+            const prefix0.ContainedReflectable(),
+            const []),
+        r.MethodMirrorImpl(
+            r'iterableToFullString',
+            2097170,
+            15,
+            7,
+            7,
+            7,
+            const <int>[],
+            const <int>[301, 302, 303],
+            const prefix0.ContainedReflectable(),
+            const []),
         r.MethodMirrorImpl(r'iterator', 35652099, 15, -1, 85, 86, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'length', 2097155, 15, 9, 9, 9, const <int>[],
@@ -2471,7 +2496,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             78,
             15,
             null,
-            const <int>[296, 297],
+            const <int>[304, 305],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'empty', 385, 15, -1, 78, 15, null, const <int>[],
@@ -2555,7 +2580,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'receiver',
             67239942,
-            16,
+            14,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -2567,7 +2592,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'memberName',
             134348806,
-            16,
+            14,
             const prefix0.ContainedReflectable(),
             7,
             7,
@@ -2579,10 +2604,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'positionalArguments',
             151126022,
-            16,
+            14,
             const prefix0.ContainedReflectable(),
             10,
-            51,
+            50,
             10,
             null,
             const [],
@@ -2591,7 +2616,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'namedArguments',
             84017158,
-            16,
+            14,
             const prefix0.ContainedReflectable(),
             14,
             87,
@@ -2603,7 +2628,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'kind',
             134348806,
-            16,
+            14,
             const prefix0.ContainedReflectable(),
             -1,
             88,
@@ -2612,6 +2637,102 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'receiver',
+            67239942,
+            15,
+            const prefix0.ContainedReflectable(),
+            4,
+            4,
+            4,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'memberName',
+            134348806,
+            15,
+            const prefix0.ContainedReflectable(),
+            7,
+            7,
+            7,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'positionalArguments',
+            151126022,
+            15,
+            const prefix0.ContainedReflectable(),
+            10,
+            50,
+            10,
+            null,
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'namedArguments',
+            84017158,
+            15,
+            const prefix0.ContainedReflectable(),
+            14,
+            87,
+            14,
+            null,
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'receiver',
+            67239942,
+            16,
+            const prefix0.ContainedReflectable(),
+            4,
+            4,
+            4,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'memberName',
+            134348806,
+            16,
+            const prefix0.ContainedReflectable(),
+            7,
+            7,
+            7,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'positionalArguments',
+            151126022,
+            16,
+            const prefix0.ContainedReflectable(),
+            10,
+            50,
+            10,
+            null,
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'namedArguments',
+            84017158,
+            16,
+            const prefix0.ContainedReflectable(),
+            14,
+            87,
+            14,
+            null,
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'receiver',
             67239942,
@@ -2642,7 +2763,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             17,
             const prefix0.ContainedReflectable(),
             10,
-            51,
+            50,
             10,
             null,
             const [],
@@ -2672,106 +2793,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'memberName',
-            134348806,
-            18,
-            const prefix0.ContainedReflectable(),
-            7,
-            7,
-            7,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'positionalArguments',
-            151126022,
-            18,
-            const prefix0.ContainedReflectable(),
-            10,
-            51,
-            10,
-            null,
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'namedArguments',
-            84017158,
-            18,
-            const prefix0.ContainedReflectable(),
-            14,
-            87,
-            14,
-            null,
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'receiver',
-            67239942,
-            19,
-            const prefix0.ContainedReflectable(),
-            4,
-            4,
-            4,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'memberName',
-            134348806,
-            19,
-            const prefix0.ContainedReflectable(),
-            7,
-            7,
-            7,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'positionalArguments',
-            151126022,
-            19,
-            const prefix0.ContainedReflectable(),
-            10,
-            51,
-            10,
-            null,
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'namedArguments',
-            84017158,
-            19,
-            const prefix0.ContainedReflectable(),
-            14,
-            87,
-            14,
-            null,
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'receiver',
-            67239942,
-            20,
-            const prefix0.ContainedReflectable(),
-            4,
-            4,
-            4,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'constructorName',
             134348806,
-            20,
+            18,
             const prefix0.ContainedReflectable(),
             7,
             7,
@@ -2783,10 +2808,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'positionalArguments',
             151126022,
-            20,
+            18,
             const prefix0.ContainedReflectable(),
             10,
-            51,
+            50,
             10,
             null,
             const [],
@@ -2795,7 +2820,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'namedArguments',
             84017158,
-            20,
+            18,
             const prefix0.ContainedReflectable(),
             14,
             87,
@@ -2807,7 +2832,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             134348806,
-            43,
+            41,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -2819,7 +2844,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'invocation',
             134348806,
-            45,
+            43,
             const prefix0.ContainedReflectable(),
             5,
             5,
@@ -2831,44 +2856,44 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'reflectee',
             134348806,
+            47,
+            const prefix0.ContainedReflectable(),
+            4,
+            4,
+            4,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'reflectee',
+            134348806,
+            48,
+            const prefix0.ContainedReflectable(),
+            4,
+            4,
+            4,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'type',
+            134348806,
             49,
             const prefix0.ContainedReflectable(),
-            4,
-            4,
-            4,
+            6,
+            6,
+            6,
             const <int>[],
             const [],
             null,
             null),
         r.ParameterMirrorImpl(
-            r'reflectee',
+            r'type',
             134348806,
             50,
             const prefix0.ContainedReflectable(),
-            4,
-            4,
-            4,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'type',
-            134348806,
-            51,
-            const prefix0.ContainedReflectable(),
-            6,
-            6,
-            6,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'type',
-            134348806,
-            52,
-            const prefix0.ContainedReflectable(),
             6,
             6,
             6,
@@ -2879,7 +2904,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'libraryName',
             134348806,
-            53,
+            51,
             const prefix0.ContainedReflectable(),
             7,
             7,
@@ -2891,7 +2916,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'type',
             134348806,
-            56,
+            54,
             const prefix0.ContainedReflectable(),
             6,
             6,
@@ -2900,6 +2925,138 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'cap0',
+            67244038,
+            57,
+            const prefix0.ContainedReflectable(),
+            16,
+            16,
+            16,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap1',
+            67244038,
+            57,
+            const prefix0.ContainedReflectable(),
+            16,
+            16,
+            16,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap2',
+            67244038,
+            57,
+            const prefix0.ContainedReflectable(),
+            16,
+            16,
+            16,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap3',
+            67244038,
+            57,
+            const prefix0.ContainedReflectable(),
+            16,
+            16,
+            16,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap4',
+            67244038,
+            57,
+            const prefix0.ContainedReflectable(),
+            16,
+            16,
+            16,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap5',
+            67244038,
+            57,
+            const prefix0.ContainedReflectable(),
+            16,
+            16,
+            16,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap6',
+            67244038,
+            57,
+            const prefix0.ContainedReflectable(),
+            16,
+            16,
+            16,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap7',
+            67244038,
+            57,
+            const prefix0.ContainedReflectable(),
+            16,
+            16,
+            16,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap8',
+            67244038,
+            57,
+            const prefix0.ContainedReflectable(),
+            16,
+            16,
+            16,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap9',
+            67244038,
+            57,
+            const prefix0.ContainedReflectable(),
+            16,
+            16,
+            16,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'capabilities',
+            151126022,
+            58,
+            const prefix0.ContainedReflectable(),
+            10,
+            44,
+            10,
+            const <int>[16],
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'cap0',
             67244038,
@@ -3026,139 +3183,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             60,
             const prefix0.ContainedReflectable(),
             10,
-            45,
-            10,
-            const <int>[16],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap0',
-            67244038,
-            61,
-            const prefix0.ContainedReflectable(),
-            16,
-            16,
-            16,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap1',
-            67244038,
-            61,
-            const prefix0.ContainedReflectable(),
-            16,
-            16,
-            16,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap2',
-            67244038,
-            61,
-            const prefix0.ContainedReflectable(),
-            16,
-            16,
-            16,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap3',
-            67244038,
-            61,
-            const prefix0.ContainedReflectable(),
-            16,
-            16,
-            16,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap4',
-            67244038,
-            61,
-            const prefix0.ContainedReflectable(),
-            16,
-            16,
-            16,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap5',
-            67244038,
-            61,
-            const prefix0.ContainedReflectable(),
-            16,
-            16,
-            16,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap6',
-            67244038,
-            61,
-            const prefix0.ContainedReflectable(),
-            16,
-            16,
-            16,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap7',
-            67244038,
-            61,
-            const prefix0.ContainedReflectable(),
-            16,
-            16,
-            16,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap8',
-            67244038,
-            61,
-            const prefix0.ContainedReflectable(),
-            16,
-            16,
-            16,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap9',
-            67244038,
-            61,
-            const prefix0.ContainedReflectable(),
-            16,
-            16,
-            16,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'capabilities',
-            151126022,
-            62,
-            const prefix0.ContainedReflectable(),
-            10,
-            45,
+            44,
             10,
             const <int>[16],
             const [],
@@ -3167,7 +3192,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap0',
             67245094,
-            63,
+            61,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -3179,7 +3204,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap1',
             67245094,
-            63,
+            61,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -3191,7 +3216,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap2',
             67245094,
-            63,
+            61,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -3203,7 +3228,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap3',
             67245094,
-            63,
+            61,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -3215,7 +3240,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap4',
             67245094,
-            63,
+            61,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -3227,7 +3252,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap5',
             67245094,
-            63,
+            61,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -3239,7 +3264,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap6',
             67245094,
-            63,
+            61,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -3251,7 +3276,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap7',
             67245094,
-            63,
+            61,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -3263,7 +3288,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap8',
             67245094,
-            63,
+            61,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -3275,7 +3300,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap9',
             67245094,
-            63,
+            61,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -3287,7 +3312,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_capabilities',
             84018214,
-            64,
+            62,
             const prefix0.ContainedReflectable(),
             10,
             89,
@@ -3299,7 +3324,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object1',
             67239942,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3311,7 +3336,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object2',
             67239942,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3323,7 +3348,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object3',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3335,7 +3360,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object4',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3347,7 +3372,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object5',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3359,7 +3384,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object6',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3371,7 +3396,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object7',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3383,7 +3408,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object8',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3395,7 +3420,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object9',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3407,7 +3432,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object10',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3419,7 +3444,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object11',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3431,7 +3456,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object12',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3443,7 +3468,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object13',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3455,7 +3480,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object14',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3467,7 +3492,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object15',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3479,7 +3504,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object16',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3491,7 +3516,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object17',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3503,7 +3528,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object18',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3515,7 +3540,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object19',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3527,7 +3552,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object20',
             67246086,
-            65,
+            63,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3539,7 +3564,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'objects',
             151126022,
-            66,
+            64,
             const prefix0.ContainedReflectable(),
             15,
             90,
@@ -3551,7 +3576,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'objects',
             151126022,
-            67,
+            65,
             const prefix0.ContainedReflectable(),
             15,
             90,
@@ -3563,7 +3588,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'memberName',
             134348806,
-            78,
+            76,
             const prefix0.ContainedReflectable(),
             -1,
             20,
@@ -3575,7 +3600,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'positionalArguments',
             84017158,
-            78,
+            76,
             const prefix0.ContainedReflectable(),
             15,
             91,
@@ -3587,7 +3612,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'namedArguments',
             84021254,
-            78,
+            76,
             const prefix0.ContainedReflectable(),
             14,
             92,
@@ -3599,7 +3624,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'memberName',
             134348806,
-            79,
+            77,
             const prefix0.ContainedReflectable(),
             -1,
             20,
@@ -3611,7 +3636,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'typeArguments',
             84017158,
-            79,
+            77,
             const prefix0.ContainedReflectable(),
             15,
             93,
@@ -3623,7 +3648,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'positionalArguments',
             84017158,
-            79,
+            77,
             const prefix0.ContainedReflectable(),
             15,
             91,
@@ -3635,7 +3660,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'namedArguments',
             84021254,
-            79,
+            77,
             const prefix0.ContainedReflectable(),
             14,
             92,
@@ -3647,7 +3672,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'name',
             134348806,
-            80,
+            78,
             const prefix0.ContainedReflectable(),
             -1,
             20,
@@ -3659,7 +3684,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'memberName',
             134348806,
-            81,
+            79,
             const prefix0.ContainedReflectable(),
             -1,
             20,
@@ -3671,7 +3696,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'argument',
             67239942,
-            81,
+            79,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3683,7 +3708,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             134348806,
-            82,
+            80,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3695,23 +3720,47 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'index',
             134348806,
+            84,
+            const prefix0.ContainedReflectable(),
+            9,
+            9,
+            9,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'index',
+            134348806,
+            85,
+            const prefix0.ContainedReflectable(),
+            9,
+            9,
+            9,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'other',
+            134348806,
             86,
             const prefix0.ContainedReflectable(),
-            9,
-            9,
-            9,
+            4,
+            4,
+            4,
             const <int>[],
             const [],
             null,
             null),
         r.ParameterMirrorImpl(
-            r'index',
+            r'other',
             134348806,
             87,
             const prefix0.ContainedReflectable(),
-            9,
-            9,
-            9,
+            7,
+            7,
+            7,
             const <int>[],
             const [],
             null,
@@ -3721,30 +3770,6 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134348806,
             88,
             const prefix0.ContainedReflectable(),
-            4,
-            4,
-            4,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'other',
-            134348806,
-            89,
-            const prefix0.ContainedReflectable(),
-            7,
-            7,
-            7,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'other',
-            134348806,
-            90,
-            const prefix0.ContainedReflectable(),
             7,
             7,
             7,
@@ -3755,7 +3780,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'pattern',
             134348806,
-            91,
+            89,
             const prefix0.ContainedReflectable(),
             -1,
             94,
@@ -3767,7 +3792,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'index',
             134354950,
-            91,
+            89,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -3779,7 +3804,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'pattern',
             134348806,
-            92,
+            90,
             const prefix0.ContainedReflectable(),
             -1,
             94,
@@ -3791,7 +3816,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'start',
             134354950,
-            92,
+            90,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -3803,7 +3828,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'pattern',
             134348806,
-            93,
+            91,
             const prefix0.ContainedReflectable(),
             -1,
             94,
@@ -3815,7 +3840,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'start',
             67244038,
-            93,
+            91,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -3827,7 +3852,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             134348806,
-            94,
+            92,
             const prefix0.ContainedReflectable(),
             7,
             7,
@@ -3839,7 +3864,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'start',
             134348806,
-            95,
+            93,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -3851,7 +3876,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'end',
             67244038,
-            95,
+            93,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -3863,6 +3888,42 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'times',
             134348806,
+            97,
+            const prefix0.ContainedReflectable(),
+            9,
+            9,
+            9,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'width',
+            134348806,
+            98,
+            const prefix0.ContainedReflectable(),
+            9,
+            9,
+            9,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'padding',
+            134354950,
+            98,
+            const prefix0.ContainedReflectable(),
+            7,
+            7,
+            7,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'width',
+            134348806,
             99,
             const prefix0.ContainedReflectable(),
             9,
@@ -3872,46 +3933,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'width',
-            134348806,
-            100,
-            const prefix0.ContainedReflectable(),
-            9,
-            9,
-            9,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'padding',
             134354950,
-            100,
-            const prefix0.ContainedReflectable(),
-            7,
-            7,
-            7,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'width',
-            134348806,
-            101,
-            const prefix0.ContainedReflectable(),
-            9,
-            9,
-            9,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'padding',
-            134354950,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             7,
             7,
@@ -3923,7 +3948,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             134348806,
-            102,
+            100,
             const prefix0.ContainedReflectable(),
             -1,
             94,
@@ -3935,7 +3960,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'startIndex',
             134354950,
-            102,
+            100,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -3947,7 +3972,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'from',
             134348806,
-            103,
+            101,
             const prefix0.ContainedReflectable(),
             -1,
             94,
@@ -3959,7 +3984,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'to',
             134348806,
-            103,
+            101,
             const prefix0.ContainedReflectable(),
             7,
             7,
@@ -3971,7 +3996,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'startIndex',
             134354950,
-            103,
+            101,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -3980,6 +4005,66 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'from',
+            134348806,
+            102,
+            const prefix0.ContainedReflectable(),
+            -1,
+            94,
+            94,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'replace',
+            134217734,
+            102,
+            const prefix0.ContainedReflectable(),
+            -1,
+            95,
+            95,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'startIndex',
+            134354950,
+            102,
+            const prefix0.ContainedReflectable(),
+            9,
+            9,
+            9,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'from',
+            134348806,
+            103,
+            const prefix0.ContainedReflectable(),
+            -1,
+            94,
+            94,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'replace',
+            134348806,
+            103,
+            const prefix0.ContainedReflectable(),
+            7,
+            7,
+            7,
+            const <int>[],
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'from',
             134348806,
@@ -4004,70 +4089,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'startIndex',
-            134354950,
-            104,
-            const prefix0.ContainedReflectable(),
-            9,
-            9,
-            9,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'from',
-            134348806,
-            105,
-            const prefix0.ContainedReflectable(),
-            -1,
-            94,
-            94,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'replace',
-            134348806,
-            105,
-            const prefix0.ContainedReflectable(),
-            7,
-            7,
-            7,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'from',
-            134348806,
-            106,
-            const prefix0.ContainedReflectable(),
-            -1,
-            94,
-            94,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'replace',
-            134217734,
-            106,
-            const prefix0.ContainedReflectable(),
-            -1,
-            95,
-            95,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'start',
             134348806,
-            107,
+            105,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -4079,7 +4104,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'end',
             67239942,
-            107,
+            105,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -4091,7 +4116,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'replacement',
             134348806,
-            107,
+            105,
             const prefix0.ContainedReflectable(),
             7,
             7,
@@ -4103,7 +4128,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'pattern',
             134348806,
-            108,
+            106,
             const prefix0.ContainedReflectable(),
             -1,
             94,
@@ -4115,7 +4140,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'pattern',
             134348806,
-            109,
+            107,
             const prefix0.ContainedReflectable(),
             -1,
             94,
@@ -4127,7 +4152,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'onMatch',
             67121158,
-            109,
+            107,
             const prefix0.ContainedReflectable(),
             -1,
             96,
@@ -4139,7 +4164,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'onNonMatch',
             67121158,
-            109,
+            107,
             const prefix0.ContainedReflectable(),
             -1,
             97,
@@ -4151,7 +4176,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'charCodes',
             151126022,
-            118,
+            116,
             const prefix0.ContainedReflectable(),
             15,
             98,
@@ -4163,7 +4188,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'start',
             134354950,
-            118,
+            116,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -4175,7 +4200,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'end',
             67244038,
-            118,
+            116,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -4187,7 +4212,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'charCode',
             134348806,
-            119,
+            117,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -4199,7 +4224,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'name',
             134348806,
-            120,
+            118,
             const prefix0.ContainedReflectable(),
             7,
             7,
@@ -4211,7 +4236,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'defaultValue',
             134363142,
-            120,
+            118,
             const prefix0.ContainedReflectable(),
             7,
             7,
@@ -4220,6 +4245,54 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             #defaultValue),
+        r.ParameterMirrorImpl(
+            r'source',
+            134348806,
+            119,
+            const prefix0.ContainedReflectable(),
+            7,
+            7,
+            7,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'caseSensitive',
+            134363142,
+            119,
+            const prefix0.ContainedReflectable(),
+            8,
+            8,
+            8,
+            const <int>[],
+            const [],
+            null,
+            #caseSensitive),
+        r.ParameterMirrorImpl(
+            r'source',
+            134348806,
+            120,
+            const prefix0.ContainedReflectable(),
+            7,
+            7,
+            7,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'caseSensitive',
+            134363142,
+            120,
+            const prefix0.ContainedReflectable(),
+            8,
+            8,
+            8,
+            const <int>[],
+            const [],
+            null,
+            #caseSensitive),
         r.ParameterMirrorImpl(
             r'other',
             134348806,
@@ -4472,18 +4545,6 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             #radix),
-        r.ParameterMirrorImpl(
-            r'onError',
-            67121158,
-            152,
-            const prefix0.ContainedReflectable(),
-            -1,
-            99,
-            99,
-            const <int>[],
-            const [],
-            null,
-            #onError),
         r.ParameterMirrorImpl(
             r'source',
             134348806,
@@ -4538,7 +4599,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             159,
             const prefix0.ContainedReflectable(),
             10,
-            100,
+            99,
             10,
             null,
             const [],
@@ -4550,7 +4611,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             160,
             const prefix0.ContainedReflectable(),
             10,
-            101,
+            100,
             10,
             null,
             const [],
@@ -4574,7 +4635,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             160,
             const prefix0.ContainedReflectable(),
             10,
-            101,
+            100,
             10,
             null,
             const [],
@@ -4610,7 +4671,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             161,
             const prefix0.ContainedReflectable(),
             10,
-            102,
+            101,
             10,
             null,
             const [],
@@ -4634,7 +4695,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             161,
             const prefix0.ContainedReflectable(),
             15,
-            103,
+            102,
             15,
             null,
             const [],
@@ -4694,7 +4755,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             166,
             const prefix0.ContainedReflectable(),
             15,
-            60,
+            59,
             15,
             null,
             const [],
@@ -4706,8 +4767,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             167,
             const prefix0.ContainedReflectable(),
             -1,
-            104,
-            104,
+            103,
+            103,
             const <int>[],
             const [],
             null,
@@ -4718,8 +4779,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             168,
             const prefix0.ContainedReflectable(),
             -1,
-            105,
-            105,
+            104,
+            104,
             const <int>[],
             const [],
             null,
@@ -4754,8 +4815,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             170,
             const prefix0.ContainedReflectable(),
             -1,
-            106,
-            106,
+            105,
+            105,
             const <int>[],
             const [],
             null,
@@ -4778,8 +4839,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             171,
             const prefix0.ContainedReflectable(),
             -1,
-            106,
-            106,
+            105,
+            105,
             const <int>[],
             const [],
             null,
@@ -4862,7 +4923,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             175,
             const prefix0.ContainedReflectable(),
             15,
-            60,
+            59,
             15,
             null,
             const [],
@@ -4886,7 +4947,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             176,
             const prefix0.ContainedReflectable(),
             15,
-            60,
+            59,
             15,
             null,
             const [],
@@ -4922,8 +4983,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             180,
             const prefix0.ContainedReflectable(),
             -1,
-            106,
-            106,
+            105,
+            105,
             const <int>[],
             const [],
             null,
@@ -4934,8 +4995,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             181,
             const prefix0.ContainedReflectable(),
             -1,
-            106,
-            106,
+            105,
+            105,
             const <int>[],
             const [],
             null,
@@ -4946,7 +5007,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             182,
             const prefix0.ContainedReflectable(),
             10,
-            59,
+            58,
             10,
             null,
             const [],
@@ -5030,7 +5091,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             185,
             const prefix0.ContainedReflectable(),
             15,
-            60,
+            59,
             15,
             null,
             const [],
@@ -5138,7 +5199,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             188,
             const prefix0.ContainedReflectable(),
             15,
-            60,
+            59,
             15,
             null,
             const [],
@@ -5156,22 +5217,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'length',
-            67244038,
-            196,
-            const prefix0.ContainedReflectable(),
-            9,
-            9,
-            9,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'length',
             134348806,
-            197,
+            196,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -5183,7 +5232,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'fill',
             6,
-            197,
+            196,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -5192,6 +5241,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'growable',
+            134363142,
+            196,
+            const prefix0.ContainedReflectable(),
+            8,
+            8,
+            8,
+            const <int>[],
+            const [],
+            null,
+            #growable),
         r.ParameterMirrorImpl(
             r'growable',
             134363142,
@@ -5204,6 +5265,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             #growable),
+        r.ParameterMirrorImpl(
+            r'elements',
+            151126022,
+            198,
+            const prefix0.ContainedReflectable(),
+            15,
+            106,
+            15,
+            null,
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'growable',
             134363142,
@@ -5222,7 +5295,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             199,
             const prefix0.ContainedReflectable(),
             15,
-            107,
+            59,
             15,
             null,
             const [],
@@ -5240,34 +5313,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             #growable),
-        r.ParameterMirrorImpl(
-            r'elements',
-            151126022,
-            200,
-            const prefix0.ContainedReflectable(),
-            15,
-            60,
-            15,
-            null,
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'growable',
-            134363142,
-            200,
-            const prefix0.ContainedReflectable(),
-            8,
-            8,
-            8,
-            const <int>[],
-            const [],
-            null,
-            #growable),
         r.ParameterMirrorImpl(
             r'length',
             134348806,
-            201,
+            200,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -5279,11 +5328,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'generator',
             134217734,
-            201,
+            200,
             const prefix0.ContainedReflectable(),
             -1,
-            108,
-            108,
+            107,
+            107,
             const <int>[],
             const [],
             null,
@@ -5291,7 +5340,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'growable',
             134363142,
-            201,
+            200,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -5303,10 +5352,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'elements',
             151126022,
-            202,
+            201,
             const prefix0.ContainedReflectable(),
             15,
-            107,
+            106,
             15,
             null,
             const [],
@@ -5351,7 +5400,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             134348806,
-            203,
+            202,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -5363,7 +5412,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'invocation',
             134348806,
-            204,
+            203,
             const prefix0.ContainedReflectable(),
             5,
             5,
@@ -5372,6 +5421,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'other',
+            134348806,
+            209,
+            const prefix0.ContainedReflectable(),
+            12,
+            12,
+            12,
+            const <int>[],
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'other',
             134348806,
@@ -5387,19 +5448,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             134348806,
-            211,
-            const prefix0.ContainedReflectable(),
-            12,
-            12,
-            12,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'other',
-            134348806,
-            224,
+            223,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -5411,10 +5460,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'source',
             151126022,
-            231,
+            230,
             const prefix0.ContainedReflectable(),
             14,
-            109,
+            108,
             14,
             null,
             const [],
@@ -5423,6 +5472,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'value',
             67239942,
+            232,
+            const prefix0.ContainedReflectable(),
+            4,
+            4,
+            4,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'key',
+            67239942,
             233,
             const prefix0.ContainedReflectable(),
             4,
@@ -5444,22 +5505,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'key',
-            67239942,
-            235,
-            const prefix0.ContainedReflectable(),
-            4,
-            4,
-            4,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'key',
             6,
-            236,
+            235,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -5471,7 +5520,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'value',
             6,
-            236,
+            235,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -5483,11 +5532,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'convert',
             134217734,
-            237,
+            236,
             const prefix0.ContainedReflectable(),
             -1,
-            110,
-            110,
+            109,
+            109,
             const <int>[],
             const [],
             null,
@@ -5495,7 +5544,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'newEntries',
             151126022,
-            238,
+            237,
             const prefix0.ContainedReflectable(),
             15,
             72,
@@ -5507,7 +5556,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'key',
             6,
-            239,
+            238,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -5519,11 +5568,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'update',
             134217734,
-            239,
+            238,
             const prefix0.ContainedReflectable(),
             -1,
-            111,
-            111,
+            110,
+            110,
             const <int>[],
             const [],
             null,
@@ -5531,6 +5580,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'ifAbsent',
             67121158,
+            238,
+            const prefix0.ContainedReflectable(),
+            -1,
+            111,
+            111,
+            const <int>[],
+            const [],
+            null,
+            #ifAbsent),
+        r.ParameterMirrorImpl(
+            r'update',
+            134217734,
             239,
             const prefix0.ContainedReflectable(),
             -1,
@@ -5539,9 +5600,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[],
             const [],
             null,
-            #ifAbsent),
+            null),
         r.ParameterMirrorImpl(
-            r'update',
+            r'test',
             134217734,
             240,
             const prefix0.ContainedReflectable(),
@@ -5552,22 +5613,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'test',
-            134217734,
-            241,
-            const prefix0.ContainedReflectable(),
-            -1,
-            114,
-            114,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'key',
             6,
-            242,
+            241,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -5579,11 +5628,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'ifAbsent',
             134217734,
-            242,
+            241,
             const prefix0.ContainedReflectable(),
             -1,
-            115,
-            115,
+            114,
+            114,
             const <int>[],
             const [],
             null,
@@ -5591,7 +5640,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             151126022,
-            243,
+            242,
             const prefix0.ContainedReflectable(),
             14,
             75,
@@ -5603,7 +5652,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'key',
             67239942,
-            244,
+            243,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -5615,22 +5664,34 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'action',
             134217734,
-            246,
+            245,
             const prefix0.ContainedReflectable(),
             -1,
-            116,
-            116,
+            115,
+            115,
             const <int>[],
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'other',
+            151126022,
+            253,
+            const prefix0.ContainedReflectable(),
+            14,
+            116,
+            14,
+            null,
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'other',
             151126022,
             254,
             const prefix0.ContainedReflectable(),
             14,
-            117,
+            75,
             14,
             null,
             const [],
@@ -5642,19 +5703,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             255,
             const prefix0.ContainedReflectable(),
             14,
-            75,
-            14,
-            null,
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'other',
-            151126022,
-            256,
-            const prefix0.ContainedReflectable(),
-            14,
-            117,
+            116,
             14,
             null,
             const [],
@@ -5663,10 +5712,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'iterable',
             151126022,
-            258,
+            257,
             const prefix0.ContainedReflectable(),
             15,
-            107,
+            106,
             15,
             null,
             const [],
@@ -5675,11 +5724,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'key',
             67121158,
-            258,
+            257,
             const prefix0.ContainedReflectable(),
             -1,
-            118,
-            118,
+            117,
+            117,
             const <int>[],
             const [],
             null,
@@ -5687,11 +5736,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'value',
             67121158,
-            258,
+            257,
             const prefix0.ContainedReflectable(),
             -1,
-            119,
-            119,
+            118,
+            118,
             const <int>[],
             const [],
             null,
@@ -5699,7 +5748,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'keys',
             151126022,
-            259,
+            258,
             const prefix0.ContainedReflectable(),
             15,
             73,
@@ -5711,7 +5760,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'values',
             151126022,
-            259,
+            258,
             const prefix0.ContainedReflectable(),
             15,
             74,
@@ -5723,7 +5772,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'entries',
             151126022,
-            260,
+            259,
             const prefix0.ContainedReflectable(),
             15,
             72,
@@ -5735,10 +5784,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'source',
             151126022,
-            261,
+            260,
             const prefix0.ContainedReflectable(),
             15,
-            120,
+            119,
             15,
             null,
             const [],
@@ -5747,7 +5796,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             151126022,
-            263,
+            262,
             const prefix0.ContainedReflectable(),
             15,
             78,
@@ -5759,6 +5808,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'toElement',
             134217734,
+            263,
+            const prefix0.ContainedReflectable(),
+            -1,
+            120,
+            120,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'test',
+            134217734,
             264,
             const prefix0.ContainedReflectable(),
             -1,
@@ -5768,26 +5829,14 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'test',
-            134217734,
-            265,
-            const prefix0.ContainedReflectable(),
-            -1,
-            122,
-            122,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'toElements',
             134217734,
-            267,
+            266,
             const prefix0.ContainedReflectable(),
             -1,
-            123,
-            123,
+            122,
+            122,
             const <int>[],
             const [],
             null,
@@ -5795,7 +5844,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'element',
             67239942,
-            268,
+            267,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -5807,6 +5856,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'action',
             134217734,
+            268,
+            const prefix0.ContainedReflectable(),
+            -1,
+            123,
+            123,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'combine',
+            134217734,
             269,
             const prefix0.ContainedReflectable(),
             -1,
@@ -5816,6 +5877,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'initialValue',
+            6,
+            270,
+            const prefix0.ContainedReflectable(),
+            -1,
+            -1,
+            -1,
+            const <int>[],
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'combine',
             134217734,
@@ -5828,38 +5901,14 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'initialValue',
-            6,
-            271,
-            const prefix0.ContainedReflectable(),
-            -1,
-            -1,
-            -1,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'combine',
-            134217734,
-            271,
-            const prefix0.ContainedReflectable(),
-            -1,
-            126,
-            126,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'test',
             134217734,
-            272,
+            271,
             const prefix0.ContainedReflectable(),
             -1,
-            122,
-            122,
+            121,
+            121,
             const <int>[],
             const [],
             null,
@@ -5867,7 +5916,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'separator',
             134354950,
-            273,
+            272,
             const prefix0.ContainedReflectable(),
             7,
             7,
@@ -5879,11 +5928,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'test',
             134217734,
-            274,
+            273,
             const prefix0.ContainedReflectable(),
             -1,
-            122,
-            122,
+            121,
+            121,
             const <int>[],
             const [],
             null,
@@ -5891,7 +5940,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'growable',
             134363142,
-            275,
+            274,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -5903,7 +5952,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'count',
             134348806,
-            277,
+            276,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -5915,11 +5964,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'test',
             134217734,
-            278,
+            277,
             const prefix0.ContainedReflectable(),
             -1,
-            122,
-            122,
+            121,
+            121,
             const <int>[],
             const [],
             null,
@@ -5927,7 +5976,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'count',
             134348806,
-            279,
+            278,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -5936,26 +5985,50 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'test',
+            134217734,
+            279,
+            const prefix0.ContainedReflectable(),
+            -1,
+            121,
+            121,
+            const <int>[],
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'test',
             134217734,
             280,
             const prefix0.ContainedReflectable(),
             -1,
-            122,
-            122,
+            121,
+            121,
             const <int>[],
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'orElse',
+            67121158,
+            280,
+            const prefix0.ContainedReflectable(),
+            -1,
+            126,
+            126,
+            const <int>[],
+            const [],
+            null,
+            #orElse),
         r.ParameterMirrorImpl(
             r'test',
             134217734,
             281,
             const prefix0.ContainedReflectable(),
             -1,
-            122,
-            122,
+            121,
+            121,
             const <int>[],
             const [],
             null,
@@ -5966,8 +6039,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             281,
             const prefix0.ContainedReflectable(),
             -1,
-            127,
-            127,
+            126,
+            126,
             const <int>[],
             const [],
             null,
@@ -5978,8 +6051,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             282,
             const prefix0.ContainedReflectable(),
             -1,
-            122,
-            122,
+            121,
+            121,
             const <int>[],
             const [],
             null,
@@ -5990,32 +6063,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             282,
             const prefix0.ContainedReflectable(),
             -1,
-            127,
-            127,
-            const <int>[],
-            const [],
-            null,
-            #orElse),
-        r.ParameterMirrorImpl(
-            r'test',
-            134217734,
-            283,
-            const prefix0.ContainedReflectable(),
-            -1,
-            122,
-            122,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'orElse',
-            67121158,
-            283,
-            const prefix0.ContainedReflectable(),
-            -1,
-            127,
-            127,
+            126,
+            126,
             const <int>[],
             const [],
             null,
@@ -6023,7 +6072,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'index',
             134348806,
-            284,
+            283,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -6032,10 +6081,82 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'iterable',
+            151126022,
+            285,
+            const prefix0.ContainedReflectable(),
+            15,
+            106,
+            15,
+            null,
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'leftDelimiter',
+            134354950,
+            285,
+            const prefix0.ContainedReflectable(),
+            7,
+            7,
+            7,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'rightDelimiter',
+            134354950,
+            285,
+            const prefix0.ContainedReflectable(),
+            7,
+            7,
+            7,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'iterable',
+            151126022,
+            286,
+            const prefix0.ContainedReflectable(),
+            15,
+            106,
+            15,
+            null,
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'leftDelimiter',
+            134354950,
+            286,
+            const prefix0.ContainedReflectable(),
+            7,
+            7,
+            7,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'rightDelimiter',
+            134354950,
+            286,
+            const prefix0.ContainedReflectable(),
+            7,
+            7,
+            7,
+            const <int>[],
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'count',
             134348806,
-            294,
+            295,
             const prefix0.ContainedReflectable(),
             9,
             9,
@@ -6047,11 +6168,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'generator',
             67112966,
-            294,
+            295,
             const prefix0.ContainedReflectable(),
             -1,
-            128,
-            128,
+            127,
+            127,
             const <int>[],
             const [],
             null,
@@ -6081,7 +6202,6 @@ final _data = <r.Reflectable, r.ReflectorData>{
         const m.TypeValue<Map<Symbol, String>>().type,
         Symbol,
         Deprecated,
-        Null,
         prefix5.InstanceInvokeCapability,
         prefix5.StaticInvokeCapability,
         prefix5.TopLevelInvokeCapability,
@@ -6129,6 +6249,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         const m.TypeValue<Map<String, prefix4.DeclarationMirror>>().type,
         prefix4.LibraryDependencyMirror,
         const m.TypeValue<List<prefix4.LibraryDependencyMirror>>().type,
+        Null,
         const r.FakeType(r'dart.core.Map<K2, V2>'),
         const r.FakeType(r'dart.core.Map<RK, RV>'),
         const r.FakeType(r'dart.core.Map<K2, V2>'),
@@ -6159,7 +6280,6 @@ final _data = <r.Reflectable, r.ReflectorData>{
         const m.TypeValue<String Function(Match)>().type,
         const m.TypeValue<String Function(String)>().type,
         const m.TypeValue<Iterable<int>>().type,
-        const m.TypeValue<int Function(String)>().type,
         const r.FakeType(r'dart.core.List<S>'),
         const r.FakeType(r'dart.core.List<T>'),
         const r.FakeType(r'dart.core.List<T>'),
@@ -6265,7 +6385,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             r'reflectable.src.reflectable_builder_based',
             Uri.parse('package:reflectable/src/reflectable_builder_based.dart'),
             const prefix0.ContainedReflectable(),
-            const <int>[1, 2, 3, 37],
+            const <int>[1, 2, 3, 35],
             {
               r'pleaseInitializeMessage': () => prefix2.pleaseInitializeMessage,
               r'data': () => prefix2.data,
@@ -6290,14 +6410,12 @@ final _data = <r.Reflectable, r.ReflectorData>{
             null),
         r.LibraryMirrorImpl(
             r'dart.core',
-            Uri.parse(r'reflectable://4/dart.core'),
+            Uri.parse(r'reflectable://4/library dart:core'),
             const prefix0.ContainedReflectable(),
-            const <int>[4, 5, 6, 7, 38, 39, 40],
+            const <int>[4, 5, 36, 37, 38],
             {
               r'deprecated': () => deprecated,
               r'override': () => override,
-              r'provisional': () => provisional,
-              r'proxy': () => proxy,
               r'identical': () => identical,
               r'identityHashCode': () => identityHashCode,
               r'print': () => print
@@ -6319,6 +6437,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             Uri.parse('package:reflectable/capability.dart'),
             const prefix0.ContainedReflectable(),
             const <int>[
+              6,
+              7,
               8,
               9,
               10,
@@ -6338,13 +6458,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
               24,
               25,
               26,
-              27,
-              28,
-              45,
-              46,
-              47,
-              48,
-              49
+              41,
+              42,
+              43,
+              44,
+              45
             ],
             {
               r'instanceInvokeCapability': () =>
diff --git a/packages/container/angel_container_generator/pubspec.yaml b/packages/container/angel_container_generator/pubspec.yaml
index 527442ee..c91db0bb 100644
--- a/packages/container/angel_container_generator/pubspec.yaml
+++ b/packages/container/angel_container_generator/pubspec.yaml
@@ -1,18 +1,18 @@
 name: angel3_container_generator
-version: 7.1.0-beta.1
+version: 8.0.0
 description: Codegen support for using pkg:reflectable with pkg:angel3_container.
 homepage: https://angel3-framework.web.app/
 repository: https://github.com/dukefirehawk/angel/tree/master/packages/container/angel_container_generator
 environment:
   sdk: '>=3.0.0 <4.0.0'
 dependencies:
-  angel3_container: ^7.1.0-beta.1
-  reflectable: ^4.0.2
+  angel3_container: ^8.0.0
+  reflectable: ^4.0.0
 dev_dependencies:
-  build_runner: ^2.3.0
-  build_test: ^2.1.3
+  build_runner: ^2.4.0
+  build_test: ^2.1.0
   test: ^1.24.0
-  lints: ^2.0.0
-#dependency_overrides:
-#  angel3_container:
-#    path: ../angel_container
+  lints: ^2.1.0
+dependency_overrides:
+  angel3_container:
+    path: ../angel_container
diff --git a/packages/container/angel_container_generator/test/reflector_test.reflectable.dart b/packages/container/angel_container_generator/test/reflector_test.reflectable.dart
index edb12297..1cd81134 100644
--- a/packages/container/angel_container_generator/test/reflector_test.reflectable.dart
+++ b/packages/container/angel_container_generator/test/reflector_test.reflectable.dart
@@ -35,8 +35,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             0,
             const prefix0.ContainedReflectable(),
-            const <int>[29, 89, 90],
-            const <int>[91, 92, 93, 94, 95, 88, 89],
+            const <int>[27, 85, 86],
+            const <int>[87, 88, 89, 90, 91, 84, 85],
             const <int>[],
             8,
             {},
@@ -56,8 +56,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             1,
             const prefix0.ContainedReflectable(),
-            const <int>[30, 31, 96, 99, 100],
-            const <int>[91, 96, 93, 94, 95, 97, 98],
+            const <int>[28, 29, 92, 95, 96],
+            const <int>[87, 92, 89, 90, 91, 93, 94],
             const <int>[],
             8,
             {},
@@ -79,8 +79,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             2,
             const prefix0.ContainedReflectable(),
-            const <int>[101],
-            const <int>[91, 96, 93, 94, 95, 97, 98],
+            const <int>[97],
+            const <int>[87, 92, 89, 90, 91, 93, 94],
             const <int>[],
             1,
             {},
@@ -100,8 +100,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             3,
             const prefix0.ContainedReflectable(),
-            const <int>[32, 103, 104],
-            const <int>[91, 92, 93, 94, 95, 102, 103],
+            const <int>[30, 99, 100],
+            const <int>[87, 88, 89, 90, 91, 98, 99],
             const <int>[],
             8,
             {},
@@ -120,8 +120,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             4,
             const prefix0.ContainedReflectable(),
-            const <int>[33, 106, 107],
-            const <int>[91, 92, 93, 94, 95, 105, 106],
+            const <int>[31, 102, 103],
+            const <int>[87, 88, 89, 90, 91, 101, 102],
             const <int>[],
             8,
             {},
@@ -138,8 +138,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             5,
             const prefix0.ContainedReflectable(),
-            const <int>[34, 35, 110, 111],
-            const <int>[91, 92, 93, 94, 95, 108, 109, 110],
+            const <int>[32, 33, 106, 107],
+            const <int>[87, 88, 89, 90, 91, 104, 105, 106],
             const <int>[],
             8,
             {},
@@ -159,9 +159,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             138412039,
             6,
             const prefix0.ContainedReflectable(),
-            const <int>[36, 37, 38, 39, 40, 41, 119],
-            const <int>[91, 92, 93, 94, 95, 120],
-            const <int>[112, 113, 114, 115, 116, 117, 118],
+            const <int>[34, 35, 36, 37, 38, 39, 115],
+            const <int>[87, 88, 89, 90, 91, 116],
+            const <int>[108, 109, 110, 111, 112, 113, 114],
             9,
             {
               r'water': () => prefix1.PokemonType.water,
@@ -185,21 +185,21 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             7,
             const prefix0.ContainedReflectable(),
-            const <int>[121],
+            const <int>[117],
             const <int>[
+              87,
+              88,
+              89,
+              90,
               91,
-              92,
-              93,
-              94,
-              95,
+              118,
+              119,
+              120,
+              121,
               122,
               123,
               124,
-              125,
-              126,
-              127,
-              128,
-              129
+              125
             ],
             const <int>[],
             10,
@@ -217,9 +217,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             8,
             const prefix0.ContainedReflectable(),
-            const <int>[91, 92, 93, 130, 131, 132, 94, 95, 133],
-            const <int>[91, 92, 93, 94, 95],
-            const <int>[130, 131, 132],
+            const <int>[87, 88, 89, 126, 127, 128, 90, 91, 129],
+            const <int>[87, 88, 89, 90, 91],
+            const <int>[126, 127, 128],
             null,
             {
               r'hash': () => Object.hash,
@@ -239,9 +239,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             9,
             const prefix0.ContainedReflectable(),
-            const <int>[134, 135, 120, 136],
-            const <int>[91, 92, 93, 94, 95, 120],
-            const <int>[134, 135],
+            const <int>[130, 131, 116, 132],
+            const <int>[87, 88, 89, 90, 91, 116],
+            const <int>[130, 131],
             8,
             {
               r'compareByIndex': () => Enum.compareByIndex,
@@ -260,23 +260,23 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             10,
             const prefix0.ContainedReflectable(),
-            const <int>[43, 44, 137, 140, 141],
+            const <int>[41, 42, 133, 136, 137],
             const <int>[
+              87,
+              88,
+              89,
+              90,
               91,
-              92,
-              93,
-              94,
-              95,
+              118,
+              119,
+              120,
+              121,
               122,
               123,
               124,
-              125,
-              126,
-              127,
-              128,
-              129
+              125
             ],
-            const <int>[137, 138, 139],
+            const <int>[133, 134, 135],
             11,
             {
               r'getInstance': () => prefix2.Reflectable.getInstance,
@@ -296,21 +296,21 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             11,
             const prefix0.ContainedReflectable(),
-            const <int>[123, 124, 125, 126, 127, 128, 129, 142, 143],
+            const <int>[119, 120, 121, 122, 123, 124, 125, 138, 139],
             const <int>[
+              87,
+              88,
+              89,
+              90,
               91,
-              92,
-              93,
-              94,
-              95,
+              118,
+              119,
+              120,
+              121,
               122,
               123,
               124,
-              125,
-              126,
-              127,
-              128,
-              129
+              125
             ],
             const <int>[],
             12,
@@ -328,8 +328,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             12,
             const prefix0.ContainedReflectable(),
-            const <int>[122, 144, 145],
-            const <int>[91, 92, 93, 94, 95, 122],
+            const <int>[118, 140, 141],
+            const <int>[87, 88, 89, 90, 91, 118],
             const <int>[],
             8,
             {},
@@ -365,6 +365,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             13,
             const prefix0.ContainedReflectable(),
             const <int>[
+              142,
+              143,
+              144,
+              145,
               146,
               147,
               148,
@@ -373,13 +377,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
               151,
               152,
               153,
-              154,
-              155,
-              156,
-              157,
-              158
+              154
             ],
-            const <int>[91, 92, 93, 94, 95, 147, 153],
+            const <int>[87, 88, 89, 90, 91, 143, 149],
             const <int>[],
             8,
             {},
@@ -412,11 +412,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134217735,
             14,
             const prefix0.ContainedReflectable(),
-            const <int>[159, 160, 161, 162, 163, 164, 165],
-            const <int>[91, 162, 93, 163, 95, 159, 160, 161],
-            const <int>[],
+            const <int>[155, 156, 157, 158, 159, 160, 161, 162, 163],
+            const <int>[87, 160, 89, 161, 91, 157, 158, 159],
+            const <int>[155, 156],
             8,
-            {},
+            {r'parse': () => bool.parse, r'tryParse': () => bool.tryParse},
             {},
             {
               r'fromEnvironment': (bool b) => (name, {defaultValue}) => b
@@ -437,6 +437,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             const prefix0.ContainedReflectable(),
             const <int>[
+              164,
+              165,
               166,
               167,
               168,
@@ -469,11 +471,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
               195,
               196,
               197,
-              198,
-              199,
-              200
+              198
             ],
-            const <int>[91, 92, 93, 94, 95],
+            const <int>[87, 88, 89, 90, 91],
             const <int>[],
             8,
             {},
@@ -499,6 +499,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             const prefix0.ContainedReflectable(),
             const <int>[
+              199,
+              200,
               201,
               202,
               203,
@@ -527,12 +529,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
               226,
               227,
               228,
-              229,
-              230,
-              231
+              229
             ],
-            const <int>[91, 92, 93, 94, 95],
-            const <int>[225, 226],
+            const <int>[87, 88, 89, 90, 91],
+            const <int>[223, 224],
             -1,
             {r'parse': () => int.parse, r'tryParse': () => int.tryParse},
             {},
@@ -552,8 +552,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             17,
             const prefix0.ContainedReflectable(),
-            const <int>[232, 233, 234, 235],
-            const <int>[91, 92, 93, 94, 95],
+            const <int>[230, 231, 232, 233],
+            const <int>[87, 88, 89, 90, 91],
             const <int>[],
             8,
             {},
@@ -571,6 +571,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             18,
             const prefix0.ContainedReflectable(),
             const <int>[
+              234,
+              235,
               236,
               237,
               238,
@@ -611,13 +613,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
               273,
               274,
               275,
-              276,
-              277,
-              278,
-              279
+              276
             ],
-            const <int>[91, 92, 93, 94, 95],
-            const <int>[236, 237, 238],
+            const <int>[87, 88, 89, 90, 91],
+            const <int>[234, 235, 236],
             8,
             {
               r'castFrom': () => List.castFrom,
@@ -626,8 +625,6 @@ final _data = <r.Reflectable, r.ReflectorData>{
             },
             {},
             {
-              r'': (bool b) => ([length]) =>
-                  b ? (length == null ? [] : List.filled(length, null)) : null,
               r'filled': (bool b) => (length, fill, {growable}) =>
                   b ? List.filled(length, fill, growable: growable) : null,
               r'empty': (bool b) =>
@@ -656,8 +653,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             19,
             const prefix0.ContainedReflectable(),
-            const <int>[280, 281, 282, 283, 284, 285, 286],
-            const <int>[91, 92, 93, 94, 95],
+            const <int>[277, 278, 279, 280, 281, 282, 283],
+            const <int>[87, 88, 89, 90, 91],
             const <int>[],
             8,
             {},
@@ -675,6 +672,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             20,
             const prefix0.ContainedReflectable(),
             const <int>[
+              284,
+              285,
+              286,
               287,
               288,
               289,
@@ -685,12 +685,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
               294,
               295,
               296,
-              297,
-              298,
-              299,
-              300
+              297
             ],
-            const <int>[91, 92, 93, 94, 95],
+            const <int>[87, 88, 89, 90, 91],
             const <int>[],
             8,
             {},
@@ -707,8 +704,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             21,
             const prefix0.ContainedReflectable(),
-            const <int>[301, 302, 303, 304, 305, 306, 307],
-            const <int>[91, 92, 93, 94, 95],
+            const <int>[298, 299, 300, 301, 302, 303, 304],
+            const <int>[87, 88, 89, 90, 91],
             const <int>[],
             8,
             {},
@@ -726,6 +723,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             22,
             const prefix0.ContainedReflectable(),
             const <int>[
+              305,
+              306,
+              307,
               308,
               309,
               310,
@@ -752,13 +752,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
               331,
               332,
               333,
-              334,
-              335,
-              336,
-              337
+              334
             ],
-            const <int>[91, 92, 93, 94, 95],
-            const <int>[308],
+            const <int>[87, 88, 89, 90, 91],
+            const <int>[305],
             8,
             {r'castFrom': () => Map.castFrom},
             {},
@@ -791,6 +788,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             23,
             const prefix0.ContainedReflectable(),
             const <int>[
+              335,
+              336,
+              337,
               338,
               339,
               340,
@@ -824,15 +824,17 @@ final _data = <r.Reflectable, r.ReflectorData>{
               368,
               369,
               370,
-              371,
-              372
+              371
             ],
             const <int>[
+              87,
+              359,
+              89,
+              90,
               91,
-              362,
-              93,
-              94,
-              95,
+              336,
+              337,
+              338,
               339,
               340,
               341,
@@ -853,19 +855,20 @@ final _data = <r.Reflectable, r.ReflectorData>{
               356,
               357,
               358,
-              359,
-              360,
-              361,
+              363,
               364,
               365,
               366,
               367,
-              368,
-              369
+              368
             ],
-            const <int>[338],
+            const <int>[335, 360, 361],
             8,
-            {r'castFrom': () => Iterable.castFrom},
+            {
+              r'castFrom': () => Iterable.castFrom,
+              r'iterableToShortString': () => Iterable.iterableToShortString,
+              r'iterableToFullString': () => Iterable.iterableToFullString
+            },
             {},
             {
               r'generate': (bool b) => (count, [generator]) =>
@@ -886,8 +889,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             134218247,
             24,
             const prefix0.ContainedReflectable(),
-            const <int>[373],
-            const <int>[91, 92, 93, 94, 95],
+            const <int>[372],
+            const <int>[87, 88, 89, 90, 91],
             const <int>[],
             8,
             {},
@@ -932,22 +935,6 @@ final _data = <r.Reflectable, r.ReflectorData>{
             8,
             8,
             8, const <int>[], const []),
-        r.VariableMirrorImpl(
-            r'provisional',
-            75629717,
-            -1,
-            const prefix0.ContainedReflectable(),
-            -1,
-            26,
-            26, const <int>[], const []),
-        r.VariableMirrorImpl(
-            r'proxy',
-            75629717,
-            -1,
-            const prefix0.ContainedReflectable(),
-            -1,
-            26,
-            26, const <int>[], const []),
         r.VariableMirrorImpl(
             r'pleaseInitializeMessage',
             142738581,
@@ -962,9 +949,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             const prefix0.ContainedReflectable(),
             22,
-            27,
+            26,
             22,
-            const <int>[10, 28],
+            const <int>[10, 27],
             const []),
         r.VariableMirrorImpl(
             r'memberSymbolMap',
@@ -972,9 +959,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             const prefix0.ContainedReflectable(),
             22,
-            29,
+            28,
             22,
-            const <int>[30, 15],
+            const <int>[29, 15],
             const []),
         r.VariableMirrorImpl(
             r'instanceInvokeCapability',
@@ -982,10 +969,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             const prefix0.ContainedReflectable(),
             -1,
+            30,
+            30, const <int>[], const []),
+        r.VariableMirrorImpl(
+            r'staticInvokeCapability',
+            142738581,
+            -1,
+            const prefix0.ContainedReflectable(),
+            -1,
             31,
             31, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'staticInvokeCapability',
+            r'topLevelInvokeCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -993,7 +988,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             32,
             32, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'topLevelInvokeCapability',
+            r'newInstanceCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1001,7 +996,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             33,
             33, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'newInstanceCapability',
+            r'metadataCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1009,7 +1004,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             34,
             34, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'metadataCapability',
+            r'typeCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1017,7 +1012,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35,
             35, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'typeCapability',
+            r'typeRelationsCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1025,7 +1020,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             36,
             36, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'typeRelationsCapability',
+            r'reflectedTypeCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1033,7 +1028,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             37,
             37, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'reflectedTypeCapability',
+            r'libraryCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1041,7 +1036,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             38,
             38, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'libraryCapability',
+            r'declarationsCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1049,7 +1044,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             39,
             39, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'declarationsCapability',
+            r'uriCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1057,7 +1052,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             40,
             40, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'uriCapability',
+            r'libraryDependenciesCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1065,7 +1060,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             41,
             41, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'libraryDependenciesCapability',
+            r'invokingCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1073,7 +1068,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             42,
             42, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'invokingCapability',
+            r'typingCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1081,7 +1076,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             43,
             43, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'typingCapability',
+            r'delegateCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1089,7 +1084,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             44,
             44, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'delegateCapability',
+            r'subtypeQuantifyCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1097,7 +1092,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             45,
             45, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'subtypeQuantifyCapability',
+            r'superclassQuantifyCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
@@ -1105,45 +1100,37 @@ final _data = <r.Reflectable, r.ReflectorData>{
             46,
             46, const <int>[], const []),
         r.VariableMirrorImpl(
-            r'superclassQuantifyCapability',
+            r'typeAnnotationQuantifyCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
             -1,
             47,
             47, const <int>[], const []),
-        r.VariableMirrorImpl(
-            r'typeAnnotationQuantifyCapability',
-            142738581,
-            -1,
-            const prefix0.ContainedReflectable(),
-            -1,
-            48,
-            48, const <int>[], const []),
         r.VariableMirrorImpl(
             r'typeAnnotationDeepQuantifyCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
             -1,
-            48,
-            48, const <int>[], const []),
+            47,
+            47, const <int>[], const []),
         r.VariableMirrorImpl(
             r'correspondingSetterQuantifyCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
             -1,
-            49,
-            49, const <int>[], const []),
+            48,
+            48, const <int>[], const []),
         r.VariableMirrorImpl(
             r'admitSubtypeCapability',
             142738581,
             -1,
             const prefix0.ContainedReflectable(),
             -1,
-            50,
-            50, const <int>[], const []),
+            49,
+            49, const <int>[], const []),
         r.VariableMirrorImpl(
             r'pokemon',
             134349829,
@@ -1254,7 +1241,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             6,
             const prefix0.ContainedReflectable(),
             18,
-            51,
+            50,
             18,
             const <int>[6],
             const []),
@@ -1327,18 +1314,16 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 2, 24),
         r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 3, 25),
         r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 4, 26),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 5, 27),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 6, 28),
-        r.ImplicitSetterMirrorImpl(const prefix0.ContainedReflectable(), 6, 29),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 7, 30),
-        r.ImplicitSetterMirrorImpl(const prefix0.ContainedReflectable(), 7, 31),
+        r.ImplicitSetterMirrorImpl(const prefix0.ContainedReflectable(), 4, 27),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 5, 28),
+        r.ImplicitSetterMirrorImpl(const prefix0.ContainedReflectable(), 5, 29),
         r.MethodMirrorImpl(
             r'reflectors',
             44040211,
             -1,
             -1,
+            51,
             52,
-            53,
             const <int>[10],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -1398,6 +1383,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[25, 26, 27, 28],
             const prefix0.ContainedReflectable(),
             const []),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 6, 36),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 7, 37),
         r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 8, 38),
         r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 9, 39),
         r.ImplicitGetterMirrorImpl(
@@ -1434,11 +1421,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const prefix0.ContainedReflectable(), 25, 55),
         r.ImplicitGetterMirrorImpl(
             const prefix0.ContainedReflectable(), 26, 56),
-        r.ImplicitGetterMirrorImpl(
-            const prefix0.ContainedReflectable(), 27, 57),
-        r.ImplicitGetterMirrorImpl(
-            const prefix0.ContainedReflectable(), 28, 58),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 0, 59),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 0, 57),
         r.MethodMirrorImpl(
             r'lowercaseName',
             2097155,
@@ -1491,8 +1474,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[],
             const prefix0.ContainedReflectable(),
             const <Object>[override]),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 1, 68),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 2, 69),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 1, 66),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 2, 67),
         r.MethodMirrorImpl(
             r'',
             0,
@@ -1526,18 +1509,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[36, 37],
             const prefix0.ContainedReflectable(),
             const []),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 3, 73),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 3, 71),
         r.MethodMirrorImpl(r'lowerName', 2097155, 3, 15, 15, 15, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'', 0, 3, -1, 3, 3, const <int>[], const <int>[38],
             const prefix0.ContainedReflectable(), const []),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 4, 76),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 4, 74),
         r.MethodMirrorImpl(r'title', 2097155, 4, 15, 15, 15, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'', 0, 4, -1, 4, 4, const <int>[], const <int>[39],
             const prefix0.ContainedReflectable(), const []),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 5, 79),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 6, 80),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 5, 77),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 6, 78),
         r.MethodMirrorImpl(
             r'totalLength',
             2097155,
@@ -1560,17 +1543,17 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[40, 41],
             const prefix0.ContainedReflectable(),
             const []),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 7, 83),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 8, 84),
-        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 9, 85),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 7, 81),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 8, 82),
+        r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 9, 83),
         r.ImplicitGetterMirrorImpl(
-            const prefix0.ContainedReflectable(), 10, 86),
+            const prefix0.ContainedReflectable(), 10, 84),
         r.ImplicitGetterMirrorImpl(
-            const prefix0.ContainedReflectable(), 11, 87),
+            const prefix0.ContainedReflectable(), 11, 85),
         r.ImplicitGetterMirrorImpl(
-            const prefix0.ContainedReflectable(), 12, 88),
+            const prefix0.ContainedReflectable(), 12, 86),
         r.ImplicitGetterMirrorImpl(
-            const prefix0.ContainedReflectable(), 13, 89),
+            const prefix0.ContainedReflectable(), 13, 87),
         r.MethodMirrorImpl(r'', 192, 6, -1, 6, 6, const <int>[], const <int>[],
             const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'index', 2097155, 9, 16, 16, 16, const <int>[],
@@ -1582,7 +1565,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35651587,
             12,
             18,
-            54,
+            53,
             18,
             const <int>[24],
             const <int>[],
@@ -1648,9 +1631,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35651587,
             11,
             22,
-            56,
+            55,
             22,
-            const <int>[55, 21],
+            const <int>[54, 21],
             const <int>[],
             const prefix0.ContainedReflectable(),
             const <Object>[override]),
@@ -1659,9 +1642,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35651587,
             11,
             23,
-            58,
+            57,
             23,
-            const <int>[57],
+            const <int>[56],
             const <int>[],
             const prefix0.ContainedReflectable(),
             const <Object>[override]),
@@ -1748,9 +1731,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const prefix0.ContainedReflectable(),
             const []),
         r.ImplicitGetterMirrorImpl(
-            const prefix0.ContainedReflectable(), 14, 109),
+            const prefix0.ContainedReflectable(), 14, 107),
         r.ImplicitGetterMirrorImpl(
-            const prefix0.ContainedReflectable(), 15, 110),
+            const prefix0.ContainedReflectable(), 15, 108),
         r.MethodMirrorImpl(
             r'',
             128,
@@ -1795,8 +1778,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             2097667,
             13,
             -1,
-            30,
-            30,
+            29,
+            29,
             const <int>[],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -1806,7 +1789,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35651587,
             13,
             18,
-            59,
+            58,
             18,
             const <int>[17],
             const <int>[],
@@ -1817,13 +1800,13 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652099,
             13,
             18,
-            60,
+            59,
             18,
             null,
             const <int>[],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'namedArguments', 35652099, 13, 22, 61, 22, null,
+        r.MethodMirrorImpl(r'namedArguments', 35652099, 13, 22, 60, 22, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'isMethod', 2097667, 13, 14, 14, 14, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
@@ -1879,12 +1862,34 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[115, 116],
             const prefix0.ContainedReflectable(),
             const []),
+        r.MethodMirrorImpl(
+            r'parse',
+            2097170,
+            14,
+            14,
+            14,
+            14,
+            const <int>[],
+            const <int>[117, 118],
+            const prefix0.ContainedReflectable(),
+            const []),
+        r.MethodMirrorImpl(
+            r'tryParse',
+            2097170,
+            14,
+            14,
+            14,
+            14,
+            const <int>[],
+            const <int>[119, 120],
+            const prefix0.ContainedReflectable(),
+            const []),
         r.MethodMirrorImpl(r'&', 2097154, 14, 14, 14, 14, const <int>[],
-            const <int>[117], const prefix0.ContainedReflectable(), const []),
+            const <int>[121], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'|', 2097154, 14, 14, 14, 14, const <int>[],
-            const <int>[118], const prefix0.ContainedReflectable(), const []),
+            const <int>[122], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'^', 2097154, 14, 14, 14, 14, const <int>[],
-            const <int>[119], const prefix0.ContainedReflectable(), const []),
+            const <int>[123], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'toString', 2097154, 14, 15, 15, 15, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'hashCode', 2097155, 14, 16, 16, 16, const <int>[],
@@ -1897,7 +1902,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             14,
             14,
             const <int>[],
-            const <int>[120, 121],
+            const <int>[124, 125],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1908,11 +1913,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             14,
             14,
             const <int>[],
-            const <int>[122],
+            const <int>[126],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'[]', 2097666, 15, 15, 15, 15, const <int>[],
-            const <int>[123], const prefix0.ContainedReflectable(), const []),
+            const <int>[127], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'codeUnitAt',
             2097666,
@@ -1921,15 +1926,15 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[124],
+            const <int>[128],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'==', 2097666, 15, 14, 14, 14, const <int>[],
-            const <int>[125], const prefix0.ContainedReflectable(), const []),
+            const <int>[129], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'compareTo', 2097666, 15, 16, 16, 16, const <int>[],
-            const <int>[126], const prefix0.ContainedReflectable(), const []),
+            const <int>[130], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'endsWith', 2097666, 15, 14, 14, 14, const <int>[],
-            const <int>[127], const prefix0.ContainedReflectable(), const []),
+            const <int>[131], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'startsWith',
             2097666,
@@ -1938,7 +1943,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             14,
             14,
             const <int>[],
-            const <int>[128, 129],
+            const <int>[132, 133],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1949,7 +1954,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[130, 131],
+            const <int>[134, 135],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -1960,11 +1965,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[132, 133],
+            const <int>[136, 137],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'+', 2097666, 15, 15, 15, 15, const <int>[],
-            const <int>[134], const prefix0.ContainedReflectable(), const []),
+            const <int>[138], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'substring',
             2097666,
@@ -1973,7 +1978,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             15,
             const <int>[],
-            const <int>[135, 136],
+            const <int>[139, 140],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'trim', 2097666, 15, 15, 15, 15, const <int>[],
@@ -1983,7 +1988,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.MethodMirrorImpl(r'trimRight', 2097666, 15, 15, 15, 15, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'*', 2097666, 15, 15, 15, 15, const <int>[],
-            const <int>[137], const prefix0.ContainedReflectable(), const []),
+            const <int>[141], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'padLeft',
             2097666,
@@ -1992,7 +1997,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             15,
             const <int>[],
-            const <int>[138, 139],
+            const <int>[142, 143],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2003,7 +2008,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             15,
             const <int>[],
-            const <int>[140, 141],
+            const <int>[144, 145],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2014,7 +2019,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             14,
             14,
             const <int>[],
-            const <int>[142, 143],
+            const <int>[146, 147],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2025,7 +2030,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             15,
             const <int>[],
-            const <int>[144, 145, 146],
+            const <int>[148, 149, 150],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2036,7 +2041,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             15,
             const <int>[],
-            const <int>[147, 148, 149],
+            const <int>[151, 152, 153],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2047,7 +2052,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             15,
             const <int>[],
-            const <int>[150, 151],
+            const <int>[154, 155],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2058,7 +2063,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             15,
             const <int>[],
-            const <int>[152, 153],
+            const <int>[156, 157],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2069,11 +2074,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             15,
             const <int>[],
-            const <int>[154, 155, 156],
+            const <int>[158, 159, 160],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'split', 35652098, 15, 18, 62, 18, const <int>[15],
-            const <int>[157], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'split', 35652098, 15, 18, 61, 18, const <int>[15],
+            const <int>[161], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'splitMapJoin',
             2097666,
@@ -2082,7 +2087,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             15,
             const <int>[],
-            const <int>[158, 159, 160],
+            const <int>[162, 163, 164],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2129,13 +2134,13 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652099,
             15,
             18,
-            63,
+            62,
             18,
             const <int>[16],
             const <int>[],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'runes', 2097667, 15, -1, 64, 64, const <int>[],
+        r.MethodMirrorImpl(r'runes', 2097667, 15, -1, 63, 63, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'fromCharCodes',
@@ -2145,11 +2150,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             15,
             const <int>[],
-            const <int>[161, 162, 163],
+            const <int>[165, 166, 167],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'fromCharCode', 1, 15, -1, 15, 15, const <int>[],
-            const <int>[164], const prefix0.ContainedReflectable(), const []),
+            const <int>[168], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'fromEnvironment',
             129,
@@ -2158,23 +2163,23 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             15,
             const <int>[],
-            const <int>[165, 166],
+            const <int>[169, 170],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'&', 2097666, 16, 16, 16, 16, const <int>[],
-            const <int>[167], const prefix0.ContainedReflectable(), const []),
+            const <int>[171], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'|', 2097666, 16, 16, 16, 16, const <int>[],
-            const <int>[168], const prefix0.ContainedReflectable(), const []),
+            const <int>[172], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'^', 2097666, 16, 16, 16, 16, const <int>[],
-            const <int>[169], const prefix0.ContainedReflectable(), const []),
+            const <int>[173], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'~', 2097666, 16, 16, 16, 16, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'<<', 2097666, 16, 16, 16, 16, const <int>[],
-            const <int>[170], const prefix0.ContainedReflectable(), const []),
+            const <int>[174], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'>>', 2097666, 16, 16, 16, 16, const <int>[],
-            const <int>[171], const prefix0.ContainedReflectable(), const []),
+            const <int>[175], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'>>>', 2097666, 16, 16, 16, 16, const <int>[],
-            const <int>[172], const prefix0.ContainedReflectable(), const []),
+            const <int>[176], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'modPow',
             2097666,
@@ -2183,7 +2188,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[173, 174],
+            const <int>[177, 178],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2194,11 +2199,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[175],
+            const <int>[179],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'gcd', 2097666, 16, 16, 16, 16, const <int>[],
-            const <int>[176], const prefix0.ContainedReflectable(), const []),
+            const <int>[180], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'toUnsigned',
             2097666,
@@ -2207,11 +2212,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[177],
+            const <int>[181],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'toSigned', 2097666, 16, 16, 16, 16, const <int>[],
-            const <int>[178], const prefix0.ContainedReflectable(), const []),
+            const <int>[182], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'unary-', 2097666, 16, 16, 16, 16, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'abs', 2097666, 16, 16, 16, 16, const <int>[],
@@ -2229,8 +2234,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             2097666,
             16,
             -1,
-            65,
-            65,
+            64,
+            64,
             const <int>[],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -2240,8 +2245,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             2097666,
             16,
             -1,
-            65,
-            65,
+            64,
+            64,
             const <int>[],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -2251,8 +2256,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             2097666,
             16,
             -1,
-            65,
-            65,
+            64,
+            64,
             const <int>[],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -2262,8 +2267,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             2097666,
             16,
             -1,
-            65,
-            65,
+            64,
+            64,
             const <int>[],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -2278,7 +2283,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             15,
             15,
             const <int>[],
-            const <int>[179],
+            const <int>[183],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2289,7 +2294,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[180, 181, 182],
+            const <int>[184, 185],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2300,7 +2305,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[183, 184],
+            const <int>[186, 187],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'isEven', 2097667, 16, 14, 14, 14, const <int>[],
@@ -2319,19 +2324,19 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[185, 186],
+            const <int>[188, 189],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'==', 2097666, 17, 14, 14, 14, const <int>[],
-            const <int>[187], const prefix0.ContainedReflectable(), const []),
+            const <int>[190], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'toString', 2097666, 17, 15, 15, 15, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'hashCode', 2097667, 17, 16, 16, 16, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'', 64, 17, -1, 17, 17, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'castFrom', 35651602, 18, 18, 66, 18, null,
-            const <int>[188], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'castFrom', 35651602, 18, 18, 65, 18, null,
+            const <int>[191], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'copyRange',
             1310738,
@@ -2340,7 +2345,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[189, 190, 191, 192, 193],
+            const <int>[192, 193, 194, 195, 196],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2351,13 +2356,13 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[194, 195, 196],
+            const <int>[197, 198, 199],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'cast', 35652098, 18, 18, 67, 18, null,
+        r.MethodMirrorImpl(r'cast', 35652098, 18, 18, 66, 18, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'[]', 514, 18, -1, -1, -1, const <int>[],
-            const <int>[197], const prefix0.ContainedReflectable(), const []),
+            const <int>[200], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'[]=',
             1311234,
@@ -2366,17 +2371,17 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[198, 199],
+            const <int>[201, 202],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'add', 1311234, 18, -1, -1, -1, const <int>[],
-            const <int>[200], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'addAll', 1311234, 18, -1, -1, -1, const <int>[],
-            const <int>[201], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'sort', 1311234, 18, -1, -1, -1, const <int>[],
-            const <int>[202], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'shuffle', 1311234, 18, -1, -1, -1, const <int>[],
             const <int>[203], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'addAll', 1311234, 18, -1, -1, -1, const <int>[],
+            const <int>[204], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'sort', 1311234, 18, -1, -1, -1, const <int>[],
+            const <int>[205], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'shuffle', 1311234, 18, -1, -1, -1, const <int>[],
+            const <int>[206], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'indexOf',
             2097666,
@@ -2385,7 +2390,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[204, 205],
+            const <int>[207, 208],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2396,7 +2401,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[206, 207],
+            const <int>[209, 210],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2407,7 +2412,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[208, 209],
+            const <int>[211, 212],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2418,7 +2423,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             16,
             16,
             const <int>[],
-            const <int>[210, 211],
+            const <int>[213, 214],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'clear', 1311234, 18, -1, -1, -1, const <int>[],
@@ -2431,7 +2436,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[212, 213],
+            const <int>[215, 216],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2442,7 +2447,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[214, 215],
+            const <int>[217, 218],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2453,13 +2458,13 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[216, 217],
+            const <int>[219, 220],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'remove', 2097666, 18, 14, 14, 14, const <int>[],
-            const <int>[218], const prefix0.ContainedReflectable(), const []),
+            const <int>[221], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'removeAt', 514, 18, -1, -1, -1, const <int>[],
-            const <int>[219], const prefix0.ContainedReflectable(), const []),
+            const <int>[222], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'removeLast', 514, 18, -1, -1, -1, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
@@ -2470,7 +2475,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[220],
+            const <int>[223],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2481,20 +2486,20 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[221],
+            const <int>[224],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'+', 35652098, 18, 18, 68, 18, null,
-            const <int>[222], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'+', 35652098, 18, 18, 67, 18, null,
+            const <int>[225], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'sublist',
             35652098,
             18,
             18,
-            68,
+            67,
             18,
             null,
-            const <int>[223, 224],
+            const <int>[226, 227],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2502,10 +2507,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652098,
             18,
             23,
-            69,
+            68,
             23,
             null,
-            const <int>[225, 226],
+            const <int>[228, 229],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2516,7 +2521,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[227, 228, 229, 230],
+            const <int>[230, 231, 232, 233],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2527,7 +2532,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[231, 232],
+            const <int>[234, 235],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2538,7 +2543,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[233, 234, 235],
+            const <int>[236, 237, 238],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2549,47 +2554,45 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[236, 237, 238],
+            const <int>[239, 240, 241],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'asMap', 35652098, 18, 22, 70, 22, null,
+        r.MethodMirrorImpl(r'asMap', 35652098, 18, 22, 69, 22, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'==', 2097666, 18, 14, 14, 14, const <int>[],
-            const <int>[239], const prefix0.ContainedReflectable(), const []),
+            const <int>[242], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'first=', 1311236, 18, -1, -1, -1, const <int>[],
-            const <int>[253], const prefix0.ContainedReflectable(), const []),
+            const <int>[255], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'last=', 1311236, 18, -1, -1, -1, const <int>[],
-            const <int>[254], const prefix0.ContainedReflectable(), const []),
+            const <int>[256], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'length', 2097667, 18, 16, 16, 16, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'length=', 1311236, 18, -1, -1, -1, const <int>[],
-            const <int>[255], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'reversed', 35652099, 18, 23, 69, 23, null,
+            const <int>[257], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'reversed', 35652099, 18, 23, 68, 23, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'', 1, 18, -1, 68, 18, null, const <int>[240],
-            const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'filled',
             1,
             18,
             -1,
-            68,
+            67,
             18,
             null,
-            const <int>[241, 242, 243],
+            const <int>[243, 244, 245],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'empty', 1, 18, -1, 68, 18, null, const <int>[244],
+        r.MethodMirrorImpl(r'empty', 1, 18, -1, 67, 18, null, const <int>[246],
             const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'from',
             1,
             18,
             -1,
-            68,
+            67,
             18,
             null,
-            const <int>[245, 246],
+            const <int>[247, 248],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2597,10 +2600,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             1,
             18,
             -1,
-            68,
+            67,
             18,
             null,
-            const <int>[247, 248],
+            const <int>[249, 250],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2608,14 +2611,14 @@ final _data = <r.Reflectable, r.ReflectorData>{
             1,
             18,
             -1,
-            68,
+            67,
             18,
             null,
-            const <int>[249, 250, 251],
+            const <int>[251, 252, 253],
             const prefix0.ContainedReflectable(),
             const []),
-        r.MethodMirrorImpl(r'unmodifiable', 1, 18, -1, 68, 18, null,
-            const <int>[252], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'unmodifiable', 1, 18, -1, 67, 18, null,
+            const <int>[254], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'==',
             2097666,
@@ -2624,12 +2627,12 @@ final _data = <r.Reflectable, r.ReflectorData>{
             14,
             14,
             const <int>[],
-            const <int>[256],
+            const <int>[258],
             const prefix0.ContainedReflectable(),
             const <Object>[override]),
         r.MethodMirrorImpl(r'delegate', 2097666, 19, 8, 8, 8, const <int>[],
-            const <int>[257], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'type', 2097667, 19, -1, 57, 57, const <int>[],
+            const <int>[259], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'type', 2097667, 19, -1, 56, 56, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'hasReflectee',
@@ -2665,7 +2668,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             14,
             14,
             const <int>[],
-            const <int>[258],
+            const <int>[260],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2676,7 +2679,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             14,
             14,
             const <int>[],
-            const <int>[259],
+            const <int>[261],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2706,9 +2709,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652099,
             20,
             18,
-            72,
+            71,
             18,
-            const <int>[71],
+            const <int>[70],
             const <int>[],
             const prefix0.ContainedReflectable(),
             const []),
@@ -2717,7 +2720,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652099,
             20,
             18,
-            73,
+            72,
             18,
             const <int>[20],
             const <int>[],
@@ -2728,7 +2731,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652099,
             20,
             18,
-            59,
+            58,
             18,
             const <int>[17],
             const <int>[],
@@ -2810,19 +2813,19 @@ final _data = <r.Reflectable, r.ReflectorData>{
             14,
             14,
             const <int>[],
-            const <int>[260],
+            const <int>[262],
             const prefix0.ContainedReflectable(),
             const <Object>[override]),
-        r.MethodMirrorImpl(r'uri', 2097667, 21, -1, 55, 55, const <int>[],
+        r.MethodMirrorImpl(r'uri', 2097667, 21, -1, 54, 54, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'declarations',
             35652099,
             21,
             22,
-            75,
+            74,
             22,
-            const <int>[15, 74],
+            const <int>[15, 73],
             const <int>[],
             const prefix0.ContainedReflectable(),
             const []),
@@ -2842,9 +2845,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             35652099,
             21,
             18,
-            77,
+            76,
             18,
-            const <int>[76],
+            const <int>[75],
             const <int>[],
             const prefix0.ContainedReflectable(),
             const []),
@@ -2853,8 +2856,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             2097667,
             21,
             -1,
-            26,
-            26,
+            77,
+            77,
             const <int>[],
             const <int>[],
             const prefix0.ContainedReflectable(),
@@ -2862,7 +2865,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.MethodMirrorImpl(r'', 64, 21, -1, 21, 21, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'castFrom', 35651602, 22, 22, 78, 22, null,
-            const <int>[261], const prefix0.ContainedReflectable(), const []),
+            const <int>[263], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'cast', 35652098, 22, 22, 79, 22, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
@@ -2873,7 +2876,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             14,
             14,
             const <int>[],
-            const <int>[262],
+            const <int>[264],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2884,11 +2887,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             14,
             14,
             const <int>[],
-            const <int>[263],
+            const <int>[265],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'[]', 514, 22, -1, -1, -1, const <int>[],
-            const <int>[264], const prefix0.ContainedReflectable(), const []),
+            const <int>[266], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'[]=',
             1311234,
@@ -2897,11 +2900,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[265, 266],
+            const <int>[267, 268],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'map', 35652098, 22, 22, 80, 22, null,
-            const <int>[267], const prefix0.ContainedReflectable(), const []),
+            const <int>[269], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'addEntries',
             1311234,
@@ -2910,7 +2913,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[268],
+            const <int>[270],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2921,11 +2924,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[269, 270, 271],
+            const <int>[271, 272, 273],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'updateAll', 1311234, 22, -1, -1, -1, const <int>[],
-            const <int>[272], const prefix0.ContainedReflectable(), const []),
+            const <int>[274], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'removeWhere',
             1311234,
@@ -2934,7 +2937,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[273],
+            const <int>[275],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -2945,17 +2948,17 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[274, 275],
+            const <int>[276, 277],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'addAll', 1311234, 22, -1, -1, -1, const <int>[],
-            const <int>[276], const prefix0.ContainedReflectable(), const []),
+            const <int>[278], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'remove', 514, 22, -1, -1, -1, const <int>[],
-            const <int>[277], const prefix0.ContainedReflectable(), const []),
+            const <int>[279], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'clear', 1311234, 22, -1, -1, -1, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'forEach', 1311234, 22, -1, -1, -1, const <int>[],
-            const <int>[278], const prefix0.ContainedReflectable(), const []),
+            const <int>[280], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'entries', 35652099, 22, 23, 81, 23, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'keys', 35652099, 22, 23, 82, 23, null,
@@ -2979,12 +2982,12 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const []),
         r.MethodMirrorImpl(r'', 1, 22, -1, 84, 22, null, const <int>[],
             const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'from', 257, 22, -1, 84, 22, null, const <int>[279],
+        r.MethodMirrorImpl(r'from', 257, 22, -1, 84, 22, null, const <int>[281],
             const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'of', 257, 22, -1, 84, 22, null, const <int>[280],
+        r.MethodMirrorImpl(r'of', 257, 22, -1, 84, 22, null, const <int>[282],
             const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'unmodifiable', 1, 22, -1, 84, 22, null,
-            const <int>[281], const prefix0.ContainedReflectable(), const []),
+            const <int>[283], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'identity', 257, 22, -1, 84, 22, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
@@ -2995,7 +2998,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             84,
             22,
             null,
-            const <int>[282, 283, 284],
+            const <int>[284, 285, 286],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
@@ -3006,31 +3009,31 @@ final _data = <r.Reflectable, r.ReflectorData>{
             84,
             22,
             null,
-            const <int>[285, 286],
+            const <int>[287, 288],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'fromEntries', 1, 22, -1, 84, 22, null,
-            const <int>[287], const prefix0.ContainedReflectable(), const []),
+            const <int>[289], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'castFrom', 35651602, 23, 23, 85, 23, null,
-            const <int>[288], const prefix0.ContainedReflectable(), const []),
+            const <int>[290], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'cast', 35651586, 23, 23, 86, 23, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'followedBy', 35651586, 23, 23, 87, 23, null,
-            const <int>[289], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'map', 35651586, 23, 23, 88, 23, null,
-            const <int>[290], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'where', 35651586, 23, 23, 87, 23, null,
             const <int>[291], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'map', 35651586, 23, 23, 88, 23, null,
+            const <int>[292], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'where', 35651586, 23, 23, 87, 23, null,
+            const <int>[293], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'whereType', 35651586, 23, 23, 89, 23, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'expand', 35651586, 23, 23, 90, 23, null,
-            const <int>[292], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'contains', 2097154, 23, 14, 14, 14, const <int>[],
-            const <int>[293], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'forEach', 1310722, 23, -1, -1, -1, const <int>[],
             const <int>[294], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'reduce', 2, 23, -1, -1, -1, const <int>[],
+        r.MethodMirrorImpl(r'contains', 2097154, 23, 14, 14, 14, const <int>[],
             const <int>[295], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'forEach', 1310722, 23, -1, -1, -1, const <int>[],
+            const <int>[296], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'reduce', 2, 23, -1, -1, -1, const <int>[],
+            const <int>[297], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'fold',
             2,
@@ -3039,27 +3042,27 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[296, 297],
+            const <int>[298, 299],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'every', 2097154, 23, 14, 14, 14, const <int>[],
-            const <int>[298], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'join', 2097154, 23, 15, 15, 15, const <int>[],
-            const <int>[299], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'any', 2097154, 23, 14, 14, 14, const <int>[],
             const <int>[300], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'toList', 35651586, 23, 18, 91, 18, null,
+        r.MethodMirrorImpl(r'join', 2097154, 23, 15, 15, 15, const <int>[],
             const <int>[301], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'any', 2097154, 23, 14, 14, 14, const <int>[],
+            const <int>[302], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'toList', 35651586, 23, 18, 91, 18, null,
+            const <int>[303], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'toSet', 35651586, 23, -1, 92, 93, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'take', 35651586, 23, 23, 87, 23, null,
-            const <int>[302], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'takeWhile', 35651586, 23, 23, 87, 23, null,
-            const <int>[303], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'skip', 35651586, 23, 23, 87, 23, null,
             const <int>[304], const prefix0.ContainedReflectable(), const []),
-        r.MethodMirrorImpl(r'skipWhile', 35651586, 23, 23, 87, 23, null,
+        r.MethodMirrorImpl(r'takeWhile', 35651586, 23, 23, 87, 23, null,
             const <int>[305], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'skip', 35651586, 23, 23, 87, 23, null,
+            const <int>[306], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(r'skipWhile', 35651586, 23, 23, 87, 23, null,
+            const <int>[307], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(
             r'firstWhere',
             2,
@@ -3068,22 +3071,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
             -1,
             -1,
             const <int>[],
-            const <int>[306, 307],
-            const prefix0.ContainedReflectable(),
-            const []),
-        r.MethodMirrorImpl(
-            r'lastWhere',
-            2,
-            23,
-            -1,
-            -1,
-            -1,
-            const <int>[],
             const <int>[308, 309],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(
-            r'singleWhere',
+            r'lastWhere',
             2,
             23,
             -1,
@@ -3093,10 +3085,43 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[310, 311],
             const prefix0.ContainedReflectable(),
             const []),
+        r.MethodMirrorImpl(
+            r'singleWhere',
+            2,
+            23,
+            -1,
+            -1,
+            -1,
+            const <int>[],
+            const <int>[312, 313],
+            const prefix0.ContainedReflectable(),
+            const []),
         r.MethodMirrorImpl(r'elementAt', 2, 23, -1, -1, -1, const <int>[],
-            const <int>[312], const prefix0.ContainedReflectable(), const []),
+            const <int>[314], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'toString', 2097154, 23, 15, 15, 15, const <int>[],
             const <int>[], const prefix0.ContainedReflectable(), const []),
+        r.MethodMirrorImpl(
+            r'iterableToShortString',
+            2097170,
+            23,
+            15,
+            15,
+            15,
+            const <int>[],
+            const <int>[315, 316, 317],
+            const prefix0.ContainedReflectable(),
+            const []),
+        r.MethodMirrorImpl(
+            r'iterableToFullString',
+            2097170,
+            23,
+            15,
+            15,
+            15,
+            const <int>[],
+            const <int>[318, 319, 320],
+            const prefix0.ContainedReflectable(),
+            const []),
         r.MethodMirrorImpl(r'iterator', 35652099, 23, -1, 94, 95, null,
             const <int>[], const prefix0.ContainedReflectable(), const []),
         r.MethodMirrorImpl(r'length', 2097155, 23, 16, 16, 16, const <int>[],
@@ -3130,7 +3155,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             87,
             23,
             null,
-            const <int>[313, 314],
+            const <int>[321, 322],
             const prefix0.ContainedReflectable(),
             const []),
         r.MethodMirrorImpl(r'empty', 385, 23, -1, 87, 23, null, const <int>[],
@@ -3214,31 +3239,31 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_data',
             151126118,
-            29,
+            27,
             const prefix0.ContainedReflectable(),
             22,
-            27,
+            26,
             22,
-            const <int>[10, 28],
+            const <int>[10, 27],
             const [],
             null,
             null),
         r.ParameterMirrorImpl(
             r'_memberSymbolMap',
             84017254,
-            31,
+            29,
             const prefix0.ContainedReflectable(),
             22,
-            29,
+            28,
             22,
-            const <int>[30, 15],
+            const <int>[29, 15],
             const [],
             null,
             null),
         r.ParameterMirrorImpl(
             r'receiver',
             67239942,
-            33,
+            31,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3250,7 +3275,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'memberName',
             134348806,
-            33,
+            31,
             const prefix0.ContainedReflectable(),
             15,
             15,
@@ -3262,10 +3287,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'positionalArguments',
             151126022,
-            33,
+            31,
             const prefix0.ContainedReflectable(),
             18,
-            60,
+            59,
             18,
             null,
             const [],
@@ -3274,7 +3299,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'namedArguments',
             84017158,
-            33,
+            31,
             const prefix0.ContainedReflectable(),
             22,
             97,
@@ -3286,7 +3311,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'kind',
             134348806,
-            33,
+            31,
             const prefix0.ContainedReflectable(),
             -1,
             98,
@@ -3295,6 +3320,102 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'receiver',
+            67239942,
+            32,
+            const prefix0.ContainedReflectable(),
+            8,
+            8,
+            8,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'memberName',
+            134348806,
+            32,
+            const prefix0.ContainedReflectable(),
+            15,
+            15,
+            15,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'positionalArguments',
+            151126022,
+            32,
+            const prefix0.ContainedReflectable(),
+            18,
+            59,
+            18,
+            null,
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'namedArguments',
+            84017158,
+            32,
+            const prefix0.ContainedReflectable(),
+            22,
+            97,
+            22,
+            null,
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'receiver',
+            67239942,
+            33,
+            const prefix0.ContainedReflectable(),
+            8,
+            8,
+            8,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'memberName',
+            134348806,
+            33,
+            const prefix0.ContainedReflectable(),
+            15,
+            15,
+            15,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'positionalArguments',
+            151126022,
+            33,
+            const prefix0.ContainedReflectable(),
+            18,
+            59,
+            18,
+            null,
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'namedArguments',
+            84017158,
+            33,
+            const prefix0.ContainedReflectable(),
+            22,
+            97,
+            22,
+            null,
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'receiver',
             67239942,
@@ -3325,7 +3446,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             34,
             const prefix0.ContainedReflectable(),
             18,
-            60,
+            59,
             18,
             null,
             const [],
@@ -3355,106 +3476,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'memberName',
-            134348806,
-            35,
-            const prefix0.ContainedReflectable(),
-            15,
-            15,
-            15,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'positionalArguments',
-            151126022,
-            35,
-            const prefix0.ContainedReflectable(),
-            18,
-            60,
-            18,
-            null,
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'namedArguments',
-            84017158,
-            35,
-            const prefix0.ContainedReflectable(),
-            22,
-            97,
-            22,
-            null,
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'receiver',
-            67239942,
-            36,
-            const prefix0.ContainedReflectable(),
-            8,
-            8,
-            8,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'memberName',
-            134348806,
-            36,
-            const prefix0.ContainedReflectable(),
-            15,
-            15,
-            15,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'positionalArguments',
-            151126022,
-            36,
-            const prefix0.ContainedReflectable(),
-            18,
-            60,
-            18,
-            null,
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'namedArguments',
-            84017158,
-            36,
-            const prefix0.ContainedReflectable(),
-            22,
-            97,
-            22,
-            null,
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'receiver',
-            67239942,
-            37,
-            const prefix0.ContainedReflectable(),
-            8,
-            8,
-            8,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'constructorName',
             134348806,
-            37,
+            35,
             const prefix0.ContainedReflectable(),
             15,
             15,
@@ -3466,10 +3491,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'positionalArguments',
             151126022,
-            37,
+            35,
             const prefix0.ContainedReflectable(),
             18,
-            60,
+            59,
             18,
             null,
             const [],
@@ -3478,7 +3503,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'namedArguments',
             84017158,
-            37,
+            35,
             const prefix0.ContainedReflectable(),
             22,
             97,
@@ -3490,7 +3515,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'pokemon',
             134349830,
-            61,
+            59,
             const prefix0.ContainedReflectable(),
             1,
             1,
@@ -3502,7 +3527,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             134348806,
-            62,
+            60,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3514,7 +3539,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'invocation',
             134348806,
-            64,
+            62,
             const prefix0.ContainedReflectable(),
             13,
             13,
@@ -3526,7 +3551,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'name',
             134349830,
-            70,
+            68,
             const prefix0.ContainedReflectable(),
             15,
             15,
@@ -3538,7 +3563,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'type',
             134349830,
-            70,
+            68,
             const prefix0.ContainedReflectable(),
             6,
             6,
@@ -3550,7 +3575,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             134348806,
-            71,
+            69,
             const prefix0.ContainedReflectable(),
             1,
             1,
@@ -3562,7 +3587,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'name',
             134348806,
-            71,
+            69,
             const prefix0.ContainedReflectable(),
             15,
             15,
@@ -3574,7 +3599,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'name',
             134348806,
-            72,
+            70,
             const prefix0.ContainedReflectable(),
             15,
             15,
@@ -3586,7 +3611,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'type',
             134348806,
-            72,
+            70,
             const prefix0.ContainedReflectable(),
             6,
             6,
@@ -3598,7 +3623,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'name',
             134358022,
-            75,
+            73,
             const prefix0.ContainedReflectable(),
             15,
             15,
@@ -3610,7 +3635,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'artist',
             134349830,
-            78,
+            76,
             const prefix0.ContainedReflectable(),
             3,
             3,
@@ -3622,7 +3647,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'artist',
             134349830,
-            82,
+            80,
             const prefix0.ContainedReflectable(),
             3,
             3,
@@ -3634,7 +3659,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'album',
             134349830,
-            82,
+            80,
             const prefix0.ContainedReflectable(),
             4,
             4,
@@ -3646,44 +3671,44 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'reflectee',
             134348806,
+            92,
+            const prefix0.ContainedReflectable(),
+            8,
+            8,
+            8,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'reflectee',
+            134348806,
+            93,
+            const prefix0.ContainedReflectable(),
+            8,
+            8,
+            8,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'type',
+            134348806,
             94,
             const prefix0.ContainedReflectable(),
-            8,
-            8,
-            8,
+            17,
+            17,
+            17,
             const <int>[],
             const [],
             null,
             null),
         r.ParameterMirrorImpl(
-            r'reflectee',
+            r'type',
             134348806,
             95,
             const prefix0.ContainedReflectable(),
-            8,
-            8,
-            8,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'type',
-            134348806,
-            96,
-            const prefix0.ContainedReflectable(),
-            17,
-            17,
-            17,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'type',
-            134348806,
-            97,
-            const prefix0.ContainedReflectable(),
             17,
             17,
             17,
@@ -3694,7 +3719,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'libraryName',
             134348806,
-            98,
+            96,
             const prefix0.ContainedReflectable(),
             15,
             15,
@@ -3706,7 +3731,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object1',
             67239942,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3718,7 +3743,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object2',
             67239942,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3730,7 +3755,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object3',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3742,7 +3767,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object4',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3754,7 +3779,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object5',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3766,7 +3791,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object6',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3778,7 +3803,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object7',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3790,7 +3815,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object8',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3802,7 +3827,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object9',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3814,7 +3839,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object10',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3826,7 +3851,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object11',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3838,7 +3863,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object12',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3850,7 +3875,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object13',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3862,7 +3887,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object14',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3874,7 +3899,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object15',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3886,7 +3911,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object16',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3898,7 +3923,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object17',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3910,7 +3935,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object18',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3922,7 +3947,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object19',
             67246086,
-            101,
+            99,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -3934,20 +3959,32 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'object20',
             67246086,
+            99,
+            const prefix0.ContainedReflectable(),
+            8,
+            8,
+            8,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'objects',
+            151126022,
+            100,
+            const prefix0.ContainedReflectable(),
+            23,
+            99,
+            23,
+            const <int>[8],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'objects',
+            151126022,
             101,
             const prefix0.ContainedReflectable(),
-            8,
-            8,
-            8,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'objects',
-            151126022,
-            102,
-            const prefix0.ContainedReflectable(),
             23,
             99,
             23,
@@ -3956,22 +3993,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             null,
             null),
         r.ParameterMirrorImpl(
-            r'objects',
-            151126022,
+            r'value1',
+            134217734,
             103,
             const prefix0.ContainedReflectable(),
-            23,
-            99,
-            23,
-            const <int>[8],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'value1',
-            134217734,
-            105,
-            const prefix0.ContainedReflectable(),
             -1,
             -1,
             -1,
@@ -3982,7 +4007,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'value2',
             134217734,
-            105,
+            103,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -3994,7 +4019,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'value1',
             134217734,
-            106,
+            104,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -4006,7 +4031,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'value2',
             134217734,
-            106,
+            104,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -4018,7 +4043,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'type',
             134348806,
-            108,
+            106,
             const prefix0.ContainedReflectable(),
             17,
             17,
@@ -4027,6 +4052,138 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'cap0',
+            67244038,
+            109,
+            const prefix0.ContainedReflectable(),
+            24,
+            24,
+            24,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap1',
+            67244038,
+            109,
+            const prefix0.ContainedReflectable(),
+            24,
+            24,
+            24,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap2',
+            67244038,
+            109,
+            const prefix0.ContainedReflectable(),
+            24,
+            24,
+            24,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap3',
+            67244038,
+            109,
+            const prefix0.ContainedReflectable(),
+            24,
+            24,
+            24,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap4',
+            67244038,
+            109,
+            const prefix0.ContainedReflectable(),
+            24,
+            24,
+            24,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap5',
+            67244038,
+            109,
+            const prefix0.ContainedReflectable(),
+            24,
+            24,
+            24,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap6',
+            67244038,
+            109,
+            const prefix0.ContainedReflectable(),
+            24,
+            24,
+            24,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap7',
+            67244038,
+            109,
+            const prefix0.ContainedReflectable(),
+            24,
+            24,
+            24,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap8',
+            67244038,
+            109,
+            const prefix0.ContainedReflectable(),
+            24,
+            24,
+            24,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'cap9',
+            67244038,
+            109,
+            const prefix0.ContainedReflectable(),
+            24,
+            24,
+            24,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'capabilities',
+            151126022,
+            110,
+            const prefix0.ContainedReflectable(),
+            18,
+            53,
+            18,
+            const <int>[24],
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'cap0',
             67244038,
@@ -4153,139 +4310,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             112,
             const prefix0.ContainedReflectable(),
             18,
-            54,
-            18,
-            const <int>[24],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap0',
-            67244038,
-            113,
-            const prefix0.ContainedReflectable(),
-            24,
-            24,
-            24,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap1',
-            67244038,
-            113,
-            const prefix0.ContainedReflectable(),
-            24,
-            24,
-            24,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap2',
-            67244038,
-            113,
-            const prefix0.ContainedReflectable(),
-            24,
-            24,
-            24,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap3',
-            67244038,
-            113,
-            const prefix0.ContainedReflectable(),
-            24,
-            24,
-            24,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap4',
-            67244038,
-            113,
-            const prefix0.ContainedReflectable(),
-            24,
-            24,
-            24,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap5',
-            67244038,
-            113,
-            const prefix0.ContainedReflectable(),
-            24,
-            24,
-            24,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap6',
-            67244038,
-            113,
-            const prefix0.ContainedReflectable(),
-            24,
-            24,
-            24,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap7',
-            67244038,
-            113,
-            const prefix0.ContainedReflectable(),
-            24,
-            24,
-            24,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap8',
-            67244038,
-            113,
-            const prefix0.ContainedReflectable(),
-            24,
-            24,
-            24,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'cap9',
-            67244038,
-            113,
-            const prefix0.ContainedReflectable(),
-            24,
-            24,
-            24,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'capabilities',
-            151126022,
-            114,
-            const prefix0.ContainedReflectable(),
-            18,
-            54,
+            53,
             18,
             const <int>[24],
             const [],
@@ -4294,7 +4319,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap0',
             67245094,
-            115,
+            113,
             const prefix0.ContainedReflectable(),
             24,
             24,
@@ -4306,7 +4331,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap1',
             67245094,
-            115,
+            113,
             const prefix0.ContainedReflectable(),
             24,
             24,
@@ -4318,7 +4343,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap2',
             67245094,
-            115,
+            113,
             const prefix0.ContainedReflectable(),
             24,
             24,
@@ -4330,7 +4355,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap3',
             67245094,
-            115,
+            113,
             const prefix0.ContainedReflectable(),
             24,
             24,
@@ -4342,7 +4367,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap4',
             67245094,
-            115,
+            113,
             const prefix0.ContainedReflectable(),
             24,
             24,
@@ -4354,7 +4379,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap5',
             67245094,
-            115,
+            113,
             const prefix0.ContainedReflectable(),
             24,
             24,
@@ -4366,7 +4391,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap6',
             67245094,
-            115,
+            113,
             const prefix0.ContainedReflectable(),
             24,
             24,
@@ -4378,7 +4403,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap7',
             67245094,
-            115,
+            113,
             const prefix0.ContainedReflectable(),
             24,
             24,
@@ -4390,7 +4415,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap8',
             67245094,
-            115,
+            113,
             const prefix0.ContainedReflectable(),
             24,
             24,
@@ -4402,7 +4427,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_cap9',
             67245094,
-            115,
+            113,
             const prefix0.ContainedReflectable(),
             24,
             24,
@@ -4414,7 +4439,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'_capabilities',
             84018214,
-            116,
+            114,
             const prefix0.ContainedReflectable(),
             18,
             100,
@@ -4426,11 +4451,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'memberName',
             134348806,
-            126,
+            124,
             const prefix0.ContainedReflectable(),
             -1,
-            30,
-            30,
+            29,
+            29,
             const <int>[],
             const [],
             null,
@@ -4438,7 +4463,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'positionalArguments',
             84017158,
-            126,
+            124,
             const prefix0.ContainedReflectable(),
             23,
             101,
@@ -4450,23 +4475,23 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'namedArguments',
             84021254,
-            126,
+            124,
             const prefix0.ContainedReflectable(),
             22,
             102,
             22,
-            const <int>[30, 8],
+            const <int>[29, 8],
             const [],
             null,
             null),
         r.ParameterMirrorImpl(
             r'memberName',
             134348806,
-            127,
+            125,
             const prefix0.ContainedReflectable(),
             -1,
-            30,
-            30,
+            29,
+            29,
             const <int>[],
             const [],
             null,
@@ -4474,7 +4499,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'typeArguments',
             84017158,
-            127,
+            125,
             const prefix0.ContainedReflectable(),
             23,
             103,
@@ -4486,7 +4511,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'positionalArguments',
             84017158,
-            127,
+            125,
             const prefix0.ContainedReflectable(),
             23,
             101,
@@ -4498,23 +4523,23 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'namedArguments',
             84021254,
-            127,
+            125,
             const prefix0.ContainedReflectable(),
             22,
             102,
             22,
-            const <int>[30, 8],
+            const <int>[29, 8],
             const [],
             null,
             null),
         r.ParameterMirrorImpl(
             r'name',
             134348806,
-            128,
+            126,
             const prefix0.ContainedReflectable(),
             -1,
-            30,
-            30,
+            29,
+            29,
             const <int>[],
             const [],
             null,
@@ -4522,11 +4547,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'memberName',
             134348806,
-            129,
+            127,
             const prefix0.ContainedReflectable(),
             -1,
-            30,
-            30,
+            29,
+            29,
             const <int>[],
             const [],
             null,
@@ -4534,7 +4559,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'argument',
             67239942,
-            129,
+            127,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -4543,6 +4568,54 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'source',
+            134348806,
+            128,
+            const prefix0.ContainedReflectable(),
+            15,
+            15,
+            15,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'caseSensitive',
+            134363142,
+            128,
+            const prefix0.ContainedReflectable(),
+            14,
+            14,
+            14,
+            const <int>[],
+            const [],
+            null,
+            #caseSensitive),
+        r.ParameterMirrorImpl(
+            r'source',
+            134348806,
+            129,
+            const prefix0.ContainedReflectable(),
+            15,
+            15,
+            15,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'caseSensitive',
+            134363142,
+            129,
+            const prefix0.ContainedReflectable(),
+            14,
+            14,
+            14,
+            const <int>[],
+            const [],
+            null,
+            #caseSensitive),
         r.ParameterMirrorImpl(
             r'other',
             134348806,
@@ -5323,18 +5396,6 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             #radix),
-        r.ParameterMirrorImpl(
-            r'onError',
-            67121158,
-            196,
-            const prefix0.ContainedReflectable(),
-            -1,
-            109,
-            109,
-            const <int>[],
-            const [],
-            null,
-            #onError),
         r.ParameterMirrorImpl(
             r'source',
             134348806,
@@ -5401,7 +5462,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             207,
             const prefix0.ContainedReflectable(),
             18,
-            110,
+            109,
             18,
             null,
             const [],
@@ -5413,7 +5474,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             208,
             const prefix0.ContainedReflectable(),
             18,
-            111,
+            110,
             18,
             null,
             const [],
@@ -5437,7 +5498,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             208,
             const prefix0.ContainedReflectable(),
             18,
-            111,
+            110,
             18,
             null,
             const [],
@@ -5473,7 +5534,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             209,
             const prefix0.ContainedReflectable(),
             18,
-            112,
+            111,
             18,
             null,
             const [],
@@ -5497,7 +5558,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             209,
             const prefix0.ContainedReflectable(),
             23,
-            113,
+            112,
             23,
             null,
             const [],
@@ -5557,7 +5618,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             214,
             const prefix0.ContainedReflectable(),
             23,
-            69,
+            68,
             23,
             null,
             const [],
@@ -5569,8 +5630,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             215,
             const prefix0.ContainedReflectable(),
             -1,
-            114,
-            114,
+            113,
+            113,
             const <int>[],
             const [],
             null,
@@ -5581,8 +5642,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             216,
             const prefix0.ContainedReflectable(),
             -1,
-            115,
-            115,
+            114,
+            114,
             const <int>[],
             const [],
             null,
@@ -5617,8 +5678,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             218,
             const prefix0.ContainedReflectable(),
             -1,
-            116,
-            116,
+            115,
+            115,
             const <int>[],
             const [],
             null,
@@ -5641,8 +5702,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             219,
             const prefix0.ContainedReflectable(),
             -1,
-            116,
-            116,
+            115,
+            115,
             const <int>[],
             const [],
             null,
@@ -5725,7 +5786,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             223,
             const prefix0.ContainedReflectable(),
             23,
-            69,
+            68,
             23,
             null,
             const [],
@@ -5749,7 +5810,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             224,
             const prefix0.ContainedReflectable(),
             23,
-            69,
+            68,
             23,
             null,
             const [],
@@ -5785,8 +5846,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             228,
             const prefix0.ContainedReflectable(),
             -1,
-            116,
-            116,
+            115,
+            115,
             const <int>[],
             const [],
             null,
@@ -5797,8 +5858,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             229,
             const prefix0.ContainedReflectable(),
             -1,
-            116,
-            116,
+            115,
+            115,
             const <int>[],
             const [],
             null,
@@ -5809,7 +5870,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             230,
             const prefix0.ContainedReflectable(),
             18,
-            68,
+            67,
             18,
             null,
             const [],
@@ -5893,7 +5954,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             233,
             const prefix0.ContainedReflectable(),
             23,
-            69,
+            68,
             23,
             null,
             const [],
@@ -6001,7 +6062,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             236,
             const prefix0.ContainedReflectable(),
             23,
-            69,
+            68,
             23,
             null,
             const [],
@@ -6019,22 +6080,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'length',
-            67244038,
-            244,
-            const prefix0.ContainedReflectable(),
-            16,
-            16,
-            16,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'length',
             134348806,
-            245,
+            244,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -6046,7 +6095,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'fill',
             6,
-            245,
+            244,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -6055,6 +6104,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'growable',
+            134363142,
+            244,
+            const prefix0.ContainedReflectable(),
+            14,
+            14,
+            14,
+            const <int>[],
+            const [],
+            null,
+            #growable),
         r.ParameterMirrorImpl(
             r'growable',
             134363142,
@@ -6067,6 +6128,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             #growable),
+        r.ParameterMirrorImpl(
+            r'elements',
+            151126022,
+            246,
+            const prefix0.ContainedReflectable(),
+            23,
+            116,
+            23,
+            null,
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'growable',
             134363142,
@@ -6085,7 +6158,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             247,
             const prefix0.ContainedReflectable(),
             23,
-            117,
+            68,
             23,
             null,
             const [],
@@ -6103,34 +6176,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             #growable),
-        r.ParameterMirrorImpl(
-            r'elements',
-            151126022,
-            248,
-            const prefix0.ContainedReflectable(),
-            23,
-            69,
-            23,
-            null,
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'growable',
-            134363142,
-            248,
-            const prefix0.ContainedReflectable(),
-            14,
-            14,
-            14,
-            const <int>[],
-            const [],
-            null,
-            #growable),
         r.ParameterMirrorImpl(
             r'length',
             134348806,
-            249,
+            248,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -6142,11 +6191,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'generator',
             134217734,
-            249,
+            248,
             const prefix0.ContainedReflectable(),
             -1,
-            118,
-            118,
+            117,
+            117,
             const <int>[],
             const [],
             null,
@@ -6154,7 +6203,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'growable',
             134363142,
-            249,
+            248,
             const prefix0.ContainedReflectable(),
             14,
             14,
@@ -6166,10 +6215,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'elements',
             151126022,
-            250,
+            249,
             const prefix0.ContainedReflectable(),
             23,
-            117,
+            116,
             23,
             null,
             const [],
@@ -6214,7 +6263,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             134348806,
-            251,
+            250,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -6226,7 +6275,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'invocation',
             134348806,
-            252,
+            251,
             const prefix0.ContainedReflectable(),
             13,
             13,
@@ -6235,6 +6284,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'other',
+            134348806,
+            257,
+            const prefix0.ContainedReflectable(),
+            20,
+            20,
+            20,
+            const <int>[],
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'other',
             134348806,
@@ -6250,19 +6311,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             134348806,
-            259,
-            const prefix0.ContainedReflectable(),
-            20,
-            20,
-            20,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'other',
-            134348806,
-            272,
+            271,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -6274,10 +6323,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'source',
             151126022,
-            279,
+            278,
             const prefix0.ContainedReflectable(),
             22,
-            119,
+            118,
             22,
             null,
             const [],
@@ -6286,6 +6335,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'value',
             67239942,
+            280,
+            const prefix0.ContainedReflectable(),
+            8,
+            8,
+            8,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'key',
+            67239942,
             281,
             const prefix0.ContainedReflectable(),
             8,
@@ -6307,22 +6368,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'key',
-            67239942,
-            283,
-            const prefix0.ContainedReflectable(),
-            8,
-            8,
-            8,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'key',
             6,
-            284,
+            283,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -6334,7 +6383,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'value',
             6,
-            284,
+            283,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -6346,11 +6395,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'convert',
             134217734,
-            285,
+            284,
             const prefix0.ContainedReflectable(),
             -1,
-            120,
-            120,
+            119,
+            119,
             const <int>[],
             const [],
             null,
@@ -6358,7 +6407,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'newEntries',
             151126022,
-            286,
+            285,
             const prefix0.ContainedReflectable(),
             23,
             81,
@@ -6370,7 +6419,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'key',
             6,
-            287,
+            286,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -6382,11 +6431,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'update',
             134217734,
-            287,
+            286,
             const prefix0.ContainedReflectable(),
             -1,
-            121,
-            121,
+            120,
+            120,
             const <int>[],
             const [],
             null,
@@ -6394,6 +6443,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'ifAbsent',
             67121158,
+            286,
+            const prefix0.ContainedReflectable(),
+            -1,
+            121,
+            121,
+            const <int>[],
+            const [],
+            null,
+            #ifAbsent),
+        r.ParameterMirrorImpl(
+            r'update',
+            134217734,
             287,
             const prefix0.ContainedReflectable(),
             -1,
@@ -6402,9 +6463,9 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const <int>[],
             const [],
             null,
-            #ifAbsent),
+            null),
         r.ParameterMirrorImpl(
-            r'update',
+            r'test',
             134217734,
             288,
             const prefix0.ContainedReflectable(),
@@ -6415,22 +6476,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'test',
-            134217734,
-            289,
-            const prefix0.ContainedReflectable(),
-            -1,
-            124,
-            124,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'key',
             6,
-            290,
+            289,
             const prefix0.ContainedReflectable(),
             -1,
             -1,
@@ -6442,11 +6491,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'ifAbsent',
             134217734,
-            290,
+            289,
             const prefix0.ContainedReflectable(),
             -1,
-            125,
-            125,
+            124,
+            124,
             const <int>[],
             const [],
             null,
@@ -6454,7 +6503,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             151126022,
-            291,
+            290,
             const prefix0.ContainedReflectable(),
             22,
             84,
@@ -6466,7 +6515,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'key',
             67239942,
-            292,
+            291,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -6478,22 +6527,34 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'action',
             134217734,
-            294,
+            293,
             const prefix0.ContainedReflectable(),
             -1,
-            126,
-            126,
+            125,
+            125,
             const <int>[],
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'other',
+            151126022,
+            301,
+            const prefix0.ContainedReflectable(),
+            22,
+            126,
+            22,
+            null,
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'other',
             151126022,
             302,
             const prefix0.ContainedReflectable(),
             22,
-            127,
+            84,
             22,
             null,
             const [],
@@ -6505,19 +6566,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             303,
             const prefix0.ContainedReflectable(),
             22,
-            84,
-            22,
-            null,
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'other',
-            151126022,
-            304,
-            const prefix0.ContainedReflectable(),
-            22,
-            127,
+            126,
             22,
             null,
             const [],
@@ -6526,10 +6575,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'iterable',
             151126022,
-            306,
+            305,
             const prefix0.ContainedReflectable(),
             23,
-            117,
+            116,
             23,
             null,
             const [],
@@ -6538,11 +6587,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'key',
             67121158,
-            306,
+            305,
             const prefix0.ContainedReflectable(),
             -1,
-            128,
-            128,
+            127,
+            127,
             const <int>[],
             const [],
             null,
@@ -6550,11 +6599,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'value',
             67121158,
-            306,
+            305,
             const prefix0.ContainedReflectable(),
             -1,
-            129,
-            129,
+            128,
+            128,
             const <int>[],
             const [],
             null,
@@ -6562,7 +6611,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'keys',
             151126022,
-            307,
+            306,
             const prefix0.ContainedReflectable(),
             23,
             82,
@@ -6574,7 +6623,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'values',
             151126022,
-            307,
+            306,
             const prefix0.ContainedReflectable(),
             23,
             83,
@@ -6586,7 +6635,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'entries',
             151126022,
-            308,
+            307,
             const prefix0.ContainedReflectable(),
             23,
             81,
@@ -6598,10 +6647,10 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'source',
             151126022,
-            309,
+            308,
             const prefix0.ContainedReflectable(),
             23,
-            130,
+            129,
             23,
             null,
             const [],
@@ -6610,7 +6659,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'other',
             151126022,
-            311,
+            310,
             const prefix0.ContainedReflectable(),
             23,
             87,
@@ -6622,6 +6671,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'toElement',
             134217734,
+            311,
+            const prefix0.ContainedReflectable(),
+            -1,
+            130,
+            130,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'test',
+            134217734,
             312,
             const prefix0.ContainedReflectable(),
             -1,
@@ -6631,26 +6692,14 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'test',
-            134217734,
-            313,
-            const prefix0.ContainedReflectable(),
-            -1,
-            132,
-            132,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'toElements',
             134217734,
-            315,
+            314,
             const prefix0.ContainedReflectable(),
             -1,
-            133,
-            133,
+            132,
+            132,
             const <int>[],
             const [],
             null,
@@ -6658,7 +6707,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'element',
             67239942,
-            316,
+            315,
             const prefix0.ContainedReflectable(),
             8,
             8,
@@ -6670,6 +6719,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'action',
             134217734,
+            316,
+            const prefix0.ContainedReflectable(),
+            -1,
+            133,
+            133,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'combine',
+            134217734,
             317,
             const prefix0.ContainedReflectable(),
             -1,
@@ -6679,6 +6740,18 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'initialValue',
+            6,
+            318,
+            const prefix0.ContainedReflectable(),
+            -1,
+            -1,
+            -1,
+            const <int>[],
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'combine',
             134217734,
@@ -6691,38 +6764,14 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
-        r.ParameterMirrorImpl(
-            r'initialValue',
-            6,
-            319,
-            const prefix0.ContainedReflectable(),
-            -1,
-            -1,
-            -1,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'combine',
-            134217734,
-            319,
-            const prefix0.ContainedReflectable(),
-            -1,
-            136,
-            136,
-            const <int>[],
-            const [],
-            null,
-            null),
         r.ParameterMirrorImpl(
             r'test',
             134217734,
-            320,
+            319,
             const prefix0.ContainedReflectable(),
             -1,
-            132,
-            132,
+            131,
+            131,
             const <int>[],
             const [],
             null,
@@ -6730,7 +6779,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'separator',
             134354950,
-            321,
+            320,
             const prefix0.ContainedReflectable(),
             15,
             15,
@@ -6742,11 +6791,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'test',
             134217734,
-            322,
+            321,
             const prefix0.ContainedReflectable(),
             -1,
-            132,
-            132,
+            131,
+            131,
             const <int>[],
             const [],
             null,
@@ -6754,7 +6803,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'growable',
             134363142,
-            323,
+            322,
             const prefix0.ContainedReflectable(),
             14,
             14,
@@ -6766,7 +6815,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'count',
             134348806,
-            325,
+            324,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -6778,11 +6827,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'test',
             134217734,
-            326,
+            325,
             const prefix0.ContainedReflectable(),
             -1,
-            132,
-            132,
+            131,
+            131,
             const <int>[],
             const [],
             null,
@@ -6790,7 +6839,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'count',
             134348806,
-            327,
+            326,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -6799,26 +6848,50 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'test',
+            134217734,
+            327,
+            const prefix0.ContainedReflectable(),
+            -1,
+            131,
+            131,
+            const <int>[],
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'test',
             134217734,
             328,
             const prefix0.ContainedReflectable(),
             -1,
-            132,
-            132,
+            131,
+            131,
             const <int>[],
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'orElse',
+            67121158,
+            328,
+            const prefix0.ContainedReflectable(),
+            -1,
+            136,
+            136,
+            const <int>[],
+            const [],
+            null,
+            #orElse),
         r.ParameterMirrorImpl(
             r'test',
             134217734,
             329,
             const prefix0.ContainedReflectable(),
             -1,
-            132,
-            132,
+            131,
+            131,
             const <int>[],
             const [],
             null,
@@ -6829,8 +6902,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             329,
             const prefix0.ContainedReflectable(),
             -1,
-            137,
-            137,
+            136,
+            136,
             const <int>[],
             const [],
             null,
@@ -6841,8 +6914,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             330,
             const prefix0.ContainedReflectable(),
             -1,
-            132,
-            132,
+            131,
+            131,
             const <int>[],
             const [],
             null,
@@ -6853,32 +6926,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             330,
             const prefix0.ContainedReflectable(),
             -1,
-            137,
-            137,
-            const <int>[],
-            const [],
-            null,
-            #orElse),
-        r.ParameterMirrorImpl(
-            r'test',
-            134217734,
-            331,
-            const prefix0.ContainedReflectable(),
-            -1,
-            132,
-            132,
-            const <int>[],
-            const [],
-            null,
-            null),
-        r.ParameterMirrorImpl(
-            r'orElse',
-            67121158,
-            331,
-            const prefix0.ContainedReflectable(),
-            -1,
-            137,
-            137,
+            136,
+            136,
             const <int>[],
             const [],
             null,
@@ -6886,7 +6935,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'index',
             134348806,
-            332,
+            331,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -6895,10 +6944,82 @@ final _data = <r.Reflectable, r.ReflectorData>{
             const [],
             null,
             null),
+        r.ParameterMirrorImpl(
+            r'iterable',
+            151126022,
+            333,
+            const prefix0.ContainedReflectable(),
+            23,
+            116,
+            23,
+            null,
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'leftDelimiter',
+            134354950,
+            333,
+            const prefix0.ContainedReflectable(),
+            15,
+            15,
+            15,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'rightDelimiter',
+            134354950,
+            333,
+            const prefix0.ContainedReflectable(),
+            15,
+            15,
+            15,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'iterable',
+            151126022,
+            334,
+            const prefix0.ContainedReflectable(),
+            23,
+            116,
+            23,
+            null,
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'leftDelimiter',
+            134354950,
+            334,
+            const prefix0.ContainedReflectable(),
+            15,
+            15,
+            15,
+            const <int>[],
+            const [],
+            null,
+            null),
+        r.ParameterMirrorImpl(
+            r'rightDelimiter',
+            134354950,
+            334,
+            const prefix0.ContainedReflectable(),
+            15,
+            15,
+            15,
+            const <int>[],
+            const [],
+            null,
+            null),
         r.ParameterMirrorImpl(
             r'count',
             134348806,
-            342,
+            343,
             const prefix0.ContainedReflectable(),
             16,
             16,
@@ -6910,11 +7031,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
         r.ParameterMirrorImpl(
             r'generator',
             67112966,
-            342,
+            343,
             const prefix0.ContainedReflectable(),
             -1,
-            138,
-            138,
+            137,
+            137,
             const <int>[],
             const [],
             null,
@@ -6947,7 +7068,6 @@ final _data = <r.Reflectable, r.ReflectorData>{
         Iterable,
         prefix6.ReflectCapability,
         Deprecated,
-        Null,
         const m.TypeValue<Map<prefix2.Reflectable, prefix3.ReflectorData>>()
             .type,
         prefix3.ReflectorData,
@@ -7001,6 +7121,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
         const m.TypeValue<Map<String, prefix5.DeclarationMirror>>().type,
         prefix5.LibraryDependencyMirror,
         const m.TypeValue<List<prefix5.LibraryDependencyMirror>>().type,
+        Null,
         const r.FakeType(r'dart.core.Map<K2, V2>'),
         const r.FakeType(r'dart.core.Map<RK, RV>'),
         const r.FakeType(r'dart.core.Map<K2, V2>'),
@@ -7032,7 +7153,6 @@ final _data = <r.Reflectable, r.ReflectorData>{
         const m.TypeValue<String Function(Match)>().type,
         const m.TypeValue<String Function(String)>().type,
         const m.TypeValue<Iterable<int>>().type,
-        const m.TypeValue<int Function(String)>().type,
         const r.FakeType(r'dart.core.List<S>'),
         const r.FakeType(r'dart.core.List<T>'),
         const r.FakeType(r'dart.core.List<T>'),
@@ -7130,7 +7250,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             Uri.parse(
                 'asset:angel3_container_generator/test/reflector_test.dart'),
             const prefix0.ContainedReflectable(),
-            const <int>[45, 46, 47],
+            const <int>[43, 44, 45],
             {
               r'main': () => prefix1.main,
               r'returnVoidFromAFunction': () => prefix1.returnVoidFromAFunction,
@@ -7151,14 +7271,12 @@ final _data = <r.Reflectable, r.ReflectorData>{
             null),
         r.LibraryMirrorImpl(
             r'dart.core',
-            Uri.parse(r'reflectable://2/dart.core'),
+            Uri.parse(r'reflectable://2/library dart:core'),
             const prefix0.ContainedReflectable(),
-            const <int>[1, 2, 3, 4, 49, 50, 51],
+            const <int>[1, 2, 47, 48, 49],
             {
               r'deprecated': () => deprecated,
               r'override': () => override,
-              r'provisional': () => provisional,
-              r'proxy': () => proxy,
               r'identical': () => identical,
               r'identityHashCode': () => identityHashCode,
               r'print': () => print
@@ -7179,7 +7297,7 @@ final _data = <r.Reflectable, r.ReflectorData>{
             r'reflectable.src.reflectable_builder_based',
             Uri.parse('package:reflectable/src/reflectable_builder_based.dart'),
             const prefix0.ContainedReflectable(),
-            const <int>[5, 6, 7, 61],
+            const <int>[3, 4, 5, 57],
             {
               r'pleaseInitializeMessage': () => prefix3.pleaseInitializeMessage,
               r'data': () => prefix3.data,
@@ -7216,6 +7334,8 @@ final _data = <r.Reflectable, r.ReflectorData>{
             Uri.parse('package:reflectable/capability.dart'),
             const prefix0.ContainedReflectable(),
             const <int>[
+              6,
+              7,
               8,
               9,
               10,
@@ -7235,13 +7355,11 @@ final _data = <r.Reflectable, r.ReflectorData>{
               24,
               25,
               26,
-              27,
-              28,
-              62,
-              63,
-              64,
-              65,
-              66
+              58,
+              59,
+              60,
+              61,
+              62
             ],
             {
               r'instanceInvokeCapability': () =>