diff --git a/integration_tests/wasm/dart_test.yaml b/integration_tests/wasm/dart_test.yaml
index 14308c465..56682bb8a 100644
--- a/integration_tests/wasm/dart_test.yaml
+++ b/integration_tests/wasm/dart_test.yaml
@@ -1,4 +1,4 @@
-platforms: [chrome, firefox]
+platforms: [chrome, firefox, safari]
 # Node doesn't work because the version available in the current Ubuntu GitHub runners is too
 # old to support WASM+GC, which would be required to run Dart tests.
 #platforms: [chrome, firefox, node]
diff --git a/pkgs/test/lib/dart.js b/pkgs/test/lib/dart.js
index 3840ba785..d454932f0 100644
--- a/pkgs/test/lib/dart.js
+++ b/pkgs/test/lib/dart.js
@@ -14,6 +14,7 @@ var sendLoadException = function(message) {
   window.parent.postMessage({
     "data": [0, {"type": "loadException", "message": message}],
     "exception": true,
+    "href": window.location.href,
   }, window.location.origin);
 }
 
diff --git a/pkgs/test/lib/src/runner/browser/post_message_channel.dart b/pkgs/test/lib/src/runner/browser/post_message_channel.dart
index 229a33cd5..66322c9f3 100644
--- a/pkgs/test/lib/src/runner/browser/post_message_channel.dart
+++ b/pkgs/test/lib/src/runner/browser/post_message_channel.dart
@@ -16,8 +16,10 @@ StreamChannel<Object?> postMessageChannel() {
   dom.window.console.log('Suite starting, sending channel to host'.toJS);
   var controller = StreamChannelController<Object?>(sync: true);
   var channel = dom.createMessageChannel();
-  dom.window.parent
-      .postMessage('port', dom.window.location.origin, [channel.port2]);
+  dom.window.parent.postMessage(
+      {'messageType': 'port', 'href': dom.window.location.href},
+      dom.window.location.origin,
+      [channel.port2]);
   var portSubscription =
       dom.Subscription(channel.port1, 'message', (dom.Event event) {
     controller.local.sink.add((event as dom.MessageEvent).data);
diff --git a/pkgs/test/lib/src/runner/browser/static/host.dart.js b/pkgs/test/lib/src/runner/browser/static/host.dart.js
index a28bdfca8..b43cdde2c 100644
--- a/pkgs/test/lib/src/runner/browser/static/host.dart.js
+++ b/pkgs/test/lib/src/runner/browser/static/host.dart.js
@@ -1,4 +1,4 @@
-// Generated by dart2js (NullSafetyMode.sound, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.6.1.
+// Generated by dart2js (, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.8.0-265.0.dev.
 // The code supports the following hooks:
 // dartPrint(message):
 //    if this function is defined it is called instead of the Dart [print]
@@ -468,18 +468,12 @@
             return receiver[a0];
       return J.getInterceptor$asx(receiver).$index(receiver, a0);
     },
-    $indexSet$ax(receiver, a0, a1) {
-      return J.getInterceptor$ax(receiver).$indexSet(receiver, a0, a1);
-    },
     allMatches$1$s(receiver, a0) {
       return J.getInterceptor$s(receiver).allMatches$1(receiver, a0);
     },
     allMatches$2$s(receiver, a0, a1) {
       return J.getInterceptor$s(receiver).allMatches$2(receiver, a0, a1);
     },
-    cast$1$0$ax(receiver, $T1) {
-      return J.getInterceptor$ax(receiver).cast$1$0(receiver, $T1);
-    },
     elementAt$1$ax(receiver, a0) {
       return J.getInterceptor$ax(receiver).elementAt$1(receiver, a0);
     },
@@ -492,9 +486,6 @@
     matchAsPrefix$2$s(receiver, a0, a1) {
       return J.getInterceptor$s(receiver).matchAsPrefix$2(receiver, a0, a1);
     },
-    noSuchMethod$1$(receiver, a0) {
-      return J.getInterceptor$(receiver).noSuchMethod$1(receiver, a0);
-    },
     skip$1$ax(receiver, a0) {
       return J.getInterceptor$ax(receiver).skip$1(receiver, a0);
     },
@@ -556,10 +547,19 @@
   A = {JS_CONST: function JS_CONST() {
     },
     CastIterable_CastIterable(source, $S, $T) {
-      if ($S._eval$1("EfficientLengthIterable<0>")._is(source))
+      if (type$.EfficientLengthIterable_dynamic._is(source))
         return new A._EfficientLengthCastIterable(source, $S._eval$1("@<0>")._bind$1($T)._eval$1("_EfficientLengthCastIterable<1,2>"));
       return new A.CastIterable(source, $S._eval$1("@<0>")._bind$1($T)._eval$1("CastIterable<1,2>"));
     },
+    LateError$fieldADI(fieldName) {
+      return new A.LateError("Field '" + fieldName + "' has been assigned during initialization.");
+    },
+    LateError$fieldNI(fieldName) {
+      return new A.LateError("Field '" + fieldName + "' has not been initialized.");
+    },
+    LateError$fieldAI(fieldName) {
+      return new A.LateError("Field '" + fieldName + "' has already been initialized.");
+    },
     hexDigitValue(char) {
       var letter,
         digit = char ^ 48;
@@ -800,9 +800,6 @@
       this._source = t0;
       this.$ti = t1;
     },
-    Symbol: function Symbol(t0) {
-      this._name = t0;
-    },
     __CastListBase__CastIterableBase_ListMixin: function __CastListBase__CastIterableBase_ListMixin() {
     },
     ConstantMap__throwUnmodifiable() {
@@ -880,9 +877,6 @@
       return parseInt(source, radix);
     },
     Primitives_objectTypeName(object) {
-      return A.Primitives__objectTypeNameNewRti(object);
-    },
-    Primitives__objectTypeNameNewRti(object) {
       var interceptor, dispatchName, $constructor, constructorName;
       if (object instanceof A.Object)
         return A._rtiToString(A.instanceType(object), null);
@@ -1012,116 +1006,6 @@
       var t1 = A.Primitives_lazyAsJsDate(receiver).getUTCMilliseconds() + 0;
       return t1;
     },
-    Primitives_functionNoSuchMethod($function, positionalArguments, namedArguments) {
-      var $arguments, namedArgumentList, t1 = {};
-      t1.argumentCount = 0;
-      $arguments = [];
-      namedArgumentList = [];
-      t1.argumentCount = positionalArguments.length;
-      B.JSArray_methods.addAll$1($arguments, positionalArguments);
-      t1.names = "";
-      if (namedArguments != null && namedArguments.__js_helper$_length !== 0)
-        namedArguments.forEach$1(0, new A.Primitives_functionNoSuchMethod_closure(t1, namedArgumentList, $arguments));
-      return J.noSuchMethod$1$($function, new A.JSInvocationMirror(B.Symbol_call, 0, $arguments, namedArgumentList, 0));
-    },
-    Primitives_applyFunction($function, positionalArguments, namedArguments) {
-      var t1, argumentCount, jsStub;
-      if (Array.isArray(positionalArguments))
-        t1 = namedArguments == null || namedArguments.__js_helper$_length === 0;
-      else
-        t1 = false;
-      if (t1) {
-        argumentCount = positionalArguments.length;
-        if (argumentCount === 0) {
-          if (!!$function.call$0)
-            return $function.call$0();
-        } else if (argumentCount === 1) {
-          if (!!$function.call$1)
-            return $function.call$1(positionalArguments[0]);
-        } else if (argumentCount === 2) {
-          if (!!$function.call$2)
-            return $function.call$2(positionalArguments[0], positionalArguments[1]);
-        } else if (argumentCount === 3) {
-          if (!!$function.call$3)
-            return $function.call$3(positionalArguments[0], positionalArguments[1], positionalArguments[2]);
-        } else if (argumentCount === 4) {
-          if (!!$function.call$4)
-            return $function.call$4(positionalArguments[0], positionalArguments[1], positionalArguments[2], positionalArguments[3]);
-        } else if (argumentCount === 5)
-          if (!!$function.call$5)
-            return $function.call$5(positionalArguments[0], positionalArguments[1], positionalArguments[2], positionalArguments[3], positionalArguments[4]);
-        jsStub = $function["call" + "$" + argumentCount];
-        if (jsStub != null)
-          return jsStub.apply($function, positionalArguments);
-      }
-      return A.Primitives__generalApplyFunction($function, positionalArguments, namedArguments);
-    },
-    Primitives__generalApplyFunction($function, positionalArguments, namedArguments) {
-      var defaultValuesClosure, t1, defaultValues, interceptor, jsFunction, maxArguments, missingDefaults, keys, _i, defaultValue, used, key,
-        $arguments = Array.isArray(positionalArguments) ? positionalArguments : A.List_List$of(positionalArguments, true, type$.dynamic),
-        argumentCount = $arguments.length,
-        requiredParameterCount = $function.$requiredArgCount;
-      if (argumentCount < requiredParameterCount)
-        return A.Primitives_functionNoSuchMethod($function, $arguments, namedArguments);
-      defaultValuesClosure = $function.$defaultValues;
-      t1 = defaultValuesClosure == null;
-      defaultValues = !t1 ? defaultValuesClosure() : null;
-      interceptor = J.getInterceptor$($function);
-      jsFunction = interceptor["call*"];
-      if (typeof jsFunction == "string")
-        jsFunction = interceptor[jsFunction];
-      if (t1) {
-        if (namedArguments != null && namedArguments.__js_helper$_length !== 0)
-          return A.Primitives_functionNoSuchMethod($function, $arguments, namedArguments);
-        if (argumentCount === requiredParameterCount)
-          return jsFunction.apply($function, $arguments);
-        return A.Primitives_functionNoSuchMethod($function, $arguments, namedArguments);
-      }
-      if (Array.isArray(defaultValues)) {
-        if (namedArguments != null && namedArguments.__js_helper$_length !== 0)
-          return A.Primitives_functionNoSuchMethod($function, $arguments, namedArguments);
-        maxArguments = requiredParameterCount + defaultValues.length;
-        if (argumentCount > maxArguments)
-          return A.Primitives_functionNoSuchMethod($function, $arguments, null);
-        if (argumentCount < maxArguments) {
-          missingDefaults = defaultValues.slice(argumentCount - requiredParameterCount);
-          if ($arguments === positionalArguments)
-            $arguments = A.List_List$of($arguments, true, type$.dynamic);
-          B.JSArray_methods.addAll$1($arguments, missingDefaults);
-        }
-        return jsFunction.apply($function, $arguments);
-      } else {
-        if (argumentCount > requiredParameterCount)
-          return A.Primitives_functionNoSuchMethod($function, $arguments, namedArguments);
-        if ($arguments === positionalArguments)
-          $arguments = A.List_List$of($arguments, true, type$.dynamic);
-        keys = Object.keys(defaultValues);
-        if (namedArguments == null)
-          for (t1 = keys.length, _i = 0; _i < keys.length; keys.length === t1 || (0, A.throwConcurrentModificationError)(keys), ++_i) {
-            defaultValue = defaultValues[A._asString(keys[_i])];
-            if (B.C__Required === defaultValue)
-              return A.Primitives_functionNoSuchMethod($function, $arguments, namedArguments);
-            B.JSArray_methods.add$1($arguments, defaultValue);
-          }
-        else {
-          for (t1 = keys.length, used = 0, _i = 0; _i < keys.length; keys.length === t1 || (0, A.throwConcurrentModificationError)(keys), ++_i) {
-            key = A._asString(keys[_i]);
-            if (namedArguments.containsKey$1(key)) {
-              ++used;
-              B.JSArray_methods.add$1($arguments, namedArguments.$index(0, key));
-            } else {
-              defaultValue = defaultValues[key];
-              if (B.C__Required === defaultValue)
-                return A.Primitives_functionNoSuchMethod($function, $arguments, namedArguments);
-              B.JSArray_methods.add$1($arguments, defaultValue);
-            }
-          }
-          if (used !== namedArguments.__js_helper$_length)
-            return A.Primitives_functionNoSuchMethod($function, $arguments, namedArguments);
-        }
-        return jsFunction.apply($function, $arguments);
-      }
-    },
     Primitives_extractStackTrace(error) {
       var jsError = error.$thrownJsError;
       if (jsError == null)
@@ -1131,7 +1015,8 @@
     Primitives_trySetStackTrace(error, stackTrace) {
       var jsError;
       if (error.$thrownJsError == null) {
-        jsError = A.wrapException(error);
+        jsError = new Error();
+        A.initializeExceptionWrapper(error, jsError);
         error.$thrownJsError = jsError;
         jsError.stack = stackTrace.toString$0(0);
       }
@@ -1165,9 +1050,9 @@
       return new A.ArgumentError(true, object, null, null);
     },
     wrapException(ex) {
-      return A.initializeExceptionWrapper(new Error(), ex);
+      return A.initializeExceptionWrapper(ex, new Error());
     },
-    initializeExceptionWrapper(wrapper, ex) {
+    initializeExceptionWrapper(ex, wrapper) {
       var t1;
       if (ex == null)
         ex = new A.TypeError();
@@ -1183,11 +1068,8 @@
     toStringWrapper() {
       return J.toString$0$(this.dartException);
     },
-    throwExpression(ex) {
-      throw A.wrapException(ex);
-    },
-    throwExpressionWithWrapper(ex, wrapper) {
-      throw A.initializeExceptionWrapper(wrapper, ex);
+    throwExpression(ex, wrapper) {
+      throw A.initializeExceptionWrapper(ex, wrapper == null ? new Error() : wrapper);
     },
     throwUnsupportedOperation(o, operation, verb) {
       var wrapper;
@@ -1196,7 +1078,7 @@
       if (verb == null)
         verb = 0;
       wrapper = Error();
-      A.throwExpressionWithWrapper(A._diagnoseUnsupportedOperation(o, operation, verb), wrapper);
+      A.throwExpression(A._diagnoseUnsupportedOperation(o, operation, verb), wrapper);
     },
     _diagnoseUnsupportedOperation(o, encodedOperation, encodedVerb) {
       var operation, table, tableLength, index, verb, object, flags, article, adjective;
@@ -1455,7 +1337,7 @@
         $prototype.$static_name = $name;
         trampoline = $function;
       }
-      $prototype.$signature = A.Closure__computeSignatureFunctionNewRti(t1, isStatic, isIntercepted);
+      $prototype.$signature = A.Closure__computeSignatureFunction(t1, isStatic, isIntercepted);
       $prototype[callName] = trampoline;
       for (applyTrampoline = trampoline, i = 1; i < funsOrNames.length; ++i) {
         stub = funsOrNames[i];
@@ -1479,7 +1361,7 @@
       $prototype.$defaultValues = parameters.dV;
       return $constructor;
     },
-    Closure__computeSignatureFunctionNewRti(functionType, isStatic, isIntercepted) {
+    Closure__computeSignatureFunction(functionType, isStatic, isIntercepted) {
       if (typeof functionType == "number")
         return functionType;
       if (typeof functionType == "string") {
@@ -1632,20 +1514,12 @@
       }
       throw A.wrapException(A.ArgumentError$("Field name " + fieldName + " not found.", null));
     },
-    boolConversionCheck(value) {
-      if (value == null)
-        A.assertThrow("boolean expression must not be null");
-      return value;
-    },
-    assertThrow(message) {
-      throw A.wrapException(new A._AssertionError(message));
-    },
-    throwCyclicInit(staticName) {
-      throw A.wrapException(new A._CyclicInitializationError(staticName));
-    },
     getIsolateAffinityTag($name) {
       return init.getIsolateTag($name);
     },
+    staticInteropGlobalContext() {
+      return init.G;
+    },
     defineProperty(obj, property, value) {
       Object.defineProperty(obj, property, {value: value, enumerable: false, writable: true, configurable: true});
     },
@@ -1798,19 +1672,18 @@
         return $function.apply(null, fieldRtis);
       return $function(fieldRtis);
     },
-    JSSyntaxRegExp_makeNative(source, multiLine, caseSensitive, unicode, dotAll, global) {
+    JSSyntaxRegExp_makeNative(source, multiLine, caseSensitive, unicode, dotAll, extraFlags) {
       var m = multiLine ? "m" : "",
         i = caseSensitive ? "" : "i",
         u = unicode ? "u" : "",
         s = dotAll ? "s" : "",
-        g = global ? "g" : "",
         regexp = function(source, modifiers) {
           try {
             return new RegExp(source, modifiers);
           } catch (e) {
             return e;
           }
-        }(source, m + i + u + s + g);
+        }(source, m + i + u + s + extraFlags);
       if (regexp instanceof RegExp)
         return regexp;
       throw A.wrapException(A.FormatException$("Illegal RegExp pattern (" + String(regexp) + ")", source, null));
@@ -1899,10 +1772,6 @@
     stringReplaceRangeUnchecked(receiver, start, end, replacement) {
       return receiver.substring(0, start) + replacement + receiver.substring(end);
     },
-    ConstantMapView: function ConstantMapView(t0, t1) {
-      this._collection$_map = t0;
-      this.$ti = t1;
-    },
     ConstantMap: function ConstantMap() {
     },
     ConstantStringMap: function ConstantStringMap(t0, t1, t2) {
@@ -1928,19 +1797,6 @@
       this._genericClosure = t0;
       this.$ti = t1;
     },
-    JSInvocationMirror: function JSInvocationMirror(t0, t1, t2, t3, t4) {
-      var _ = this;
-      _._memberName = t0;
-      _.__js_helper$_kind = t1;
-      _._arguments = t2;
-      _._namedArgumentNames = t3;
-      _._typeArgumentCount = t4;
-    },
-    Primitives_functionNoSuchMethod_closure: function Primitives_functionNoSuchMethod_closure(t0, t1, t2) {
-      this._box_0 = t0;
-      this.namedArgumentList = t1;
-      this.$arguments = t2;
-    },
     TypeErrorDecoder: function TypeErrorDecoder(t0, t1, t2, t3, t4, t5) {
       var _ = this;
       _._pattern = t0;
@@ -1981,17 +1837,9 @@
       this._receiver = t0;
       this._interceptor = t1;
     },
-    _CyclicInitializationError: function _CyclicInitializationError(t0) {
-      this.variableName = t0;
-    },
     RuntimeError: function RuntimeError(t0) {
       this.message = t0;
     },
-    _AssertionError: function _AssertionError(t0) {
-      this.message = t0;
-    },
-    _Required: function _Required() {
-    },
     JsLinkedHashMap: function JsLinkedHashMap(t0) {
       var _ = this;
       _.__js_helper$_length = 0;
@@ -1999,25 +1847,35 @@
       _._modifications = 0;
       _.$ti = t0;
     },
-    JsLinkedHashMap_values_closure: function JsLinkedHashMap_values_closure(t0) {
-      this.$this = t0;
-    },
     LinkedHashMapCell: function LinkedHashMapCell(t0, t1) {
       var _ = this;
       _.hashMapCellKey = t0;
       _.hashMapCellValue = t1;
       _._previous = _._next = null;
     },
-    LinkedHashMapKeyIterable: function LinkedHashMapKeyIterable(t0, t1) {
+    LinkedHashMapKeysIterable: function LinkedHashMapKeysIterable(t0, t1) {
       this.__js_helper$_map = t0;
       this.$ti = t1;
     },
-    LinkedHashMapKeyIterator: function LinkedHashMapKeyIterator(t0, t1, t2) {
+    LinkedHashMapKeyIterator: function LinkedHashMapKeyIterator(t0, t1, t2, t3) {
       var _ = this;
       _.__js_helper$_map = t0;
       _._modifications = t1;
-      _.__js_helper$_current = _._cell = null;
-      _.$ti = t2;
+      _._cell = t2;
+      _.__js_helper$_current = null;
+      _.$ti = t3;
+    },
+    LinkedHashMapValuesIterable: function LinkedHashMapValuesIterable(t0, t1) {
+      this.__js_helper$_map = t0;
+      this.$ti = t1;
+    },
+    LinkedHashMapValueIterator: function LinkedHashMapValueIterator(t0, t1, t2, t3) {
+      var _ = this;
+      _.__js_helper$_map = t0;
+      _._modifications = t1;
+      _._cell = t2;
+      _.__js_helper$_current = null;
+      _.$ti = t3;
     },
     initHooks_closure: function initHooks_closure(t0) {
       this.getTag = t0;
@@ -2032,7 +1890,7 @@
       var _ = this;
       _.pattern = t0;
       _._nativeRegExp = t1;
-      _._nativeAnchoredRegExp = _._nativeGlobalRegExp = null;
+      _._hasCapturesCache = _._nativeAnchoredRegExp = _._nativeGlobalRegExp = null;
     },
     _MatchImplementation: function _MatchImplementation(t0) {
       this._match = t0;
@@ -2066,20 +1924,20 @@
       _.__js_helper$_current = null;
     },
     throwLateFieldNI(fieldName) {
-      A.throwExpressionWithWrapper(new A.LateError("Field '" + fieldName + "' has not been initialized."), new Error());
+      throw A.initializeExceptionWrapper(A.LateError$fieldNI(fieldName), new Error());
     },
     throwLateFieldAI(fieldName) {
-      A.throwExpressionWithWrapper(new A.LateError("Field '" + fieldName + "' has already been initialized."), new Error());
+      throw A.initializeExceptionWrapper(A.LateError$fieldAI(fieldName), new Error());
     },
     throwLateFieldADI(fieldName) {
-      A.throwExpressionWithWrapper(new A.LateError("Field '" + fieldName + "' has been assigned during initialization."), new Error());
+      throw A.initializeExceptionWrapper(A.LateError$fieldADI(fieldName), new Error());
     },
     _Cell$named(_name) {
       var t1 = new A._Cell(_name);
       return t1._value = t1;
     },
     _Cell: function _Cell(t0) {
-      this.__late_helper$_name = t0;
+      this._name = t0;
       this._value = null;
     },
     _ensureNativeList(list) {
@@ -2143,19 +2001,15 @@
     },
     _NativeTypedArrayOfInt_NativeTypedArray_ListMixin_FixedLengthListMixin: function _NativeTypedArrayOfInt_NativeTypedArray_ListMixin_FixedLengthListMixin() {
     },
-    Rti__getQuestionFromStar(universe, rti) {
-      var question = rti._precomputed1;
-      return question == null ? rti._precomputed1 = A._Universe__lookupQuestionRti(universe, rti._primary, true) : question;
-    },
     Rti__getFutureFromFutureOr(universe, rti) {
       var future = rti._precomputed1;
       return future == null ? rti._precomputed1 = A._Universe__lookupInterfaceRti(universe, "Future", [rti._primary]) : future;
     },
     Rti__isUnionOfFunctionType(rti) {
       var kind = rti._kind;
-      if (kind === 6 || kind === 7 || kind === 8)
+      if (kind === 6 || kind === 7)
         return A.Rti__isUnionOfFunctionType(rti._primary);
-      return kind === 12 || kind === 13;
+      return kind === 11 || kind === 12;
     },
     Rti__getCanonicalRecipe(rti) {
       return rti._canonicalRecipe;
@@ -2190,30 +2044,24 @@
         case 4:
           return rti;
         case 6:
-          baseType = rti._primary;
-          substitutedBaseType = A._substitute(universe, baseType, typeArguments, depth);
-          if (substitutedBaseType === baseType)
-            return rti;
-          return A._Universe__lookupStarRti(universe, substitutedBaseType, true);
-        case 7:
           baseType = rti._primary;
           substitutedBaseType = A._substitute(universe, baseType, typeArguments, depth);
           if (substitutedBaseType === baseType)
             return rti;
           return A._Universe__lookupQuestionRti(universe, substitutedBaseType, true);
-        case 8:
+        case 7:
           baseType = rti._primary;
           substitutedBaseType = A._substitute(universe, baseType, typeArguments, depth);
           if (substitutedBaseType === baseType)
             return rti;
           return A._Universe__lookupFutureOrRti(universe, substitutedBaseType, true);
-        case 9:
+        case 8:
           interfaceTypeArguments = rti._rest;
           substitutedInterfaceTypeArguments = A._substituteArray(universe, interfaceTypeArguments, typeArguments, depth);
           if (substitutedInterfaceTypeArguments === interfaceTypeArguments)
             return rti;
           return A._Universe__lookupInterfaceRti(universe, rti._primary, substitutedInterfaceTypeArguments);
-        case 10:
+        case 9:
           base = rti._primary;
           substitutedBase = A._substitute(universe, base, typeArguments, depth);
           $arguments = rti._rest;
@@ -2221,14 +2069,14 @@
           if (substitutedBase === base && substitutedArguments === $arguments)
             return rti;
           return A._Universe__lookupBindingRti(universe, substitutedBase, substitutedArguments);
-        case 11:
+        case 10:
           t1 = rti._primary;
           fields = rti._rest;
           substitutedFields = A._substituteArray(universe, fields, typeArguments, depth);
           if (substitutedFields === fields)
             return rti;
           return A._Universe__lookupRecordRti(universe, t1, substitutedFields);
-        case 12:
+        case 11:
           returnType = rti._primary;
           substitutedReturnType = A._substitute(universe, returnType, typeArguments, depth);
           functionParameters = rti._rest;
@@ -2236,7 +2084,7 @@
           if (substitutedReturnType === returnType && substitutedFunctionParameters === functionParameters)
             return rti;
           return A._Universe__lookupFunctionRti(universe, substitutedReturnType, substitutedFunctionParameters);
-        case 13:
+        case 12:
           bounds = rti._rest;
           depth += bounds.length;
           substitutedBounds = A._substituteArray(universe, bounds, typeArguments, depth);
@@ -2245,7 +2093,7 @@
           if (substitutedBounds === bounds && substitutedBase === base)
             return rti;
           return A._Universe__lookupGenericFunctionRti(universe, substitutedBase, substitutedBounds, true);
-        case 14:
+        case 13:
           index = rti._primary;
           if (index < depth)
             return rti;
@@ -2387,60 +2235,44 @@
     },
     createRuntimeType(rti) {
       var t1 = rti._cachedRuntimeType;
-      return t1 == null ? rti._cachedRuntimeType = A._createRuntimeType(rti) : t1;
-    },
-    _createRuntimeType(rti) {
-      var starErasedRti, t1,
-        s = rti._canonicalRecipe,
-        starErasedRecipe = s.replace(/\*/g, "");
-      if (starErasedRecipe === s)
-        return rti._cachedRuntimeType = new A._Type(rti);
-      starErasedRti = A._Universe_eval(init.typeUniverse, starErasedRecipe, true);
-      t1 = starErasedRti._cachedRuntimeType;
-      return t1 == null ? starErasedRti._cachedRuntimeType = A._createRuntimeType(starErasedRti) : t1;
+      return t1 == null ? rti._cachedRuntimeType = new A._Type(rti) : t1;
     },
     typeLiteral(recipe) {
       return A.createRuntimeType(A._Universe_eval(init.typeUniverse, recipe, false));
     },
     _installSpecializedIsTest(object) {
-      var t1, unstarred, unstarredKind, isFn, $name, predicate, testRti = this;
+      var kind, isFn, $name, predicate, testRti = this;
       if (testRti === type$.Object)
         return A._finishIsFn(testRti, object, A._isObject);
-      if (!A.isSoundTopType(testRti))
-        t1 = testRti === type$.legacy_Object;
-      else
-        t1 = true;
-      if (t1)
+      if (A.isTopType(testRti))
         return A._finishIsFn(testRti, object, A._isTop);
-      t1 = testRti._kind;
-      if (t1 === 7)
+      kind = testRti._kind;
+      if (kind === 6)
         return A._finishIsFn(testRti, object, A._generalNullableIsTestImplementation);
-      if (t1 === 1)
+      if (kind === 1)
         return A._finishIsFn(testRti, object, A._isNever);
-      unstarred = t1 === 6 ? testRti._primary : testRti;
-      unstarredKind = unstarred._kind;
-      if (unstarredKind === 8)
+      if (kind === 7)
         return A._finishIsFn(testRti, object, A._isFutureOr);
-      if (unstarred === type$.int)
+      if (testRti === type$.int)
         isFn = A._isInt;
-      else if (unstarred === type$.double || unstarred === type$.num)
+      else if (testRti === type$.double || testRti === type$.num)
         isFn = A._isNum;
-      else if (unstarred === type$.String)
+      else if (testRti === type$.String)
         isFn = A._isString;
       else
-        isFn = unstarred === type$.bool ? A._isBool : null;
+        isFn = testRti === type$.bool ? A._isBool : null;
       if (isFn != null)
         return A._finishIsFn(testRti, object, isFn);
-      if (unstarredKind === 9) {
-        $name = unstarred._primary;
-        if (unstarred._rest.every(A.isDefinitelyTopType)) {
+      if (kind === 8) {
+        $name = testRti._primary;
+        if (testRti._rest.every(A.isTopType)) {
           testRti._specializedTestResource = "$is" + $name;
           if ($name === "List")
             return A._finishIsFn(testRti, object, A._isListTestViaProperty);
           return A._finishIsFn(testRti, object, A._isTestViaProperty);
         }
-      } else if (unstarredKind === 11) {
-        predicate = A.createRecordTypePredicate(unstarred._primary, unstarred._rest);
+      } else if (kind === 10) {
+        predicate = A.createRecordTypePredicate(testRti._primary, testRti._rest);
         return A._finishIsFn(testRti, object, predicate == null ? A._isNever : predicate);
       }
       return A._finishIsFn(testRti, object, A._generalIsTestImplementation);
@@ -2450,39 +2282,41 @@
       return testRti._is(object);
     },
     _installSpecializedAsCheck(object) {
-      var t1, testRti = this,
+      var testRti = this,
         asFn = A._generalAsCheckImplementation;
-      if (!A.isSoundTopType(testRti))
-        t1 = testRti === type$.legacy_Object;
-      else
-        t1 = true;
-      if (t1)
+      if (A.isTopType(testRti))
         asFn = A._asTop;
       else if (testRti === type$.Object)
         asFn = A._asObject;
-      else {
-        t1 = A.isNullable(testRti);
-        if (t1)
-          asFn = A._generalNullableAsCheckImplementation;
-      }
+      else if (A.isNullable(testRti))
+        asFn = A._generalNullableAsCheckImplementation;
+      if (testRti === type$.int)
+        asFn = A._asInt;
+      else if (testRti === type$.nullable_int)
+        asFn = A._asIntQ;
+      else if (testRti === type$.String)
+        asFn = A._asString;
+      else if (testRti === type$.nullable_String)
+        asFn = A._asStringQ;
+      else if (testRti === type$.bool)
+        asFn = A._asBool;
+      else if (testRti === type$.nullable_bool)
+        asFn = A._asBoolQ;
+      else if (testRti === type$.num)
+        asFn = A._asNum;
+      else if (testRti === type$.nullable_num)
+        asFn = A._asNumQ;
+      else if (testRti === type$.double)
+        asFn = A._asDouble;
+      else if (testRti === type$.nullable_double)
+        asFn = A._asDoubleQ;
       testRti._as = asFn;
       return testRti._as(object);
     },
-    _nullIs(testRti) {
-      var kind = testRti._kind,
-        t1 = true;
-      if (!A.isSoundTopType(testRti))
-        if (!(testRti === type$.legacy_Object))
-          if (!(testRti === type$.legacy_Never))
-            if (kind !== 7)
-              if (!(kind === 6 && A._nullIs(testRti._primary)))
-                t1 = kind === 8 && A._nullIs(testRti._primary) || testRti === type$.Null || testRti === type$.JSNull;
-      return t1;
-    },
     _generalIsTestImplementation(object) {
       var testRti = this;
       if (object == null)
-        return A._nullIs(testRti);
+        return A.isNullable(testRti);
       return A.isSubtype(init.typeUniverse, A.instanceOrFunctionType(object, testRti), testRti);
     },
     _generalNullableIsTestImplementation(object) {
@@ -2493,7 +2327,7 @@
     _isTestViaProperty(object) {
       var tag, testRti = this;
       if (object == null)
-        return A._nullIs(testRti);
+        return A.isNullable(testRti);
       tag = testRti._specializedTestResource;
       if (object instanceof A.Object)
         return !!object[tag];
@@ -2502,7 +2336,7 @@
     _isListTestViaProperty(object) {
       var tag, testRti = this;
       if (object == null)
-        return A._nullIs(testRti);
+        return A.isNullable(testRti);
       if (typeof object != "object")
         return false;
       if (Array.isArray(object))
@@ -2519,23 +2353,21 @@
           return object;
       } else if (testRti._is(object))
         return object;
-      A._failedAsCheck(object, testRti);
+      throw A.initializeExceptionWrapper(A._errorForAsCheck(object, testRti), new Error());
     },
     _generalNullableAsCheckImplementation(object) {
       var testRti = this;
-      if (object == null)
+      if (object == null || testRti._is(object))
         return object;
-      else if (testRti._is(object))
-        return object;
-      A._failedAsCheck(object, testRti);
+      throw A.initializeExceptionWrapper(A._errorForAsCheck(object, testRti), new Error());
     },
-    _failedAsCheck(object, testRti) {
-      throw A.wrapException(A._TypeError$fromMessage(A._Error_compose(object, A._rtiToString(testRti, null))));
+    _errorForAsCheck(object, testRti) {
+      return new A._TypeError("TypeError: " + A._Error_compose(object, A._rtiToString(testRti, null)));
     },
     checkTypeBound(type, bound, variable, methodName) {
       if (A.isSubtype(init.typeUniverse, type, bound))
         return type;
-      throw A.wrapException(A._TypeError$fromMessage("The type argument '" + A._rtiToString(type, null) + "' is not a subtype of the type variable bound '" + A._rtiToString(bound, null) + "' of type variable '" + variable + "' in '" + methodName + "'."));
+      throw A.initializeExceptionWrapper(A._TypeError$fromMessage("The type argument '" + A._rtiToString(type, null) + "' is not a subtype of the type variable bound '" + A._rtiToString(bound, null) + "' of type variable '" + variable + "' in '" + methodName + "'."), new Error());
     },
     _Error_compose(object, checkedTypeDescription) {
       return A.Error_safeToString(object) + ": type '" + A._rtiToString(A._structuralTypeOf(object), null) + "' is not a subtype of type '" + checkedTypeDescription + "'";
@@ -2547,9 +2379,8 @@
       return new A._TypeError("TypeError: " + A._Error_compose(object, type));
     },
     _isFutureOr(object) {
-      var testRti = this,
-        unstarred = testRti._kind === 6 ? testRti._primary : testRti;
-      return unstarred._primary._is(object) || A.Rti__getFutureFromFutureOr(init.typeUniverse, unstarred)._is(object);
+      var testRti = this;
+      return testRti._primary._is(object) || A.Rti__getFutureFromFutureOr(init.typeUniverse, testRti)._is(object);
     },
     _isObject(object) {
       return object != null;
@@ -2557,7 +2388,7 @@
     _asObject(object) {
       if (object != null)
         return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "Object"));
+      throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "Object"), new Error());
     },
     _isTop(object) {
       return true;
@@ -2576,16 +2407,7 @@
         return true;
       if (false === object)
         return false;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "bool"));
-    },
-    _asBoolS(object) {
-      if (true === object)
-        return true;
-      if (false === object)
-        return false;
-      if (object == null)
-        return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "bool"));
+      throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "bool"), new Error());
     },
     _asBoolQ(object) {
       if (true === object)
@@ -2594,26 +2416,19 @@
         return false;
       if (object == null)
         return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "bool?"));
+      throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "bool?"), new Error());
     },
     _asDouble(object) {
       if (typeof object == "number")
         return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "double"));
