diff --git a/pkg/compiler/lib/src/kernel/fasta_support.dart b/pkg/compiler/lib/src/kernel/fasta_support.dart
index 672b34562c7..91dd4ea5604 100644
--- a/pkg/compiler/lib/src/kernel/fasta_support.dart
+++ b/pkg/compiler/lib/src/kernel/fasta_support.dart
@@ -138,16 +138,26 @@ void _loadExtras(Loader loader) {
 }
 
 const _extraDart2jsLibraries = const <String>[
-  'dart:async',
-  'dart:collection',
-  'dart:mirrors',
-  'dart:_native_typed_data',
-  'dart:_internal',
-  'dart:_js_helper',
-  'dart:_interceptors',
+  'dart:_chrome',
   'dart:_foreign_helper',
+  'dart:_interceptors',
+  'dart:_internal',
+  'dart:_isolate_helper',
+  'dart:_js_embedded_names',
+  'dart:_js_helper',
   'dart:_js_mirrors',
   'dart:_js_names',
-  'dart:_js_embedded_names',
-  'dart:_isolate_helper',
+  'dart:_native_typed_data',
+  'dart:async',
+  'dart:collection',
+  'dart:html',
+  'dart:html_common',
+  'dart:indexed_db',
+  'dart:js',
+  'dart:js_util',
+  'dart:mirrors',
+  'dart:svg',
+  'dart:web_audio',
+  'dart:web_gl',
+  'dart:web_sql',
 ];
diff --git a/pkg/front_end/lib/src/fasta/translate_uri.dart b/pkg/front_end/lib/src/fasta/translate_uri.dart
index 00453c66929..483a11cae80 100644
--- a/pkg/front_end/lib/src/fasta/translate_uri.dart
+++ b/pkg/front_end/lib/src/fasta/translate_uri.dart
@@ -75,25 +75,26 @@ class TranslateUri {
         "convert": sdk.resolve("lib/convert/convert.dart"),
         "core": sdk.resolve("lib/core/core.dart"),
         "developer": sdk.resolve("lib/developer/developer.dart"),
-        "html": sdk.resolve("lib/html/dartium/html_dartium.dart"),
-        "html_common": sdk.resolve("lib/html/html_common/html_common.dart"),
+        "html": sdk.resolve("lib/html/dart2js/html_dart2js.dart"),
+        "html_common":
+            sdk.resolve("lib/html/html_common/html_common_dart2js.dart"),
         "indexed_db":
-            sdk.resolve("lib/indexed_db/dartium/indexed_db_dartium.dart"),
+            sdk.resolve("lib/indexed_db/dart2js/indexed_db_dart2js.dart"),
         "io": sdk.resolve("lib/io/io.dart"),
         "isolate": sdk.resolve("lib/isolate/isolate.dart"),
-        "js": sdk.resolve("lib/js/dartium/js_dartium.dart"),
-        "js_util": sdk.resolve("lib/js_util/dartium/js_util_dartium.dart"),
+        "js": sdk.resolve("lib/js/dart2js/js_dart2js.dart"),
+        "js_util": sdk.resolve("lib/js_util/dart2js/js_util_dart2js.dart"),
         "math": sdk.resolve("lib/math/math.dart"),
         "mirrors": sdk.resolve("lib/mirrors/mirrors.dart"),
         "nativewrappers": sdk.resolve("lib/html/dartium/nativewrappers.dart"),
         "profiler": sdk.resolve("lib/profiler/profiler.dart"),
-        "svg": sdk.resolve("lib/svg/dartium/svg_dartium.dart"),
+        "svg": sdk.resolve("lib/svg/dart2js/svg_dart2js.dart"),
         "typed_data": sdk.resolve("lib/typed_data/typed_data.dart"),
         "vmservice_io": sdk.resolve("lib/vmservice_io/vmservice_io.dart"),
         "web_audio":
-            sdk.resolve("lib/web_audio/dartium/web_audio_dartium.dart"),
-        "web_gl": sdk.resolve("lib/web_gl/dartium/web_gl_dartium.dart"),
-        "web_sql": sdk.resolve("lib/web_sql/dartium/web_sql_dartium.dart"),
+            sdk.resolve("lib/web_audio/dart2js/web_audio_dart2js.dart"),
+        "web_gl": sdk.resolve("lib/web_gl/dart2js/web_gl_dart2js.dart"),
+        "web_sql": sdk.resolve("lib/web_sql/dart2js/web_sql_dart2js.dart"),
       };
     }
     uri ??= Uri.base.resolve(".packages");
diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart
index 51a2367cd4d..76e3a5a1f89 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -43018,9 +43018,9 @@ class _EventStreamSubscription<T extends Event> extends StreamSubscription<T> {
     }
   }
 
-  Future/*<E>*/ asFuture/*<E>*/([var/*=E*/ futureValue]) {
+  Future<E> asFuture<E>([E futureValue]) {
     // We just need a future that will never succeed or fail.
-    var completer = new Completer/*<E>*/();
+    var completer = new Completer<E>();
     return completer.future;
   }
 }
diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart
index 246297fe0de..9d624acef6e 100644
--- a/sdk/lib/html/dartium/html_dartium.dart
+++ b/sdk/lib/html/dartium/html_dartium.dart
@@ -49166,9 +49166,9 @@ class _EventStreamSubscription<T extends Event> extends StreamSubscription<T> {
     }
   }
 
-  Future/*<E>*/ asFuture/*<E>*/([var/*=E*/ futureValue]) {
+  Future<E> asFuture<E>([E futureValue]) {
     // We just need a future that will never succeed or fail.
-    var completer = new Completer/*<E>*/();
+    var completer = new Completer<E>();
     return completer.future;
   }
 }
diff --git a/sdk/lib/html/html_common/css_class_set.dart b/sdk/lib/html/html_common/css_class_set.dart
index 61b9863c76e..11c35cbb927 100644
--- a/sdk/lib/html/html_common/css_class_set.dart
+++ b/sdk/lib/html/html_common/css_class_set.dart
@@ -55,12 +55,12 @@ abstract class CssClassSetImpl implements CssClassSet {
 
   String join([String separator = ""]) => readClasses().join(separator);
 
-  Iterable/*<T>*/ map/*<T>*/(/*=T*/ f(String e)) => readClasses().map/*<T>*/(f);
+  Iterable<T> map<T>(T f(String e)) => readClasses().map<T>(f);
 
   Iterable<String> where(bool f(String element)) => readClasses().where(f);
 
-  Iterable/*<T>*/ expand/*<T>*/(Iterable/*<T>*/ f(String element)) =>
-      readClasses().expand/*<T>*/(f);
+  Iterable<T> expand<T>(Iterable<T> f(String element)) =>
+      readClasses().expand<T>(f);
 
   bool every(bool f(String element)) => readClasses().every(f);
 
@@ -76,9 +76,8 @@ abstract class CssClassSetImpl implements CssClassSet {
     return readClasses().reduce(combine);
   }
 
-  dynamic/*=T*/ fold/*<T>*/(var/*=T*/ initialValue,
-      dynamic/*=T*/ combine(var/*=T*/ previousValue, String element)) {
-    return readClasses().fold/*<T>*/(initialValue, combine);
+  T fold<T>(T initialValue, T combine(T previousValue, String element)) {
+    return readClasses().fold<T>(initialValue, combine);
   }
 
   // interface Collection - END
diff --git a/tools/dom/src/EventStreamProvider.dart b/tools/dom/src/EventStreamProvider.dart
index 3fd6be8e7c0..7989689d1bd 100644
--- a/tools/dom/src/EventStreamProvider.dart
+++ b/tools/dom/src/EventStreamProvider.dart
@@ -298,9 +298,9 @@ class _EventStreamSubscription<T extends Event> extends StreamSubscription<T> {
     }
   }
 
-  Future/*<E>*/ asFuture/*<E>*/([var/*=E*/ futureValue]) {
+  Future<E> asFuture<E>([E futureValue]) {
     // We just need a future that will never succeed or fail.
-    var completer = new Completer/*<E>*/();
+    var completer = new Completer<E>();
     return completer.future;
   }
 }