-    },
-    _asDoubleS(object) {
-      if (typeof object == "number")
-        return object;
-      if (object == null)
-        return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "double"));
+      throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "double"), new Error());
     },
     _asDoubleQ(object) {
       if (typeof object == "number")
         return object;
       if (object == null)
         return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "double?"));
+      throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "double?"), new Error());
     },
     _isInt(object) {
       return typeof object == "number" && Math.floor(object) === object;
@@ -2621,21 +2436,14 @@
     _asInt(object) {
       if (typeof object == "number" && Math.floor(object) === object)
         return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "int"));
-    },
-    _asIntS(object) {
-      if (typeof object == "number" && Math.floor(object) === object)
-        return object;
-      if (object == null)
-        return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "int"));
+      throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "int"), new Error());
     },
     _asIntQ(object) {
       if (typeof object == "number" && Math.floor(object) === object)
         return object;
       if (object == null)
         return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "int?"));
+      throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "int?"), new Error());
     },
     _isNum(object) {
       return typeof object == "number";
@@ -2643,21 +2451,14 @@
     _asNum(object) {
       if (typeof object == "number")
         return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "num"));
-    },
-    _asNumS(object) {
-      if (typeof object == "number")
-        return object;
-      if (object == null)
-        return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "num"));
+      throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "num"), new Error());
     },
     _asNumQ(object) {
       if (typeof object == "number")
         return object;
       if (object == null)
         return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "num?"));
+      throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "num?"), new Error());
     },
     _isString(object) {
       return typeof object == "string";
@@ -2665,21 +2466,14 @@
     _asString(object) {
       if (typeof object == "string")
         return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "String"));
-    },
-    _asStringS(object) {
-      if (typeof object == "string")
-        return object;
-      if (object == null)
-        return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "String"));
+      throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "String"), new Error());
     },
     _asStringQ(object) {
       if (typeof object == "string")
         return object;
       if (object == null)
         return object;
-      throw A.wrapException(A._TypeError__TypeError$forType(object, "String?"));
+      throw A.initializeExceptionWrapper(A._TypeError__TypeError$forType(object, "String?"), new Error());
     },
     _rtiArrayToString(array, genericContext) {
       var s, sep, i;
@@ -2708,7 +2502,7 @@
       return s + "})";
     },
     _functionRtiToString(functionType, genericContext, bounds) {
-      var boundsLength, offset, i, t1, t2, typeParametersText, typeSep, t3, t4, boundRti, kind, parameters, requiredPositional, requiredPositionalLength, optionalPositional, optionalPositionalLength, named, namedLength, returnTypeText, argumentsText, sep, _s2_ = ", ", outerContextLength = null;
+      var boundsLength, offset, i, t1, typeParametersText, typeSep, t2, t3, boundRti, kind, parameters, requiredPositional, requiredPositionalLength, optionalPositional, optionalPositionalLength, named, namedLength, returnTypeText, argumentsText, sep, _s2_ = ", ", outerContextLength = null;
       if (bounds != null) {
         boundsLength = bounds.length;
         if (genericContext == null)
@@ -2718,19 +2512,15 @@
         offset = genericContext.length;
         for (i = boundsLength; i > 0; --i)
           B.JSArray_methods.add$1(genericContext, "T" + (offset + i));
-        for (t1 = type$.nullable_Object, t2 = type$.legacy_Object, typeParametersText = "<", typeSep = "", i = 0; i < boundsLength; ++i, typeSep = _s2_) {
-          t3 = genericContext.length;
-          t4 = t3 - 1 - i;
-          if (!(t4 >= 0))
-            return A.ioore(genericContext, t4);
-          typeParametersText = typeParametersText + typeSep + genericContext[t4];
+        for (t1 = type$.nullable_Object, typeParametersText = "<", typeSep = "", i = 0; i < boundsLength; ++i, typeSep = _s2_) {
+          t2 = genericContext.length;
+          t3 = t2 - 1 - i;
+          if (!(t3 >= 0))
+            return A.ioore(genericContext, t3);
+          typeParametersText = typeParametersText + typeSep + genericContext[t3];
           boundRti = bounds[i];
           kind = boundRti._kind;
           if (!(kind === 2 || kind === 3 || kind === 4 || kind === 5 || boundRti === t1))
-            t3 = boundRti === t2;
-          else
-            t3 = true;
-          if (!t3)
             typeParametersText += " extends " + A._rtiToString(boundRti, genericContext);
         }
         typeParametersText += ">";
@@ -2782,28 +2572,26 @@
         return "Never";
       if (kind === 4)
         return "any";
-      if (kind === 6)
-        return A._rtiToString(rti._primary, genericContext);
-      if (kind === 7) {
+      if (kind === 6) {
         questionArgument = rti._primary;
         s = A._rtiToString(questionArgument, genericContext);
         argumentKind = questionArgument._kind;
-        return (argumentKind === 12 || argumentKind === 13 ? "(" + s + ")" : s) + "?";
+        return (argumentKind === 11 || argumentKind === 12 ? "(" + s + ")" : s) + "?";
       }
-      if (kind === 8)
+      if (kind === 7)
         return "FutureOr<" + A._rtiToString(rti._primary, genericContext) + ">";
-      if (kind === 9) {
+      if (kind === 8) {
         $name = A._unminifyOrTag(rti._primary);
         $arguments = rti._rest;
         return $arguments.length > 0 ? $name + ("<" + A._rtiArrayToString($arguments, genericContext) + ">") : $name;
       }
-      if (kind === 11)
+      if (kind === 10)
         return A._recordRtiToString(rti, genericContext);
-      if (kind === 12)
+      if (kind === 11)
         return A._functionRtiToString(rti, genericContext, null);
-      if (kind === 13)
+      if (kind === 12)
         return A._functionRtiToString(rti._primary, genericContext, rti._rest);
-      if (kind === 14) {
+      if (kind === 13) {
         t1 = rti._primary;
         t2 = genericContext.length;
         t1 = t2 - 1 - t1;
@@ -2855,7 +2643,7 @@
         probe = t1.get(recipe);
       if (probe != null)
         return probe;
-      rti = A._Parser_parse(A._Parser_create(universe, null, recipe, normalize));
+      rti = A._Parser_parse(A._Parser_create(universe, null, recipe, false));
       t1.set(recipe, rti);
       return rti;
     },
@@ -2880,7 +2668,7 @@
       probe = cache.get(argumentsRecipe);
       if (probe != null)
         return probe;
-      rti = A._Universe__lookupBindingRti(universe, environment, argumentsRti._kind === 10 ? argumentsRti._rest : [argumentsRti]);
+      rti = A._Universe__lookupBindingRti(universe, environment, argumentsRti._kind === 9 ? argumentsRti._rest : [argumentsRti]);
       cache.set(argumentsRecipe, rti);
       return rti;
     },
@@ -2901,33 +2689,6 @@
       universe.eC.set(key, t1);
       return t1;
     },
-    _Universe__lookupStarRti(universe, baseType, normalize) {
-      var t1,
-        key = baseType._canonicalRecipe + "*",
-        probe = universe.eC.get(key);
-      if (probe != null)
-        return probe;
-      t1 = A._Universe__createStarRti(universe, baseType, key, normalize);
-      universe.eC.set(key, t1);
-      return t1;
-    },
-    _Universe__createStarRti(universe, baseType, key, normalize) {
-      var baseKind, t1, rti;
-      if (normalize) {
-        baseKind = baseType._kind;
-        if (!A.isSoundTopType(baseType))
-          t1 = baseType === type$.Null || baseType === type$.JSNull || baseKind === 7 || baseKind === 6;
-        else
-          t1 = true;
-        if (t1)
-          return baseType;
-      }
-      rti = new A.Rti(null, null);
-      rti._kind = 6;
-      rti._primary = baseType;
-      rti._canonicalRecipe = key;
-      return A._Universe__installTypeTests(universe, rti);
-    },
     _Universe__lookupQuestionRti(universe, baseType, normalize) {
       var t1,
         key = baseType._canonicalRecipe + "?",
@@ -2939,28 +2700,21 @@
       return t1;
     },
     _Universe__createQuestionRti(universe, baseType, key, normalize) {
-      var baseKind, t1, starArgument, rti;
+      var baseKind, t1, rti;
       if (normalize) {
         baseKind = baseType._kind;
         t1 = true;
-        if (!A.isSoundTopType(baseType))
+        if (!A.isTopType(baseType))
           if (!(baseType === type$.Null || baseType === type$.JSNull))
-            if (baseKind !== 7)
-              t1 = baseKind === 8 && A.isNullable(baseType._primary);
+            if (baseKind !== 6)
+              t1 = baseKind === 7 && A.isNullable(baseType._primary);
         if (t1)
           return baseType;
-        else if (baseKind === 1 || baseType === type$.legacy_Never)
+        else if (baseKind === 1)
           return type$.Null;
-        else if (baseKind === 6) {
-          starArgument = baseType._primary;
-          if (starArgument._kind === 8 && A.isNullable(starArgument._primary))
-            return starArgument;
-          else
-            return A.Rti__getQuestionFromStar(universe, baseType);
-        }
       }
       rti = new A.Rti(null, null);
-      rti._kind = 7;
+      rti._kind = 6;
       rti._primary = baseType;
       rti._canonicalRecipe = key;
       return A._Universe__installTypeTests(universe, rti);
@@ -2979,7 +2733,7 @@
       var t1, rti;
       if (normalize) {
         t1 = baseType._kind;
-        if (A.isSoundTopType(baseType) || baseType === type$.Object || baseType === type$.legacy_Object)
+        if (A.isTopType(baseType) || baseType === type$.Object)
           return baseType;
         else if (t1 === 1)
           return A._Universe__lookupInterfaceRti(universe, "Future", [baseType]);
@@ -2987,7 +2741,7 @@
           return type$.nullable_Future_Null;
       }
       rti = new A.Rti(null, null);
-      rti._kind = 8;
+      rti._kind = 7;
       rti._primary = baseType;
       rti._canonicalRecipe = key;
       return A._Universe__installTypeTests(universe, rti);
@@ -2999,7 +2753,7 @@
       if (probe != null)
         return probe;
       rti = new A.Rti(null, null);
-      rti._kind = 14;
+      rti._kind = 13;
       rti._primary = index;
       rti._canonicalRecipe = key;
       t1 = A._Universe__installTypeTests(universe, rti);
@@ -3032,7 +2786,7 @@
       if (probe != null)
         return probe;
       rti = new A.Rti(null, null);
-      rti._kind = 9;
+      rti._kind = 8;
       rti._primary = $name;
       rti._rest = $arguments;
       if ($arguments.length > 0)
@@ -3044,7 +2798,7 @@
     },
     _Universe__lookupBindingRti(universe, base, $arguments) {
       var newBase, newArguments, key, probe, rti, t1;
-      if (base._kind === 10) {
+      if (base._kind === 9) {
         newBase = base._primary;
         newArguments = base._rest.concat($arguments);
       } else {
@@ -3056,7 +2810,7 @@
       if (probe != null)
         return probe;
       rti = new A.Rti(null, null);
-      rti._kind = 10;
+      rti._kind = 9;
       rti._primary = newBase;
       rti._rest = newArguments;
       rti._canonicalRecipe = key;
@@ -3071,7 +2825,7 @@
       if (probe != null)
         return probe;
       rti = new A.Rti(null, null);
-      rti._kind = 11;
+      rti._kind = 10;
       rti._primary = partialShapeTag;
       rti._rest = fields;
       rti._canonicalRecipe = key;
@@ -3102,7 +2856,7 @@
       if (probe != null)
         return probe;
       rti = new A.Rti(null, null);
-      rti._kind = 12;
+      rti._kind = 11;
       rti._primary = returnType;
       rti._rest = parameters;
       rti._canonicalRecipe = key;
@@ -3139,7 +2893,7 @@
         }
       }
       rti = new A.Rti(null, null);
-      rti._kind = 13;
+      rti._kind = 12;
       rti._primary = baseFunctionType;
       rti._rest = bounds;
       rti._canonicalRecipe = key;
@@ -3196,10 +2950,6 @@
             case 38:
               A._Parser_handleExtendedOperations(parser, t1);
               break;
-            case 42:
-              t3 = parser.u;
-              t1.push(A._Universe__lookupStarRti(t3, A._Parser_toType(t3, parser.e, t1.pop()), parser.n));
-              break;
             case 63:
               t3 = parser.u;
               t1.push(A._Universe__lookupQuestionRti(t3, A._Parser_toType(t3, parser.e, t1.pop()), parser.n));
@@ -3288,7 +3038,7 @@
       if (hasPeriod) {
         t1 = parser.u;
         environment = parser.e;
-        if (environment._kind === 10)
+        if (environment._kind === 9)
           environment = environment._primary;
         recipe = A._Universe_findRule(t1, environment._primary)[string];
         if (recipe == null)
@@ -3308,7 +3058,7 @@
       else {
         base = A._Parser_toType(t1, parser.e, head);
         switch (base._kind) {
-          case 12:
+          case 11:
             stack.push(A._Universe__lookupGenericFunctionRti(t1, base, $arguments, parser.n));
             break;
           default:
@@ -3401,7 +3151,7 @@
     _Parser_indexToType(universe, environment, index) {
       var typeArguments, len,
         kind = environment._kind;
-      if (kind === 10) {
+      if (kind === 9) {
         if (index === 0)
           return environment._primary;
         typeArguments = environment._rest;
@@ -3413,7 +3163,7 @@
         kind = environment._kind;
       } else if (index === 0)
         return environment;
-      if (kind !== 9)
+      if (kind !== 8)
         throw A.wrapException(A.AssertionError$("Indexed base must be an interface type"));
       typeArguments = environment._rest;
       if (index <= typeArguments.length)
@@ -3427,87 +3177,66 @@
         sCache = s._isSubtypeCache = new Map();
       result = sCache.get(t);
       if (result == null) {
-        result = A._isSubtype(universe, s, null, t, null, false) ? 1 : 0;
+        result = A._isSubtype(universe, s, null, t, null);
         sCache.set(t, result);
       }
-      if (0 === result)
-        return false;
-      if (1 === result)
-        return true;
-      return true;
+      return result;
     },
-    _isSubtype(universe, s, sEnv, t, tEnv, isLegacy) {
-      var t1, sKind, leftTypeVariable, tKind, t2, sBounds, tBounds, sLength, i, sBound, tBound;
+    _isSubtype(universe, s, sEnv, t, tEnv) {
+      var sKind, leftTypeVariable, tKind, t1, t2, sBounds, tBounds, sLength, i, sBound, tBound;
       if (s === t)
         return true;
-      if (!A.isSoundTopType(t))
-        t1 = t === type$.legacy_Object;
-      else
-        t1 = true;
-      if (t1)
+      if (A.isTopType(t))
         return true;
       sKind = s._kind;
       if (sKind === 4)
         return true;
-      if (A.isSoundTopType(s))
+      if (A.isTopType(s))
         return false;
-      t1 = s._kind;
-      if (t1 === 1)
+      if (s._kind === 1)
         return true;
-      leftTypeVariable = sKind === 14;
+      leftTypeVariable = sKind === 13;
       if (leftTypeVariable)
-        if (A._isSubtype(universe, sEnv[s._primary], sEnv, t, tEnv, false))
+        if (A._isSubtype(universe, sEnv[s._primary], sEnv, t, tEnv))
           return true;
       tKind = t._kind;
-      t1 = s === type$.Null || s === type$.JSNull;
-      if (t1) {
-        if (tKind === 8)
-          return A._isSubtype(universe, s, sEnv, t._primary, tEnv, false);
-        return t === type$.Null || t === type$.JSNull || tKind === 7 || tKind === 6;
+      t1 = type$.Null;
+      if (s === t1 || s === type$.JSNull) {
+        if (tKind === 7)
+          return A._isSubtype(universe, s, sEnv, t._primary, tEnv);
+        return t === t1 || t === type$.JSNull || tKind === 6;
       }
       if (t === type$.Object) {
-        if (sKind === 8)
-          return A._isSubtype(universe, s._primary, sEnv, t, tEnv, false);
-        if (sKind === 6)
-          return A._isSubtype(universe, s._primary, sEnv, t, tEnv, false);
-        return sKind !== 7;
-      }
-      if (sKind === 6)
-        return A._isSubtype(universe, s._primary, sEnv, t, tEnv, false);
-      if (tKind === 6) {
-        t1 = A.Rti__getQuestionFromStar(universe, t);
-        return A._isSubtype(universe, s, sEnv, t1, tEnv, false);
-      }
-      if (sKind === 8) {
-        if (!A._isSubtype(universe, s._primary, sEnv, t, tEnv, false))
-          return false;
-        return A._isSubtype(universe, A.Rti__getFutureFromFutureOr(universe, s), sEnv, t, tEnv, false);
+        if (sKind === 7)
+          return A._isSubtype(universe, s._primary, sEnv, t, tEnv);
+        return sKind !== 6;
       }
       if (sKind === 7) {
-        t1 = A._isSubtype(universe, type$.Null, sEnv, t, tEnv, false);
-        return t1 && A._isSubtype(universe, s._primary, sEnv, t, tEnv, false);
-      }
-      if (tKind === 8) {
-        if (A._isSubtype(universe, s, sEnv, t._primary, tEnv, false))
-          return true;
-        return A._isSubtype(universe, s, sEnv, A.Rti__getFutureFromFutureOr(universe, t), tEnv, false);
+        if (!A._isSubtype(universe, s._primary, sEnv, t, tEnv))
+          return false;
+        return A._isSubtype(universe, A.Rti__getFutureFromFutureOr(universe, s), sEnv, t, tEnv);
       }
+      if (sKind === 6)
+        return A._isSubtype(universe, t1, sEnv, t, tEnv) && A._isSubtype(universe, s._primary, sEnv, t, tEnv);
       if (tKind === 7) {
-        t1 = A._isSubtype(universe, s, sEnv, type$.Null, tEnv, false);
-        return t1 || A._isSubtype(universe, s, sEnv, t._primary, tEnv, false);
+        if (A._isSubtype(universe, s, sEnv, t._primary, tEnv))
+          return true;
+        return A._isSubtype(universe, s, sEnv, A.Rti__getFutureFromFutureOr(universe, t), tEnv);
       }
+      if (tKind === 6)
+        return A._isSubtype(universe, s, sEnv, t1, tEnv) || A._isSubtype(universe, s, sEnv, t._primary, tEnv);
       if (leftTypeVariable)
         return false;
-      t1 = sKind !== 12;
-      if ((!t1 || sKind === 13) && t === type$.Function)
+      t1 = sKind !== 11;
+      if ((!t1 || sKind === 12) && t === type$.Function)
         return true;
-      t2 = sKind === 11;
+      t2 = sKind === 10;
       if (t2 && t === type$.Record)
         return true;
-      if (tKind === 13) {
+      if (tKind === 12) {
         if (s === type$.JavaScriptFunction)
           return true;
-        if (sKind !== 13)
+        if (sKind !== 12)
           return false;
         sBounds = s._rest;
         tBounds = t._rest;
@@ -3519,30 +3248,30 @@
         for (i = 0; i < sLength; ++i) {
           sBound = sBounds[i];
           tBound = tBounds[i];
-          if (!A._isSubtype(universe, sBound, sEnv, tBound, tEnv, false) || !A._isSubtype(universe, tBound, tEnv, sBound, sEnv, false))
+          if (!A._isSubtype(universe, sBound, sEnv, tBound, tEnv) || !A._isSubtype(universe, tBound, tEnv, sBound, sEnv))
             return false;
         }
-        return A._isFunctionSubtype(universe, s._primary, sEnv, t._primary, tEnv, false);
+        return A._isFunctionSubtype(universe, s._primary, sEnv, t._primary, tEnv);
       }
-      if (tKind === 12) {
+      if (tKind === 11) {
         if (s === type$.JavaScriptFunction)
           return true;
         if (t1)
           return false;
-        return A._isFunctionSubtype(universe, s, sEnv, t, tEnv, false);
+        return A._isFunctionSubtype(universe, s, sEnv, t, tEnv);
       }
-      if (sKind === 9) {
-        if (tKind !== 9)
+      if (sKind === 8) {
+        if (tKind !== 8)
           return false;
-        return A._isInterfaceSubtype(universe, s, sEnv, t, tEnv, false);
+        return A._isInterfaceSubtype(universe, s, sEnv, t, tEnv);
       }
-      if (t2 && tKind === 11)
-        return A._isRecordSubtype(universe, s, sEnv, t, tEnv, false);
+      if (t2 && tKind === 10)
+        return A._isRecordSubtype(universe, s, sEnv, t, tEnv);
       return false;
     },
-    _isFunctionSubtype(universe, s, sEnv, t, tEnv, isLegacy) {
+    _isFunctionSubtype(universe, s, sEnv, t, tEnv) {
       var sParameters, tParameters, sRequiredPositional, tRequiredPositional, sRequiredPositionalLength, tRequiredPositionalLength, requiredPositionalDelta, sOptionalPositional, tOptionalPositional, sOptionalPositionalLength, tOptionalPositionalLength, i, t1, sNamed, tNamed, sNamedLength, tNamedLength, sIndex, tIndex, tName, sName, sIsRequired;
-      if (!A._isSubtype(universe, s._primary, sEnv, t._primary, tEnv, false))
+      if (!A._isSubtype(universe, s._primary, sEnv, t._primary, tEnv))
         return false;
       sParameters = s._rest;
       tParameters = t._rest;
@@ -3561,17 +3290,17 @@
         return false;
       for (i = 0; i < sRequiredPositionalLength; ++i) {
         t1 = sRequiredPositional[i];
-        if (!A._isSubtype(universe, tRequiredPositional[i], tEnv, t1, sEnv, false))
+        if (!A._isSubtype(universe, tRequiredPositional[i], tEnv, t1, sEnv))
           return false;
       }
       for (i = 0; i < requiredPositionalDelta; ++i) {
         t1 = sOptionalPositional[i];
-        if (!A._isSubtype(universe, tRequiredPositional[sRequiredPositionalLength + i], tEnv, t1, sEnv, false))
+        if (!A._isSubtype(universe, tRequiredPositional[sRequiredPositionalLength + i], tEnv, t1, sEnv))
           return false;
       }
       for (i = 0; i < tOptionalPositionalLength; ++i) {
         t1 = sOptionalPositional[requiredPositionalDelta + i];
-        if (!A._isSubtype(universe, tOptionalPositional[i], tEnv, t1, sEnv, false))
+        if (!A._isSubtype(universe, tOptionalPositional[i], tEnv, t1, sEnv))
           return false;
       }
       sNamed = sParameters._named;
@@ -3597,7 +3326,7 @@
           if (sIsRequired && !t1)
             return false;
           t1 = sNamed[sIndex - 1];
-          if (!A._isSubtype(universe, tNamed[tIndex + 2], tEnv, t1, sEnv, false))
+          if (!A._isSubtype(universe, tNamed[tIndex + 2], tEnv, t1, sEnv))
             return false;
           break;
         }
@@ -3609,7 +3338,7 @@
       }
       return true;
     },
-    _isInterfaceSubtype(universe, s, sEnv, t, tEnv, isLegacy) {
+    _isInterfaceSubtype(universe, s, sEnv, t, tEnv) {
       var rule, recipes, $length, supertypeArgs, i,
         sName = s._primary,
         tName = t._primary;
@@ -3628,19 +3357,19 @@
         supertypeArgs = $length > 0 ? new Array($length) : init.typeUniverse.sEA;
         for (i = 0; i < $length; ++i)
           supertypeArgs[i] = A._Universe_evalInEnvironment(universe, s, recipes[i]);
-        return A._areArgumentsSubtypes(universe, supertypeArgs, null, sEnv, t._rest, tEnv, false);
+        return A._areArgumentsSubtypes(universe, supertypeArgs, null, sEnv, t._rest, tEnv);
       }
-      return A._areArgumentsSubtypes(universe, s._rest, null, sEnv, t._rest, tEnv, false);
+      return A._areArgumentsSubtypes(universe, s._rest, null, sEnv, t._rest, tEnv);
     },
-    _areArgumentsSubtypes(universe, sArgs, sVariances, sEnv, tArgs, tEnv, isLegacy) {
+    _areArgumentsSubtypes(universe, sArgs, sVariances, sEnv, tArgs, tEnv) {
       var i,
         $length = sArgs.length;
       for (i = 0; i < $length; ++i)
-        if (!A._isSubtype(universe, sArgs[i], sEnv, tArgs[i], tEnv, false))
+        if (!A._isSubtype(universe, sArgs[i], sEnv, tArgs[i], tEnv))
           return false;
       return true;
     },
-    _isRecordSubtype(universe, s, sEnv, t, tEnv, isLegacy) {
+    _isRecordSubtype(universe, s, sEnv, t, tEnv) {
       var i,
         sFields = s._rest,
         tFields = t._rest,
@@ -3650,7 +3379,7 @@
       if (s._primary !== t._primary)
         return false;
       for (i = 0; i < sCount; ++i)
-        if (!A._isSubtype(universe, sFields[i], sEnv, tFields[i], tEnv, false))
+        if (!A._isSubtype(universe, sFields[i], sEnv, tFields[i], tEnv))
           return false;
       return true;
     },
@@ -3658,21 +3387,12 @@
       var kind = t._kind,
         t1 = true;
       if (!(t === type$.Null || t === type$.JSNull))
-        if (!A.isSoundTopType(t))
-          if (kind !== 7)
-            if (!(kind === 6 && A.isNullable(t._primary)))
-              t1 = kind === 8 && A.isNullable(t._primary);
+        if (!A.isTopType(t))
+          if (kind !== 6)
+            t1 = kind === 7 && A.isNullable(t._primary);
       return t1;
     },
-    isDefinitelyTopType(t) {
-      var t1;
-      if (!A.isSoundTopType(t))
-        t1 = t === type$.legacy_Object;
-      else
-        t1 = true;
-      return t1;
-    },
-    isSoundTopType(t) {
+    isTopType(t) {
       var kind = t._kind;
       return kind === 2 || kind === 3 || kind === 4 || kind === 5 || t === type$.nullable_Object;
     },
@@ -3708,10 +3428,11 @@
       this.__rti$_message = t0;
     },
     _AsyncRun__initializeScheduleImmediate() {
-      var div, span, t1 = {};
+      var t1, div, span;
       if (self.scheduleImmediate != null)
         return A.async__AsyncRun__scheduleImmediateJsOverride$closure();
       if (self.MutationObserver != null && self.document != null) {
+        t1 = {};
         div = self.document.createElement("div");
         span = self.document.createElement("span");
         t1.storedCallback = null;
@@ -3753,7 +3474,7 @@
         if (stackTrace != null)
           return stackTrace;
       }
-      return B._StringStackTrace_uwd;
+      return B._StringStackTrace_OdL;
     },
     Future_Future$value(value, $T) {
       var t1;
@@ -3787,69 +3508,62 @@
         if (type$.Error._is(error)) {
           stackTrace = error.get$stackTrace();
           if (stackTrace == null) {
-            A.Primitives_trySetStackTrace(error, B._StringStackTrace_uwd);
-            stackTrace = B._StringStackTrace_uwd;
+            A.Primitives_trySetStackTrace(error, B._StringStackTrace_OdL);
+            stackTrace = B._StringStackTrace_OdL;
           }
         } else
-          stackTrace = B._StringStackTrace_uwd;
+          stackTrace = B._StringStackTrace_OdL;
       else if (type$.Error._is(error))
         A.Primitives_trySetStackTrace(error, stackTrace);
       return new A.AsyncError(error, stackTrace);
     },
-    _Future__chainCoreFutureSync(source, target) {
-      var t1, t2, listeners;
-      for (t1 = type$._Future_dynamic; t2 = source._async$_state, (t2 & 4) !== 0;)
-        source = t1._as(source._resultOrListeners);
-      if (source === target) {
-        target._asyncCompleteError$2(new A.ArgumentError(true, source, null, "Cannot complete a future with itself"), A.StackTrace_current());
-        return;
-      }
-      t1 = t2 | target._async$_state & 1;
-      source._async$_state = t1;
-      if ((t1 & 24) !== 0) {
-        listeners = target._removeListeners$0();
-        target._cloneResult$1(source);
-        A._Future__propagateToListeners(target, listeners);
-      } else {
-        listeners = type$.nullable__FutureListener_dynamic_dynamic._as(target._resultOrListeners);
-        target._setChained$1(source);
-        source._prependListeners$1(listeners);
-      }
-    },
-    _Future__chainCoreFutureAsync(source, target) {
-      var t2, t3, listeners, _box_0 = {},
+    _Future__chainCoreFuture(source, target, sync) {
+      var t2, t3, ignoreError, listeners, _box_0 = {},
         t1 = _box_0.source = source;
       for (t2 = type$._Future_dynamic; t3 = t1._async$_state, (t3 & 4) !== 0; t1 = source) {
         source = t2._as(t1._resultOrListeners);
         _box_0.source = source;
       }
       if (t1 === target) {
-        target._asyncCompleteError$2(new A.ArgumentError(true, t1, null, "Cannot complete a future with itself"), A.StackTrace_current());
+        t2 = A.StackTrace_current();
+        target._asyncCompleteErrorObject$1(new A.AsyncError(new A.ArgumentError(true, t1, null, "Cannot complete a future with itself"), t2));
         return;
       }
-      if ((t3 & 24) === 0) {
+      ignoreError = target._async$_state & 1;
+      t2 = t1._async$_state = t3 | ignoreError;
+      if ((t2 & 24) === 0) {
         listeners = type$.nullable__FutureListener_dynamic_dynamic._as(target._resultOrListeners);
-        target._setChained$1(t1);
-        _box_0.source._prependListeners$1(listeners);
+        target._async$_state = target._async$_state & 1 | 4;
+        target._resultOrListeners = t1;
+        t1._prependListeners$1(listeners);
         return;
       }
-      if ((t3 & 16) === 0 && target._resultOrListeners == null) {
-        target._cloneResult$1(t1);
+      if (!sync)
+        if (target._resultOrListeners == null)
+          t1 = (t2 & 16) === 0 || ignoreError !== 0;
+        else
+          t1 = false;
+      else
+        t1 = true;
+      if (t1) {
+        listeners = target._removeListeners$0();
+        target._cloneResult$1(_box_0.source);
+        A._Future__propagateToListeners(target, listeners);
         return;
       }
       target._async$_state ^= 2;
-      target._zone.scheduleMicrotask$1(new A._Future__chainCoreFutureAsync_closure(_box_0, target));
+      target._zone.scheduleMicrotask$1(new A._Future__chainCoreFuture_closure(_box_0, target));
     },
     _Future__propagateToListeners(source, listeners) {
-      var t2, t3, t4, _box_0, t5, t6, hasError, asyncError, nextListener, nextListener0, sourceResult, t7, zone, oldZone, result, current, _box_1 = {},
+      var t2, t3, _box_0, t4, t5, hasError, asyncError, nextListener, nextListener0, sourceResult, t6, zone, oldZone, result, current, _box_1 = {},
         t1 = _box_1.source = source;
-      for (t2 = type$.AsyncError, t3 = type$.nullable__FutureListener_dynamic_dynamic, t4 = type$.Future_dynamic; true;) {
+      for (t2 = type$.AsyncError, t3 = type$.nullable__FutureListener_dynamic_dynamic; true;) {
         _box_0 = {};
-        t5 = t1._async$_state;
-        t6 = (t5 & 16) === 0;
-        hasError = !t6;
+        t4 = t1._async$_state;
+        t5 = (t4 & 16) === 0;
+        hasError = !t5;
         if (listeners == null) {
-          if (hasError && (t5 & 1) === 0) {
+          if (hasError && (t4 & 1) === 0) {
             asyncError = t2._as(t1._resultOrListeners);
             t1._zone.handleUncaughtError$2(asyncError.error, asyncError.stackTrace);
           }
@@ -3863,19 +3577,19 @@
           _box_0.listener = nextListener;
           nextListener0 = nextListener._nextListener;
         }
-        t5 = _box_1.source;
-        sourceResult = t5._resultOrListeners;
+        t4 = _box_1.source;
+        sourceResult = t4._resultOrListeners;
         _box_0.listenerHasError = hasError;
         _box_0.listenerValueOrError = sourceResult;
-        if (t6) {
-          t7 = t1.state;
-          t7 = (t7 & 1) !== 0 || (t7 & 15) === 8;
+        if (t5) {
+          t6 = t1.state;
+          t6 = (t6 & 1) !== 0 || (t6 & 15) === 8;
         } else
-          t7 = true;
-        if (t7) {
+          t6 = true;
+        if (t6) {
           zone = t1.result._zone;
           if (hasError) {
-            t1 = t5._zone;
+            t1 = t4._zone;
             t1 = !(t1 === zone || t1.get$errorZone() === zone.get$errorZone());
           } else
             t1 = false;
@@ -3893,7 +3607,7 @@
           t1 = _box_0.listener.state;
           if ((t1 & 15) === 8)
             new A._Future__propagateToListeners_handleWhenCompleteCallback(_box_0, _box_1, hasError).call$0();
-          else if (t6) {
+          else if (t5) {
             if ((t1 & 1) !== 0)
               new A._Future__propagateToListeners_handleValueCallback(_box_0, sourceResult).call$0();
           } else if ((t1 & 2) !== 0)
@@ -3902,12 +3616,11 @@
             $.Zone__current = oldZone;
           t1 = _box_0.listenerValueOrError;
           if (t1 instanceof A._Future) {
-            t5 = _box_0.listener.$ti;
-            t5 = t5._eval$1("Future<2>")._is(t1) || !t5._rest[1]._is(t1);
+            t4 = _box_0.listener.$ti;
+            t4 = t4._eval$1("Future<2>")._is(t1) || !t4._rest[1]._is(t1);
           } else
-            t5 = false;
-          if (t5) {
-            t4._as(t1);
+            t4 = false;
+          if (t4) {
             result = _box_0.listener.result;
             if ((t1._async$_state & 24) !== 0) {
               current = t3._as(result._resultOrListeners);
@@ -3918,7 +3631,7 @@
               _box_1.source = t1;
               continue;
             } else
-              A._Future__chainCoreFutureSync(t1, result);
+              A._Future__chainCoreFuture(t1, result, true);
             return;
           }
         }
@@ -3927,15 +3640,15 @@
         result._resultOrListeners = null;
         listeners = result._reverseListeners$1(current);
         t1 = _box_0.listenerHasError;
-        t5 = _box_0.listenerValueOrError;
+        t4 = _box_0.listenerValueOrError;
         if (!t1) {
-          result.$ti._precomputed1._as(t5);
+          result.$ti._precomputed1._as(t4);
           result._async$_state = 8;
-          result._resultOrListeners = t5;
+          result._resultOrListeners = t4;
         } else {
-          t2._as(t5);
+          t2._as(t4);
           result._async$_state = result._async$_state & 1 | 16;
-          result._resultOrListeners = t5;
+          result._resultOrListeners = t4;
         }
         _box_1.source = result;
         t1 = result;
@@ -4175,7 +3888,7 @@
       t1 = new A._CustomZone(zone.get$_run(), zone.get$_runUnary(), zone.get$_runBinary(), zone.get$_registerCallback(), zone.get$_registerUnaryCallback(), zone.get$_registerBinaryCallback(), zone.get$_errorCallback(), zone.get$_scheduleMicrotask(), zone.get$_createTimer(), zone.get$_createPeriodicTimer(), zone.get$_print(), zone.get$_fork(), zone.get$_handleUncaughtError(), zone, valueMap);
       handleUncaughtError = specification.handleUncaughtError;
       if (handleUncaughtError != null)
-        t1.set$_handleUncaughtError(new A._ZoneFunction(t1, handleUncaughtError, type$._ZoneFunction_of_void_Function_Zone_ZoneDelegate_Zone_Object_StackTrace));
+        t1._handleUncaughtError = new A._ZoneFunction(t1, handleUncaughtError, type$._ZoneFunction_of_void_Function_Zone_ZoneDelegate_Zone_Object_StackTrace);
       return t1;
     },
     runZonedGuarded(body, onError, $R) {
@@ -4262,18 +3975,7 @@
       this._box_0 = t0;
       this.$this = t1;
     },
-    _Future__chainForeignFuture_closure: function _Future__chainForeignFuture_closure(t0) {
-      this.$this = t0;
-    },
-    _Future__chainForeignFuture_closure0: function _Future__chainForeignFuture_closure0(t0) {
-      this.$this = t0;
-    },
-    _Future__chainForeignFuture_closure1: function _Future__chainForeignFuture_closure1(t0, t1, t2) {
-      this.$this = t0;
-      this.e = t1;
-      this.s = t2;
-    },
-    _Future__chainCoreFutureAsync_closure: function _Future__chainCoreFutureAsync_closure(t0, t1) {
+    _Future__chainCoreFuture_closure: function _Future__chainCoreFuture_closure(t0, t1) {
       this._box_0 = t0;
       this.target = t1;
     },
@@ -4281,18 +3983,21 @@
       this.$this = t0;
       this.value = t1;
     },
-    _Future__asyncCompleteError_closure: function _Future__asyncCompleteError_closure(t0, t1, t2) {
+    _Future__asyncCompleteErrorObject_closure: function _Future__asyncCompleteErrorObject_closure(t0, t1) {
       this.$this = t0;
       this.error = t1;
-      this.stackTrace = t2;
     },
     _Future__propagateToListeners_handleWhenCompleteCallback: function _Future__propagateToListeners_handleWhenCompleteCallback(t0, t1, t2) {
       this._box_0 = t0;
       this._box_1 = t1;
       this.hasError = t2;
     },
-    _Future__propagateToListeners_handleWhenCompleteCallback_closure: function _Future__propagateToListeners_handleWhenCompleteCallback_closure(t0) {
-      this.originalSource = t0;
+    _Future__propagateToListeners_handleWhenCompleteCallback_closure: function _Future__propagateToListeners_handleWhenCompleteCallback_closure(t0, t1) {
+      this.joinedResult = t0;
+      this.originalSource = t1;
+    },
+    _Future__propagateToListeners_handleWhenCompleteCallback_closure0: function _Future__propagateToListeners_handleWhenCompleteCallback_closure0(t0) {
+      this.joinedResult = t0;
     },
     _Future__propagateToListeners_handleValueCallback: function _Future__propagateToListeners_handleValueCallback(t0, t1) {
       this._box_0 = t0;
@@ -4545,11 +4250,12 @@
       return t1;
     },
     MapBase_mapToString(m) {
-      var result, t1 = {};
+      var result, t1;
       if (A.isToStringVisiting(m))
         return "{...}";
       result = new A.StringBuffer("");
       try {
+        t1 = {};
         B.JSArray_methods.add$1($.toStringVisiting, m);
         result._contents += "{";
         t1.first = true;
@@ -4815,12 +4521,11 @@
       throw A.wrapException(A.FormatException$(source, null, null));
     },
     Error__throw(error, stackTrace) {
-      error = A.wrapException(error);
+      error = A.initializeExceptionWrapper(error, new Error());
       if (error == null)
         error = type$.Object._as(error);
       error.stack = stackTrace.toString$0(0);
       throw error;
-      throw A.wrapException("unreachable");
     },
     List_List$filled($length, fill, growable, $E) {
       var i,
@@ -4838,14 +4543,6 @@
       list.$flags = 1;
       return list;
     },
-    List_List$of(elements, growable, $E) {
-      var t1;
-      if (growable)
-        return A.List_List$_of(elements, $E);
-      t1 = A.List_List$_of(elements, $E);
-      t1.$flags = 1;
-      return t1;
-    },
     List_List$_of(elements, $E) {
       var list, t1;
       if (Array.isArray(elements))
@@ -4885,7 +4582,8 @@
         charCodes = J.take$1$ax(charCodes, end);
       if (start > 0)
         charCodes = J.skip$1$ax(charCodes, start);
-      return A.Primitives_stringFromCharCodes(A.List_List$of(charCodes, true, type$.int));
+      t1 = A.List_List$_of(charCodes, type$.int);
+      return A.Primitives_stringFromCharCodes(t1);
     },
     String_String$fromCharCode(charCode) {
       return A.Primitives_stringFromCharCode(charCode);
@@ -4897,7 +4595,7 @@
       return A.Primitives_stringFromNativeUint8List(charCodes, start, endOrNull == null || endOrNull > len ? len : endOrNull);
     },
     RegExp_RegExp(source, multiLine) {
-      return new A.JSSyntaxRegExp(source, A.JSSyntaxRegExp_makeNative(source, multiLine, true, false, false, false));
+      return new A.JSSyntaxRegExp(source, A.JSSyntaxRegExp_makeNative(source, multiLine, true, false, false, ""));
     },
     StringBuffer__writeAll(string, objects, separator) {
       var iterator = J.get$iterator$ax(objects);
@@ -4914,9 +4612,6 @@
       }
       return string;
     },
-    NoSuchMethodError_NoSuchMethodError$withInvocation(receiver, invocation) {
-      return new A.NoSuchMethodError(receiver, invocation.get$memberName(), invocation.get$positionalArguments(), invocation.get$namedArguments());
-    },
     Uri_base() {
       var cachedUri, uri,
         current = A.Primitives_currentUri();
@@ -4930,8 +4625,8 @@
       $.Uri__cachedBaseString = current;
       return uri;
     },
-    _Uri__uriEncode(canonicalTable, text, encoding, spaceToPlus) {
-      var t1, bytes, i, t2, byte, t3,
+    _Uri__uriEncode(canonicalMask, text, encoding, spaceToPlus) {
+      var t1, bytes, i, t2, byte,
         _s16_ = "0123456789ABCDEF";
       if (encoding === B.C_Utf8Codec) {
         t1 = $.$get$_Uri__needsNoEncoding();
@@ -4943,14 +4638,7 @@
       bytes = B.C_Utf8Encoder.convert$1(text);
       for (t1 = bytes.length, i = 0, t2 = ""; i < t1; ++i) {
         byte = bytes[i];
-        if (byte < 128) {
-          t3 = byte >>> 4;
-          if (!(t3 < 8))
-            return A.ioore(canonicalTable, t3);
-          t3 = (canonicalTable[t3] & 1 << (byte & 15)) !== 0;
-        } else
-          t3 = false;
-        if (t3)
+        if (byte < 128 && (string$.x00_____.charCodeAt(byte) & canonicalMask) !== 0)
           t2 += A.Primitives_stringFromCharCode(byte);
         else
           t2 = spaceToPlus && byte === 32 ? t2 + "+" : t2 + "%" + _s16_[byte >>> 4 & 15] + _s16_[byte & 15];
@@ -5182,7 +4870,7 @@
       A.UriData__writeUri(_null, _null, _null, buffer, indices);
       B.JSArray_methods.add$1(indices, buffer._contents.length);
       buffer._contents += ",";
-      A.UriData__uriEncodeBytes(B.List_42A, B.C_AsciiCodec.encode$1($content), buffer);
+      A.UriData__uriEncodeBytes(256, B.C_AsciiCodec.encode$1($content), buffer);
       t1 = buffer._contents;
       return new A.UriData(t1.charCodeAt(0) == 0 ? t1 : t1, indices, _null).get$uri();
     },
@@ -5673,49 +5361,40 @@
           index += 3;
           sectionStart = index;
           isNormalized = true;
-        } else {
-          if (char < 127) {
-            t2 = char >>> 4;
-            if (!(t2 < 8))
-              return A.ioore(B.List_piR, t2);
-            t2 = (B.List_piR[t2] & 1 << (char & 15)) !== 0;
-          } else
-            t2 = false;
-          if (t2) {
-            if (isNormalized && 65 <= char && 90 >= char) {
-              if (buffer == null)
-                buffer = new A.StringBuffer("");
-              if (sectionStart < index) {
-                buffer._contents += B.JSString_methods.substring$2(host, sectionStart, index);
-                sectionStart = index;
-              }
-              isNormalized = false;
+        } else if (char < 127 && (string$.x00_____.charCodeAt(char) & 1) !== 0) {
+          if (isNormalized && 65 <= char && 90 >= char) {
+            if (buffer == null)
+              buffer = new A.StringBuffer("");
+            if (sectionStart < index) {
+              buffer._contents += B.JSString_methods.substring$2(host, sectionStart, index);
+              sectionStart = index;
             }
-            ++index;
-          } else {
-            sourceLength = 1;
-            if ((char & 64512) === 55296 && index + 1 < end) {
-              t2 = index + 1;
-              if (!(t2 < t1))
-                return A.ioore(host, t2);
-              tail = host.charCodeAt(t2);
-              if ((tail & 64512) === 56320) {
-                char = (char & 1023) << 10 | tail & 1023 | 65536;
-                sourceLength = 2;
-              }
+            isNormalized = false;
+          }
+          ++index;
+        } else {
+          sourceLength = 1;
+          if ((char & 64512) === 55296 && index + 1 < end) {
+            t2 = index + 1;
+            if (!(t2 < t1))
+              return A.ioore(host, t2);
+            tail = host.charCodeAt(t2);
+            if ((tail & 64512) === 56320) {
+              char = 65536 + ((char & 1023) << 10) + (tail & 1023);
+              sourceLength = 2;
             }
-            slice = B.JSString_methods.substring$2(host, sectionStart, index);
-            if (buffer == null) {
-              buffer = new A.StringBuffer("");
-              t2 = buffer;
-            } else
-              t2 = buffer;
-            t2._contents += slice;
-            t3 = A._Uri__escapeChar(char);
-            t2._contents += t3;
-            index += sourceLength;
-            sectionStart = index;
           }
+          slice = B.JSString_methods.substring$2(host, sectionStart, index);
+          if (buffer == null) {
+            buffer = new A.StringBuffer("");
+            t2 = buffer;
+          } else
+            t2 = buffer;
+          t2._contents += slice;
+          t3 = A._Uri__escapeChar(char);
+          t2._contents += t3;
+          index += sourceLength;
+          sectionStart = index;
         }
       }
       if (buffer == null)
@@ -5728,7 +5407,8 @@
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
     _Uri__normalizeRegName(host, start, end) {
-      var t1, index, sectionStart, buffer, isNormalized, char, replacement, t2, slice, t3, sourceLength, tail;
+      var t1, index, sectionStart, buffer, isNormalized, char, replacement, t2, slice, t3, sourceLength, tail,
+        _s128_ = string$.x00_____;
       for (t1 = host.length, index = start, sectionStart = index, buffer = null, isNormalized = true; index < end;) {
         if (!(index >= 0 && index < t1))
           return A.ioore(host, index);
@@ -5757,62 +5437,44 @@
           index += sourceLength;
           sectionStart = index;
           isNormalized = true;
-        } else {
-          if (char < 127) {
-            t2 = char >>> 4;
-            if (!(t2 < 8))
-              return A.ioore(B.List_4AN, t2);
-            t2 = (B.List_4AN[t2] & 1 << (char & 15)) !== 0;
-          } else
-            t2 = false;
-          if (t2) {
-            if (isNormalized && 65 <= char && 90 >= char) {
-              if (buffer == null)
-                buffer = new A.StringBuffer("");
-              if (sectionStart < index) {
-                buffer._contents += B.JSString_methods.substring$2(host, sectionStart, index);
-                sectionStart = index;
-              }
-              isNormalized = false;
-            }
-            ++index;
-          } else {
-            if (char <= 93) {
-              t2 = char >>> 4;
-              if (!(t2 < 8))
-                return A.ioore(B.List_VOY, t2);
-              t2 = (B.List_VOY[t2] & 1 << (char & 15)) !== 0;
-            } else
-              t2 = false;
-            if (t2)
-              A._Uri__fail(host, index, "Invalid character");
-            else {
-              sourceLength = 1;
-              if ((char & 64512) === 55296 && index + 1 < end) {
-                t2 = index + 1;
-                if (!(t2 < t1))
-                  return A.ioore(host, t2);
-                tail = host.charCodeAt(t2);
-                if ((tail & 64512) === 56320) {
-                  char = (char & 1023) << 10 | tail & 1023 | 65536;
-                  sourceLength = 2;
-                }
-              }
-              slice = B.JSString_methods.substring$2(host, sectionStart, index);
-              if (!isNormalized)
-                slice = slice.toLowerCase();
-              if (buffer == null) {
-                buffer = new A.StringBuffer("");
-                t2 = buffer;
-              } else
-                t2 = buffer;
-              t2._contents += slice;
-              t3 = A._Uri__escapeChar(char);
-              t2._contents += t3;
-              index += sourceLength;
+        } else if (char < 127 && (_s128_.charCodeAt(char) & 32) !== 0) {
+          if (isNormalized && 65 <= char && 90 >= char) {
+            if (buffer == null)
+              buffer = new A.StringBuffer("");
+            if (sectionStart < index) {
+              buffer._contents += B.JSString_methods.substring$2(host, sectionStart, index);
               sectionStart = index;
             }
+            isNormalized = false;
           }
+          ++index;
+        } else if (char <= 93 && (_s128_.charCodeAt(char) & 1024) !== 0)
+          A._Uri__fail(host, index, "Invalid character");
+        else {
+          sourceLength = 1;
+          if ((char & 64512) === 55296 && index + 1 < end) {
+            t2 = index + 1;
+            if (!(t2 < t1))
+              return A.ioore(host, t2);
+            tail = host.charCodeAt(t2);
+            if ((tail & 64512) === 56320) {
+              char = 65536 + ((char & 1023) << 10) + (tail & 1023);
+              sourceLength = 2;
+            }
+          }
+          slice = B.JSString_methods.substring$2(host, sectionStart, index);
+          if (!isNormalized)
+            slice = slice.toLowerCase();
+          if (buffer == null) {
+            buffer = new A.StringBuffer("");
+            t2 = buffer;
+          } else
+            t2 = buffer;
+          t2._contents += slice;
+          t3 = A._Uri__escapeChar(char);
+          t2._contents += t3;
+          index += sourceLength;
+          sectionStart = index;
         }
       }
       if (buffer == null)
@@ -5827,7 +5489,7 @@
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     },
     _Uri__makeScheme(scheme, start, end) {
-      var t1, i, containsUpperCase, codeUnit, t2;
+      var t1, i, containsUpperCase, codeUnit;
       if (start === end)
         return "";
       t1 = scheme.length;
@@ -5839,14 +5501,7 @@
         if (!(i < t1))
           return A.ioore(scheme, i);
         codeUnit = scheme.charCodeAt(i);
-        if (codeUnit < 128) {
-          t2 = codeUnit >>> 4;
-          if (!(t2 < 8))
-            return A.ioore(B.List_GVy, t2);
-          t2 = (B.List_GVy[t2] & 1 << (codeUnit & 15)) !== 0;
-        } else
-          t2 = false;
-        if (!t2)
+        if (!(codeUnit < 128 && (string$.x00_____.charCodeAt(codeUnit) & 8) !== 0))
           A._Uri__fail(scheme, i, "Illegal scheme character");
         if (65 <= codeUnit && codeUnit <= 90)
           containsUpperCase = true;
@@ -5868,7 +5523,7 @@
     _Uri__makeUserInfo(userInfo, start, end) {
       if (userInfo == null)
         return "";
-      return A._Uri__normalizeOrSubstring(userInfo, start, end, B.List_2jN, false, false);
+      return A._Uri__normalizeOrSubstring(userInfo, start, end, 16, false, false);
     },
     _Uri__makePath(path, start, end, pathSegments, scheme, hasAuthority) {
       var t1, result,
@@ -5882,7 +5537,7 @@
       } else if (pathSegments != null)
         throw A.wrapException(A.ArgumentError$("Both path and pathSegments specified", null));
       else
-        result = A._Uri__normalizeOrSubstring(path, start, end, B.List_M2I, true, true);
+        result = A._Uri__normalizeOrSubstring(path, start, end, 128, true, true);
       if (result.length === 0) {
         if (isFile)
           return "/";
@@ -5898,16 +5553,17 @@
     },
     _Uri__makeQuery(query, start, end, queryParameters) {
       if (query != null)
-        return A._Uri__normalizeOrSubstring(query, start, end, B.List_42A, true, false);
+        return A._Uri__normalizeOrSubstring(query, start, end, 256, true, false);
       return null;
     },
     _Uri__makeFragment(fragment, start, end) {
       if (fragment == null)
         return null;
-      return A._Uri__normalizeOrSubstring(fragment, start, end, B.List_42A, true, false);
+      return A._Uri__normalizeOrSubstring(fragment, start, end, 256, true, false);
     },
     _Uri__normalizeEscape(source, index, lowerCase) {
       var t3, firstDigit, secondDigit, firstDigitValue, secondDigitValue, value,
+        _s128_ = string$.x00_____,
         t1 = index + 2,
         t2 = source.length;
       if (t1 >= t2)
@@ -5925,10 +5581,9 @@
         return "%";
       value = firstDigitValue * 16 + secondDigitValue;
       if (value < 127) {
-        t1 = B.JSInt_methods._shrOtherPositive$1(value, 4);
-        if (!(t1 < 8))
-          return A.ioore(B.List_piR, t1);
-        t1 = (B.List_piR[t1] & 1 << (value & 15)) !== 0;
+        if (!(value >= 0))
+          return A.ioore(_s128_, value);
+        t1 = (_s128_.charCodeAt(value) & 1) !== 0;
       } else
         t1 = false;
       if (t1)
@@ -5940,7 +5595,7 @@
     _Uri__escapeChar(char) {
       var codeUnits, t1, flag, encodedBytes, index, byte, t2, t3,
         _s16_ = "0123456789ABCDEF";
-      if (char < 128) {
+      if (char <= 127) {
         codeUnits = new Uint8Array(3);
         codeUnits[0] = 37;
         t1 = char >>> 4;
@@ -5984,24 +5639,18 @@
       }
       return A.String_String$fromCharCodes(codeUnits, 0, null);
     },
-    _Uri__normalizeOrSubstring(component, start, end, charTable, escapeDelimiters, replaceBackslash) {
-      var t1 = A._Uri__normalize(component, start, end, charTable, escapeDelimiters, replaceBackslash);
+    _Uri__normalizeOrSubstring(component, start, end, charMask, escapeDelimiters, replaceBackslash) {
+      var t1 = A._Uri__normalize(component, start, end, charMask, escapeDelimiters, replaceBackslash);
       return t1 == null ? B.JSString_methods.substring$2(component, start, end) : t1;
     },
-    _Uri__normalize(component, start, end, charTable, escapeDelimiters, replaceBackslash) {
-      var t1, t2, index, sectionStart, buffer, char, t3, sourceLength, replacement, tail, t4, _null = null;
+    _Uri__normalize(component, start, end, charMask, escapeDelimiters, replaceBackslash) {
+      var t1, t2, index, sectionStart, buffer, char, sourceLength, replacement, t3, tail, _null = null,
+        _s128_ = string$.x00_____;
       for (t1 = !escapeDelimiters, t2 = component.length, index = start, sectionStart = index, buffer = _null; index < end;) {
         if (!(index >= 0 && index < t2))
           return A.ioore(component, index);
         char = component.charCodeAt(index);
-        if (char < 127) {
-          t3 = char >>> 4;
-          if (!(t3 < 8))
-            return A.ioore(charTable, t3);
-          t3 = (charTable[t3] & 1 << (char & 15)) !== 0;
-        } else
-          t3 = false;
-        if (t3)
+        if (char < 127 && (_s128_.charCodeAt(char) & charMask) !== 0)
           ++index;
         else {
           sourceLength = 1;
@@ -6017,42 +5666,31 @@
               sourceLength = 3;
           } else if (char === 92 && replaceBackslash)
             replacement = "/";
-          else {
-            t3 = false;
-            if (t1)
-              if (char <= 93) {
-                t3 = char >>> 4;
-                if (!(t3 < 8))
-                  return A.ioore(B.List_VOY, t3);
-                t3 = (B.List_VOY[t3] & 1 << (char & 15)) !== 0;
-              }
-            if (t3) {
-              A._Uri__fail(component, index, "Invalid character");
-              sourceLength = _null;
-              replacement = sourceLength;
-            } else {
-              if ((char & 64512) === 55296) {
-                t3 = index + 1;
-                if (t3 < end) {
-                  if (!(t3 < t2))
-                    return A.ioore(component, t3);
-                  tail = component.charCodeAt(t3);
-                  if ((tail & 64512) === 56320) {
-                    char = (char & 1023) << 10 | tail & 1023 | 65536;
-                    sourceLength = 2;
-                  }
+          else if (t1 && char <= 93 && (_s128_.charCodeAt(char) & 1024) !== 0) {
+            A._Uri__fail(component, index, "Invalid character");
+            sourceLength = _null;
+            replacement = sourceLength;
+          } else {
+            if ((char & 64512) === 55296) {
+              t3 = index + 1;
+              if (t3 < end) {
+                if (!(t3 < t2))
+                  return A.ioore(component, t3);
+                tail = component.charCodeAt(t3);
+                if ((tail & 64512) === 56320) {
+                  char = 65536 + ((char & 1023) << 10) + (tail & 1023);
+                  sourceLength = 2;
                 }
               }
-              replacement = A._Uri__escapeChar(char);
             }
+            replacement = A._Uri__escapeChar(char);
           }
           if (buffer == null) {
             buffer = new A.StringBuffer("");
             t3 = buffer;
           } else
             t3 = buffer;
-          t4 = t3._contents += B.JSString_methods.substring$2(component, sectionStart, index);
-          t3._contents = t4 + A.S(replacement);
+          t3._contents = (t3._contents += B.JSString_methods.substring$2(component, sectionStart, index)) + replacement;
           if (typeof sourceLength !== "number")
             return A.iae(sourceLength);
           index += sourceLength;
@@ -6144,6 +5782,7 @@
     },
     _Uri__escapeScheme(path) {
       var i, char, t2,
+        _s128_ = string$.x00_____,
         t1 = path.length;
       if (t1 >= 2 && A._Uri__isAlphabeticCharacter(path.charCodeAt(0)))
         for (i = 1; i < t1; ++i) {
@@ -6151,10 +5790,9 @@
           if (char === 58)
             return B.JSString_methods.substring$2(path, 0, i) + "%3A" + B.JSString_methods.substring$1(path, i + 1);
           if (char <= 127) {
-            t2 = char >>> 4;
-            if (!(t2 < 8))
-              return A.ioore(B.List_GVy, t2);
-            t2 = (B.List_GVy[t2] & 1 << (char & 15)) === 0;
+            if (!(char < 128))
+              return A.ioore(_s128_, char);
+            t2 = (_s128_.charCodeAt(char) & 8) === 0;
           } else
             t2 = true;
           if (t2)
@@ -6287,26 +5925,19 @@
       if ((indices.length & 1) === 1)
         text = B.C_Base64Codec.normalize$3(text, t2, t1);
       else {
-        data = A._Uri__normalize(text, t2, t1, B.List_42A, true, false);
+        data = A._Uri__normalize(text, t2, t1, 256, true, false);
         if (data != null)
           text = B.JSString_methods.replaceRange$3(text, t2, t1, data);
       }
       return new A.UriData(text, indices, sourceUri);
     },
-    UriData__uriEncodeBytes(canonicalTable, bytes, buffer) {
+    UriData__uriEncodeBytes(canonicalMask, bytes, buffer) {
       var t1, byteOr, i, byte, t2,
         _s16_ = "0123456789ABCDEF";
       for (t1 = bytes.length, byteOr = 0, i = 0; i < t1; ++i) {
         byte = bytes[i];
         byteOr |= byte;
-        if (byte < 128) {
-          t2 = byte >>> 4;
-          if (!(t2 < 8))
-            return A.ioore(canonicalTable, t2);
-          t2 = (canonicalTable[t2] & 1 << (byte & 15)) !== 0;
-        } else
-          t2 = false;
-        if (t2) {
+        if (byte < 128 && (string$.x00_____.charCodeAt(byte) & canonicalMask) !== 0) {
           t2 = A.Primitives_stringFromCharCode(byte);
           buffer._contents += t2;
         } else {
@@ -6328,161 +5959,19 @@
             throw A.wrapException(A.ArgumentError$value(byte, "non-byte value", null));
         }
     },
-    _createTables() {
-      var _i, t1, t2, t3, b,
-        _s77_ = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-._~!$&'()*+,;=",
-        _s1_ = ".", _s1_0 = ":", _s1_1 = "/", _s1_2 = "\\", _s1_3 = "?", _s1_4 = "#", _s2_ = "/\\",
-        tables = A._setArrayType(new Array(22), type$.JSArray_Uint8List);
-      for (_i = 0; _i < 22; ++_i)
-        tables[_i] = new Uint8Array(96);
-      t1 = new A._createTables_build(tables);
-      t2 = new A._createTables_setChars();
-      t3 = new A._createTables_setRange();
-      b = t1.call$2(0, 225);
-      t2.call$3(b, _s77_, 1);
-      t2.call$3(b, _s1_, 14);
-      t2.call$3(b, _s1_0, 34);
-      t2.call$3(b, _s1_1, 3);
-      t2.call$3(b, _s1_2, 227);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(14, 225);
-      t2.call$3(b, _s77_, 1);
-      t2.call$3(b, _s1_, 15);
-      t2.call$3(b, _s1_0, 34);
-      t2.call$3(b, _s2_, 234);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(15, 225);
-      t2.call$3(b, _s77_, 1);
-      t2.call$3(b, "%", 225);
-      t2.call$3(b, _s1_0, 34);
-      t2.call$3(b, _s1_1, 9);
-      t2.call$3(b, _s1_2, 233);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(1, 225);
-      t2.call$3(b, _s77_, 1);
-      t2.call$3(b, _s1_0, 34);
-      t2.call$3(b, _s1_1, 10);
-      t2.call$3(b, _s1_2, 234);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(2, 235);
-      t2.call$3(b, _s77_, 139);
-      t2.call$3(b, _s1_1, 131);
-      t2.call$3(b, _s1_2, 131);
-      t2.call$3(b, _s1_, 146);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(3, 235);
-      t2.call$3(b, _s77_, 11);
-      t2.call$3(b, _s1_1, 68);
-      t2.call$3(b, _s1_2, 68);
-      t2.call$3(b, _s1_, 18);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(4, 229);
-      t2.call$3(b, _s77_, 5);
-      t3.call$3(b, "AZ", 229);
-      t2.call$3(b, _s1_0, 102);
-      t2.call$3(b, "@", 68);
-      t2.call$3(b, "[", 232);
-      t2.call$3(b, _s1_1, 138);
-      t2.call$3(b, _s1_2, 138);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(5, 229);
-      t2.call$3(b, _s77_, 5);
-      t3.call$3(b, "AZ", 229);
-      t2.call$3(b, _s1_0, 102);
-      t2.call$3(b, "@", 68);
-      t2.call$3(b, _s1_1, 138);
-      t2.call$3(b, _s1_2, 138);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(6, 231);
-      t3.call$3(b, "19", 7);
-      t2.call$3(b, "@", 68);
-      t2.call$3(b, _s1_1, 138);
-      t2.call$3(b, _s1_2, 138);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(7, 231);
-      t3.call$3(b, "09", 7);
-      t2.call$3(b, "@", 68);
-      t2.call$3(b, _s1_1, 138);
-      t2.call$3(b, _s1_2, 138);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      t2.call$3(t1.call$2(8, 8), "]", 5);
-      b = t1.call$2(9, 235);
-      t2.call$3(b, _s77_, 11);
-      t2.call$3(b, _s1_, 16);
-      t2.call$3(b, _s2_, 234);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(16, 235);
-      t2.call$3(b, _s77_, 11);
-      t2.call$3(b, _s1_, 17);
-      t2.call$3(b, _s2_, 234);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(17, 235);
-      t2.call$3(b, _s77_, 11);
-      t2.call$3(b, _s1_1, 9);
-      t2.call$3(b, _s1_2, 233);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(10, 235);
-      t2.call$3(b, _s77_, 11);
-      t2.call$3(b, _s1_, 18);
-      t2.call$3(b, _s1_1, 10);
-      t2.call$3(b, _s1_2, 234);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(18, 235);
-      t2.call$3(b, _s77_, 11);
-      t2.call$3(b, _s1_, 19);
-      t2.call$3(b, _s2_, 234);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(19, 235);
-      t2.call$3(b, _s77_, 11);
-      t2.call$3(b, _s2_, 234);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(11, 235);
-      t2.call$3(b, _s77_, 11);
-      t2.call$3(b, _s1_1, 10);
-      t2.call$3(b, _s1_2, 234);
-      t2.call$3(b, _s1_3, 172);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(12, 236);
-      t2.call$3(b, _s77_, 12);
-      t2.call$3(b, _s1_3, 12);
-      t2.call$3(b, _s1_4, 205);
-      b = t1.call$2(13, 237);
-      t2.call$3(b, _s77_, 13);
-      t2.call$3(b, _s1_3, 13);
-      t3.call$3(t1.call$2(20, 245), "az", 21);
-      b = t1.call$2(21, 245);
-      t3.call$3(b, "az", 21);
-      t3.call$3(b, "09", 21);
-      t2.call$3(b, "+-.", 21);
-      return tables;
-    },
     _scan(uri, start, end, state, indices) {
-      var t1, i, table, char, transition,
-        tables = $.$get$_scannerTables();
+      var t1, i, char, t2, transition,
+        _s2112_ = '\xe1\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xe1\xe1\xe1\x01\xe1\xe1\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xe1\xe3\xe1\xe1\x01\xe1\x01\xe1\xcd\x01\xe1\x01\x01\x01\x01\x01\x01\x01\x01\x0e\x03\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"\x01\xe1\x01\xe1\xac\xe1\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xe1\xe1\xe1\x01\xe1\xe1\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xe1\xea\xe1\xe1\x01\xe1\x01\xe1\xcd\x01\xe1\x01\x01\x01\x01\x01\x01\x01\x01\x01\n\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"\x01\xe1\x01\xe1\xac\xeb\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\xeb\xeb\xeb\x8b\xeb\xeb\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\xeb\x83\xeb\xeb\x8b\xeb\x8b\xeb\xcd\x8b\xeb\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x92\x83\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\x8b\xeb\x8b\xeb\x8b\xeb\xac\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xeb\xeb\v\xeb\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xebD\xeb\xeb\v\xeb\v\xeb\xcd\v\xeb\v\v\v\v\v\v\v\v\x12D\v\v\v\v\v\v\v\v\v\v\xeb\v\xeb\v\xeb\xac\xe5\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\xe5\xe5\xe5\x05\xe5D\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe8\x8a\xe5\xe5\x05\xe5\x05\xe5\xcd\x05\xe5\x05\x05\x05\x05\x05\x05\x05\x05\x05\x8a\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05f\x05\xe5\x05\xe5\xac\xe5\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05\xe5\xe5\xe5\x05\xe5D\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\xe5\x8a\xe5\xe5\x05\xe5\x05\xe5\xcd\x05\xe5\x05\x05\x05\x05\x05\x05\x05\x05\x05\x8a\x05\x05\x05\x05\x05\x05\x05\x05\x05\x05f\x05\xe5\x05\xe5\xac\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7D\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\x8a\xe7\xe7\xe7\xe7\xe7\xe7\xcd\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\x8a\xe7\x07\x07\x07\x07\x07\x07\x07\x07\x07\xe7\xe7\xe7\xe7\xe7\xac\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7D\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\x8a\xe7\xe7\xe7\xe7\xe7\xe7\xcd\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\xe7\x8a\x07\x07\x07\x07\x07\x07\x07\x07\x07\x07\xe7\xe7\xe7\xe7\xe7\xac\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\x05\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xeb\xeb\v\xeb\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xea\xeb\xeb\v\xeb\v\xeb\xcd\v\xeb\v\v\v\v\v\v\v\v\x10\xea\v\v\v\v\v\v\v\v\v\v\xeb\v\xeb\v\xeb\xac\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xeb\xeb\v\xeb\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xea\xeb\xeb\v\xeb\v\xeb\xcd\v\xeb\v\v\v\v\v\v\v\v\x12\n\v\v\v\v\v\v\v\v\v\v\xeb\v\xeb\v\xeb\xac\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xeb\xeb\v\xeb\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xea\xeb\xeb\v\xeb\v\xeb\xcd\v\xeb\v\v\v\v\v\v\v\v\v\n\v\v\v\v\v\v\v\v\v\v\xeb\v\xeb\v\xeb\xac\xec\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\xec\xec\xec\f\xec\xec\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\f\xec\xec\xec\xec\f\xec\f\xec\xcd\f\xec\f\f\f\f\f\f\f\f\f\xec\f\f\f\f\f\f\f\f\f\f\xec\f\xec\f\xec\f\xed\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\xed\xed\xed\r\xed\xed\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\xed\xed\xed\xed\r\xed\r\xed\xed\r\xed\r\r\r\r\r\r\r\r\r\xed\r\r\r\r\r\r\r\r\r\r\xed\r\xed\r\xed\r\xe1\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xe1\xe1\xe1\x01\xe1\xe1\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xe1\xea\xe1\xe1\x01\xe1\x01\xe1\xcd\x01\xe1\x01\x01\x01\x01\x01\x01\x01\x01\x0f\xea\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"\x01\xe1\x01\xe1\xac\xe1\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xe1\xe1\xe1\x01\xe1\xe1\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01\xe1\xe9\xe1\xe1\x01\xe1\x01\xe1\xcd\x01\xe1\x01\x01\x01\x01\x01\x01\x01\x01\x01\t\x01\x01\x01\x01\x01\x01\x01\x01\x01\x01"\x01\xe1\x01\xe1\xac\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xeb\xeb\v\xeb\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xea\xeb\xeb\v\xeb\v\xeb\xcd\v\xeb\v\v\v\v\v\v\v\v\x11\xea\v\v\v\v\v\v\v\v\v\v\xeb\v\xeb\v\xeb\xac\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xeb\xeb\v\xeb\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xe9\xeb\xeb\v\xeb\v\xeb\xcd\v\xeb\v\v\v\v\v\v\v\v\v\t\v\v\v\v\v\v\v\v\v\v\xeb\v\xeb\v\xeb\xac\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xeb\xeb\v\xeb\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xea\xeb\xeb\v\xeb\v\xeb\xcd\v\xeb\v\v\v\v\v\v\v\v\x13\xea\v\v\v\v\v\v\v\v\v\v\xeb\v\xeb\v\xeb\xac\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xeb\xeb\v\xeb\xeb\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\v\xeb\xea\xeb\xeb\v\xeb\v\xeb\xcd\v\xeb\v\v\v\v\v\v\v\v\v\xea\v\v\v\v\v\v\v\v\v\v\xeb\v\xeb\v\xeb\xac\xf5\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\xf5\x15\xf5\x15\x15\xf5\x15\x15\x15\x15\x15\x15\x15\x15\x15\x15\xf5\xf5\xf5\xf5\xf5\xf5';
       for (t1 = uri.length, i = start; i < end; ++i) {
-        if (!(state >= 0 && state < tables.length))
-          return A.ioore(tables, state);
-        table = tables[state];
         if (!(i < t1))
           return A.ioore(uri, i);
         char = uri.charCodeAt(i) ^ 96;
-        transition = table[char > 95 ? 31 : char];
+        if (char > 95)
+          char = 31;
+        t2 = state * 96 + char;
+        if (!(t2 < 2112))
+          return A.ioore(_s2112_, t2);
+        transition = _s2112_.charCodeAt(t2);
         state = transition & 31;
         B.JSArray_methods.$indexSet(indices, transition >>> 5, i);
       }
@@ -6528,10 +6017,6 @@
       }
       return result;
     },
-    NoSuchMethodError_toString_closure: function NoSuchMethodError_toString_closure(t0, t1) {
-      this._box_0 = t0;
-      this.sb = t1;
-    },
     DateTime: function DateTime(t0, t1, t2) {
       this._core$_value = t0;
       this._microsecond = t1;
@@ -6571,13 +6056,6 @@
       _.name = t3;
       _.message = t4;
     },
-    NoSuchMethodError: function NoSuchMethodError(t0, t1, t2, t3) {
-      var _ = this;
-      _._core$_receiver = t0;
-      _._core$_memberName = t1;
-      _._core$_arguments = t2;
-      _._namedArguments = t3;
-    },
     UnsupportedError: function UnsupportedError(t0) {
       this.message = t0;
     },
@@ -6645,13 +6123,6 @@
       this._separatorIndices = t1;
       this._uriCache = t2;
     },
-    _createTables_build: function _createTables_build(t0) {
-      this.tables = t0;
-    },
-    _createTables_setChars: function _createTables_setChars() {
-    },
-    _createTables_setRange: function _createTables_setRange() {
-    },
     _SimpleUri: function _SimpleUri(t0, t1, t2, t3, t4, t5, t6, t7) {
       var _ = this;
       _._uri = t0;
@@ -6675,30 +6146,38 @@
       _._fragment = t6;
       _.___Uri_queryParameters_FI = _.___Uri_hashCode_FI = _.___Uri_pathSegments_FI = _.___Uri__text_FI = $;
     },
-    _convertDartFunctionFast(f) {
-      var ret,
-        existing = f.$dart_jsFunction;
-      if (existing != null)
-        return existing;
-      ret = function(_call, f) {
+    _functionToJS0(f) {
+      var result;
+      if (typeof f == "function")
+        throw A.wrapException(A.ArgumentError$("Attempting to rewrap a JS function.", null));
+      result = function(_call, f) {
         return function() {
-          return _call(f, Array.prototype.slice.apply(arguments));
+          return _call(f);
         };
-      }(A._callDartFunctionFast, f);
-      ret[$.$get$DART_CLOSURE_PROPERTY_NAME()] = f;
-      f.$dart_jsFunction = ret;
-      return ret;
-    },
-    _callDartFunctionFast(callback, $arguments) {
-      type$.List_dynamic._as($arguments);
-      type$.Function._as(callback);
-      return A.Primitives_applyFunction(callback, $arguments, null);
+      }(A._callDartFunctionFast0, f);
+      result[$.$get$DART_CLOSURE_PROPERTY_NAME()] = f;
+      return result;
     },
-    allowInterop(f, $F) {
+    _functionToJS1(f) {
+      var result;
       if (typeof f == "function")
-        return f;
-      else
-        return $F._as(A._convertDartFunctionFast(f));
+        throw A.wrapException(A.ArgumentError$("Attempting to rewrap a JS function.", null));
+      result = function(_call, f) {
+        return function(arg1) {
+          return _call(f, arg1, arguments.length);
+        };
+      }(A._callDartFunctionFast1, f);
+      result[$.$get$DART_CLOSURE_PROPERTY_NAME()] = f;
+      return result;
+    },
+    _callDartFunctionFast0(callback) {
+      return type$.Function._as(callback).call$0();
+    },
+    _callDartFunctionFast1(callback, arg1, $length) {
+      type$.Function._as(callback);
+      if (A._asInt($length) >= 1)
+        return callback.call$1(arg1);
+      return callback.call$0();
     },
     _noJsifyRequired(o) {
       return o == null || A._isBool(o) || typeof o == "number" || typeof o == "string" || type$.Int8List._is(o) || type$.Uint8List._is(o) || type$.Uint8ClampedList._is(o) || type$.Int16List._is(o) || type$.Uint16List._is(o) || type$.Int32List._is(o) || type$.Uint32List._is(o) || type$.Float32List._is(o) || type$.Float64List._is(o) || type$.ByteBuffer._is(o) || type$.ByteData._is(o);
@@ -6711,9 +6190,6 @@
     getProperty(o, $name, $T) {
       return $T._as(o[$name]);
     },
-    callMethod(o, method, args, $T) {
-      return $T._as(o[method].apply(o, args));
-    },
     callConstructor(constr, $arguments, $T) {
       var args, factoryFunction;
       if ($arguments instanceof Array)
@@ -6899,7 +6375,7 @@
     },
     Chain_Chain$parse(chain) {
       var t1, t2,
-        _s51_ = string$.______;
+        _s51_ = string$.x3d_____;
       if (chain.length === 0)
         return new A.Chain(A.List_List$unmodifiable(A._setArrayType([], type$.JSArray_Trace), type$.Trace));
       t1 = $.$get$vmChainGap();
@@ -7037,7 +6513,7 @@
           t1 = A.Trace$parseFirefox(trace);
           return t1;
         }
-        if (B.JSString_methods.contains$1(trace, string$.______)) {
+        if (B.JSString_methods.contains$1(trace, string$.x3d_____)) {
           t1 = A.Chain_Chain$parse(trace).toTrace$0();
           return t1;
         }
@@ -7074,7 +6550,7 @@
       t1 = A.TakeIterable_TakeIterable(lines, lines.get$length(0) - 1, t3._eval$1("Iterable.E"));
       t2 = A._instanceType(t1);
       t2 = A.MappedIterable_MappedIterable(t1, t2._eval$1("Frame(Iterable.E)")._as(A.frame_Frame___parseVM_tearOff$closure()), t2._eval$1("Iterable.E"), type$.Frame);
-      $frames = A.List_List$of(t2, true, A._instanceType(t2)._eval$1("Iterable.E"));
+      $frames = A.List_List$_of(t2, A._instanceType(t2)._eval$1("Iterable.E"));
       if (!J.endsWith$1$s(lines.get$last(0), ".da"))
         B.JSArray_methods.add$1($frames, A.Frame_Frame$parseVM(lines.get$last(0)));
       return $frames;
@@ -7233,10 +6709,8 @@
         t2 = A._instanceType(foreignToLocalController),
         t3 = A._instanceType(localToForeignController),
         t4 = $T._eval$1("StreamChannel<0>");
-      t1.set$__StreamChannelController__local_F(t4._as(A.GuaranteeChannel$(new A._ControllerStream(foreignToLocalController, t2._eval$1("_ControllerStream<1>")), new A._StreamSinkWrapper(localToForeignController, t3._eval$1("_StreamSinkWrapper<1>")), true, $T)));
-      t2 = t4._as(A.GuaranteeChannel$(new A._ControllerStream(localToForeignController, t3._eval$1("_ControllerStream<1>")), new A._StreamSinkWrapper(foreignToLocalController, t2._eval$1("_StreamSinkWrapper<1>")), true, $T));
-      t1.__StreamChannelController__foreign_F !== $ && A.throwLateFieldAI("_foreign");
-      t1.set$__StreamChannelController__foreign_F(t2);
+      t1.__StreamChannelController__local_F = t4._as(A.GuaranteeChannel$(new A._ControllerStream(foreignToLocalController, t2._eval$1("_ControllerStream<1>")), new A._StreamSinkWrapper(localToForeignController, t3._eval$1("_StreamSinkWrapper<1>")), true, $T));
+      t1.__StreamChannelController__foreign_F = t4._as(A.GuaranteeChannel$(new A._ControllerStream(localToForeignController, t3._eval$1("_ControllerStream<1>")), new A._StreamSinkWrapper(foreignToLocalController, t2._eval$1("_StreamSinkWrapper<1>")), true, $T));
       return t1;
     },
     StreamChannelController: function StreamChannelController(t0) {
@@ -7245,28 +6719,29 @@
     },
     StreamChannelMixin: function StreamChannelMixin() {
     },
-    EventTargetExtension_addEventListener(_this, type, listener) {
-      var t1 = A._setArrayType([type, listener], type$.JSArray_Object);
-      A.callMethod(_this, "addEventListener", t1, type$.void);
+    EventTarget_addEventListener(_this, type, listener) {
+      var t1 = A._functionToJS1(listener);
+      _this.addEventListener.apply(_this, [type, t1]);
     },
-    EventTargetExtension_removeEventListener(_this, type, listener) {
-      var t1 = A._setArrayType([type, listener], type$.JSArray_Object);
-      A.callMethod(_this, "removeEventListener", t1, type$.void);
+    EventTarget_removeEventListener(_this, type, listener) {
+      var t1 = A._functionToJS1(listener);
+      _this.removeEventListener.apply(_this, [type, t1]);
     },
-    MessagePortExtension_get_postMessage(_this) {
-      return new A.MessagePortExtension_get_postMessage_closure(_this);
+    MessagePort_get_postMessage(_this) {
+      return new A.MessagePort_get_postMessage_closure(_this);
     },
     _callConstructor(constructorName, args) {
-      var $constructor = self.window[constructorName];
+      var t1 = type$.JSObject,
+        $constructor = type$.nullable_JavaScriptFunction._as(t1._as(init.G.window)[constructorName]);
       if ($constructor == null)
         return null;
-      return A.callConstructor($constructor, args, type$.nullable_Object);
+      return A.callConstructor($constructor, args, t1);
     },
     Subscription$(target, type, listener) {
-      A.EventTargetExtension_addEventListener(target, type, listener);
+      A.EventTarget_addEventListener(target, type, listener);
       return new A.Subscription(type, target, listener);
     },
-    MessagePortExtension_get_postMessage_closure: function MessagePortExtension_get_postMessage_closure(t0) {
+    MessagePort_get_postMessage_closure: function MessagePort_get_postMessage_closure(t0) {
       this._this = t0;
     },
     Subscription: function Subscription(t0, t1, t2) {
@@ -7275,21 +6750,21 @@
       this.listener = t2;
     },
     main() {
-      var t1 = type$.JavaScriptObject;
-      t1._as(self.window.console).log("Dart test runner browser host running");
+      var t1 = init.G,
+        t2 = type$.JSObject;
+      t2._as(t2._as(t1.window).console).log("Dart test runner browser host running");
       if ($.$get$_currentUrl().get$queryParameters().$index(0, "debug") === "true")
-        t1._as(type$.nullable_JavaScriptObject._as(self.document.body).classList).add("debug");
+        t2._as(type$.nullable_JSObject._as(t2._as(t1.document).body).classList).add("debug");
       A.runZonedGuarded(new A.main_closure(), new A.main_closure0(), type$.Null);
     },
     _connectToServer() {
       var controller, t2,
         t1 = $.$get$_currentUrl().get$queryParameters().$index(0, "managerUrl");
       t1.toString;
-      t1 = A._callConstructor("WebSocket", A._setArrayType([t1], type$.JSArray_Object));
+      t1 = A._callConstructor("WebSocket", [t1]);
       t1.toString;
-      type$.JavaScriptObject._as(t1);
       controller = A.StreamChannelController$(true, type$.nullable_Object);
-      A.EventTargetExtension_addEventListener(t1, "message", A.allowInterop(new A._connectToServer_closure(controller), type$.void_Function_JavaScriptObject));
+      A.EventTarget_addEventListener(t1, "message", new A._connectToServer_closure(controller));
       t2 = controller.__StreamChannelController__local_F;
       t2 === $ && A.throwLateFieldNI("_local");
       t2 = t2.__GuaranteeChannel__streamController_F;
@@ -7300,20 +6775,20 @@
       return A._MultiChannel$(t1, type$.dynamic);
     },
     _connectToIframe(url, id) {
-      var t2, t3, iframe, controller, windowSubscription,
+      var t3, iframe, controller, windowSubscription,
         suiteUrl = A.Uri_parse(url).removeFragment$0(),
-        t1 = type$.JavaScriptObject;
-      t1._as(self.window.console).log("Starting suite " + suiteUrl.toString$0(0));
-      t2 = self.document;
-      t3 = A._setArrayType(["iframe"], type$.JSArray_Object);
-      iframe = t1._as(A.callMethod(t2, "createElement", t3, type$.dynamic));
+        t1 = init.G,
+        t2 = type$.JSObject;
+      t2._as(t2._as(t1.window).console).log("Starting suite " + suiteUrl.toString$0(0));
+      t3 = t2._as(t1.document);
+      iframe = t2._as(t3.createElement.apply(t3, ["iframe"]));
       $._iframes.$indexSet(0, id, iframe);
       controller = A.StreamChannelController$(true, type$.nullable_Object);
       windowSubscription = A._Cell$named("windowSubscription");
-      windowSubscription._value = A.Subscription$(self.window, "message", A.allowInterop(new A._connectToIframe_closure(iframe, windowSubscription, suiteUrl, id, controller), type$.void_Function_JavaScriptObject));
+      windowSubscription._value = A.Subscription$(t2._as(t1.window), "message", new A._connectToIframe_closure(iframe, windowSubscription, suiteUrl, id, controller));
       iframe.src = url;
-      t1._as(type$.nullable_JavaScriptObject._as(self.document.body).appendChild(iframe));
-      t1._as(self.window.console).log("Appended iframe with src " + url);
+      t2._as(type$.nullable_JSObject._as(t2._as(t1.document).body).appendChild(iframe));
+      t2._as(t2._as(t1.window).console).log("Appended iframe with src " + url);
       t1 = controller.__StreamChannelController__foreign_F;
       t1 === $ && A.throwLateFieldNI("_foreign");
       return t1;
@@ -7454,9 +6929,6 @@
     toString$0(receiver) {
       return "Instance of '" + A.Primitives_objectTypeName(receiver) + "'";
     },
-    noSuchMethod$1(receiver, invocation) {
-      throw A.wrapException(A.NoSuchMethodError_NoSuchMethodError$withInvocation(receiver, type$.Invocation._as(invocation)));
-    },
     get$runtimeType(receiver) {
       return A.createRuntimeType(A._instanceTypeFromConstructor(this));
     }
@@ -7487,7 +6959,7 @@
     $isTrustedGetRuntimeType: 1,
     $isNull: 1
   };
-  J.JavaScriptObject.prototype = {};
+  J.JavaScriptObject.prototype = {$isJSObject: 1};
   J.LegacyJavaScriptObject.prototype = {
     get$hashCode(receiver) {
       return 0;
@@ -7728,16 +7200,13 @@
       }
       t2 = _this._index;
       if (t2 >= $length) {
-        _this.set$_current(null);
+        _this._current = null;
         return false;
       }
-      _this.set$_current(t1[t2]);
-      ++_this._index;
+      _this._current = t1[t2];
+      _this._index = t2 + 1;
       return true;
     },
-    set$_current(_current) {
-      this._current = this.$ti._eval$1("1?")._as(_current);
-    },
     $isIterator: 1
   };
   J.JSNumber.prototype = {
@@ -7875,14 +7344,13 @@
       return A.stringReplaceFirstUnchecked(receiver, from, to, 0);
     },
     split$1(receiver, pattern) {
-      var nativeAnchoredRegExp, t1;
+      var t1;
       if (typeof pattern == "string")
         return A._setArrayType(receiver.split(pattern), type$.JSArray_String);
       else {
         if (pattern instanceof A.JSSyntaxRegExp) {
-          nativeAnchoredRegExp = pattern.get$_nativeAnchoredVersion();
-          nativeAnchoredRegExp.lastIndex = 0;
-          t1 = nativeAnchoredRegExp.exec("").length - 2 === 0;
+          t1 = pattern._hasCapturesCache;
+          t1 = !(t1 == null ? pattern._hasCapturesCache = pattern._computeHasCaptures$0() : t1);
         } else
           t1 = false;
         if (t1)
@@ -8066,7 +7534,7 @@
     onData$1(handleData) {
       var t1 = this.$ti;
       t1._eval$1("~(2)?")._as(handleData);
-      this.set$_handleData(handleData == null ? null : this.__internal$_zone.registerUnaryCallback$2$1(handleData, type$.dynamic, t1._rest[1]));
+      this._handleData = handleData == null ? null : this.__internal$_zone.registerUnaryCallback$2$1(handleData, type$.dynamic, t1._rest[1]);
     },
     onError$1(handleError) {
       var _this = this;
@@ -8108,9 +7576,6 @@
       }
       _this.__internal$_zone.runUnaryGuarded$1$2(t2, targetData, t1._rest[1]);
     },
-    set$_handleData(_handleData) {
-      this._handleData = this.$ti._eval$1("~(2)?")._as(_handleData);
-    },
     $isStreamSubscription: 1
   };
   A._CastIterableBase.prototype = {
@@ -8160,17 +7625,10 @@
     $index(_, index) {
       return this.$ti._rest[1]._as(J.$index$asx(this._source, index));
     },
-    $indexSet(_, index, value) {
-      var t1 = this.$ti;
-      J.$indexSet$ax(this._source, index, t1._precomputed1._as(t1._rest[1]._as(value)));
-    },
     $isEfficientLengthIterable: 1,
     $isList: 1
   };
   A.CastList.prototype = {
-    cast$1$0(_, $R) {
-      return new A.CastList(this._source, this.$ti._eval$1("@<1>")._bind$1($R)._eval$1("CastList<1,2>"));
-    },
     get$_source() {
       return this._source;
     }
@@ -8195,7 +7653,7 @@
     call$0() {
       return A.Future_Future$value(null, type$.void);
     },
-    $signature: 38
+    $signature: 53
   };
   A.SentinelValue.prototype = {};
   A.EfficientLengthIterable.prototype = {};
@@ -8292,8 +7750,6 @@
       endOrLength = this._endOrLength;
       if (endOrLength == null || endOrLength >= $length)
         return $length - t1;
-      if (typeof endOrLength !== "number")
-        return endOrLength.$sub();
       return endOrLength - t1;
     },
     elementAt$1(_, index) {
@@ -8363,16 +7819,13 @@
         throw A.wrapException(A.ConcurrentModificationError$(t1));
       t3 = _this.__internal$_index;
       if (t3 >= $length) {
-        _this.set$__internal$_current(null);
+        _this.__internal$_current = null;
         return false;
       }
-      _this.set$__internal$_current(t2.elementAt$1(t1, t3));
+      _this.__internal$_current = t2.elementAt$1(t1, t3);
       ++_this.__internal$_index;
       return true;
     },
-    set$__internal$_current(_current) {
-      this.__internal$_current = this.$ti._eval$1("1?")._as(_current);
-    },
     $isIterator: 1
   };
   A.MappedIterable.prototype = {
@@ -8395,19 +7848,16 @@
       var _this = this,
         t1 = _this._iterator;
       if (t1.moveNext$0()) {
-        _this.set$__internal$_current(_this._f.call$1(t1.get$current()));
+        _this.__internal$_current = _this._f.call$1(t1.get$current());
         return true;
       }
-      _this.set$__internal$_current(null);
+      _this.__internal$_current = null;
       return false;
     },
     get$current() {
       var t1 = this.__internal$_current;
       return t1 == null ? this.$ti._rest[1]._as(t1) : t1;
     },
-    set$__internal$_current(_current) {
-      this.__internal$_current = this.$ti._eval$1("2?")._as(_current);
-    },
     $isIterator: 1
   };
   A.MappedListIterable.prototype = {
@@ -8431,7 +7881,7 @@
     moveNext$0() {
       var t1, t2;
       for (t1 = this._iterator, t2 = this._f; t1.moveNext$0();)
-        if (A.boolConversionCheck(t2.call$1(t1.get$current())))
+        if (t2.call$1(t1.get$current()))
           return true;
       return false;
     },
@@ -8451,26 +7901,22 @@
       return t1 == null ? this.$ti._rest[1]._as(t1) : t1;
     },
     moveNext$0() {
-      var t1, t2, _this = this;
-      if (_this._currentExpansion == null)
+      var t2, t3, _this = this,
+        t1 = _this._currentExpansion;
+      if (t1 == null)
         return false;
-      for (t1 = _this._iterator, t2 = _this._f; !_this._currentExpansion.moveNext$0();) {
-        _this.set$__internal$_current(null);
-        if (t1.moveNext$0()) {
-          _this.set$_currentExpansion(null);
-          _this.set$_currentExpansion(J.get$iterator$ax(t2.call$1(t1.get$current())));
+      for (t2 = _this._iterator, t3 = _this._f; !t1.moveNext$0();) {
+        _this.__internal$_current = null;
+        if (t2.moveNext$0()) {
+          _this._currentExpansion = null;
+          t1 = J.get$iterator$ax(t3.call$1(t2.get$current()));
+          _this._currentExpansion = t1;
         } else
           return false;
       }
-      _this.set$__internal$_current(_this._currentExpansion.get$current());
+      _this.__internal$_current = _this._currentExpansion.get$current();
       return true;
     },
-    set$_currentExpansion(_currentExpansion) {
-      this._currentExpansion = this.$ti._eval$1("Iterator<2>?")._as(_currentExpansion);
-    },
-    set$__internal$_current(_current) {
-      this.__internal$_current = this.$ti._eval$1("2?")._as(_current);
-    },
     $isIterator: 1
   };
   A.TakeIterable.prototype = {
@@ -8552,7 +7998,7 @@
       if (!_this._hasSkipped) {
         _this._hasSkipped = true;
         for (t1 = _this._iterator, t2 = _this._f; t1.moveNext$0();)
-          if (!A.boolConversionCheck(t2.call$1(t1.get$current())))
+          if (!t2.call$1(t1.get$current()))
             return true;
       }
       return _this._iterator.moveNext$0();
@@ -8616,12 +8062,7 @@
     $isIterator: 1
   };
   A.FixedLengthListMixin.prototype = {};
-  A.UnmodifiableListMixin.prototype = {
-    $indexSet(_, index, value) {
-      A._instanceType(this)._eval$1("UnmodifiableListMixin.E")._as(value);
-      throw A.wrapException(A.UnsupportedError$("Cannot modify an unmodifiable list"));
-    }
-  };
+  A.UnmodifiableListMixin.prototype = {};
   A.UnmodifiableListBase.prototype = {};
   A.ReversedListIterable.prototype = {
     get$length(_) {
@@ -8633,27 +8074,7 @@
       return t2.elementAt$1(t1, t2.get$length(t1) - 1 - index);
     }
   };
-  A.Symbol.prototype = {
-    get$hashCode(_) {
-      var hash = this._hashCode;
-      if (hash != null)
-        return hash;
-      hash = 664597 * B.JSString_methods.get$hashCode(this._name) & 536870911;
-      this._hashCode = hash;
-      return hash;
-    },
-    toString$0(_) {
-      return 'Symbol("' + this._name + '")';
-    },
-    $eq(_, other) {
-      if (other == null)
-        return false;
-      return other instanceof A.Symbol && this._name === other._name;
-    },
-    $isSymbol0: 1
-  };
   A.__CastListBase__CastIterableBase_ListMixin.prototype = {};
-  A.ConstantMapView.prototype = {};
   A.ConstantMap.prototype = {
     get$isEmpty(_) {
       return this.get$length(this) === 0;
@@ -8729,16 +8150,13 @@
       var _this = this,
         t1 = _this.__js_helper$_index;
       if (t1 >= _this.__js_helper$_length) {
-        _this.set$__js_helper$_current(null);
+        _this.__js_helper$_current = null;
         return false;
       }
-      _this.set$__js_helper$_current(_this._elements[t1]);
-      ++_this.__js_helper$_index;
+      _this.__js_helper$_current = _this._elements[t1];
+      _this.__js_helper$_index = t1 + 1;
       return true;
     },
-    set$__js_helper$_current(_current) {
-      this.__js_helper$_current = this.$ti._eval$1("1?")._as(_current);
-    },
     $isIterator: 1
   };
   A.Instantiation.prototype = {
@@ -8759,65 +8177,12 @@
     call$2(a0, a1) {
       return this._genericClosure.call$1$2(a0, a1, this.$ti._rest[0]);
     },
-    call$4(a0, a1, a2, a3) {
-      return this._genericClosure.call$1$4(a0, a1, a2, a3, this.$ti._rest[0]);
-    },
-    $signature() {
-      return A.instantiatedGenericFunctionType(A.closureFunctionType(this._genericClosure), this.$ti);
-    }
-  };
-  A.JSInvocationMirror.prototype = {
-    get$memberName() {
-      var t1 = this._memberName;
-      if (t1 instanceof A.Symbol)
-        return t1;
-      return this._memberName = new A.Symbol(A._asString(t1));
-    },
-    get$positionalArguments() {
-      var t1, t2, argumentCount, list, index, _this = this;
-      if (_this.__js_helper$_kind === 1)
-        return B.List_empty0;
-      t1 = _this._arguments;
-      t2 = J.getInterceptor$asx(t1);
-      argumentCount = t2.get$length(t1) - J.get$length$asx(_this._namedArgumentNames) - _this._typeArgumentCount;
-      if (argumentCount === 0)
-        return B.List_empty0;
-      list = [];
-      for (index = 0; index < argumentCount; ++index)
-        list.push(t2.$index(t1, index));
-      list.$flags = 3;
-      return list;
-    },
-    get$namedArguments() {
-      var t1, t2, namedArgumentCount, t3, t4, namedArgumentsStartIndex, map, i, _this = this;
-      if (_this.__js_helper$_kind !== 0)
-        return B.Map_empty0;
-      t1 = _this._namedArgumentNames;
-      t2 = J.getInterceptor$asx(t1);
-      namedArgumentCount = t2.get$length(t1);
-      t3 = _this._arguments;
-      t4 = J.getInterceptor$asx(t3);
-      namedArgumentsStartIndex = t4.get$length(t3) - namedArgumentCount - _this._typeArgumentCount;
-      if (namedArgumentCount === 0)
-        return B.Map_empty0;
-      map = new A.JsLinkedHashMap(type$.JsLinkedHashMap_Symbol_dynamic);
-      for (i = 0; i < namedArgumentCount; ++i)
-        map.$indexSet(0, new A.Symbol(A._asString(t2.$index(t1, i))), t4.$index(t3, namedArgumentsStartIndex + i));
-      return new A.ConstantMapView(map, type$.ConstantMapView_Symbol_dynamic);
-    },
-    $isInvocation: 1
-  };
-  A.Primitives_functionNoSuchMethod_closure.prototype = {
-    call$2($name, argument) {
-      var t1;
-      A._asString($name);
-      t1 = this._box_0;
-      t1.names = t1.names + "$" + $name;
-      B.JSArray_methods.add$1(this.namedArgumentList, $name);
-      B.JSArray_methods.add$1(this.$arguments, argument);
-      ++t1.argumentCount;
+    call$4(a0, a1, a2, a3) {
+      return this._genericClosure.call$1$4(a0, a1, a2, a3, this.$ti._rest[0]);
     },
-    $signature: 33
+    $signature() {
+      return A.instantiatedGenericFunctionType(A.closureFunctionType(this._genericClosure), this.$ti);
+    }
   };
   A.TypeErrorDecoder.prototype = {
     matchTypeError$1(message) {
@@ -8928,22 +8293,11 @@
       return "Closure '" + this.$_name + "' of " + ("Instance of '" + A.Primitives_objectTypeName(this._receiver) + "'");
     }
   };
-  A._CyclicInitializationError.prototype = {
-    toString$0(_) {
-      return "Reading static variable '" + this.variableName + "' during its initialization";
-    }
-  };
   A.RuntimeError.prototype = {
     toString$0(_) {
       return "RuntimeError: " + this.message;
     }
   };
-  A._AssertionError.prototype = {
-    toString$0(_) {
-      return "Assertion failed: " + A.Error_safeToString(this.message);
-    }
-  };
-  A._Required.prototype = {};
   A.JsLinkedHashMap.prototype = {
     get$length(_) {
       return this.__js_helper$_length;
@@ -8952,11 +8306,7 @@
       return this.__js_helper$_length === 0;
     },
     get$keys() {
-      return new A.LinkedHashMapKeyIterable(this, A._instanceType(this)._eval$1("LinkedHashMapKeyIterable<1>"));
-    },
-    get$values() {
-      var t1 = A._instanceType(this);
-      return A.MappedIterable_MappedIterable(new A.LinkedHashMapKeyIterable(this, t1._eval$1("LinkedHashMapKeyIterable<1>")), new A.JsLinkedHashMap_values_closure(this), t1._precomputed1, t1._rest[1]);
+      return new A.LinkedHashMapKeysIterable(this, A._instanceType(this)._eval$1("LinkedHashMapKeysIterable<1>"));
     },
     containsKey$1(key) {
       var strings, nums;
@@ -9175,19 +8525,8 @@
     },
     $isLinkedHashMap: 1
   };
-  A.JsLinkedHashMap_values_closure.prototype = {
-    call$1(each) {
-      var t1 = this.$this,
-        t2 = A._instanceType(t1);
-      t1 = t1.$index(0, t2._precomputed1._as(each));
-      return t1 == null ? t2._rest[1]._as(t1) : t1;
-    },
-    $signature() {
-      return A._instanceType(this.$this)._eval$1("2(1)");
-    }
-  };
   A.LinkedHashMapCell.prototype = {};
-  A.LinkedHashMapKeyIterable.prototype = {
+  A.LinkedHashMapKeysIterable.prototype = {
     get$length(_) {
       return this.__js_helper$_map.__js_helper$_length;
     },
@@ -9195,10 +8534,8 @@
       return this.__js_helper$_map.__js_helper$_length === 0;
     },
     get$iterator(_) {
-      var t1 = this.__js_helper$_map,
-        t2 = new A.LinkedHashMapKeyIterator(t1, t1._modifications, this.$ti._eval$1("LinkedHashMapKeyIterator<1>"));
-      t2._cell = t1._first;
-      return t2;
+      var t1 = this.__js_helper$_map;
+      return new A.LinkedHashMapKeyIterator(t1, t1._modifications, t1._first, this.$ti._eval$1("LinkedHashMapKeyIterator<1>"));
     },
     contains$1(_, element) {
       return this.__js_helper$_map.containsKey$1(element);
@@ -9215,16 +8552,46 @@
         throw A.wrapException(A.ConcurrentModificationError$(t1));
       cell = _this._cell;
       if (cell == null) {
-        _this.set$__js_helper$_current(null);
+        _this.__js_helper$_current = null;
         return false;
       } else {
-        _this.set$__js_helper$_current(cell.hashMapCellKey);
+        _this.__js_helper$_current = cell.hashMapCellKey;
         _this._cell = cell._next;
         return true;
       }
     },
-    set$__js_helper$_current(_current) {
-      this.__js_helper$_current = this.$ti._eval$1("1?")._as(_current);
+    $isIterator: 1
+  };
+  A.LinkedHashMapValuesIterable.prototype = {
+    get$length(_) {
+      return this.__js_helper$_map.__js_helper$_length;
+    },
+    get$isEmpty(_) {
+      return this.__js_helper$_map.__js_helper$_length === 0;
+    },
+    get$iterator(_) {
+      var t1 = this.__js_helper$_map;
+      return new A.LinkedHashMapValueIterator(t1, t1._modifications, t1._first, this.$ti._eval$1("LinkedHashMapValueIterator<1>"));
+    }
+  };
+  A.LinkedHashMapValueIterator.prototype = {
+    get$current() {
+      return this.__js_helper$_current;
+    },
+    moveNext$0() {
+      var cell, _this = this,
+        t1 = _this.__js_helper$_map;
+      if (_this._modifications !== t1._modifications)
+        throw A.wrapException(A.ConcurrentModificationError$(t1));
+      cell = _this._cell;
+      if (cell == null) {
+        _this.__js_helper$_current = null;
+        return false;
+      } else {
+        _this.__js_helper$_current = cell.hashMapCellValue;
+        _this._cell = cell._next;
+        return true;
+      }
     },
     $isIterator: 1
   };
@@ -9238,13 +8605,13 @@
     call$2(o, tag) {
       return this.getUnknownTag(o, tag);
     },
-    $signature: 43
+    $signature: 30
   };
   A.initHooks_closure1.prototype = {
     call$1(tag) {
       return this.prototypeForTag(A._asString(tag));
     },
-    $signature: 26
+    $signature: 31
   };
   A.JSSyntaxRegExp.prototype = {
     toString$0(_) {
@@ -9256,7 +8623,7 @@
       if (t1 != null)
         return t1;
       t1 = _this._nativeRegExp;
-      return _this._nativeGlobalRegExp = A.JSSyntaxRegExp_makeNative(_this.pattern, t1.multiline, !t1.ignoreCase, t1.unicode, t1.dotAll, true);
+      return _this._nativeGlobalRegExp = A.JSSyntaxRegExp_makeNative(_this.pattern, t1.multiline, !t1.ignoreCase, t1.unicode, t1.dotAll, "g");
     },
     get$_nativeAnchoredVersion() {
       var _this = this,
@@ -9264,7 +8631,15 @@
       if (t1 != null)
         return t1;
       t1 = _this._nativeRegExp;
-      return _this._nativeAnchoredRegExp = A.JSSyntaxRegExp_makeNative(_this.pattern + "|()", t1.multiline, !t1.ignoreCase, t1.unicode, t1.dotAll, true);
+      return _this._nativeAnchoredRegExp = A.JSSyntaxRegExp_makeNative(_this.pattern, t1.multiline, !t1.ignoreCase, t1.unicode, t1.dotAll, "y");
+    },
+    _computeHasCaptures$0() {
+      var t2,
+        t1 = this.pattern;
+      if (!B.JSString_methods.contains$1(t1, "("))
+        return false;
+      t2 = this._nativeRegExp.unicode ? "u" : "";
+      return new RegExp("(?:)|" + t1, t2).exec("").length > 1;
     },
     firstMatch$1(string) {
       var m = this._nativeRegExp.exec(string);
@@ -9301,10 +8676,6 @@
       match = regexp.exec(string);
       if (match == null)
         return null;
-      if (0 >= match.length)
-        return A.ioore(match, -1);
-      if (match.pop() != null)
-        return null;
       return new A._MatchImplementation(match);
     },
     matchAsPrefix$2(_, string, start) {
@@ -9435,13 +8806,13 @@
     _readLocal$0() {
       var t1 = this._value;
       if (t1 === this)
-        throw A.wrapException(new A.LateError("Local '" + this.__late_helper$_name + "' has not been initialized."));
+        throw A.wrapException(new A.LateError("Local '" + this._name + "' has not been initialized."));
       return t1;
     }
   };
   A.NativeByteBuffer.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_ByteBuffer_EOZ;
+      return B.Type_ByteBuffer_rqD;
     },
     $isTrustedGetRuntimeType: 1,
     $isByteBuffer: 1
@@ -9449,7 +8820,7 @@
   A.NativeTypedData.prototype = {};
   A.NativeByteData.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_ByteData_mF8;
+      return B.Type_ByteData_9dB;
     },
     $isTrustedGetRuntimeType: 1,
     $isByteData: 1
@@ -9465,44 +8836,28 @@
       A._checkValidIndex(index, receiver, receiver.length);
       return receiver[index];
     },
-    $indexSet(receiver, index, value) {
-      A._asDouble(value);
-      receiver.$flags & 2 && A.throwUnsupportedOperation(receiver);
-      A._checkValidIndex(index, receiver, receiver.length);
-      receiver[index] = value;
-    },
-    $isEfficientLengthIterable: 1,
-    $isIterable: 1,
-    $isList: 1
-  };
-  A.NativeTypedArrayOfInt.prototype = {
-    $indexSet(receiver, index, value) {
-      A._asInt(value);
-      receiver.$flags & 2 && A.throwUnsupportedOperation(receiver);
-      A._checkValidIndex(index, receiver, receiver.length);
-      receiver[index] = value;
-    },
     $isEfficientLengthIterable: 1,
     $isIterable: 1,
     $isList: 1
   };
+  A.NativeTypedArrayOfInt.prototype = {$isEfficientLengthIterable: 1, $isIterable: 1, $isList: 1};
   A.NativeFloat32List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Float32List_Ymk;
+      return B.Type_Float32List_9Kz;
     },
     $isTrustedGetRuntimeType: 1,
     $isFloat32List: 1
   };
   A.NativeFloat64List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Float64List_Ymk;
+      return B.Type_Float64List_9Kz;
     },
     $isTrustedGetRuntimeType: 1,
     $isFloat64List: 1
   };
   A.NativeInt16List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Int16List_cot;
+      return B.Type_Int16List_s5h;
     },
     $index(receiver, index) {
       A._checkValidIndex(index, receiver, receiver.length);
@@ -9513,7 +8868,7 @@
   };
   A.NativeInt32List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Int32List_m1p;
+      return B.Type_Int32List_O8Z;
     },
     $index(receiver, index) {
       A._checkValidIndex(index, receiver, receiver.length);
@@ -9524,7 +8879,7 @@
   };
   A.NativeInt8List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Int8List_woc;
+      return B.Type_Int8List_rFV;
     },
     $index(receiver, index) {
       A._checkValidIndex(index, receiver, receiver.length);
@@ -9535,7 +8890,7 @@
   };
   A.NativeUint16List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Uint16List_2mh;
+      return B.Type_Uint16List_kmP;
     },
     $index(receiver, index) {
       A._checkValidIndex(index, receiver, receiver.length);
@@ -9546,7 +8901,7 @@
   };
   A.NativeUint32List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Uint32List_2mh;
+      return B.Type_Uint32List_kmP;
     },
     $index(receiver, index) {
       A._checkValidIndex(index, receiver, receiver.length);
@@ -9557,7 +8912,7 @@
   };
   A.NativeUint8ClampedList.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Uint8ClampedList_9Bb;
+      return B.Type_Uint8ClampedList_04U;
     },
     get$length(receiver) {
       return receiver.length;
@@ -9571,7 +8926,7 @@
   };
   A.NativeUint8List.prototype = {
     get$runtimeType(receiver) {
-      return B.Type_Uint8List_CSc;
+      return B.Type_Uint8List_8Eb;
     },
     get$length(receiver) {
       return receiver.length;
@@ -9612,7 +8967,7 @@
   };
   A._TypeError.prototype = {$isTypeError: 1};
   A._AsyncRun__initializeScheduleImmediate_internalCallback.prototype = {
-    call$1(_) {
+    call$1(__wc0_formal) {
       var t1 = this._box_0,
         f = t1.storedCallback;
       t1.storedCallback = null;
@@ -9628,7 +8983,7 @@
       t2 = this.span;
       t1.firstChild ? t1.removeChild(t2) : t1.appendChild(t2);
     },
-    $signature: 36
+    $signature: 24
   };
   A._AsyncRun__scheduleImmediateJsOverride_internalCallback.prototype = {
     call$0() {
@@ -9691,11 +9046,9 @@
   };
   A._Completer.prototype = {
     completeError$2(error, stackTrace) {
-      var _0_0;
       if ((this.future._async$_state & 30) !== 0)
         throw A.wrapException(A.StateError$("Future already completed"));
-      _0_0 = A._interceptUserError(error, stackTrace);
-      this._completeError$2(_0_0.error, _0_0.stackTrace);
+      this._completeErrorObject$1(A._interceptUserError(error, stackTrace));
     },
     completeError$1(error) {
       return this.completeError$2(error, null);
@@ -9715,8 +9068,8 @@
     complete$0() {
       return this.complete$1(null);
     },
-    _completeError$2(error, stackTrace) {
-      this.future._asyncCompleteError$2(error, stackTrace);
+    _completeErrorObject$1(error) {
+      this.future._asyncCompleteErrorObject$1(error);
     }
   };
   A._SyncCompleter.prototype = {
@@ -9732,8 +9085,8 @@
     complete$0() {
       return this.complete$1(null);
     },
-    _completeError$2(error, stackTrace) {
-      this.future._completeError$2(error, stackTrace);
+    _completeErrorObject$1(error) {
+      this.future._completeErrorObject$1(error);
     }
   };
   A._FutureListener.prototype = {
@@ -9768,10 +9121,6 @@
     }
   };
   A._Future.prototype = {
-    _setChained$1(source) {
-      this._async$_state = this._async$_state & 1 | 4;
-      this._resultOrListeners = source;
-    },
     then$1$2$onError(f, onError, $R) {
       var currentZone, result, t2,
         t1 = this.$ti;
@@ -9791,6 +9140,7 @@
       return result;
     },
     then$1$1(f, $R) {
+      f.toString;
       return this.then$1$2$onError(f, null, $R);
     },
     whenComplete$1(action) {
@@ -9871,26 +9221,12 @@
       }
       return prev;
     },
-    _chainForeignFuture$1(source) {
-      var e, s, exception, _this = this;
-      _this._async$_state ^= 2;
-      try {
-        source.then$1$2$onError(new A._Future__chainForeignFuture_closure(_this), new A._Future__chainForeignFuture_closure0(_this), type$.Null);
-      } catch (exception) {
-        e = A.unwrapException(exception);
-        s = A.getTraceFromException(exception);
-        A.scheduleMicrotask(new A._Future__chainForeignFuture_closure1(_this, e, s));
-      }
-    },
     _complete$1(value) {
       var listeners, _this = this,
         t1 = _this.$ti;
       t1._eval$1("1/")._as(value);
       if (t1._eval$1("Future<1>")._is(value))
-        if (t1._is(value))
-          A._Future__chainCoreFutureSync(value, _this);
-        else
-          _this._chainForeignFuture$1(value);
+        A._Future__chainCoreFuture(value, _this, true);
       else {
         listeners = _this._removeListeners$0();
         t1._precomputed1._as(value);
@@ -9907,13 +9243,29 @@
       _this._resultOrListeners = value;
       A._Future__propagateToListeners(_this, listeners);
     },
+    _completeWithResultOf$1(source) {
+      var t1, t2, listeners, _this = this;
+      if ((source._async$_state & 16) !== 0) {
+        t1 = _this._zone;
+        t2 = source._zone;
+        t1 = !(t1 === t2 || t1.get$errorZone() === t2.get$errorZone());
+      } else
+        t1 = false;
+      if (t1)
+        return;
+      listeners = _this._removeListeners$0();
+      _this._cloneResult$1(source);
+      A._Future__propagateToListeners(_this, listeners);
+    },
+    _completeErrorObject$1(error) {
+      var listeners = this._removeListeners$0();
+      this._setErrorObject$1(error);
+      A._Future__propagateToListeners(this, listeners);
+    },
     _completeError$2(error, stackTrace) {
-      var listeners;
       type$.Object._as(error);
       type$.StackTrace._as(stackTrace);
-      listeners = this._removeListeners$0();
-      this._setErrorObject$1(new A.AsyncError(error, stackTrace));
-      A._Future__propagateToListeners(this, listeners);
+      this._completeErrorObject$1(new A.AsyncError(error, stackTrace));
     },
     _asyncComplete$1(value) {
       var t1 = this.$ti;
@@ -9931,18 +9283,12 @@
       _this._zone.scheduleMicrotask$1(new A._Future__asyncCompleteWithValue_closure(_this, value));
     },
     _chainFuture$1(value) {
-      var t1 = this.$ti;
-      t1._eval$1("Future<1>")._as(value);
-      if (t1._is(value)) {
-        A._Future__chainCoreFutureAsync(value, this);
-        return;
-      }
-      this._chainForeignFuture$1(value);
+      A._Future__chainCoreFuture(this.$ti._eval$1("Future<1>")._as(value), this, false);
+      return;
     },
-    _asyncCompleteError$2(error, stackTrace) {
-      type$.StackTrace._as(stackTrace);
+    _asyncCompleteErrorObject$1(error) {
       this._async$_state ^= 2;
-      this._zone.scheduleMicrotask$1(new A._Future__asyncCompleteError_closure(this, error, stackTrace));
+      this._zone.scheduleMicrotask$1(new A._Future__asyncCompleteErrorObject_closure(this, error));
     },
     $isFuture: 1
   };
@@ -9958,36 +9304,9 @@
     },
     $signature: 0
   };
-  A._Future__chainForeignFuture_closure.prototype = {
-    call$1(value) {
-      var error, stackTrace, exception,
-        t1 = this.$this;
-      t1._async$_state ^= 2;
-      try {
-        t1._completeWithValue$1(t1.$ti._precomputed1._as(value));
-      } catch (exception) {
-        error = A.unwrapException(exception);
-        stackTrace = A.getTraceFromException(exception);
-        t1._completeError$2(error, stackTrace);
-      }
-    },
-    $signature: 8
-  };
-  A._Future__chainForeignFuture_closure0.prototype = {
-    call$2(error, stackTrace) {
-      this.$this._completeError$2(type$.Object._as(error), type$.StackTrace._as(stackTrace));
-    },
-    $signature: 27
-  };
-  A._Future__chainForeignFuture_closure1.prototype = {
-    call$0() {
-      this.$this._completeError$2(this.e, this.s);
-    },
-    $signature: 0
-  };
-  A._Future__chainCoreFutureAsync_closure.prototype = {
+  A._Future__chainCoreFuture_closure.prototype = {
     call$0() {
-      A._Future__chainCoreFutureSync(this._box_0.source, this.target);
+      A._Future__chainCoreFuture(this._box_0.source, this.target, true);
     },
     $signature: 0
   };
@@ -9997,15 +9316,15 @@
     },
     $signature: 0
   };
-  A._Future__asyncCompleteError_closure.prototype = {
+  A._Future__asyncCompleteErrorObject_closure.prototype = {
     call$0() {
-      this.$this._completeError$2(this.error, this.stackTrace);
+      this.$this._completeErrorObject$1(this.error);
     },
     $signature: 0
   };
   A._Future__propagateToListeners_handleWhenCompleteCallback.prototype = {
     call$0() {
-      var e, s, t1, exception, t2, t3, originalSource, _this = this, completeResult = null;
+      var e, s, t1, exception, t2, t3, originalSource, joinedResult, _this = this, completeResult = null;
       try {
         t1 = _this._box_0.listener;
         completeResult = t1.result._zone.run$1$1(type$.dynamic_Function._as(t1.callback), type$.dynamic);
@@ -10037,18 +9356,28 @@
       }
       if (completeResult instanceof A._Future) {
         originalSource = _this._box_1.source;
+        joinedResult = new A._Future(originalSource._zone, originalSource.$ti);
+        completeResult.then$1$2$onError(new A._Future__propagateToListeners_handleWhenCompleteCallback_closure(joinedResult, originalSource), new A._Future__propagateToListeners_handleWhenCompleteCallback_closure0(joinedResult), type$.void);
         t1 = _this._box_0;
-        t1.listenerValueOrError = completeResult.then$1$1(new A._Future__propagateToListeners_handleWhenCompleteCallback_closure(originalSource), type$.dynamic);
+        t1.listenerValueOrError = joinedResult;
         t1.listenerHasError = false;
       }
     },
     $signature: 0
   };
   A._Future__propagateToListeners_handleWhenCompleteCallback_closure.prototype = {
-    call$1(_) {
-      return this.originalSource;
+    call$1(__wc0_formal) {
+      this.joinedResult._completeWithResultOf$1(this.originalSource);
     },
-    $signature: 28
+    $signature: 8
+  };
+  A._Future__propagateToListeners_handleWhenCompleteCallback_closure0.prototype = {
+    call$2(e, s) {
+      type$.Object._as(e);
+      type$.StackTrace._as(s);
+      this.joinedResult._completeErrorObject$1(new A.AsyncError(e, s));
+    },
+    $signature: 54
   };
   A._Future__propagateToListeners_handleValueCallback.prototype = {
     call$0() {
@@ -10121,14 +9450,14 @@
     }
   };
   A.Stream_pipe_closure.prototype = {
-    call$1(_) {
+    call$1(__wc0_formal) {
       return this.streamConsumer.close$0();
     },
-    $signature: 29
+    $signature: 23
   };
   A.Stream_length_closure.prototype = {
-    call$1(_) {
-      A._instanceType(this.$this)._eval$1("Stream.T")._as(_);
+    call$1(__wc0_formal) {
+      A._instanceType(this.$this)._eval$1("Stream.T")._as(__wc0_formal);
       ++this._box_0.count;
     },
     $signature() {
@@ -10246,8 +9575,7 @@
       t7 = onDone == null ? A.async___nullDoneHandler$closure() : onDone;
       subscription = new A._ControllerSubscription(_this, t5, t6, t2.registerCallback$1$1(t7, type$.void), t2, t3 | t4, t1._eval$1("_ControllerSubscription<1>"));
       pendingEvents = _this.get$_pendingEvents();
-      t4 = _this._async$_state |= 1;
-      if ((t4 & 8) !== 0) {
+      if (((_this._async$_state |= 1) & 8) !== 0) {
         addState = t1._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData);
         addState._varData = subscription;
         addState.addSubscription.resume$0();
@@ -10258,7 +9586,7 @@
       return subscription;
     },
     _recordCancel$1(subscription) {
-      var result, onCancel, cancelResult, e, s, exception, result0, _this = this,
+      var result, onCancel, cancelResult, e, s, exception, result0, t2, _this = this,
         t1 = A._instanceType(_this);
       t1._eval$1("StreamSubscription<1>")._as(subscription);
       result = null;
@@ -10277,7 +9605,9 @@
             e = A.unwrapException(exception);
             s = A.getTraceFromException(exception);
             result0 = new A._Future($.Zone__current, type$._Future_void);
-            result0._asyncCompleteError$2(e, s);
+            t1 = type$.Object._as(e);
+            t2 = type$.StackTrace._as(s);
+            result0._asyncCompleteErrorObject$1(new A.AsyncError(t1, t2));
             result = result0;
           }
         else
@@ -10374,7 +9704,7 @@
       A._instanceType(_this)._eval$1("_PendingEvents<_BufferingStreamSubscription.T>?")._as(pendingEvents);
       if (pendingEvents == null)
         return;
-      _this.set$_pending(pendingEvents);
+      _this._pending = pendingEvents;
       if (pendingEvents.lastPendingEvent != null) {
         _this._async$_state = (_this._async$_state | 128) >>> 0;
         pendingEvents.schedule$1(_this);
@@ -10382,7 +9712,7 @@
     },
     onData$1(handleData) {
       var t1 = A._instanceType(this);
-      this.set$_onData(A._BufferingStreamSubscription__registerDataHandler(this._zone, t1._eval$1("~(_BufferingStreamSubscription.T)?")._as(handleData), t1._eval$1("_BufferingStreamSubscription.T")));
+      this._onData = A._BufferingStreamSubscription__registerDataHandler(this._zone, t1._eval$1("~(_BufferingStreamSubscription.T)?")._as(handleData), t1._eval$1("_BufferingStreamSubscription.T"));
     },
     onError$1(handleError) {
       var _this = this,
@@ -10411,7 +9741,7 @@
           t2._async$_state = 3;
       }
       if ((t1 & 64) === 0)
-        _this.set$_pending(null);
+        _this._pending = null;
       _this._cancelFuture = _this._onCancel$0();
     },
     _add$1(data) {
@@ -10460,10 +9790,8 @@
     _addPending$1($event) {
       var t1, _this = this,
         pending = _this._pending;
-      if (pending == null) {
-        pending = new A._PendingEvents(A._instanceType(_this)._eval$1("_PendingEvents<_BufferingStreamSubscription.T>"));
-        _this.set$_pending(pending);
-      }
+      if (pending == null)
+        pending = _this._pending = new A._PendingEvents(A._instanceType(_this)._eval$1("_PendingEvents<_BufferingStreamSubscription.T>"));
       pending.add$1(0, $event);
       t1 = _this._async$_state;
       if ((t1 & 128) === 0) {
@@ -10539,7 +9867,7 @@
       }
       for (; true; wasInputPaused = isInputPaused) {
         if ((t1 & 8) !== 0) {
-          _this.set$_pending(null);
+          _this._pending = null;
           return;
         }
         isInputPaused = (t1 & 4) !== 0;
@@ -10556,12 +9884,6 @@
       if ((t1 & 128) !== 0 && t1 < 256)
         _this._pending.schedule$1(_this);
     },
-    set$_onData(_onData) {
-      this._onData = A._instanceType(this)._eval$1("~(_BufferingStreamSubscription.T)")._as(_onData);
-    },
-    set$_pending(_pending) {
-      this._pending = A._instanceType(this)._eval$1("_PendingEvents<_BufferingStreamSubscription.T>?")._as(_pending);
-    },
     $isStreamSubscription: 1,
     $is_EventDispatch: 1
   };
@@ -10642,7 +9964,7 @@
     get$next() {
       return null;
     },
-    set$next(_) {
+    set$next(__wc0_formal) {
       throw A.wrapException(A.StateError$("No events after a done."));
     },
     $is_DelayedEvent: 1
@@ -10698,7 +10020,7 @@
     },
     cancel$0() {
       this._async$_state = -1;
-      this.set$_onDone(null);
+      this._onDone = null;
       return $.$get$Future__nullFuture();
     },
     _onMicrotask$0() {
@@ -10708,15 +10030,12 @@
         _this._async$_state = -1;
         _0_0 = _this._onDone;
         if (_0_0 != null) {
-          _this.set$_onDone(null);
+          _this._onDone = null;
           _this._zone.runGuarded$1(_0_0);
         }
       } else
         _this._async$_state = unscheduledState;
     },
-    set$_onDone(_onDone) {
-      this._onDone = type$.nullable_void_Function._as(_onDone);
-    },
     $isStreamSubscription: 1
   };
   A._EmptyStream.prototype = {
@@ -10729,7 +10048,7 @@
       t1 = new A._DoneStreamSubscription(t2, t1._eval$1("_DoneStreamSubscription<1>"));
       A.scheduleMicrotask(t1.get$_onMicrotask());
       if (onDone != null)
-        t1.set$_onDone(t2.registerCallback$1$1(onDone, type$.void));
+        t1._onDone = t2.registerCallback$1$1(onDone, type$.void);
       return t1;
     },
     listen$1(onData) {
@@ -10908,9 +10227,6 @@
       t1 = implementation.zone;
       return implementation.$function.call$5(t1, t1.get$_parentDelegate(), this, duration, f);
     },
-    set$_handleUncaughtError(_handleUncaughtError) {
-      this._handleUncaughtError = type$._ZoneFunction_of_void_Function_Zone_ZoneDelegate_Zone_Object_StackTrace._as(_handleUncaughtError);
-    },
     get$_run() {
       return this._run;
     },
@@ -11010,10 +10326,10 @@
       return B._ZoneFunction__RootZone__rootRegisterCallback;
     },
     get$_registerUnaryCallback() {
-      return B._ZoneFunction_QOa;
+      return B._ZoneFunction_Xkh;
     },
     get$_registerBinaryCallback() {
-      return B._ZoneFunction_qxw;
+      return B._ZoneFunction_e9o;
     },
     get$_errorCallback() {
       return B._ZoneFunction__RootZone__rootErrorCallback;
@@ -11025,7 +10341,7 @@
       return B._ZoneFunction__RootZone__rootCreateTimer;
     },
     get$_createPeriodicTimer() {
-      return B._ZoneFunction_kWM;
+      return B._ZoneFunction_PAY;
     },
     get$_print() {
       return B._ZoneFunction__RootZone__rootPrint;
@@ -11034,7 +10350,7 @@
       return B._ZoneFunction__RootZone__rootFork;
     },
     get$_handleUncaughtError() {
-      return B._ZoneFunction_NIe;
+      return B._ZoneFunction_KjJ;
     },
     get$parent() {
       return null;
@@ -11209,7 +10525,7 @@
           t2._processUncaughtError$3(zone, type$.Object._as(e), t1._as(s));
       }
     },
-    $signature: 35
+    $signature: 28
   };
   A._HashMap.prototype = {
     get$length(_) {
@@ -11428,17 +10744,14 @@
       if (keys !== t1._keys)
         throw A.wrapException(A.ConcurrentModificationError$(t1));
       else if (offset >= keys.length) {
-        _this.set$_collection$_current(null);
+        _this._collection$_current = null;
         return false;
       } else {
-        _this.set$_collection$_current(keys[offset]);
+        _this._collection$_current = keys[offset];
         _this._offset = offset + 1;
         return true;
       }
     },
-    set$_collection$_current(_current) {
-      this._collection$_current = this.$ti._eval$1("1?")._as(_current);
-    },
     $isIterator: 1
   };
   A._LinkedHashSet.prototype = {
@@ -11599,17 +10912,14 @@
       if (_this._collection$_modifications !== t1._collection$_modifications)
         throw A.wrapException(A.ConcurrentModificationError$(t1));
       else if (cell == null) {
-        _this.set$_collection$_current(null);
+        _this._collection$_current = null;
         return false;
       } else {
-        _this.set$_collection$_current(_this.$ti._eval$1("1?")._as(cell._element));
+        _this._collection$_current = _this.$ti._eval$1("1?")._as(cell._element);
         _this._collection$_cell = cell._collection$_next;
         return true;
       }
     },
-    set$_collection$_current(_current) {
-      this._collection$_current = this.$ti._eval$1("1?")._as(_current);
-    },
     $isIterator: 1
   };
   A.ListBase.prototype = {
@@ -11640,16 +10950,6 @@
     take$1(receiver, count) {
       return A.SubListIterable$(receiver, 0, A.checkNotNullable(count, "count", type$.int), A.instanceType(receiver)._eval$1("ListBase.E"));
     },
-    cast$1$0(receiver, $R) {
-      return new A.CastList(receiver, A.instanceType(receiver)._eval$1("@<ListBase.E>")._bind$1($R)._eval$1("CastList<1,2>"));
-    },
-    fillRange$3(receiver, start, end, fill) {
-      var i;
-      A.instanceType(receiver)._eval$1("ListBase.E?")._as(fill);
-      A.RangeError_checkValidRange(start, end, this.get$length(receiver));
-      for (i = start; i < end; ++i)
-        this.$indexSet(receiver, i, fill);
-    },
     toString$0(receiver) {
       return A.Iterable_iterableToFullString(receiver, "[", "]");
     },
@@ -11693,8 +10993,7 @@
       t1.first = false;
       t1 = this.result;
       t2 = A.S(k);
-      t2 = t1._contents += t2;
-      t1._contents = t2 + ": ";
+      t1._contents = (t1._contents += t2) + ": ";
       t2 = A.S(v);
       t1._contents += t2;
     },
@@ -11702,7 +11001,7 @@
   };
   A._UnmodifiableMapMixin.prototype = {
     $indexSet(_, key, value) {
-      var t1 = A._instanceType(this);
+      var t1 = this.$ti;
       t1._precomputed1._as(key);
       t1._rest[1]._as(value);
       throw A.wrapException(A.UnsupportedError$("Cannot modify unmodifiable map"));
@@ -11713,14 +11012,14 @@
       return this._collection$_map.$index(0, key);
     },
     $indexSet(_, key, value) {
-      var t1 = A._instanceType(this);
+      var t1 = this.$ti;
       this._collection$_map.$indexSet(0, t1._precomputed1._as(key), t1._rest[1]._as(value));
     },
     containsKey$1(key) {
       return this._collection$_map.containsKey$1(key);
     },
     forEach$1(_, action) {
-      this._collection$_map.forEach$1(0, A._instanceType(this)._eval$1("~(1,2)")._as(action));
+      this._collection$_map.forEach$1(0, this.$ti._eval$1("~(1,2)")._as(action));
     },
     get$isEmpty(_) {
       var t1 = this._collection$_map;
@@ -11800,7 +11099,7 @@
     get$keys() {
       if (this._processed == null) {
         var t1 = this._data;
-        return new A.LinkedHashMapKeyIterable(t1, A._instanceType(t1)._eval$1("LinkedHashMapKeyIterable<1>"));
+        return new A.LinkedHashMapKeysIterable(t1, A._instanceType(t1)._eval$1("LinkedHashMapKeysIterable<1>"));
       }
       return new A._JsonMapKeyIterable(this);
     },
@@ -12551,8 +11850,7 @@
                     break;
                   default:
                     t3 = A.Primitives_stringFromCharCode(_65533);
-                    t3 = buffer._contents += t3;
-                    buffer._contents = t3 + A.Primitives_stringFromCharCode(_65533);
+                    buffer._contents = (buffer._contents += t3) + A.Primitives_stringFromCharCode(_65533);
                     break;
                 }
               else {
@@ -12622,22 +11920,6 @@
       return t1.charCodeAt(0) == 0 ? t1 : t1;
     }
   };
-  A.NoSuchMethodError_toString_closure.prototype = {
-    call$2(key, value) {
-      var t1, t2, t3;
-      type$.Symbol._as(key);
-      t1 = this.sb;
-      t2 = this._box_0;
-      t3 = t1._contents += t2.comma;
-      t3 += key._name;
-      t1._contents = t3;
-      t1._contents = t3 + ": ";
-      t3 = A.Error_safeToString(value);
-      t1._contents += t3;
-      t2.comma = ", ";
-    },
-    $signature: 39
-  };
   A.DateTime.prototype = {
     $eq(_, other) {
       var t1;
@@ -12764,25 +12046,6 @@
       return this.length;
     }
   };
-  A.NoSuchMethodError.prototype = {
-    toString$0(_) {
-      var $arguments, t1, _i, t2, t3, argument, receiverText, actualParameters, _this = this, _box_0 = {},
-        sb = new A.StringBuffer("");
-      _box_0.comma = "";
-      $arguments = _this._core$_arguments;
-      for (t1 = $arguments.length, _i = 0, t2 = "", t3 = ""; _i < t1; ++_i, t3 = ", ") {
-        argument = $arguments[_i];
-        sb._contents = t2 + t3;
-        t2 = A.Error_safeToString(argument);
-        t2 = sb._contents += t2;
-        _box_0.comma = ", ";
-      }
-      _this._namedArguments.forEach$1(0, new A.NoSuchMethodError_toString_closure(_box_0, sb));
-      receiverText = A.Error_safeToString(_this._core$_receiver);
-      actualParameters = sb.toString$0(0);
-      return "NoSuchMethodError: method not found: '" + _this._core$_memberName._name + "'\nReceiver: " + receiverText + "\nArguments: [" + actualParameters + "]";
-    }
-  };
   A.UnsupportedError.prototype = {
     toString$0(_) {
       return "Unsupported operation: " + this.message;
@@ -12903,15 +12166,20 @@
     $isException: 1
   };
   A.Iterable.prototype = {
-    cast$1$0(_, $R) {
-      return A.CastIterable_CastIterable(this, A._instanceType(this)._eval$1("Iterable.E"), $R);
-    },
     map$1$1(_, toElement, $T) {
       var t1 = A._instanceType(this);
       return A.MappedIterable_MappedIterable(this, t1._bind$1($T)._eval$1("1(Iterable.E)")._as(toElement), t1._eval$1("Iterable.E"), $T);
     },
     toList$1$growable(_, growable) {
-      return A.List_List$of(this, growable, A._instanceType(this)._eval$1("Iterable.E"));
+      var t1 = A._instanceType(this)._eval$1("Iterable.E");
+      if (growable)
+        t1 = A.List_List$_of(this, t1);
+      else {
+        t1 = A.List_List$_of(this, t1);
+        t1.$flags = 1;
+        t1 = t1;
+      }
+      return t1;
     },
     toList$0(_) {
       return this.toList$1$growable(0, true);
@@ -12988,9 +12256,6 @@
     toString$0(_) {
       return "Instance of '" + A.Primitives_objectTypeName(this) + "'";
     },
-    noSuchMethod$1(_, invocation) {
-      throw A.wrapException(A.NoSuchMethodError_NoSuchMethodError$withInvocation(this, type$.Invocation._as(invocation)));
-    },
     get$runtimeType(_) {
       return A.getRuntimeTypeOfDartObject(this);
     },
@@ -13039,19 +12304,19 @@
       }
       return map;
     },
-    $signature: 23
+    $signature: 33
   };
   A.Uri__parseIPv4Address_error.prototype = {
     call$2(msg, position) {
       throw A.wrapException(A.FormatException$("Illegal IPv4 address, " + msg, this.host, position));
     },
-    $signature: 44
+    $signature: 22
   };
   A.Uri_parseIPv6Address_error.prototype = {
     call$2(msg, position) {
       throw A.wrapException(A.FormatException$("Illegal IPv6 address, " + msg, this.host, position));
     },
-    $signature: 58
+    $signature: 38
   };
   A.Uri_parseIPv6Address_parseHex.prototype = {
     call$2(start, end) {
@@ -13063,7 +12328,7 @@
         this.error.call$2("each part must be in the range of `0x0..0xFFFF`", start);
       return value;
     },
-    $signature: 59
+    $signature: 39
   };
   A._Uri.prototype = {
     get$_text() {
@@ -13114,8 +12379,7 @@
           pathToSplit = B.JSString_methods.substring$1(pathToSplit, 1);
         result = pathToSplit.length === 0 ? B.List_empty : A.List_List$unmodifiable(new A.MappedListIterable(A._setArrayType(pathToSplit.split("/"), type$.JSArray_String), type$.dynamic_Function_String._as(A.core_Uri_decodeComponent$closure()), type$.MappedListIterable_String_dynamic), type$.String);
         _this.___Uri_pathSegments_FI !== $ && A.throwLateFieldADI("pathSegments");
-        _this.set$___Uri_pathSegments_FI(result);
-        value = result;
+        value = _this.___Uri_pathSegments_FI = result;
       }
       return value;
     },
@@ -13131,14 +12395,13 @@
       return value;
     },
     get$queryParameters() {
-      var t1, result, _this = this,
+      var t1, _this = this,
         value = _this.___Uri_queryParameters_FI;
       if (value === $) {
         t1 = _this._query;
-        result = new A.UnmodifiableMapView(A.Uri_splitQueryString(t1 == null ? "" : t1), type$.UnmodifiableMapView_String_String);
+        t1 = A.Uri_splitQueryString(t1 == null ? "" : t1);
         _this.___Uri_queryParameters_FI !== $ && A.throwLateFieldADI("queryParameters");
-        _this.set$___Uri_queryParameters_FI(result);
-        value = result;
+        value = _this.___Uri_queryParameters_FI = new A.UnmodifiableMapView(t1, type$.UnmodifiableMapView_String_String);
       }
       return value;
     },
@@ -13352,12 +12615,6 @@
                   }
       return t1;
     },
-    set$___Uri_pathSegments_FI(___Uri_pathSegments_FI) {
-      this.___Uri_pathSegments_FI = type$.List_String._as(___Uri_pathSegments_FI);
-    },
-    set$___Uri_queryParameters_FI(___Uri_queryParameters_FI) {
-      this.___Uri_queryParameters_FI = type$.Map_String_String._as(___Uri_queryParameters_FI);
-    },
     $isUri: 1,
     get$scheme() {
       return this.scheme;
@@ -13368,7 +12625,7 @@
   };
   A._Uri__makePath_closure.prototype = {
     call$1(s) {
-      return A._Uri__uriEncode(B.List_M2I0, A._asString(s), B.C_Utf8Codec, false);
+      return A._Uri__uriEncode(64, A._asString(s), B.C_Utf8Codec, false);
     },
     $signature: 16
   };
@@ -13385,11 +12642,11 @@
         queryIndex = B.JSString_methods.indexOf$2(t2, "?", t1);
         end = t2.length;
         if (queryIndex >= 0) {
-          query = A._Uri__normalizeOrSubstring(t2, queryIndex + 1, end, B.List_42A, false, false);
+          query = A._Uri__normalizeOrSubstring(t2, queryIndex + 1, end, 256, false, false);
           end = queryIndex;
         } else
           query = _null;
-        t1 = _this._uriCache = new A._DataUri("data", "", _null, _null, A._Uri__normalizeOrSubstring(t2, t1, end, B.List_M2I, false, false), query, _null);
+        t1 = _this._uriCache = new A._DataUri("data", "", _null, _null, A._Uri__normalizeOrSubstring(t2, t1, end, 128, false, false), query, _null);
       }
       return t1;
     },
@@ -13402,51 +12659,6 @@
       return t1[0] === -1 ? "data:" + t2 : t2;
     }
   };
-  A._createTables_build.prototype = {
-    call$2(state, defaultTransition) {
-      var t1 = this.tables;
-      if (!(state < t1.length))
-        return A.ioore(t1, state);
-      t1 = t1[state];
-      B.NativeUint8List_methods.fillRange$3(t1, 0, 96, defaultTransition);
-      return t1;
-    },
-    $signature: 25
-  };
-  A._createTables_setChars.prototype = {
-    call$3(target, chars, transition) {
-      var t1, t2, i, t3;
-      for (t1 = chars.length, t2 = target.$flags | 0, i = 0; i < t1; ++i) {
-        t3 = chars.charCodeAt(i) ^ 96;
-        t2 & 2 && A.throwUnsupportedOperation(target);
-        if (!(t3 < 96))
-          return A.ioore(target, t3);
-        target[t3] = transition;
-      }
-    },
-    $signature: 17
-  };
-  A._createTables_setRange.prototype = {
-    call$3(target, range, transition) {
-      var i, n, t2,
-        t1 = range.length;
-      if (0 >= t1)
-        return A.ioore(range, 0);
-      i = range.charCodeAt(0);
-      if (1 >= t1)
-        return A.ioore(range, 1);
-      n = range.charCodeAt(1);
-      t1 = target.$flags | 0;
-      for (; i <= n; ++i) {
-        t2 = (i ^ 96) >>> 0;
-        t1 & 2 && A.throwUnsupportedOperation(target);
-        if (!(t2 < 96))
-          return A.ioore(target, t2);
-        target[t2] = transition;
-      }
-    },
-    $signature: 17
-  };
   A._SimpleUri.prototype = {
     get$hasAuthority() {
       return this._hostStart > 0;
@@ -13724,7 +12936,7 @@
       t1 = this._convertedObjects;
       if (t1.containsKey$1(o))
         return t1.$index(0, o);
-      if (type$.Map_of_nullable_Object_and_nullable_Object._is(o)) {
+      if (type$.Map_dynamic_dynamic._is(o)) {
         convertedMap = {};
         t1.$indexSet(0, o, convertedMap);
         for (t1 = o.get$keys(), t1 = t1.get$iterator(t1); t1.moveNext$0();) {
@@ -13732,7 +12944,7 @@
           convertedMap[key] = this.call$1(o.$index(0, key));
         }
         return convertedMap;
-      } else if (type$.Iterable_nullable_Object._is(o)) {
+      } else if (type$.Iterable_dynamic._is(o)) {
         convertedList = [];
         t1.$indexSet(0, o, convertedList);
         B.JSArray_methods.addAll$1(convertedList, J.map$1$1$ax(o, this, type$.dynamic));
@@ -13740,7 +12952,7 @@
       } else
         return o;
     },
-    $signature: 18
+    $signature: 17
   };
   A.promiseToFuture_closure.prototype = {
     call$1(r) {
@@ -13806,7 +13018,7 @@
       }
       return o;
     },
-    $signature: 18
+    $signature: 17
   };
   A.NullRejectionException.prototype = {
     toString$0(_) {
@@ -13903,7 +13115,8 @@
         t1 = parsed.parts,
         t2 = A._arrayInstanceType(t1),
         t3 = t2._eval$1("WhereIterable<1>");
-      parsed.set$parts(A.List_List$of(new A.WhereIterable(t1, t2._eval$1("bool(1)")._as(new A.Context_split_closure()), t3), true, t3._eval$1("Iterable.E")));
+      t1 = A.List_List$_of(new A.WhereIterable(t1, t2._eval$1("bool(1)")._as(new A.Context_split_closure()), t3), t3._eval$1("Iterable.E"));
+      parsed.set$parts(t1);
       t1 = parsed.root;
       if (t1 != null)
         B.JSArray_methods.insert$2(parsed.parts, 0, t1);
@@ -14099,7 +13312,7 @@
       A._asStringQ(arg);
       return arg == null ? "null" : '"' + arg + '"';
     },
-    $signature: 30
+    $signature: 25
   };
   A.InternalStyle.prototype = {
     getRoot$1(path) {
@@ -14179,17 +13392,15 @@
         B.JSArray_methods.insertAll$2(newParts, 0, A.List_List$filled(leadingDoubles, "..", false, type$.String));
       if (newParts.length === 0 && _this.root == null)
         B.JSArray_methods.add$1(newParts, ".");
-      _this.set$parts(newParts);
+      _this.parts = newParts;
       t1 = _this.style;
-      _this.set$separators(A.List_List$filled(newParts.length + 1, t1.get$separator(), true, type$.String));
+      _this.separators = A.List_List$filled(newParts.length + 1, t1.get$separator(), true, type$.String);
       t2 = _this.root;
       if (t2 == null || newParts.length === 0 || !t1.needsSeparator$1(t2))
         B.JSArray_methods.$indexSet(_this.separators, 0, "");
       t2 = _this.root;
-      if (t2 != null && t1 === $.$get$Style_windows()) {
-        t2.toString;
+      if (t2 != null && t1 === $.$get$Style_windows())
         _this.root = A.stringReplaceAllUnchecked(t2, "/", "\\");
-      }
       _this.removeTrailingSeparators$0();
     },
     toString$0(_) {
@@ -14206,9 +13417,6 @@
     },
     set$parts(parts) {
       this.parts = type$.List_String._as(parts);
-    },
-    set$separators(separators) {
-      this.separators = type$.List_String._as(separators);
     }
   };
   A.PathException.prototype = {
@@ -14508,7 +13716,7 @@
     toString$0(_) {
       var t1 = this.traces,
         t2 = A._arrayInstanceType(t1);
-      return new A.MappedListIterable(t1, t2._eval$1("String(1)")._as(new A.Chain_toString_closure(new A.MappedListIterable(t1, t2._eval$1("int(1)")._as(new A.Chain_toString_closure0()), t2._eval$1("MappedListIterable<1,int>")).fold$1$2(0, 0, B.CONSTANT, type$.int))), t2._eval$1("MappedListIterable<1,String>")).join$1(0, string$.______);
+      return new A.MappedListIterable(t1, t2._eval$1("String(1)")._as(new A.Chain_toString_closure(new A.MappedListIterable(t1, t2._eval$1("int(1)")._as(new A.Chain_toString_closure0()), t2._eval$1("MappedListIterable<1,int>")).fold$1$2(0, 0, B.CONSTANT, type$.int))), t2._eval$1("MappedListIterable<1,String>")).join$1(0, string$.x3d_____);
     },
     $isStackTrace: 1
   };
@@ -14522,7 +13730,7 @@
     call$1(trace) {
       return type$.Trace._as(trace).get$frames();
     },
-    $signature: 31
+    $signature: 26
   };
   A.Chain_toString_closure0.prototype = {
     call$1(trace) {
@@ -14530,13 +13738,13 @@
         t2 = A._arrayInstanceType(t1);
       return new A.MappedListIterable(t1, t2._eval$1("int(1)")._as(new A.Chain_toString__closure0()), t2._eval$1("MappedListIterable<1,int>")).fold$1$2(0, 0, B.CONSTANT, type$.int);
     },
-    $signature: 32
+    $signature: 27
   };
   A.Chain_toString__closure0.prototype = {
     call$1(frame) {
       return type$.Frame._as(frame).get$location().length;
     },
-    $signature: 19
+    $signature: 18
   };
   A.Chain_toString_closure.prototype = {
     call$1(trace) {
@@ -14544,14 +13752,14 @@
         t2 = A._arrayInstanceType(t1);
       return new A.MappedListIterable(t1, t2._eval$1("String(1)")._as(new A.Chain_toString__closure(this.longest)), t2._eval$1("MappedListIterable<1,String>")).join$0(0);
     },
-    $signature: 34
+    $signature: 29
   };
   A.Chain_toString__closure.prototype = {
     call$1(frame) {
       type$.Frame._as(frame);
       return B.JSString_methods.padRight$1(frame.get$location(), this.longest) + "  " + A.S(frame.get$member()) + "\n";
     },
-    $signature: 20
+    $signature: 19
   };
   A.Frame.prototype = {
     get$isCore() {
@@ -14714,7 +13922,7 @@
       columnMatch = t1[3];
       return new A.Frame(uri, line, columnMatch != null ? A.int_parse(columnMatch, _null) : _null, member);
     },
-    $signature: 37
+    $signature: 32
   };
   A.Frame_Frame$_parseFirefoxEval_closure.prototype = {
     call$0() {
@@ -14899,7 +14107,7 @@
     call$0() {
       return this.$this.get$_lazy_trace$_trace().get$terse();
     },
-    $signature: 21
+    $signature: 20
   };
   A.Trace.prototype = {
     get$terse() {
@@ -14916,14 +14124,15 @@
         t3 = t1.__internal$_current;
         if (t3 == null)
           t3 = t2._as(t3);
-        if (t3 instanceof A.UnparsedFrame || !A.boolConversionCheck(_box_0.predicate.call$1(t3)))
+        if (t3 instanceof A.UnparsedFrame || !_box_0.predicate.call$1(t3))
           B.JSArray_methods.add$1(newFrames, t3);
-        else if (newFrames.length === 0 || !A.boolConversionCheck(_box_0.predicate.call$1(B.JSArray_methods.get$last(newFrames))))
+        else if (newFrames.length === 0 || !_box_0.predicate.call$1(B.JSArray_methods.get$last(newFrames)))
           B.JSArray_methods.add$1(newFrames, new A.Frame(t3.get$uri(), t3.get$line(), t3.get$column(), t3.get$member()));
       }
-      t1 = type$.MappedListIterable_Frame_Frame;
-      newFrames = A.List_List$of(new A.MappedListIterable(newFrames, type$.Frame_Function_Frame._as(new A.Trace_foldFrames_closure0(_box_0)), t1), true, t1._eval$1("ListIterable.E"));
-      if (newFrames.length > 1 && A.boolConversionCheck(_box_0.predicate.call$1(B.JSArray_methods.get$first(newFrames))))
+      t1 = type$.Frame_Function_Frame._as(new A.Trace_foldFrames_closure0(_box_0));
+      t2 = type$.MappedListIterable_Frame_Frame;
+      newFrames = A.List_List$_of(new A.MappedListIterable(newFrames, t1, t2), t2._eval$1("ListIterable.E"));
+      if (newFrames.length > 1 && _box_0.predicate.call$1(B.JSArray_methods.get$first(newFrames)))
         B.JSArray_methods.removeAt$1(newFrames, 0);
       return A.Trace$(new A.ReversedListIterable(newFrames, A._arrayInstanceType(newFrames)._eval$1("ReversedListIterable<1>")), this.original._stackTrace);
     },
@@ -14941,7 +14150,7 @@
     call$0() {
       return A.Trace_Trace$parse(this.trace.toString$0(0));
     },
-    $signature: 21
+    $signature: 20
   };
   A.Trace__parseVM_closure.prototype = {
     call$1(line) {
@@ -14978,12 +14187,12 @@
     call$1(_) {
       return false;
     },
-    $signature: 22
+    $signature: 21
   };
   A.Trace_foldFrames_closure.prototype = {
     call$1(frame) {
       var t1;
-      if (A.boolConversionCheck(this.oldPredicate.call$1(frame)))
+      if (this.oldPredicate.call$1(frame))
         return true;
       if (frame.get$isCore())
         return true;
@@ -14995,25 +14204,25 @@
         return false;
       return frame.get$line() == null;
     },
-    $signature: 22
+    $signature: 21
   };
   A.Trace_foldFrames_closure0.prototype = {
     call$1(frame) {
       var t1, t2;
       type$.Frame._as(frame);
-      if (frame instanceof A.UnparsedFrame || !A.boolConversionCheck(this._box_0.predicate.call$1(frame)))
+      if (frame instanceof A.UnparsedFrame || !this._box_0.predicate.call$1(frame))
         return frame;
       t1 = frame.get$library();
       t2 = $.$get$_terseRegExp();
       return new A.Frame(A.Uri_parse(A.stringReplaceAllUnchecked(t1, t2, "")), null, null, frame.get$member());
     },
-    $signature: 60
+    $signature: 35
   };
   A.Trace_toString_closure0.prototype = {
     call$1(frame) {
       return type$.Frame._as(frame).get$location().length;
     },
-    $signature: 19
+    $signature: 18
   };
   A.Trace_toString_closure.prototype = {
     call$1(frame) {
@@ -15022,7 +14231,7 @@
         return frame.toString$0(0) + "\n";
       return B.JSString_methods.padRight$1(frame.get$location(), this.longest) + "  " + A.S(frame.get$member()) + "\n";
     },
-    $signature: 20
+    $signature: 19
   };
   A.UnparsedFrame.prototype = {
     toString$0(_) {
@@ -15058,12 +14267,12 @@
     GuaranteeChannel$3$allowSinkErrors(innerSink, allowSinkErrors, _box_0, $T) {
       var _this = this,
         t1 = _this.$ti,
-        t2 = t1._eval$1("_GuaranteeSink<1>")._as(new A._GuaranteeSink(innerSink, _this, new A._AsyncCompleter(new A._Future($.Zone__current, type$._Future_dynamic), type$._AsyncCompleter_dynamic), true, $T._eval$1("_GuaranteeSink<0>")));
+        t2 = t1._eval$1("_GuaranteeSink<1>")._as(new A._GuaranteeSink(innerSink, _this, new A._AsyncCompleter(new A._Future($.Zone__current, type$._Future_void), type$._AsyncCompleter_void), true, $T._eval$1("_GuaranteeSink<0>")));
       _this.__GuaranteeChannel__sink_F !== $ && A.throwLateFieldAI("_sink");
-      _this.set$__GuaranteeChannel__sink_F(t2);
+      _this.__GuaranteeChannel__sink_F = t2;
       t1 = t1._eval$1("StreamController<1>")._as(A.StreamController_StreamController(null, new A.GuaranteeChannel_closure(_box_0, _this, $T), true, $T));
       _this.__GuaranteeChannel__streamController_F !== $ && A.throwLateFieldAI("_streamController");
-      _this.set$__GuaranteeChannel__streamController_F(t1);
+      _this.__GuaranteeChannel__streamController_F = t1;
     },
     _onSinkDisconnected$0() {
       var subscription, t1;
@@ -15074,15 +14283,6 @@
       t1 = this.__GuaranteeChannel__streamController_F;
       t1 === $ && A.throwLateFieldNI("_streamController");
       t1.close$0();
-    },
-    set$__GuaranteeChannel__sink_F(__GuaranteeChannel__sink_F) {
-      this.__GuaranteeChannel__sink_F = this.$ti._eval$1("_GuaranteeSink<1>")._as(__GuaranteeChannel__sink_F);
-    },
-    set$__GuaranteeChannel__streamController_F(__GuaranteeChannel__streamController_F) {
-      this.__GuaranteeChannel__streamController_F = this.$ti._eval$1("StreamController<1>")._as(__GuaranteeChannel__streamController_F);
-    },
-    set$_subscription(_subscription) {
-      this._subscription = this.$ti._eval$1("StreamSubscription<1>?")._as(_subscription);
     }
   };
   A.GuaranteeChannel_closure.prototype = {
@@ -15094,7 +14294,7 @@
       t2 = this._box_0.innerStream;
       t3 = t1.__GuaranteeChannel__streamController_F;
       t3 === $ && A.throwLateFieldNI("_streamController");
-      t1.set$_subscription(t2.listen$3$onDone$onError(this.T._eval$1("~(0)")._as(t3.get$add(t3)), new A.GuaranteeChannel__closure(t1), t3.get$addError()));
+      t1._subscription = t2.listen$3$onDone$onError(this.T._eval$1("~(0)")._as(t3.get$add(t3)), new A.GuaranteeChannel__closure(t1), t3.get$addError());
     },
     $signature: 0
   };
@@ -15158,7 +14358,7 @@
       t2 = new A._SyncCompleter(new A._Future($.Zone__current, type$._Future_dynamic), type$._SyncCompleter_dynamic);
       _this._addStreamCompleter = t2;
       t3 = _this._inner;
-      _this.set$_addStreamSubscription(stream.listen$3$onDone$onError(t1._eval$1("~(1)")._as(t3.get$add(t3)), type$.void_Function_$opt_dynamic._as(t2.get$complete()), _this.get$_addError()));
+      _this._addStreamSubscription = stream.listen$3$onDone$onError(t1._eval$1("~(1)")._as(t3.get$add(t3)), type$.void_Function_$opt_dynamic._as(t2.get$complete()), _this.get$_addError());
       return _this._addStreamCompleter.future.then$1$1(new A._GuaranteeSink_addStream_closure(_this), type$.void);
     },
     close$0() {
@@ -15186,11 +14386,7 @@
       t2 = _this._addStreamCompleter;
       t2.toString;
       t2.complete$1(t1.cancel$0());
-      _this._addStreamCompleter = null;
-      _this.set$_addStreamSubscription(null);
-    },
-    set$_addStreamSubscription(_addStreamSubscription) {
-      this._addStreamSubscription = this.$ti._eval$1("StreamSubscription<1>?")._as(_addStreamSubscription);
+      _this._addStreamSubscription = _this._addStreamCompleter = null;
     },
     $isStreamConsumer: 1,
     $isStreamSink: 1
@@ -15198,8 +14394,7 @@
   A._GuaranteeSink_addStream_closure.prototype = {
     call$1(_) {
       var t1 = this.$this;
-      t1._addStreamCompleter = null;
-      t1.set$_addStreamSubscription(null);
+      t1._addStreamSubscription = t1._addStreamCompleter = null;
     },
     $signature: 8
   };
@@ -15232,7 +14427,7 @@
       if (_this._multi_channel$_inner == null) {
         t1 = _this.$ti;
         t2 = A.Future_Future$value(null, type$.dynamic);
-        return new A.VirtualChannel(_this, new A._EmptyStream(t1._eval$1("_EmptyStream<1>")), new A.NullStreamSink(t2, t1._eval$1("NullStreamSink<1>")), t1._eval$1("VirtualChannel<1>"));
+        return new A.VirtualChannel(_this, B.C__EmptyStream, new A.NullStreamSink(t2, t1._eval$1("NullStreamSink<1>")), t1._eval$1("VirtualChannel<1>"));
       }
       controller = A._Cell$named("controller");
       if (_this._pendingIds.remove$1(0, id)) {
@@ -15288,7 +14483,14 @@
       t1.close$0();
       _this._innerStreamSubscription._source.cancel$0();
       _this._multi_channel$_inner = null;
-      for (t1 = _this._controllers, t2 = t1.get$values(), t2 = A.List_List$of(t2, false, A._instanceType(t2)._eval$1("Iterable.E")), t3 = t2.length, _i = 0; _i < t3; ++_i) {
+      t1 = _this._controllers;
+      t2 = A._instanceType(t1)._eval$1("LinkedHashMapValuesIterable<2>");
+      t2 = A.List_List$_of(new A.LinkedHashMapValuesIterable(t1, t2), t2._eval$1("Iterable.E"));
+      t2.$flags = 1;
+      t2 = t2;
+      t3 = t2.length;
+      _i = 0;
+      for (; _i < t2.length; t2.length === t3 || (0, A.throwConcurrentModificationError)(t2), ++_i) {
         t4 = t2[_i].__StreamChannelController__local_F;
         t4 === $ && A.throwLateFieldNI("_local");
         t4 = t4.__GuaranteeChannel__sink_F;
@@ -15342,7 +14544,7 @@
         t1.close$0();
       }
     },
-    $signature: 41
+    $signature: 55
   };
   A._MultiChannel__closure.prototype = {
     call$0() {
@@ -15373,24 +14575,15 @@
     $signature: 0
   };
   A.VirtualChannel.prototype = {$isMultiChannel: 1};
-  A.StreamChannelController.prototype = {
-    set$__StreamChannelController__local_F(__StreamChannelController__local_F) {
-      this.__StreamChannelController__local_F = this.$ti._eval$1("StreamChannel<1>")._as(__StreamChannelController__local_F);
-    },
-    set$__StreamChannelController__foreign_F(__StreamChannelController__foreign_F) {
-      this.__StreamChannelController__foreign_F = this.$ti._eval$1("StreamChannel<1>")._as(__StreamChannelController__foreign_F);
-    }
-  };
+  A.StreamChannelController.prototype = {};
   A.StreamChannelMixin.prototype = {$isStreamChannel: 1};
-  A.MessagePortExtension_get_postMessage_closure.prototype = {
+  A.MessagePort_get_postMessage_closure.prototype = {
     call$1(message) {
-      var t2,
-        t1 = A._setArrayType([], type$.JSArray_Object);
-      if (message != null) {
-        t2 = A.jsify(message);
-        t1.push(t2 == null ? type$.Object._as(t2) : t2);
-      }
-      return A.callMethod(this._this, "postMessage", t1, type$.void);
+      var t1 = this._this,
+        t2 = [];
+      if (message != null)
+        t2.push(A.jsify(message));
+      return t1.postMessage.apply(t1, t2);
     },
     $signature: 3
   };
@@ -15405,17 +14598,17 @@
       t1 === $ && A.throwLateFieldNI("_streamController");
       new A._ControllerStream(t1, A._instanceType(t1)._eval$1("_ControllerStream<1>")).listen$1(new A.main__closure(serverChannel));
       A.Timer_Timer$periodic(B.Duration_1000000, new A.main__closure0(serverChannel));
-      play = type$.nullable_JavaScriptObject._as(self.document.querySelector("#play"));
+      t1 = init.G;
+      play = type$.nullable_JSObject._as(type$.JSObject._as(t1.document).querySelector("#play"));
       play.toString;
-      A.EventTargetExtension_addEventListener(play, "click", A.allowInterop(new A.main__closure1(serverChannel), type$.void_Function_JavaScriptObject));
-      t1 = type$.void_Function;
-      self.dartTest = type$.JavaScriptObject._as({resume: A.allowInterop(new A.main__closure2(serverChannel), t1), restartCurrent: A.allowInterop(new A.main__closure3(serverChannel), t1)});
+      A.EventTarget_addEventListener(play, "click", new A.main__closure1(serverChannel));
+      t1.dartTest = {resume: A._functionToJS0(new A.main__closure2(serverChannel)), restartCurrent: A._functionToJS0(new A.main__closure3(serverChannel))};
     },
     $signature: 2
   };
   A.main__closure.prototype = {
     call$1(message) {
-      var _0_4_isSet, _0_3, _0_15, _0_15_isSet, _0_14, _0_14_isSet, channel, url, id, t1, _0_4, _0_3_isSet, t2, _0_9, _0_12, suiteChannel, _0_4_isSet0, _null = null,
+      var _0_4_isSet, _0_3, _0_15, _0_15_isSet, _0_14, _0_14_isSet, channel, url, id, t1, _0_4, _0_3_isSet, t2, _0_9, _0_12, suiteChannel, _null = null,
         _s7_ = "command",
         _s2_ = "id";
       $label0$0: {
@@ -15489,7 +14682,7 @@
         }
         t1 = false;
         if (_0_4_isSet) {
-          if (_0_4 == null) {
+          if (_0_4 == null)
             if (_0_3_isSet)
               t2 = _0_3;
             else {
@@ -15497,19 +14690,19 @@
               t2 = _0_3;
               _0_3_isSet = true;
             }
-            A.boolConversionCheck(t2);
-          } else
+          else
             t2 = true;
           if (t2)
             t1 = "displayPause" === _0_4;
         }
         if (t1) {
-          type$.JavaScriptObject._as(type$.nullable_JavaScriptObject._as(self.document.body).classList).add("paused");
+          t1 = type$.JSObject;
+          t1._as(type$.nullable_JSObject._as(t1._as(init.G.document).body).classList).add("paused");
           break $label0$0;
         }
         t1 = false;
         if (_0_4_isSet) {
-          if (_0_4 == null) {
+          if (_0_4 == null)
             if (_0_3_isSet)
               t2 = _0_3;
             else {
@@ -15517,35 +14710,25 @@
               t2 = _0_3;
               _0_3_isSet = true;
             }
-            A.boolConversionCheck(t2);
-          } else
+          else
             t2 = true;
           if (t2)
             t1 = "resume" === _0_4;
-          _0_4_isSet0 = true;
-        } else
-          _0_4_isSet0 = _0_4_isSet;
+        }
         if (t1) {
-          type$.JavaScriptObject._as(type$.nullable_JavaScriptObject._as(self.document.body).classList).remove("paused");
+          t1 = type$.JSObject;
+          t1._as(type$.nullable_JSObject._as(t1._as(init.G.document).body).classList).remove("paused");
           break $label0$0;
         }
         id = _null;
         t1 = false;
         if (_0_4_isSet) {
-          if (_0_4_isSet0) {
-            t2 = _0_4;
-            _0_4_isSet = _0_4_isSet0;
-          } else {
-            _0_4 = message.$index(0, _s7_);
-            t2 = _0_4;
-            _0_4_isSet = true;
-          }
-          if (t2 == null)
-            t2 = A.boolConversionCheck(_0_3_isSet ? _0_3 : message.containsKey$1(_s7_));
+          if (_0_4 == null)
+            t2 = _0_3_isSet ? _0_3 : message.containsKey$1(_s7_);
           else
             t2 = true;
           if (t2)
-            if ("closeSuite" === (_0_4_isSet ? _0_4 : message.$index(0, _s7_))) {
+            if ("closeSuite" === _0_4) {
               if (_0_15_isSet)
                 t2 = _0_15;
               else {
@@ -15554,7 +14737,7 @@
                 _0_15_isSet = true;
               }
               if (t2 == null)
-                t1 = A.boolConversionCheck(_0_14_isSet ? _0_14 : message.containsKey$1(_s2_));
+                t1 = _0_14_isSet ? _0_14 : message.containsKey$1(_s2_);
               else
                 t1 = true;
               if (t1)
@@ -15563,18 +14746,19 @@
         }
         if (t1) {
           t1 = $._iframes.remove$1(0, id);
-          t2 = type$.nullable_JavaScriptObject;
+          t2 = type$.nullable_JSObject;
           if (t2._as(t1.parentNode) != null)
-            type$.JavaScriptObject._as(t2._as(t1.parentNode).removeChild(t1));
+            type$.JSObject._as(t2._as(t1.parentNode).removeChild(t1));
           t1 = $._subscriptions.remove$1(0, id);
           if (t1 != null)
             t1.cancel$0();
           t1 = $._domSubscriptions.remove$1(0, id);
           if (t1 != null)
-            A.EventTargetExtension_removeEventListener(t1.target, t1.type, t1.listener);
+            A.EventTarget_removeEventListener(t1.target, t1.type, t1.listener);
           break $label0$0;
         }
-        type$.JavaScriptObject._as(self.window.console).warn("Unhandled message from test runner: " + A.S(message));
+        t1 = type$.JSObject;
+        t1._as(t1._as(init.G.window).console).warn("Unhandled message from test runner: " + A.S(message));
       }
     },
     $signature: 5
@@ -15590,17 +14774,18 @@
       t2 = type$.String;
       return t1.add$1(0, A.LinkedHashMap_LinkedHashMap$_literal(["command", "ping"], t2, t2));
     },
-    $signature: 42
+    $signature: 37
   };
   A.main__closure1.prototype = {
     call$1(_) {
-      var t2,
-        t1 = type$.JavaScriptObject;
+      var t2, t3,
+        t1 = type$.JSObject;
       t1._as(_);
-      t2 = type$.nullable_JavaScriptObject;
-      if (!A._asBool(t1._as(t2._as(self.document.body).classList).contains("paused")))
+      t2 = init.G;
+      t3 = type$.nullable_JSObject;
+      if (!A._asBool(t1._as(t3._as(t1._as(t2.document).body).classList).contains("paused")))
         return;
-      t1._as(t2._as(self.document.body).classList).remove("paused");
+      t1._as(t3._as(t1._as(t2.document).body).classList).remove("paused");
       t1 = this.serverChannel._mainController.__StreamChannelController__foreign_F;
       t1 === $ && A.throwLateFieldNI("_foreign");
       t1 = t1.__GuaranteeChannel__sink_F;
@@ -15612,11 +14797,12 @@
   };
   A.main__closure2.prototype = {
     call$0() {
-      var t1 = type$.nullable_JavaScriptObject,
-        t2 = type$.JavaScriptObject;
-      if (!A._asBool(t2._as(t1._as(self.document.body).classList).contains("paused")))
+      var t1 = init.G,
+        t2 = type$.JSObject,
+        t3 = type$.nullable_JSObject;
+      if (!A._asBool(t2._as(t3._as(t2._as(t1.document).body).classList).contains("paused")))
         return;
-      t2._as(t1._as(self.document.body).classList).remove("paused");
+      t2._as(t3._as(t2._as(t1.document).body).classList).remove("paused");
       t1 = this.serverChannel._mainController.__StreamChannelController__foreign_F;
       t1 === $ && A.throwLateFieldNI("_foreign");
       t1 = t1.__GuaranteeChannel__sink_F;
@@ -15624,7 +14810,7 @@
       t2 = type$.String;
       t1.add$1(0, A.LinkedHashMap_LinkedHashMap$_literal(["command", "resume"], t2, t2));
     },
-    $signature: 0
+    $signature: 2
   };
   A.main__closure3.prototype = {
     call$0() {
@@ -15636,20 +14822,22 @@
       t2 = type$.String;
       t1.add$1(0, A.LinkedHashMap_LinkedHashMap$_literal(["command", "restart"], t2, t2));
     },
-    $signature: 0
+    $signature: 2
   };
   A.main_closure0.prototype = {
     call$2(error, stackTrace) {
+      var t1;
       type$.Object._as(error);
       type$.StackTrace._as(stackTrace);
-      type$.JavaScriptObject._as(self.window.console).warn(A.S(error) + "\n" + A.Trace_Trace$from(stackTrace).get$terse().toString$0(0));
+      t1 = type$.JSObject;
+      t1._as(t1._as(init.G.window).console).warn(A.S(error) + "\n" + A.Trace_Trace$from(stackTrace).get$terse().toString$0(0));
     },
     $signature: 9
   };
   A._connectToServer_closure.prototype = {
     call$1(message) {
       var t1;
-      type$.JavaScriptObject._as(message);
+      type$.JSObject._as(message);
       t1 = this.controller.__StreamChannelController__local_F;
       t1 === $ && A.throwLateFieldNI("_local");
       t1 = t1.__GuaranteeChannel__sink_F;
@@ -15666,53 +14854,75 @@
   };
   A._connectToIframe_closure.prototype = {
     call$1($event) {
-      var t2, _0_0, port, data, _0_6, _0_11, _this = this,
+      var t2, data, t3, t4, _0_0, _0_6, port, _0_10, _0_15, _this = this,
+        _s11_ = "messageType",
         _s9_ = "exception",
-        t1 = type$.JavaScriptObject;
+        t1 = type$.JSObject;
       t1._as($event);
-      if (A._asString($event.origin) !== A._asString(t1._as(self.window.location).origin))
+      t2 = init.G;
+      if (A._asString($event.origin) !== A._asString(t1._as(t1._as(t2.window).location).origin))
         return;
-      t2 = $event.source.location;
-      t2 = t2 == null ? null : A._asStringQ(t2.href);
-      if (t2 != A._asStringQ(_this.iframe.src))
+      data = A.dartify($event.data);
+      t3 = $event.source.location;
+      t3 = t3 == null ? null : A._asStringQ(t3.href);
+      t4 = _this.iframe;
+      if (t3 != A._asStringQ(t4.src))
+        t3 = !type$.Map_dynamic_dynamic._is(data) || !J.$eq$(data.$index(0, "href"), A._asStringQ(t4.src));
+      else
+        t3 = false;
+      if (t3)
         return;
       $event.stopPropagation();
-      t2 = _this.windowSubscription._readLocal$0();
-      A.EventTargetExtension_removeEventListener(t2.target, t2.type, t2.listener);
+      t3 = _this.windowSubscription._readLocal$0();
+      A.EventTarget_removeEventListener(t3.target, t3.type, t3.listener);
       $label0$0: {
         _0_0 = A.dartify($event.data);
-        if ("port" === _0_0) {
-          t1._as(self.window.console).log("Connecting channel for suite " + _this.suiteUrl.toString$0(0));
-          t1 = J.cast$1$0$ax(type$.List_dynamic._as($event.ports), t1);
+        if ("port" !== _0_0) {
+          t3 = false;
+          if (type$.Map_dynamic_dynamic._is(_0_0)) {
+            _0_6 = _0_0.$index(0, _s11_);
+            if (_0_6 == null)
+              t4 = _0_0.containsKey$1(_s11_);
+            else
+              t4 = true;
+            if (t4)
+              t3 = "port" === _0_6;
+          }
+        } else
+          t3 = true;
+        if (t3) {
+          t1._as(t1._as(t2.window).console).log("Connecting channel for suite " + _this.suiteUrl.toString$0(0));
+          t2 = type$.JSArray_nullable_Object._as($event.ports);
+          t1 = B.JSArray_methods.cast$1$0(t2, t1);
           port = t1.get$first(t1);
           t1 = _this.id;
           t2 = _this.controller;
-          $._domSubscriptions.$indexSet(0, t1, A.Subscription$(port, "message", A.allowInterop(new A._connectToIframe__closure(t2), type$.void_Function_JavaScriptObject)));
+          $._domSubscriptions.$indexSet(0, t1, A.Subscription$(port, "message", new A._connectToIframe__closure(t2)));
           port.start();
           t2 = t2.__StreamChannelController__local_F;
           t2 === $ && A.throwLateFieldNI("_local");
           t2 = t2.__GuaranteeChannel__streamController_F;
           t2 === $ && A.throwLateFieldNI("_streamController");
-          $._subscriptions.$indexSet(0, t1, new A._ControllerStream(t2, A._instanceType(t2)._eval$1("_ControllerStream<1>")).listen$1(A.MessagePortExtension_get_postMessage(port)));
+          $._subscriptions.$indexSet(0, t1, new A._ControllerStream(t2, A._instanceType(t2)._eval$1("_ControllerStream<1>")).listen$1(A.MessagePort_get_postMessage(port)));
           break $label0$0;
         }
         data = null;
         t1 = false;
         if (type$.Map_dynamic_dynamic._is(_0_0)) {
-          _0_6 = _0_0.$index(0, _s9_);
-          if (_0_6 == null)
+          _0_10 = _0_0.$index(0, _s9_);
+          if (_0_10 == null)
             t2 = _0_0.containsKey$1(_s9_);
           else
             t2 = true;
           if (t2)
-            if (true === _0_6) {
-              _0_11 = _0_0.$index(0, "data");
-              if (_0_11 == null)
+            if (true === _0_10) {
+              _0_15 = _0_0.$index(0, "data");
+              if (_0_15 == null)
                 t1 = _0_0.containsKey$1("data");
               else
                 t1 = true;
               if (t1)
-                data = _0_11;
+                data = _0_15;
             }
         }
         if (t1) {
@@ -15729,7 +14939,7 @@
   A._connectToIframe__closure.prototype = {
     call$1($event) {
       var t1;
-      type$.JavaScriptObject._as($event);
+      type$.JSObject._as($event);
       t1 = this.controller.__StreamChannelController__local_F;
       t1 === $ && A.throwLateFieldNI("_local");
       t1 = t1.__GuaranteeChannel__sink_F;
@@ -15762,44 +14972,42 @@
     _static_1(A, "async___nullDataHandler$closure", "_nullDataHandler", 5);
     _static_2(A, "async___nullErrorHandler$closure", "_nullErrorHandler", 9);
     _static_0(A, "async___nullDoneHandler$closure", "_nullDoneHandler", 0);
-    _static(A, "async___rootHandleUncaughtError$closure", 5, null, ["call$5"], ["_rootHandleUncaughtError"], 45, 0);
+    _static(A, "async___rootHandleUncaughtError$closure", 5, null, ["call$5"], ["_rootHandleUncaughtError"], 40, 0);
     _static(A, "async___rootRun$closure", 4, null, ["call$1$4", "call$4"], ["_rootRun", function($self, $parent, zone, f) {
+      f.toString;
       return A._rootRun($self, $parent, zone, f, type$.dynamic);
-    }], 46, 1);
+    }], 41, 0);
     _static(A, "async___rootRunUnary$closure", 5, null, ["call$2$5", "call$5"], ["_rootRunUnary", function($self, $parent, zone, f, arg) {
       var t1 = type$.dynamic;
+      f.toString;
       return A._rootRunUnary($self, $parent, zone, f, arg, t1, t1);
-    }], 47, 1);
-    _static(A, "async___rootRunBinary$closure", 6, null, ["call$3$6", "call$6"], ["_rootRunBinary", function($self, $parent, zone, f, arg1, arg2) {
-      var t1 = type$.dynamic;
-      return A._rootRunBinary($self, $parent, zone, f, arg1, arg2, t1, t1, t1);
-    }], 48, 1);
+    }], 42, 0);
+    _static(A, "async___rootRunBinary$closure", 6, null, ["call$3$6"], ["_rootRunBinary"], 43, 0);
     _static(A, "async___rootRegisterCallback$closure", 4, null, ["call$1$4", "call$4"], ["_rootRegisterCallback", function($self, $parent, zone, f) {
+      f.toString;
       return A._rootRegisterCallback($self, $parent, zone, f, type$.dynamic);
-    }], 49, 0);
+    }], 44, 0);
     _static(A, "async___rootRegisterUnaryCallback$closure", 4, null, ["call$2$4", "call$4"], ["_rootRegisterUnaryCallback", function($self, $parent, zone, f) {
       var t1 = type$.dynamic;
+      f.toString;
       return A._rootRegisterUnaryCallback($self, $parent, zone, f, t1, t1);
-    }], 50, 0);
+    }], 45, 0);
     _static(A, "async___rootRegisterBinaryCallback$closure", 4, null, ["call$3$4", "call$4"], ["_rootRegisterBinaryCallback", function($self, $parent, zone, f) {
       var t1 = type$.dynamic;
+      f.toString;
       return A._rootRegisterBinaryCallback($self, $parent, zone, f, t1, t1, t1);
-    }], 51, 0);
-    _static(A, "async___rootErrorCallback$closure", 5, null, ["call$5"], ["_rootErrorCallback"], 52, 0);
-    _static(A, "async___rootScheduleMicrotask$closure", 4, null, ["call$4"], ["_rootScheduleMicrotask"], 53, 0);
-    _static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 54, 0);
-    _static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 55, 0);
-    _static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 56, 0);
-    _static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 57, 0);
-    _instance(A._SyncCompleter.prototype, "get$complete", 0, 0, function() {
-      return [null];
-    }, ["call$1", "call$0"], ["complete$1", "complete$0"], 24, 0, 0);
+    }], 46, 0);
+    _static(A, "async___rootErrorCallback$closure", 5, null, ["call$5"], ["_rootErrorCallback"], 47, 0);
+    _static(A, "async___rootScheduleMicrotask$closure", 4, null, ["call$4"], ["_rootScheduleMicrotask"], 48, 0);
+    _static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 49, 0);
+    _static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 50, 0);
+    _static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 51, 0);
+    _static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 52, 0);
+    _instance(A._SyncCompleter.prototype, "get$complete", 0, 0, null, ["call$1", "call$0"], ["complete$1", "complete$0"], 34, 0, 0);
     _instance_2_u(A._Future.prototype, "get$_completeError", "_completeError$2", 9);
     var _;
     _instance_1_i(_ = A._StreamController.prototype, "get$add", "add$1", 3);
-    _instance(_, "get$addError", 0, 1, function() {
-      return [null];
-    }, ["call$2", "call$1"], ["addError$2", "addError$1"], 10, 0, 0);
+    _instance(_, "get$addError", 0, 1, null, ["call$2", "call$1"], ["addError$2", "addError$1"], 10, 0, 0);
     _instance_1_i(A._StreamSinkWrapper.prototype, "get$add", "add$1", 3);
     _instance_0_u(A._DoneStreamSubscription.prototype, "get$_onMicrotask", "_onMicrotask$0", 0);
     _static_1(A, "convert___defaultToEncodable$closure", "_defaultToEncodable", 13);
@@ -15810,23 +15018,21 @@
     _static_1(A, "frame_Frame___parseFriendly_tearOff$closure", "Frame___parseFriendly_tearOff", 7);
     _static_1(A, "trace_Trace___parseVM_tearOff$closure", "Trace___parseVM_tearOff", 12);
     _static_1(A, "trace_Trace___parseFriendly_tearOff$closure", "Trace___parseFriendly_tearOff", 12);
-    _instance(_ = A._GuaranteeSink.prototype, "get$addError", 0, 1, function() {
-      return [null];
-    }, ["call$2", "call$1"], ["addError$2", "addError$1"], 10, 0, 0);
-    _instance(_, "get$_addError", 0, 1, function() {
-      return [null];
-    }, ["call$2", "call$1"], ["_addError$2", "_addError$1"], 10, 0, 0);
+    _instance(_ = A._GuaranteeSink.prototype, "get$addError", 0, 1, null, ["call$2", "call$1"], ["addError$2", "addError$1"], 10, 0, 0);
+    _instance(_, "get$_addError", 0, 1, null, ["call$2", "call$1"], ["_addError$2", "_addError$1"], 10, 0, 0);
     _instance_0_u(A._MultiChannel.prototype, "get$_closeInnerChannel", "_closeInnerChannel$0", 0);
     _static(A, "math__max$closure", 2, null, ["call$1$2", "call$2"], ["max", function(a, b) {
+      a.toString;
+      b.toString;
       return A.max(a, b, type$.num);
-    }], 40, 0);
+    }], 36, 0);
   })();
   (function inheritance() {
     var _mixin = hunkHelpers.mixin,
       _inherit = hunkHelpers.inherit,
       _inheritMany = hunkHelpers.inheritMany;
     _inherit(A.Object, null);
-    _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, J.ArrayIterator, A.Stream, A.CastStreamSubscription, A.Iterable, A.CastIterator, A.Error, A.ListBase, A.Closure, A.SentinelValue, A.ListIterator, A.MappedIterator, A.WhereIterator, A.ExpandIterator, A.TakeIterator, A.SkipIterator, A.SkipWhileIterator, A.EmptyIterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.Symbol, A.MapView, A.ConstantMap, A._KeysOrValuesOrElementsIterator, A.JSInvocationMirror, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A._StackTrace, A._Required, A.MapBase, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, A.JSSyntaxRegExp, A._MatchImplementation, A._AllMatchesIterator, A.StringMatch, A._StringAllMatchesIterator, A._Cell, A.Rti, A._FunctionParameters, A._Type, A._TimerImpl, A.AsyncError, A._Completer, A._FutureListener, A._Future, A._AsyncCallbackEntry, A._StreamController, A._SyncStreamControllerDispatch, A._BufferingStreamSubscription, A._StreamSinkWrapper, A._DelayedEvent, A._DelayedDone, A._PendingEvents, A._DoneStreamSubscription, A._ZoneFunction, A._ZoneSpecification, A._ZoneDelegate, A._Zone, A._HashMapKeyIterator, A.SetBase, A._LinkedHashSetCell, A._LinkedHashSetIterator, A._UnmodifiableMapMixin, A.Codec, A.Converter, A._JsonStringifier, A._Utf8Encoder, A._Utf8Decoder, A.DateTime, A.Duration, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.Null, A._StringStackTrace, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.NullRejectionException, A.NullStreamSink, A.Context, A.Style, A.ParsedPath, A.PathException, A.Chain, A.Frame, A.LazyTrace, A.Trace, A.UnparsedFrame, A.StreamChannelMixin, A._GuaranteeSink, A.StreamChannelController, A.Subscription]);
+    _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, J.ArrayIterator, A.Stream, A.CastStreamSubscription, A.Iterable, A.CastIterator, A.Error, A.ListBase, A.Closure, A.SentinelValue, A.ListIterator, A.MappedIterator, A.WhereIterator, A.ExpandIterator, A.TakeIterator, A.SkipIterator, A.SkipWhileIterator, A.EmptyIterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.ConstantMap, A._KeysOrValuesOrElementsIterator, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A._StackTrace, A.MapBase, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, A.LinkedHashMapValueIterator, A.JSSyntaxRegExp, A._MatchImplementation, A._AllMatchesIterator, A.StringMatch, A._StringAllMatchesIterator, A._Cell, A.Rti, A._FunctionParameters, A._Type, A._TimerImpl, A.AsyncError, A._Completer, A._FutureListener, A._Future, A._AsyncCallbackEntry, A._StreamController, A._SyncStreamControllerDispatch, A._BufferingStreamSubscription, A._StreamSinkWrapper, A._DelayedEvent, A._DelayedDone, A._PendingEvents, A._DoneStreamSubscription, A._ZoneFunction, A._ZoneSpecification, A._ZoneDelegate, A._Zone, A._HashMapKeyIterator, A.SetBase, A._LinkedHashSetCell, A._LinkedHashSetIterator, A._UnmodifiableMapMixin, A.MapView, A.Codec, A.Converter, A._JsonStringifier, A._Utf8Encoder, A._Utf8Decoder, A.DateTime, A.Duration, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.Null, A._StringStackTrace, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.NullRejectionException, A.NullStreamSink, A.Context, A.Style, A.ParsedPath, A.PathException, A.Chain, A.Frame, A.LazyTrace, A.Trace, A.UnparsedFrame, A.StreamChannelMixin, A._GuaranteeSink, A.StreamChannelController, A.Subscription]);
     _inheritMany(J.Interceptor, [J.JSBool, J.JSNull, J.JavaScriptObject, J.JavaScriptBigInt, J.JavaScriptSymbol, J.JSNumber, J.JSString]);
     _inheritMany(J.JavaScriptObject, [J.LegacyJavaScriptObject, J.JSArray, A.NativeByteBuffer, A.NativeTypedData]);
     _inheritMany(J.LegacyJavaScriptObject, [J.PlainJavaScriptObject, J.UnknownJavaScriptObject, J.JavaScriptFunction]);
@@ -15838,26 +15044,22 @@
     _inherit(A._EfficientLengthCastIterable, A.CastIterable);
     _inherit(A._CastListBase, A.__CastListBase__CastIterableBase_ListMixin);
     _inherit(A.CastList, A._CastListBase);
-    _inheritMany(A.Error, [A.LateError, A.TypeError, A.JsNoSuchMethodError, A.UnknownJsTypeError, A._CyclicInitializationError, A.RuntimeError, A.AssertionError, A._Error, A.JsonUnsupportedObjectError, A.ArgumentError, A.NoSuchMethodError, A.UnsupportedError, A.UnimplementedError, A.StateError, A.ConcurrentModificationError]);
+    _inheritMany(A.Error, [A.LateError, A.TypeError, A.JsNoSuchMethodError, A.UnknownJsTypeError, A.RuntimeError, A._Error, A.JsonUnsupportedObjectError, A.AssertionError, A.ArgumentError, A.UnsupportedError, A.UnimplementedError, A.StateError, A.ConcurrentModificationError]);
     _inherit(A.UnmodifiableListBase, A.ListBase);
     _inherit(A.CodeUnits, A.UnmodifiableListBase);
-    _inheritMany(A.Closure, [A.Closure0Args, A.Instantiation, A.Closure2Args, A.TearOffClosure, A.JsLinkedHashMap_values_closure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._Future__chainForeignFuture_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A.Stream_pipe_closure, A.Stream_length_closure, A._CustomZone_bindUnaryCallback_closure, A._CustomZone_bindUnaryCallbackGuarded_closure, A._RootZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallbackGuarded_closure, A.runZonedGuarded_closure, A._Uri__makePath_closure, A._createTables_setChars, A._createTables_setRange, A.jsify__convert, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.dartify_convert, A.Context_joinAll_closure, A.Context_split_closure, A._validateArgList_closure, A.WindowsStyle_absolutePathToUri_closure, A.Chain_Chain$parse_closure, A.Chain_toTrace_closure, A.Chain_toString_closure0, A.Chain_toString__closure0, A.Chain_toString_closure, A.Chain_toString__closure, A.Trace__parseVM_closure, A.Trace$parseV8_closure, A.Trace$parseJSCore_closure, A.Trace$parseFirefox_closure, A.Trace$parseFriendly_closure, A.Trace_terse_closure, A.Trace_foldFrames_closure, A.Trace_foldFrames_closure0, A.Trace_toString_closure0, A.Trace_toString_closure, A._GuaranteeSink_addStream_closure, A._MultiChannel_closure, A._MultiChannel_closure1, A._MultiChannel_virtualChannel_closure, A.MessagePortExtension_get_postMessage_closure, A.main__closure, A.main__closure0, A.main__closure1, A._connectToServer_closure, A._connectToServer_closure0, A._connectToIframe_closure, A._connectToIframe__closure]);
-    _inheritMany(A.Closure0Args, [A.nullFuture_closure, A._AsyncRun__scheduleImmediateJsOverride_internalCallback, A._AsyncRun__scheduleImmediateWithSetImmediate_internalCallback, A._TimerImpl_internalCallback, A._TimerImpl$periodic_closure, A._Future__addListener_closure, A._Future__prependListeners_closure, A._Future__chainForeignFuture_closure1, A._Future__chainCoreFutureAsync_closure, A._Future__asyncCompleteWithValue_closure, A._Future__asyncCompleteError_closure, A._Future__propagateToListeners_handleWhenCompleteCallback, A._Future__propagateToListeners_handleValueCallback, A._Future__propagateToListeners_handleError, A.Stream_length_closure0, A._StreamController__subscribe_closure, A._StreamController__recordCancel_complete, A._AddStreamState_cancel_closure, A._BufferingStreamSubscription__sendError_sendError, A._BufferingStreamSubscription__sendDone_sendDone, A._PendingEvents_schedule_closure, A._CustomZone_bindCallback_closure, A._CustomZone_bindCallbackGuarded_closure, A._rootHandleError_closure, A._RootZone_bindCallback_closure, A._RootZone_bindCallbackGuarded_closure, A._Utf8Decoder__decoder_closure, A._Utf8Decoder__decoderNonfatal_closure, A.NullStreamSink_addStream_closure, A.Frame_Frame$parseVM_closure, A.Frame_Frame$parseV8_closure, A.Frame_Frame$_parseFirefoxEval_closure, A.Frame_Frame$parseFirefox_closure, A.Frame_Frame$parseFriendly_closure, A.LazyTrace_terse_closure, A.Trace_Trace$from_closure, A.GuaranteeChannel_closure, A.GuaranteeChannel__closure, A._MultiChannel_closure0, A._MultiChannel__closure, A._MultiChannel_virtualChannel_closure0, A.main_closure, A.main__closure2, A.main__closure3]);
-    _inheritMany(A.EfficientLengthIterable, [A.ListIterable, A.EmptyIterable, A.LinkedHashMapKeyIterable, A._HashMapKeyIterable]);
+    _inheritMany(A.Closure, [A.Closure0Args, A.Instantiation, A.Closure2Args, A.TearOffClosure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A.Stream_pipe_closure, A.Stream_length_closure, A._CustomZone_bindUnaryCallback_closure, A._CustomZone_bindUnaryCallbackGuarded_closure, A._RootZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallbackGuarded_closure, A.runZonedGuarded_closure, A._Uri__makePath_closure, A.jsify__convert, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.dartify_convert, A.Context_joinAll_closure, A.Context_split_closure, A._validateArgList_closure, A.WindowsStyle_absolutePathToUri_closure, A.Chain_Chain$parse_closure, A.Chain_toTrace_closure, A.Chain_toString_closure0, A.Chain_toString__closure0, A.Chain_toString_closure, A.Chain_toString__closure, A.Trace__parseVM_closure, A.Trace$parseV8_closure, A.Trace$parseJSCore_closure, A.Trace$parseFirefox_closure, A.Trace$parseFriendly_closure, A.Trace_terse_closure, A.Trace_foldFrames_closure, A.Trace_foldFrames_closure0, A.Trace_toString_closure0, A.Trace_toString_closure, A._GuaranteeSink_addStream_closure, A._MultiChannel_closure, A._MultiChannel_closure1, A._MultiChannel_virtualChannel_closure, A.MessagePort_get_postMessage_closure, A.main__closure, A.main__closure0, A.main__closure1, A._connectToServer_closure, A._connectToServer_closure0, A._connectToIframe_closure, A._connectToIframe__closure]);
+    _inheritMany(A.Closure0Args, [A.nullFuture_closure, A._AsyncRun__scheduleImmediateJsOverride_internalCallback, A._AsyncRun__scheduleImmediateWithSetImmediate_internalCallback, A._TimerImpl_internalCallback, A._TimerImpl$periodic_closure, A._Future__addListener_closure, A._Future__prependListeners_closure, A._Future__chainCoreFuture_closure, A._Future__asyncCompleteWithValue_closure, A._Future__asyncCompleteErrorObject_closure, A._Future__propagateToListeners_handleWhenCompleteCallback, A._Future__propagateToListeners_handleValueCallback, A._Future__propagateToListeners_handleError, A.Stream_length_closure0, A._StreamController__subscribe_closure, A._StreamController__recordCancel_complete, A._AddStreamState_cancel_closure, A._BufferingStreamSubscription__sendError_sendError, A._BufferingStreamSubscription__sendDone_sendDone, A._PendingEvents_schedule_closure, A._CustomZone_bindCallback_closure, A._CustomZone_bindCallbackGuarded_closure, A._rootHandleError_closure, A._RootZone_bindCallback_closure, A._RootZone_bindCallbackGuarded_closure, A._Utf8Decoder__decoder_closure, A._Utf8Decoder__decoderNonfatal_closure, A.NullStreamSink_addStream_closure, A.Frame_Frame$parseVM_closure, A.Frame_Frame$parseV8_closure, A.Frame_Frame$_parseFirefoxEval_closure, A.Frame_Frame$parseFirefox_closure, A.Frame_Frame$parseFriendly_closure, A.LazyTrace_terse_closure, A.Trace_Trace$from_closure, A.GuaranteeChannel_closure, A.GuaranteeChannel__closure, A._MultiChannel_closure0, A._MultiChannel__closure, A._MultiChannel_virtualChannel_closure0, A.main_closure, A.main__closure2, A.main__closure3]);
+    _inheritMany(A.EfficientLengthIterable, [A.ListIterable, A.EmptyIterable, A.LinkedHashMapKeysIterable, A.LinkedHashMapValuesIterable, A._HashMapKeyIterable]);
     _inheritMany(A.ListIterable, [A.SubListIterable, A.MappedListIterable, A.ReversedListIterable, A._JsonMapKeyIterable]);
     _inherit(A.EfficientLengthMappedIterable, A.MappedIterable);
     _inherit(A.EfficientLengthTakeIterable, A.TakeIterable);
     _inherit(A.EfficientLengthSkipIterable, A.SkipIterable);
-    _inherit(A._UnmodifiableMapView_MapView__UnmodifiableMapMixin, A.MapView);
-    _inherit(A.UnmodifiableMapView, A._UnmodifiableMapView_MapView__UnmodifiableMapMixin);
-    _inherit(A.ConstantMapView, A.UnmodifiableMapView);
     _inherit(A.ConstantStringMap, A.ConstantMap);
     _inherit(A.Instantiation1, A.Instantiation);
-    _inheritMany(A.Closure2Args, [A.Primitives_functionNoSuchMethod_closure, A.initHooks_closure0, A._Future__chainForeignFuture_closure0, A.MapBase_mapToString_closure, A._JsonStringifier_writeMap_closure, A.NoSuchMethodError_toString_closure, A.Uri_splitQueryString_closure, A.Uri__parseIPv4Address_error, A.Uri_parseIPv6Address_error, A.Uri_parseIPv6Address_parseHex, A._createTables_build, A.Frame_Frame$parseV8_closure_parseJsLocation, A.main_closure0]);
     _inherit(A.NullError, A.TypeError);
     _inheritMany(A.TearOffClosure, [A.StaticClosure, A.BoundClosure]);
-    _inherit(A._AssertionError, A.AssertionError);
     _inheritMany(A.MapBase, [A.JsLinkedHashMap, A._HashMap, A._JsonMap]);
+    _inheritMany(A.Closure2Args, [A.initHooks_closure0, A._Future__propagateToListeners_handleWhenCompleteCallback_closure0, A.MapBase_mapToString_closure, A._JsonStringifier_writeMap_closure, A.Uri_splitQueryString_closure, A.Uri__parseIPv4Address_error, A.Uri_parseIPv6Address_error, A.Uri_parseIPv6Address_parseHex, A.Frame_Frame$parseV8_closure_parseJsLocation, A.main_closure0]);
     _inheritMany(A.NativeTypedData, [A.NativeByteData, A.NativeTypedArray]);
     _inheritMany(A.NativeTypedArray, [A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin, A._NativeTypedArrayOfInt_NativeTypedArray_ListMixin]);
     _inherit(A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin_FixedLengthListMixin, A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin);
@@ -15876,6 +15078,8 @@
     _inherit(A._IdentityHashMap, A._HashMap);
     _inherit(A._SetBase, A.SetBase);
     _inherit(A._LinkedHashSet, A._SetBase);
+    _inherit(A._UnmodifiableMapView_MapView__UnmodifiableMapMixin, A.MapView);
+    _inherit(A.UnmodifiableMapView, A._UnmodifiableMapView_MapView__UnmodifiableMapMixin);
     _inheritMany(A.Codec, [A.Encoding, A.Base64Codec, A._FusedCodec, A.JsonCodec]);
     _inheritMany(A.Encoding, [A.AsciiCodec, A.Utf8Codec]);
     _inheritMany(A.Converter, [A._UnicodeSubsetEncoder, A.Base64Encoder, A.JsonEncoder, A.JsonDecoder, A.Utf8Encoder, A.Utf8Decoder]);
@@ -15897,18 +15101,20 @@
     _mixin(A._UnmodifiableMapView_MapView__UnmodifiableMapMixin, A._UnmodifiableMapMixin);
   })();
   var init = {
+    G: typeof self != "undefined" ? self : globalThis,
     typeUniverse: {eC: new Map(), tR: {}, eT: {}, tPV: {}, sEA: []},
     mangledGlobalNames: {int: "int", double: "double", num: "num", String: "String", bool: "bool", Null: "Null", List: "List", Object: "Object", Map: "Map"},
     mangledNames: {},
-    types: ["~()", "bool(String)", "Null()", "~(Object?)", "Frame()", "~(@)", "~(JavaScriptObject)", "Frame(String)", "Null(@)", "~(Object,StackTrace)", "~(Object[StackTrace?])", "~(~())", "Trace(String)", "@(@)", "~(Object?,Object?)", "@()", "String(String)", "~(Uint8List,String,int)", "Object?(Object?)", "int(Frame)", "String(Frame)", "Trace()", "bool(Frame)", "Map<String,String>(Map<String,String>,String)", "~([Object?])", "Uint8List(@,@)", "@(String)", "Null(Object,StackTrace)", "_Future<@>(@)", "Future<@>(@)", "String(String?)", "List<Frame>(Trace)", "int(Trace)", "~(String,@)", "String(Trace)", "~(Zone,ZoneDelegate,Zone,Object,StackTrace)", "Null(~())", "Frame(String,String)", "Future<~>()", "~(Symbol0,@)", "0^(0^,0^)<num>", "~(List<@>)", "~(Timer)", "@(@,String)", "~(String,int)", "~(Zone?,ZoneDelegate?,Zone,Object,StackTrace)", "0^(Zone?,ZoneDelegate?,Zone,0^())<Object?>", "0^(Zone?,ZoneDelegate?,Zone,0^(1^),1^)<Object?,Object?>", "0^(Zone?,ZoneDelegate?,Zone,0^(1^,2^),1^,2^)<Object?,Object?,Object?>", "0^()(Zone,ZoneDelegate,Zone,0^())<Object?>", "0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))<Object?,Object?>", "0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))<Object?,Object?,Object?>", "AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)", "~(Zone?,ZoneDelegate?,Zone,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))", "~(Zone,ZoneDelegate,Zone,String)", "Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map<Object?,Object?>?)", "~(String,int?)", "int(int,int)", "Frame(Frame)"],
+    types: ["~()", "bool(String)", "Null()", "~(Object?)", "Frame()", "~(@)", "~(JSObject)", "Frame(String)", "Null(@)", "~(Object,StackTrace)", "~(Object[StackTrace?])", "~(~())", "Trace(String)", "@(@)", "~(Object?,Object?)", "@()", "String(String)", "Object?(Object?)", "int(Frame)", "String(Frame)", "Trace()", "bool(Frame)", "~(String,int)", "Future<@>(@)", "Null(~())", "String(String?)", "List<Frame>(Trace)", "int(Trace)", "~(Zone,ZoneDelegate,Zone,Object,StackTrace)", "String(Trace)", "@(@,String)", "@(String)", "Frame(String,String)", "Map<String,String>(Map<String,String>,String)", "~([Object?])", "Frame(Frame)", "0^(0^,0^)<num>", "~(Timer)", "~(String,int?)", "int(int,int)", "~(Zone?,ZoneDelegate?,Zone,Object,StackTrace)", "0^(Zone?,ZoneDelegate?,Zone,0^())<Object?>", "0^(Zone?,ZoneDelegate?,Zone,0^(1^),1^)<Object?,Object?>", "0^(Zone?,ZoneDelegate?,Zone,0^(1^,2^),1^,2^)<Object?,Object?,Object?>", "0^()(Zone,ZoneDelegate,Zone,0^())<Object?>", "0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))<Object?,Object?>", "0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))<Object?,Object?,Object?>", "AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)", "~(Zone?,ZoneDelegate?,Zone,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))", "~(Zone,ZoneDelegate,Zone,String)", "Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map<Object?,Object?>?)", "Future<~>()", "Null(Object,StackTrace)", "~(List<@>)"],
     interceptorsByTag: null,
     leafTags: null,
     arrayRti: Symbol("$ti")
   };
-  A._Universe_addRules(init.typeUniverse, JSON.parse('{"PlainJavaScriptObject":"LegacyJavaScriptObject","UnknownJavaScriptObject":"LegacyJavaScriptObject","JavaScriptFunction":"LegacyJavaScriptObject","JSBool":{"bool":[],"TrustedGetRuntimeType":[]},"JSNull":{"Null":[],"TrustedGetRuntimeType":[]},"LegacyJavaScriptObject":{"JavaScriptObject":[]},"JSArray":{"List":["1"],"JavaScriptObject":[],"EfficientLengthIterable":["1"],"Iterable":["1"]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"JavaScriptObject":[],"EfficientLengthIterable":["1"],"Iterable":["1"]},"ArrayIterator":{"Iterator":["1"]},"JSNumber":{"double":[],"num":[]},"JSInt":{"double":[],"int":[],"num":[],"TrustedGetRuntimeType":[]},"JSNumNotInt":{"double":[],"num":[],"TrustedGetRuntimeType":[]},"JSString":{"String":[],"Pattern":[],"TrustedGetRuntimeType":[]},"CastStream":{"Stream":["2"],"Stream.T":"2"},"CastStreamSubscription":{"StreamSubscription":["2"]},"_CastIterableBase":{"Iterable":["2"]},"CastIterator":{"Iterator":["2"]},"CastIterable":{"_CastIterableBase":["1","2"],"Iterable":["2"],"Iterable.E":"2"},"_EfficientLengthCastIterable":{"CastIterable":["1","2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"_CastListBase":{"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"]},"CastList":{"_CastListBase":["1","2"],"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","Iterable.E":"2"},"LateError":{"Error":[]},"CodeUnits":{"ListBase":["int"],"UnmodifiableListMixin":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"ListBase.E":"int","UnmodifiableListMixin.E":"int"},"EfficientLengthIterable":{"Iterable":["1"]},"ListIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"SubListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"ListIterator":{"Iterator":["1"]},"MappedIterable":{"Iterable":["2"],"Iterable.E":"2"},"EfficientLengthMappedIterable":{"MappedIterable":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"MappedIterator":{"Iterator":["2"]},"MappedListIterable":{"ListIterable":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListIterable.E":"2","Iterable.E":"2"},"WhereIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereIterator":{"Iterator":["1"]},"ExpandIterable":{"Iterable":["2"],"Iterable.E":"2"},"ExpandIterator":{"Iterator":["2"]},"TakeIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthTakeIterable":{"TakeIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"TakeIterator":{"Iterator":["1"]},"SkipIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthSkipIterable":{"SkipIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"SkipIterator":{"Iterator":["1"]},"SkipWhileIterable":{"Iterable":["1"],"Iterable.E":"1"},"SkipWhileIterator":{"Iterator":["1"]},"EmptyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"EmptyIterator":{"Iterator":["1"]},"WhereTypeIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereTypeIterator":{"Iterator":["1"]},"UnmodifiableListBase":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"ReversedListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"Symbol":{"Symbol0":[]},"ConstantMapView":{"UnmodifiableMapView":["1","2"],"_UnmodifiableMapView_MapView__UnmodifiableMapMixin":["1","2"],"MapView":["1","2"],"_UnmodifiableMapMixin":["1","2"],"Map":["1","2"]},"ConstantMap":{"Map":["1","2"]},"ConstantStringMap":{"ConstantMap":["1","2"],"Map":["1","2"]},"_KeysOrValues":{"Iterable":["1"],"Iterable.E":"1"},"_KeysOrValuesOrElementsIterator":{"Iterator":["1"]},"Instantiation":{"Closure":[],"Function":[]},"Instantiation1":{"Closure":[],"Function":[]},"JSInvocationMirror":{"Invocation":[]},"NullError":{"TypeError":[],"Error":[]},"JsNoSuchMethodError":{"Error":[]},"UnknownJsTypeError":{"Error":[]},"NullThrownFromJavaScriptException":{"Exception":[]},"_StackTrace":{"StackTrace":[]},"Closure":{"Function":[]},"Closure0Args":{"Closure":[],"Function":[]},"Closure2Args":{"Closure":[],"Function":[]},"TearOffClosure":{"Closure":[],"Function":[]},"StaticClosure":{"Closure":[],"Function":[]},"BoundClosure":{"Closure":[],"Function":[]},"_CyclicInitializationError":{"Error":[]},"RuntimeError":{"Error":[]},"_AssertionError":{"Error":[]},"JsLinkedHashMap":{"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"LinkedHashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapKeyIterator":{"Iterator":["1"]},"JSSyntaxRegExp":{"RegExp":[],"Pattern":[]},"_MatchImplementation":{"RegExpMatch":[],"Match":[]},"_AllMatchesIterable":{"Iterable":["RegExpMatch"],"Iterable.E":"RegExpMatch"},"_AllMatchesIterator":{"Iterator":["RegExpMatch"]},"StringMatch":{"Match":[]},"_StringAllMatchesIterable":{"Iterable":["Match"],"Iterable.E":"Match"},"_StringAllMatchesIterator":{"Iterator":["Match"]},"NativeByteBuffer":{"JavaScriptObject":[],"ByteBuffer":[],"TrustedGetRuntimeType":[]},"NativeTypedData":{"JavaScriptObject":[]},"NativeByteData":{"JavaScriptObject":[],"ByteData":[],"TrustedGetRuntimeType":[]},"NativeTypedArray":{"JavaScriptIndexingBehavior":["1"],"JavaScriptObject":[]},"NativeTypedArrayOfDouble":{"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"]},"NativeTypedArrayOfInt":{"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"]},"NativeFloat32List":{"Float32List":[],"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double"},"NativeFloat64List":{"Float64List":[],"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double"},"NativeInt16List":{"Int16List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeInt32List":{"Int32List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeInt8List":{"Int8List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint16List":{"Uint16List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint32List":{"Uint32List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint8ClampedList":{"Uint8ClampedList":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint8List":{"Uint8List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"_Error":{"Error":[]},"_TypeError":{"TypeError":[],"Error":[]},"AsyncError":{"Error":[]},"_Future":{"Future":["1"]},"_TimerImpl":{"Timer":[]},"_Completer":{"Completer":["1"]},"_AsyncCompleter":{"_Completer":["1"],"Completer":["1"]},"_SyncCompleter":{"_Completer":["1"],"Completer":["1"]},"_StreamController":{"StreamController":["1"],"StreamSink":["1"],"StreamConsumer":["1"],"_StreamControllerLifecycle":["1"],"_EventDispatch":["1"]},"_SyncStreamController":{"_SyncStreamControllerDispatch":["1"],"_StreamController":["1"],"StreamController":["1"],"StreamSink":["1"],"StreamConsumer":["1"],"_StreamControllerLifecycle":["1"],"_EventDispatch":["1"]},"_ControllerStream":{"_StreamImpl":["1"],"Stream":["1"],"Stream.T":"1"},"_ControllerSubscription":{"_BufferingStreamSubscription":["1"],"StreamSubscription":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamSinkWrapper":{"StreamSink":["1"],"StreamConsumer":["1"]},"_BufferingStreamSubscription":{"StreamSubscription":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamImpl":{"Stream":["1"]},"_DelayedData":{"_DelayedEvent":["1"]},"_DelayedError":{"_DelayedEvent":["@"]},"_DelayedDone":{"_DelayedEvent":["@"]},"_DoneStreamSubscription":{"StreamSubscription":["1"]},"_EmptyStream":{"Stream":["1"],"Stream.T":"1"},"_ZoneSpecification":{"ZoneSpecification":[]},"_ZoneDelegate":{"ZoneDelegate":[]},"_Zone":{"Zone":[]},"_CustomZone":{"_Zone":[],"Zone":[]},"_RootZone":{"_Zone":[],"Zone":[]},"_HashMap":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_IdentityHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashMapKeyIterator":{"Iterator":["1"]},"_LinkedHashSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_LinkedHashSetIterator":{"Iterator":["1"]},"ListBase":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapBase":{"Map":["1","2"]},"MapView":{"Map":["1","2"]},"UnmodifiableMapView":{"_UnmodifiableMapView_MapView__UnmodifiableMapMixin":["1","2"],"MapView":["1","2"],"_UnmodifiableMapMixin":["1","2"],"Map":["1","2"]},"SetBase":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SetBase":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_JsonMap":{"MapBase":["String","@"],"Map":["String","@"],"MapBase.K":"String","MapBase.V":"@"},"_JsonMapKeyIterable":{"ListIterable":["String"],"EfficientLengthIterable":["String"],"Iterable":["String"],"ListIterable.E":"String","Iterable.E":"String"},"AsciiCodec":{"Codec":["String","List<int>"]},"_UnicodeSubsetEncoder":{"Converter":["String","List<int>"],"StreamTransformer":["String","List<int>"]},"AsciiEncoder":{"Converter":["String","List<int>"],"StreamTransformer":["String","List<int>"]},"Base64Codec":{"Codec":["List<int>","String"]},"Base64Encoder":{"Converter":["List<int>","String"],"StreamTransformer":["List<int>","String"]},"_FusedCodec":{"Codec":["1","3"]},"Converter":{"StreamTransformer":["1","2"]},"Encoding":{"Codec":["String","List<int>"]},"JsonUnsupportedObjectError":{"Error":[]},"JsonCyclicError":{"Error":[]},"JsonCodec":{"Codec":["Object?","String"]},"JsonEncoder":{"Converter":["Object?","String"],"StreamTransformer":["Object?","String"]},"JsonDecoder":{"Converter":["String","Object?"],"StreamTransformer":["String","Object?"]},"Utf8Codec":{"Codec":["String","List<int>"]},"Utf8Encoder":{"Converter":["String","List<int>"],"StreamTransformer":["String","List<int>"]},"Utf8Decoder":{"Converter":["List<int>","String"],"StreamTransformer":["List<int>","String"]},"double":{"num":[]},"int":{"num":[]},"List":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"RegExpMatch":{"Match":[]},"String":{"Pattern":[]},"AssertionError":{"Error":[]},"TypeError":{"Error":[]},"ArgumentError":{"Error":[]},"RangeError":{"Error":[]},"IndexError":{"Error":[]},"NoSuchMethodError":{"Error":[]},"UnsupportedError":{"Error":[]},"UnimplementedError":{"Error":[]},"StateError":{"Error":[]},"ConcurrentModificationError":{"Error":[]},"OutOfMemoryError":{"Error":[]},"StackOverflowError":{"Error":[]},"_Exception":{"Exception":[]},"FormatException":{"Exception":[]},"_StringStackTrace":{"StackTrace":[]},"StringBuffer":{"StringSink":[]},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"NullRejectionException":{"Exception":[]},"NullStreamSink":{"StreamSink":["1"],"StreamConsumer":["1"]},"PathException":{"Exception":[]},"PosixStyle":{"InternalStyle":[]},"UrlStyle":{"InternalStyle":[]},"WindowsStyle":{"InternalStyle":[]},"Chain":{"StackTrace":[]},"LazyTrace":{"Trace":[],"StackTrace":[]},"Trace":{"StackTrace":[]},"UnparsedFrame":{"Frame":[]},"GuaranteeChannel":{"StreamChannelMixin":["1"],"StreamChannel":["1"]},"_GuaranteeSink":{"StreamSink":["1"],"StreamConsumer":["1"]},"_MultiChannel":{"StreamChannelMixin":["1"],"MultiChannel":["1"],"StreamChannel":["1"]},"VirtualChannel":{"StreamChannelMixin":["1"],"MultiChannel":["1"],"StreamChannel":["1"]},"StreamChannelMixin":{"StreamChannel":["1"]},"Int8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8ClampedList":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Float32List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"Float64List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]}}'));
+  A._Universe_addRules(init.typeUniverse, JSON.parse('{"PlainJavaScriptObject":"LegacyJavaScriptObject","UnknownJavaScriptObject":"LegacyJavaScriptObject","JavaScriptFunction":"LegacyJavaScriptObject","JSArray":{"List":["1"],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["1"]},"JSBool":{"bool":[],"TrustedGetRuntimeType":[]},"JSNull":{"Null":[],"TrustedGetRuntimeType":[]},"JavaScriptObject":{"JSObject":[]},"LegacyJavaScriptObject":{"JSObject":[]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["1"]},"ArrayIterator":{"Iterator":["1"]},"JSNumber":{"double":[],"num":[]},"JSInt":{"double":[],"int":[],"num":[],"TrustedGetRuntimeType":[]},"JSNumNotInt":{"double":[],"num":[],"TrustedGetRuntimeType":[]},"JSString":{"String":[],"Pattern":[],"TrustedGetRuntimeType":[]},"CastStream":{"Stream":["2"],"Stream.T":"2"},"CastStreamSubscription":{"StreamSubscription":["2"]},"_CastIterableBase":{"Iterable":["2"]},"CastIterator":{"Iterator":["2"]},"CastIterable":{"_CastIterableBase":["1","2"],"Iterable":["2"],"Iterable.E":"2"},"_EfficientLengthCastIterable":{"CastIterable":["1","2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"_CastListBase":{"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"]},"CastList":{"_CastListBase":["1","2"],"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","Iterable.E":"2"},"LateError":{"Error":[]},"CodeUnits":{"ListBase":["int"],"UnmodifiableListMixin":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"ListBase.E":"int"},"EfficientLengthIterable":{"Iterable":["1"]},"ListIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"SubListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"ListIterator":{"Iterator":["1"]},"MappedIterable":{"Iterable":["2"],"Iterable.E":"2"},"EfficientLengthMappedIterable":{"MappedIterable":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"MappedIterator":{"Iterator":["2"]},"MappedListIterable":{"ListIterable":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListIterable.E":"2","Iterable.E":"2"},"WhereIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereIterator":{"Iterator":["1"]},"ExpandIterable":{"Iterable":["2"],"Iterable.E":"2"},"ExpandIterator":{"Iterator":["2"]},"TakeIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthTakeIterable":{"TakeIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"TakeIterator":{"Iterator":["1"]},"SkipIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthSkipIterable":{"SkipIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"SkipIterator":{"Iterator":["1"]},"SkipWhileIterable":{"Iterable":["1"],"Iterable.E":"1"},"SkipWhileIterator":{"Iterator":["1"]},"EmptyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"EmptyIterator":{"Iterator":["1"]},"WhereTypeIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereTypeIterator":{"Iterator":["1"]},"UnmodifiableListBase":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"ReversedListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"ConstantMap":{"Map":["1","2"]},"ConstantStringMap":{"ConstantMap":["1","2"],"Map":["1","2"]},"_KeysOrValues":{"Iterable":["1"],"Iterable.E":"1"},"_KeysOrValuesOrElementsIterator":{"Iterator":["1"]},"Instantiation":{"Closure":[],"Function":[]},"Instantiation1":{"Closure":[],"Function":[]},"NullError":{"TypeError":[],"Error":[]},"JsNoSuchMethodError":{"Error":[]},"UnknownJsTypeError":{"Error":[]},"NullThrownFromJavaScriptException":{"Exception":[]},"_StackTrace":{"StackTrace":[]},"Closure":{"Function":[]},"Closure0Args":{"Closure":[],"Function":[]},"Closure2Args":{"Closure":[],"Function":[]},"TearOffClosure":{"Closure":[],"Function":[]},"StaticClosure":{"Closure":[],"Function":[]},"BoundClosure":{"Closure":[],"Function":[]},"RuntimeError":{"Error":[]},"JsLinkedHashMap":{"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"LinkedHashMapKeysIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapKeyIterator":{"Iterator":["1"]},"LinkedHashMapValuesIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapValueIterator":{"Iterator":["1"]},"JSSyntaxRegExp":{"RegExp":[],"Pattern":[]},"_MatchImplementation":{"RegExpMatch":[],"Match":[]},"_AllMatchesIterable":{"Iterable":["RegExpMatch"],"Iterable.E":"RegExpMatch"},"_AllMatchesIterator":{"Iterator":["RegExpMatch"]},"StringMatch":{"Match":[]},"_StringAllMatchesIterable":{"Iterable":["Match"],"Iterable.E":"Match"},"_StringAllMatchesIterator":{"Iterator":["Match"]},"NativeByteBuffer":{"JSObject":[],"ByteBuffer":[],"TrustedGetRuntimeType":[]},"NativeTypedData":{"JSObject":[]},"NativeByteData":{"ByteData":[],"JSObject":[],"TrustedGetRuntimeType":[]},"NativeTypedArray":{"JavaScriptIndexingBehavior":["1"],"JSObject":[]},"NativeTypedArrayOfDouble":{"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"EfficientLengthIterable":["double"],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"]},"NativeTypedArrayOfInt":{"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"]},"NativeFloat32List":{"Float32List":[],"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"EfficientLengthIterable":["double"],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double"},"NativeFloat64List":{"Float64List":[],"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"EfficientLengthIterable":["double"],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double"},"NativeInt16List":{"Int16List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeInt32List":{"Int32List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeInt8List":{"Int8List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint16List":{"Uint16List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint32List":{"Uint32List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint8ClampedList":{"Uint8ClampedList":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint8List":{"Uint8List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"_Error":{"Error":[]},"_TypeError":{"TypeError":[],"Error":[]},"AsyncError":{"Error":[]},"_TimerImpl":{"Timer":[]},"_Completer":{"Completer":["1"]},"_AsyncCompleter":{"_Completer":["1"],"Completer":["1"]},"_SyncCompleter":{"_Completer":["1"],"Completer":["1"]},"_Future":{"Future":["1"]},"_StreamController":{"StreamController":["1"],"StreamSink":["1"],"StreamConsumer":["1"],"_StreamControllerLifecycle":["1"],"_EventDispatch":["1"]},"_SyncStreamController":{"_SyncStreamControllerDispatch":["1"],"_StreamController":["1"],"StreamController":["1"],"StreamSink":["1"],"StreamConsumer":["1"],"_StreamControllerLifecycle":["1"],"_EventDispatch":["1"]},"_ControllerStream":{"_StreamImpl":["1"],"Stream":["1"],"Stream.T":"1"},"_ControllerSubscription":{"_BufferingStreamSubscription":["1"],"StreamSubscription":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamSinkWrapper":{"StreamSink":["1"],"StreamConsumer":["1"]},"_BufferingStreamSubscription":{"StreamSubscription":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamImpl":{"Stream":["1"]},"_DelayedData":{"_DelayedEvent":["1"]},"_DelayedError":{"_DelayedEvent":["@"]},"_DelayedDone":{"_DelayedEvent":["@"]},"_DoneStreamSubscription":{"StreamSubscription":["1"]},"_EmptyStream":{"Stream":["1"],"Stream.T":"1"},"_ZoneSpecification":{"ZoneSpecification":[]},"_ZoneDelegate":{"ZoneDelegate":[]},"_Zone":{"Zone":[]},"_CustomZone":{"_Zone":[],"Zone":[]},"_RootZone":{"_Zone":[],"Zone":[]},"_HashMap":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_IdentityHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashMapKeyIterator":{"Iterator":["1"]},"_LinkedHashSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_LinkedHashSetIterator":{"Iterator":["1"]},"ListBase":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapBase":{"Map":["1","2"]},"MapView":{"Map":["1","2"]},"UnmodifiableMapView":{"_UnmodifiableMapView_MapView__UnmodifiableMapMixin":["1","2"],"MapView":["1","2"],"_UnmodifiableMapMixin":["1","2"],"Map":["1","2"]},"SetBase":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SetBase":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_JsonMap":{"MapBase":["String","@"],"Map":["String","@"],"MapBase.K":"String","MapBase.V":"@"},"_JsonMapKeyIterable":{"ListIterable":["String"],"EfficientLengthIterable":["String"],"Iterable":["String"],"ListIterable.E":"String","Iterable.E":"String"},"AsciiCodec":{"Codec":["String","List<int>"]},"_UnicodeSubsetEncoder":{"Converter":["String","List<int>"],"StreamTransformer":["String","List<int>"]},"AsciiEncoder":{"Converter":["String","List<int>"],"StreamTransformer":["String","List<int>"]},"Base64Codec":{"Codec":["List<int>","String"]},"Base64Encoder":{"Converter":["List<int>","String"],"StreamTransformer":["List<int>","String"]},"_FusedCodec":{"Codec":["1","3"]},"Converter":{"StreamTransformer":["1","2"]},"Encoding":{"Codec":["String","List<int>"]},"JsonUnsupportedObjectError":{"Error":[]},"JsonCyclicError":{"Error":[]},"JsonCodec":{"Codec":["Object?","String"]},"JsonEncoder":{"Converter":["Object?","String"],"StreamTransformer":["Object?","String"]},"JsonDecoder":{"Converter":["String","Object?"],"StreamTransformer":["String","Object?"]},"Utf8Codec":{"Codec":["String","List<int>"]},"Utf8Encoder":{"Converter":["String","List<int>"],"StreamTransformer":["String","List<int>"]},"Utf8Decoder":{"Converter":["List<int>","String"],"StreamTransformer":["List<int>","String"]},"double":{"num":[]},"int":{"num":[]},"List":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"RegExpMatch":{"Match":[]},"String":{"Pattern":[]},"AssertionError":{"Error":[]},"TypeError":{"Error":[]},"ArgumentError":{"Error":[]},"RangeError":{"Error":[]},"IndexError":{"Error":[]},"UnsupportedError":{"Error":[]},"UnimplementedError":{"Error":[]},"StateError":{"Error":[]},"ConcurrentModificationError":{"Error":[]},"OutOfMemoryError":{"Error":[]},"StackOverflowError":{"Error":[]},"_Exception":{"Exception":[]},"FormatException":{"Exception":[]},"_StringStackTrace":{"StackTrace":[]},"StringBuffer":{"StringSink":[]},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"NullRejectionException":{"Exception":[]},"NullStreamSink":{"StreamSink":["1"],"StreamConsumer":["1"]},"PathException":{"Exception":[]},"PosixStyle":{"InternalStyle":[]},"UrlStyle":{"InternalStyle":[]},"WindowsStyle":{"InternalStyle":[]},"Chain":{"StackTrace":[]},"LazyTrace":{"Trace":[],"StackTrace":[]},"Trace":{"StackTrace":[]},"UnparsedFrame":{"Frame":[]},"GuaranteeChannel":{"StreamChannelMixin":["1"],"StreamChannel":["1"]},"_GuaranteeSink":{"StreamSink":["1"],"StreamConsumer":["1"]},"_MultiChannel":{"StreamChannelMixin":["1"],"MultiChannel":["1"],"StreamChannel":["1"]},"VirtualChannel":{"StreamChannelMixin":["1"],"MultiChannel":["1"],"StreamChannel":["1"]},"StreamChannelMixin":{"StreamChannel":["1"]},"Int8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8ClampedList":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Float32List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"Float64List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]}}'));
   A._Universe_addErasedTypes(init.typeUniverse, JSON.parse('{"UnmodifiableListBase":1,"__CastListBase__CastIterableBase_ListMixin":2,"NativeTypedArray":1,"_DelayedEvent":1,"_SetBase":1}'));
   var string$ = {
-    ______: "===== asynchronous gap ===========================\n",
+    x00_____: "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\u03f6\x00\u0404\u03f4 \u03f4\u03f6\u01f6\u01f6\u03f6\u03fc\u01f4\u03ff\u03ff\u0584\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u05d4\u01f4\x00\u01f4\x00\u0504\u05c4\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u0400\x00\u0400\u0200\u03f7\u0200\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u0200\u0200\u0200\u03f7\x00",
+    x3d_____: "===== asynchronous gap ===========================\n",
     Cannotff: "Cannot extract a file path from a URI with a fragment component",
     Cannotfq: "Cannot extract a file path from a URI with a query component",
     Cannotn: "Cannot extract a non-Windows file path from a file URI with an authority",
@@ -15921,7 +15127,6 @@
       AsyncError: findType("AsyncError"),
       ByteBuffer: findType("ByteBuffer"),
       ByteData: findType("ByteData"),
-      ConstantMapView_Symbol_dynamic: findType("ConstantMapView<Symbol0,@>"),
       Duration: findType("Duration"),
       EfficientLengthIterable_dynamic: findType("EfficientLengthIterable<@>"),
       Error: findType("Error"),
@@ -15932,33 +15137,27 @@
       Frame_Function_Frame: findType("Frame(Frame)"),
       Frame_Function_String: findType("Frame(String)"),
       Function: findType("Function"),
-      Future_dynamic: findType("Future<@>"),
       Int16List: findType("Int16List"),
       Int32List: findType("Int32List"),
       Int8List: findType("Int8List"),
-      Invocation: findType("Invocation"),
       Iterable_String: findType("Iterable<String>"),
       Iterable_dynamic: findType("Iterable<@>"),
-      Iterable_nullable_Object: findType("Iterable<Object?>"),
       JSArray_Frame: findType("JSArray<Frame>"),
-      JSArray_Object: findType("JSArray<Object>"),
       JSArray_String: findType("JSArray<String>"),
       JSArray_Trace: findType("JSArray<Trace>"),
-      JSArray_Uint8List: findType("JSArray<Uint8List>"),
       JSArray_dynamic: findType("JSArray<@>"),
       JSArray_int: findType("JSArray<int>"),
+      JSArray_nullable_Object: findType("JSArray<Object?>"),
       JSArray_nullable_String: findType("JSArray<String?>"),
       JSNull: findType("JSNull"),
+      JSObject: findType("JSObject"),
       JavaScriptFunction: findType("JavaScriptFunction"),
       JavaScriptIndexingBehavior_dynamic: findType("JavaScriptIndexingBehavior<@>"),
-      JavaScriptObject: findType("JavaScriptObject"),
-      JsLinkedHashMap_Symbol_dynamic: findType("JsLinkedHashMap<Symbol0,@>"),
       List_String: findType("List<String>"),
       List_dynamic: findType("List<@>"),
       List_int: findType("List<int>"),
       Map_String_String: findType("Map<String,String>"),
       Map_dynamic_dynamic: findType("Map<@,@>"),
-      Map_of_nullable_Object_and_nullable_Object: findType("Map<Object?,Object?>"),
       MappedIterable_String_Frame: findType("MappedIterable<String,Frame>"),
       MappedListIterable_Frame_Frame: findType("MappedListIterable<Frame,Frame>"),
       MappedListIterable_String_Trace: findType("MappedListIterable<String,Trace>"),
@@ -15970,7 +15169,6 @@
       RegExpMatch: findType("RegExpMatch"),
       StackTrace: findType("StackTrace"),
       String: findType("String"),
-      Symbol: findType("Symbol0"),
       Timer: findType("Timer"),
       Trace: findType("Trace"),
       Trace_Function_String: findType("Trace(String)"),
@@ -15986,7 +15184,7 @@
       WhereIterable_String: findType("WhereIterable<String>"),
       WhereTypeIterable_String: findType("WhereTypeIterable<String>"),
       Zone: findType("Zone"),
-      _AsyncCompleter_dynamic: findType("_AsyncCompleter<@>"),
+      _AsyncCompleter_void: findType("_AsyncCompleter<~>"),
       _Future_dynamic: findType("_Future<@>"),
       _Future_int: findType("_Future<int>"),
       _Future_void: findType("_Future<~>"),
@@ -16005,26 +15203,29 @@
       dynamic_Function_Object_StackTrace: findType("@(Object,StackTrace)"),
       dynamic_Function_String: findType("@(String)"),
       int: findType("int"),
-      legacy_Never: findType("0&*"),
-      legacy_Object: findType("Object*"),
       nullable_Future_Null: findType("Future<Null>?"),
-      nullable_JavaScriptObject: findType("JavaScriptObject?"),
+      nullable_JSObject: findType("JSObject?"),
+      nullable_JavaScriptFunction: findType("JavaScriptFunction?"),
       nullable_List_dynamic: findType("List<@>?"),
       nullable_Map_of_nullable_Object_and_nullable_Object: findType("Map<Object?,Object?>?"),
       nullable_Object: findType("Object?"),
       nullable_StackTrace: findType("StackTrace?"),
+      nullable_String: findType("String?"),
       nullable_Zone: findType("Zone?"),
       nullable_ZoneDelegate: findType("ZoneDelegate?"),
       nullable_ZoneSpecification: findType("ZoneSpecification?"),
       nullable__DelayedEvent_dynamic: findType("_DelayedEvent<@>?"),
       nullable__FutureListener_dynamic_dynamic: findType("_FutureListener<@,@>?"),
       nullable__LinkedHashSetCell: findType("_LinkedHashSetCell?"),
+      nullable_bool: findType("bool?"),
+      nullable_double: findType("double?"),
+      nullable_int: findType("int?"),
+      nullable_num: findType("num?"),
       nullable_void_Function: findType("~()?"),
       num: findType("num"),
       void: findType("~"),
       void_Function: findType("~()"),
       void_Function_$opt_dynamic: findType("~([@])"),
-      void_Function_JavaScriptObject: findType("~(JavaScriptObject)"),
       void_Function_Object: findType("~(Object)"),
       void_Function_Object_StackTrace: findType("~(Object,StackTrace)"),
       void_Function_String_dynamic: findType("~(String,@)"),
@@ -16180,42 +15381,32 @@
     B.C_Utf8Codec = new A.Utf8Codec();
     B.C_Utf8Encoder = new A.Utf8Encoder();
     B.C__DelayedDone = new A._DelayedDone();
-    B.C__Required = new A._Required();
+    B.C__EmptyStream = new A._EmptyStream(A.findType("_EmptyStream<0&>"));
     B.C__RootZone = new A._RootZone();
     B.Duration_0 = new A.Duration(0);
     B.Duration_1000000 = new A.Duration(1000000);
     B.JsonDecoder_null = new A.JsonDecoder(null);
     B.JsonEncoder_null = new A.JsonEncoder(null);
-    B.List_2jN = A._setArrayType(makeConstList([0, 0, 32722, 12287, 65534, 34815, 65534, 18431]), type$.JSArray_int);
-    B.List_42A = A._setArrayType(makeConstList([0, 0, 65490, 45055, 65535, 34815, 65534, 18431]), type$.JSArray_int);
-    B.List_4AN = A._setArrayType(makeConstList([0, 0, 32754, 11263, 65534, 34815, 65534, 18431]), type$.JSArray_int);
-    B.List_GVy = A._setArrayType(makeConstList([0, 0, 26624, 1023, 65534, 2047, 65534, 2047]), type$.JSArray_int);
-    B.List_M2I0 = A._setArrayType(makeConstList([0, 0, 32722, 12287, 65535, 34815, 65534, 18431]), type$.JSArray_int);
-    B.List_M2I = A._setArrayType(makeConstList([0, 0, 65490, 12287, 65535, 34815, 65534, 18431]), type$.JSArray_int);
-    B.List_VOY = A._setArrayType(makeConstList([0, 0, 32776, 33792, 1, 10240, 0, 0]), type$.JSArray_int);
     B.List_empty = A._setArrayType(makeConstList([]), type$.JSArray_String);
-    B.List_empty0 = A._setArrayType(makeConstList([]), type$.JSArray_dynamic);
-    B.List_piR = A._setArrayType(makeConstList([0, 0, 24576, 1023, 65534, 34815, 65534, 18431]), type$.JSArray_int);
     B.Object_empty = {};
     B.Map_empty = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<String,String>"));
-    B.Map_empty0 = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<Symbol0,@>"));
-    B.Symbol_call = new A.Symbol("call");
-    B.Type_ByteBuffer_EOZ = A.typeLiteral("ByteBuffer");
-    B.Type_ByteData_mF8 = A.typeLiteral("ByteData");
-    B.Type_Float32List_Ymk = A.typeLiteral("Float32List");
-    B.Type_Float64List_Ymk = A.typeLiteral("Float64List");
-    B.Type_Int16List_cot = A.typeLiteral("Int16List");
-    B.Type_Int32List_m1p = A.typeLiteral("Int32List");
-    B.Type_Int8List_woc = A.typeLiteral("Int8List");
-    B.Type_Object_QJv = A.typeLiteral("Object");
-    B.Type_Uint16List_2mh = A.typeLiteral("Uint16List");
-    B.Type_Uint32List_2mh = A.typeLiteral("Uint32List");
-    B.Type_Uint8ClampedList_9Bb = A.typeLiteral("Uint8ClampedList");
-    B.Type_Uint8List_CSc = A.typeLiteral("Uint8List");
+    B.Type_ByteBuffer_rqD = A.typeLiteral("ByteBuffer");
+    B.Type_ByteData_9dB = A.typeLiteral("ByteData");
+    B.Type_Float32List_9Kz = A.typeLiteral("Float32List");
+    B.Type_Float64List_9Kz = A.typeLiteral("Float64List");
+    B.Type_Int16List_s5h = A.typeLiteral("Int16List");
+    B.Type_Int32List_O8Z = A.typeLiteral("Int32List");
+    B.Type_Int8List_rFV = A.typeLiteral("Int8List");
+    B.Type_Object_A4p = A.typeLiteral("Object");
+    B.Type_Uint16List_kmP = A.typeLiteral("Uint16List");
+    B.Type_Uint32List_kmP = A.typeLiteral("Uint32List");
+    B.Type_Uint8ClampedList_04U = A.typeLiteral("Uint8ClampedList");
+    B.Type_Uint8List_8Eb = A.typeLiteral("Uint8List");
     B.Utf8Decoder_false = new A.Utf8Decoder(false);
-    B._StringStackTrace_uwd = new A._StringStackTrace("");
-    B._ZoneFunction_NIe = new A._ZoneFunction(B.C__RootZone, A.async___rootHandleUncaughtError$closure(), type$._ZoneFunction_of_void_Function_Zone_ZoneDelegate_Zone_Object_StackTrace);
-    B._ZoneFunction_QOa = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterUnaryCallback$closure(), A.findType("_ZoneFunction<0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))<Object?,Object?>>"));
+    B._StringStackTrace_OdL = new A._StringStackTrace("");
+    B._ZoneFunction_KjJ = new A._ZoneFunction(B.C__RootZone, A.async___rootHandleUncaughtError$closure(), type$._ZoneFunction_of_void_Function_Zone_ZoneDelegate_Zone_Object_StackTrace);
+    B._ZoneFunction_PAY = new A._ZoneFunction(B.C__RootZone, A.async___rootCreatePeriodicTimer$closure(), A.findType("_ZoneFunction<Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))>"));
+    B._ZoneFunction_Xkh = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterUnaryCallback$closure(), A.findType("_ZoneFunction<0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))<Object?,Object?>>"));
     B._ZoneFunction__RootZone__rootCreateTimer = new A._ZoneFunction(B.C__RootZone, A.async___rootCreateTimer$closure(), A.findType("_ZoneFunction<Timer(Zone,ZoneDelegate,Zone,Duration,~())>"));
     B._ZoneFunction__RootZone__rootErrorCallback = new A._ZoneFunction(B.C__RootZone, A.async___rootErrorCallback$closure(), A.findType("_ZoneFunction<AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)>"));
     B._ZoneFunction__RootZone__rootFork = new A._ZoneFunction(B.C__RootZone, A.async___rootFork$closure(), A.findType("_ZoneFunction<Zone(Zone,ZoneDelegate,Zone,ZoneSpecification?,Map<Object?,Object?>?)>"));
@@ -16225,12 +15416,11 @@
     B._ZoneFunction__RootZone__rootRunBinary = new A._ZoneFunction(B.C__RootZone, A.async___rootRunBinary$closure(), A.findType("_ZoneFunction<0^(Zone,ZoneDelegate,Zone,0^(1^,2^),1^,2^)<Object?,Object?,Object?>>"));
     B._ZoneFunction__RootZone__rootRunUnary = new A._ZoneFunction(B.C__RootZone, A.async___rootRunUnary$closure(), A.findType("_ZoneFunction<0^(Zone,ZoneDelegate,Zone,0^(1^),1^)<Object?,Object?>>"));
     B._ZoneFunction__RootZone__rootScheduleMicrotask = new A._ZoneFunction(B.C__RootZone, A.async___rootScheduleMicrotask$closure(), A.findType("_ZoneFunction<~(Zone,ZoneDelegate,Zone,~())>"));
-    B._ZoneFunction_kWM = new A._ZoneFunction(B.C__RootZone, A.async___rootCreatePeriodicTimer$closure(), A.findType("_ZoneFunction<Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))>"));
-    B._ZoneFunction_qxw = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterBinaryCallback$closure(), A.findType("_ZoneFunction<0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))<Object?,Object?,Object?>>"));
+    B._ZoneFunction_e9o = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterBinaryCallback$closure(), A.findType("_ZoneFunction<0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))<Object?,Object?,Object?>>"));
   })();
   (function staticFields() {
     $._JS_INTEROP_INTERCEPTOR_TAG = null;
-    $.toStringVisiting = A._setArrayType([], type$.JSArray_Object);
+    $.toStringVisiting = A._setArrayType([], A.findType("JSArray<Object>"));
     $.Primitives__identityHashCodeProperty = null;
     $.BoundClosure__receiverFieldNameCache = null;
     $.BoundClosure__interceptorFieldNameCache = null;
@@ -16250,7 +15440,7 @@
     $.Uri__cachedBaseUri = null;
     $._currentUriBase = null;
     $._current = null;
-    $._iframes = A.LinkedHashMap_LinkedHashMap$_empty(type$.int, type$.JavaScriptObject);
+    $._iframes = A.LinkedHashMap_LinkedHashMap$_empty(type$.int, type$.JSObject);
     $._subscriptions = A.LinkedHashMap_LinkedHashMap$_empty(type$.int, A.findType("StreamSubscription<~>"));
     $._domSubscriptions = A.LinkedHashMap_LinkedHashMap$_empty(type$.int, A.findType("Subscription"));
   })();
@@ -16313,8 +15503,7 @@
     _lazyFinal($, "_Utf8Decoder__decoderNonfatal", "$get$_Utf8Decoder__decoderNonfatal", () => new A._Utf8Decoder__decoderNonfatal_closure().call$0());
     _lazyFinal($, "_Base64Decoder__inverseAlphabet", "$get$_Base64Decoder__inverseAlphabet", () => A.NativeInt8List__create1(A._ensureNativeList(A._setArrayType([-2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -1, -2, -2, -2, -2, -2, 62, -2, 62, -2, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -2, -2, -2, -1, -2, -2, -2, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -2, -2, -2, -2, 63, -2, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -2, -2, -2, -2, -2], type$.JSArray_int))));
     _lazyFinal($, "_Uri__needsNoEncoding", "$get$_Uri__needsNoEncoding", () => A.RegExp_RegExp("^[\\-\\.0-9A-Z_a-z~]*$", false));
-    _lazyFinal($, "_hashSeed", "$get$_hashSeed", () => A.objectHashCode(B.Type_Object_QJv));
-    _lazyFinal($, "_scannerTables", "$get$_scannerTables", () => A._createTables());
+    _lazyFinal($, "_hashSeed", "$get$_hashSeed", () => A.objectHashCode(B.Type_Object_A4p));
     _lazyFinal($, "windows", "$get$windows", () => A.Context_Context($.$get$Style_windows()));
     _lazyFinal($, "context", "$get$context", () => new A.Context($.$get$Style_platform(), null));
     _lazyFinal($, "Style_posix", "$get$Style_posix", () => new A.PosixStyle(A.RegExp_RegExp("/", false), A.RegExp_RegExp("[^/]$", false), A.RegExp_RegExp("^/", false)));
@@ -16342,7 +15531,10 @@
     _lazyFinal($, "_firefoxSafariTrace", "$get$_firefoxSafariTrace", () => A.RegExp_RegExp("^(([.0-9A-Za-z_$/<]|\\(.*\\))*@)?[^\\s]*:\\d*$", true));
     _lazyFinal($, "_friendlyTrace", "$get$_friendlyTrace", () => A.RegExp_RegExp("^[^\\s<][^\\s]*( \\d+(:\\d+)?)?[ \\t]+[^\\s]+$", true));
     _lazyFinal($, "vmChainGap", "$get$vmChainGap", () => A.RegExp_RegExp("^<asynchronous suspension>\\n?$", true));
-    _lazyFinal($, "_currentUrl", "$get$_currentUrl", () => A.Uri_parse(A.getProperty(A.getProperty(self.window, "location", type$.JavaScriptObject), "href", type$.String)));
+    _lazyFinal($, "_currentUrl", "$get$_currentUrl", () => {
+      var t1 = type$.JSObject;
+      return A.Uri_parse(A.getProperty(A.getProperty(A.getProperty(A.staticInteropGlobalContext(), "window", t1), "location", t1), "href", type$.String));
+    });
   })();
   (function nativeSupport() {
     !function() {
@@ -16428,9 +15620,6 @@
   Function.prototype.call$1$2 = function(a, b) {
     return this(a, b);
   };
-  Function.prototype.call$1$0 = function() {
-    return this();
-  };
   Function.prototype.call$2$3 = function(a, b, c) {
     return this(a, b, c);
   };
diff --git a/pkgs/test/test/runner/runner_test.dart b/pkgs/test/test/runner/runner_test.dart
index 379e2a7f1..362ab085e 100644
--- a/pkgs/test/test/runner/runner_test.dart
+++ b/pkgs/test/test/runner/runner_test.dart
@@ -129,7 +129,7 @@ final _runtimeCompilers = [
   '[vm]: kernel (default), source, exe',
   '[chrome]: dart2js (default), dart2wasm',
   '[firefox]: dart2js (default), dart2wasm',
-  if (Platform.isMacOS) '[safari]: dart2js (default)',
+  if (Platform.isMacOS) '[safari]: dart2js (default), dart2wasm',
   '[edge]: dart2js (default)',
   '[node]: dart2js (default), dart2wasm',
 ].map((str) => '                                      $str').join('\n');
diff --git a/pkgs/test/tool/host.dart b/pkgs/test/tool/host.dart
index 0cb6a8b99..cb573461d 100644
--- a/pkgs/test/tool/host.dart
+++ b/pkgs/test/tool/host.dart
@@ -201,15 +201,20 @@ StreamChannel<dynamic> _connectToIframe(String url, int id) {
     // running, but it's good practice to check the origin anyway.
     var message = event as dom.MessageEvent;
     if (message.origin != dom.window.location.origin) return;
+
     // Disambiguate between frames for different test suites.
     // Depending on the source type, the `location.href` may be missing.
-    if (message.source.location?.href != iframe.src) return;
+    var data = message.data;
+    if (message.source.location?.href != iframe.src &&
+        (data is! Map || data['href'] != iframe.src)) {
+      return;
+    }
 
     message.stopPropagation();
     windowSubscription.cancel();
 
     switch (message.data) {
-      case 'port':
+      case 'port' || {'messageType': 'port'}:
         dom.window.console.log('Connecting channel for suite $suiteUrl'.toJS);
         // The frame is starting and sending a port to forward for the suite.
         final port = message.ports.first;
diff --git a/pkgs/test_api/lib/src/backend/runtime.dart b/pkgs/test_api/lib/src/backend/runtime.dart
index ceef2277e..dd5cee639 100644
--- a/pkgs/test_api/lib/src/backend/runtime.dart
+++ b/pkgs/test_api/lib/src/backend/runtime.dart
@@ -25,8 +25,8 @@ final class Runtime {
       isBrowser: true);
 
   /// Apple Safari.
-  static const Runtime safari = Runtime(
-      'Safari', 'safari', Compiler.dart2js, [Compiler.dart2js],
+  static const Runtime safari = Runtime('Safari', 'safari', Compiler.dart2js,
+      [Compiler.dart2js, Compiler.dart2wasm],
       isBrowser: true);
 
   /// Microsoft Internet Explorer.